Fixed a series of mistakes that prevented converting from regionized leveldb to a different format

Remove regionized leveldb 32x32 and 64x64
these produce such small file sizes on average that the DB logs would probably take up a significant fraction of the world's footprint. My gut instinct is that 128 will probably be the sweet spot, as on average it should sit well below the threshold for level 3 compactions, and most worlds would likely fit into a single DB. 256 is probably not worthwhile, but might be worth trying.
2025-09-08 10:53:05 +00:00 · 2024-12-23 19:11:59 +00:00 · 2024-12-21 18:47:44 +00:00 · 2024-12-21 18:13:59 +00:00 · 2024-12-21 18:10:25 +00:00 · 2024-12-21 18:03:41 +00:00
255 changed files with 3139 additions and 6636 deletions
--- a/.github/ISSUE_TEMPLATE/api-change-request.md
+++ b/.github/ISSUE_TEMPLATE/api-change-request.md
@ -0,0 +1,19 @@
+---
+name: API change request
+about: Suggest a change, addition or removal to the plugin API
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--- Describe the problem you want to solve -->
+## Problem description
+
+
+<!--- 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 solutions that don't require API changes
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@ -1,87 +0,0 @@
-name: Bug report
-description: Report a feature of PocketMine-MP not working as expected
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Plugin information
-
-        > [!IMPORTANT]
-        > It's strongly recommended to test for bugs without plugins before reporting an issue.
-        > This helps avoid wasting maintainers' time on bugs that are not actually caused by PocketMine-MP.
-        >
-        > If you're not sure whether a plugin might be causing your issue, please seek help on our [Discord](https://discord.gg/bmSAZBG) before writing an issue.
-
-  - type: dropdown
-    attributes:
-      label: Plugin information
-      options:
-        - "I haven't tested without plugins"
-        - Bug happens without plugins
-        - Bug only happens with certain plugins (describe below)
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        ## Bug description
-
-        > [!TIP]
-        > Helpful information to include:
-        > - Steps to reproduce the issue
-        > - Error backtraces
-        > - Crashdumps
-        > - Plugin code that triggers the issue
-        > - List of installed plugins (use /plugins)
-
-        > [!IMPORTANT]
-        > **Steps to reproduce are critical to finding the cause of the problem!**
-        > Without reproducing steps, the issue will probably not be solvable and may be closed.
-
-  - type: textarea
-    attributes:
-      label: Problem description
-      description: Describe the problem, and how you encountered it
-      placeholder: e.g. Steps to reproduce the issue
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behaviour
-      description: What did you expect to happen?
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        ## Version, OS and game info
-        > [!WARNING]
-        > "Latest" is not a valid version.
-        > Failure to fill these fields with valid information may result in your issue being closed.
-
-  - type: input
-    attributes:
-      label: PocketMine-MP version
-      placeholder: Use the /version command in PocketMine-MP
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: PHP version
-      placeholder: Use the /version command in PocketMine-MP
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Server OS
-      placeholder: Use the /version command in PocketMine-MP
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Game version (if applicable)
-      placeholder: e.g. Android, iOS, Windows, Xbox, PS4, Switch
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Unexpected non-crash behaviour (except missing gameplay features)
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Issue description
+
+- Expected result: What were you expecting to happen?
+- Actual result: What actually happened?
+
+### Steps to reproduce the issue
+1. ...
+2. ...
+
+### OS and versions
+<!-- try the `version` command | LATEST IS NOT A VALID VERSION -->
+* PocketMine-MP:
+* PHP:
+* Using JIT: yes/no (delete as appropriate) <!-- look for the giant yellow warning in the log that says you're using JIT -->
+* Server OS:
+* Game version: Android/iOS/Win10/Xbox/PS4/Switch (delete as appropriate)
+
+### Plugins
+<!--- use the `plugins` command and paste the output below -->
+
+- If you remove all plugins, does the issue still occur?
+- If the issue is **not** reproducible without plugins:
+  - Have you asked for help on our forums before creating an issue?
+  - Can you provide sample, *minimal* reproducing code for the issue? If so, paste it in the bottom section
+
+### Crashdump, backtrace or other files
+<!--- Submit crashdumps at https://crash.pmmp.io and paste a link -->
+<!--- Use gist or anything else to add other files and add links here -->
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@ -0,0 +1,16 @@
+---
+name: Crash
+about: Report a crash in PocketMine-MP (not plugins)
+title: Server crashed
+labels: ''
+assignees: ''
+
+---
+
+<!--- submit crashdump files to https://crash.pmmp.io -->
+<!--- or, copy the data between ===BEGIN CRASH DUMP=== and ===END CRASH DUMP and paste it on a site like https://pastebin.com -->
+<!--- DON'T JUST PASTE the crashdump into an issue -->
+Link to crashdump: 
+
+<!--- write additional information about the crash to help us find the problem -->
+### Additional comments (optional)
--- a/.github/ISSUE_TEMPLATE/crash.yml
+++ b/.github/ISSUE_TEMPLATE/crash.yml
@ -1,25 +0,0 @@
-name: Crash
-description: Report a crash in PocketMine-MP (not plugins)
-title: Server crashed
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!TIP]
-        > Submit crashdump `.log` files to the [Crash Archive](https://crash.pmmp.io/submit).
-        > If you can't submit the crashdump to the Crash Archive, paste it on a site like [GitHub Gist](https://gist.github.com) or [Pastebin](https://pastebin.com).
-
-        > [!CAUTION]
-        > DON'T paste the crashdump data directly into an issue.
-
-  - type: input
-    id: crashdump-url
-    attributes:
-      label: Link to crashdump
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Additional comments (optional)
-      description: Any other information that might help us solve the problem
--- a/.github/ISSUE_TEMPLATE/feature-proposal.yml
+++ b/.github/ISSUE_TEMPLATE/feature-proposal.yml
@ -1,19 +0,0 @@
-name: Feature addition, change, or removal
-description: Propose adding new features, or changing/removing existing ones
-body:
-  - type: textarea
-    attributes:
-      label: Problem description
-      description: Explain why a change is needed
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Proposed solution
-      description: Describe what changes you think should be made
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: "Alternative solutions or workarounds"
-      description: "Describe other ways you've explored to achieve your goal"
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -12,10 +12,6 @@ updates:
      update-types:
        - "version-update:semver-major"
        - "version-update:semver-minor"
-
-    #since we lock this to exact versions, it causes conflicts with minor-next & major-next in composer.lock
-    #better to just test updates to this locally anyway since almost every version breaks something
-    - dependency-name: phpstan/phpstan
  groups:
    production-patch-updates:
      dependency-type: production
--- a/.github/workflows/branch-sync-cron-trigger.yml
+++ b/.github/workflows/branch-sync-cron-trigger.yml
@ -1,32 +0,0 @@
-#Since GitHub automatically disables cron actions after 60 days of repo inactivity, we need the active repo (PM)
-#to trigger the branch merge workflow explicitly. This avoids the need for TOS-violating actions which we previously
-#used to keep the restricted action active, as the workflow depends on the activity of this repo anyway.
-
-name: Trigger branch sync
-
-on:
-  schedule:
-    - cron: "0 0 * * *" #once per day so we don't spam merge commits on busy days
-  workflow_dispatch: #for testing
-
-jobs:
-  trigger:
-    name: Trigger branch sync RestrictedActions workflow
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Generate access token
-        id: generate-token
-        uses: actions/create-github-app-token@v2
-        with:
-          app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
-          private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
-          owner: ${{ github.repository_owner }}
-          repositories: RestrictedActions
-
-      - name: Dispatch branch sync restricted action
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          repository: ${{ github.repository_owner }}/RestrictedActions
-          event-type: pocketmine_mp_branch_sync
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@ -8,7 +8,7 @@ on:
 jobs:
  build:
    name: Update Docker Hub images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    steps:
      - name: Set up Docker Buildx
@ -53,7 +53,7 @@ jobs:
        run: echo NAME=$(echo "${GITHUB_REPOSITORY,,}") >> $GITHUB_OUTPUT

      - name: Build image for tag
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v6.10.0
        with:
          push: true
          context: ./pocketmine-mp
@ -66,7 +66,7 @@ jobs:

      - name: Build image for major tag
        if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v6.10.0
        with:
          push: true
          context: ./pocketmine-mp
@ -79,7 +79,7 @@ jobs:

      - name: Build image for minor tag
        if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v6.10.0
        with:
          push: true
          context: ./pocketmine-mp
@ -92,7 +92,7 @@ jobs:

      - name: Build image for latest tag
        if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v6.10.0
        with:
          push: true
          context: ./pocketmine-mp
--- a/.github/workflows/discord-release-notify.yml
+++ b/.github/workflows/discord-release-notify.yml
@ -13,7 +13,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.33.0
+        uses: shivammathur/setup-php@2.31.1
        with:
          php-version: 8.2

--- a/.github/workflows/draft-release-pr-check.yml
+++ b/.github/workflows/draft-release-pr-check.yml
@ -24,7 +24,7 @@ permissions:
 jobs:
  check-intent:
    name: Check release trigger
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    outputs:
      valid: ${{ steps.validate.outputs.DEV_BUILD == 'false' }}
@ -43,13 +43,13 @@ jobs:
    #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-22.04
+    runs-on: ubuntu-20.04

    steps:
      - uses: actions/checkout@v4

      - name: Setup PHP
-        uses: shivammathur/setup-php@2.33.0
+        uses: shivammathur/setup-php@2.31.1
        with:
          php-version: 8.2

--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@ -23,7 +23,7 @@ env:
 jobs:
  skip:
    name: Check whether to ignore this tag
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    outputs:
      skip: ${{ steps.exists.outputs.exists == 'true' }}
@ -54,12 +54,12 @@ jobs:
    needs: [check]
    if: needs.check.outputs.valid == 'true' && github.ref_type != 'tag' #can't do post-commit for a tag

-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    steps:
      - name: Generate access token
        id: generate-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v1
        with:
          app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
          private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
@ -79,7 +79,7 @@ jobs:
    needs: [check]
    if: needs.check.outputs.valid == 'true' || github.ref_type == 'tag' #ignore validity check for tags

-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    steps:
      - uses: actions/checkout@v4
@ -87,7 +87,7 @@ jobs:
          submodules: true

      - name: Setup PHP
-        uses: shivammathur/setup-php@2.33.0
+        uses: shivammathur/setup-php@2.31.1
        with:
          php-version: ${{ env.PHP_VERSION }}

@ -165,7 +165,7 @@ jobs:
            ${{ github.workspace }}/core-permissions.rst

      - name: Create draft release
-        uses: ncipollo/release-action@v1.16.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,${{ github.workspace }}/core-permissions.rst
@ -182,10 +182,8 @@ jobs:

            :information_source: Download the recommended PHP binary [here](${{ steps.php-binary-url.outputs.PHP_BINARY_URL }}).

-            :warning: Found a bug? Report it on our [issue tracker](${{ github.server_url }}/${{ github.repository }}/issues). **We can't fix bugs if you don't report them.**
-
      - name: Post draft release URL on PR
        if: github.event_name == 'pull_request_target'
        uses: thollander/actions-comment-pull-request@v3
        with:
-          message: "${{ vars.DRAFT_RELEASE_NOTIFICATION_MENTION }} [Draft release ${{ steps.get-pm-version.outputs.PM_VERSION }}](${{ steps.create-draft.outputs.html_url }}) has been created for commit ${{ github.sha }}. Please review and publish it."
+          message: "[Draft release ${{ steps.get-pm-version.outputs.PM_VERSION }}](${{ steps.create-draft.outputs.html_url }}) has been created for commit ${{ github.sha }}. Please review and publish it."
--- a/.github/workflows/main-php-matrix.yml
+++ b/.github/workflows/main-php-matrix.yml
@ -15,7 +15,7 @@ on:
        type: number
      image:
        description: 'Runner image to use'
-        default: 'ubuntu-22.04'
+        default: 'ubuntu-20.04'
        type: string

 jobs:
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -20,7 +20,7 @@ jobs:

  codestyle:
    name: Code Style checks
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    strategy:
      fail-fast: false

@ -28,10 +28,10 @@ jobs:
      - uses: actions/checkout@v4

      - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.33.0
+        uses: shivammathur/setup-php@2.31.1
        with:
-          php-version: 8.3
-          tools: php-cs-fixer:3.75
+          php-version: 8.2
+          tools: php-cs-fixer:3.49
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@ -40,7 +40,7 @@ jobs:

  shellcheck:
    name: ShellCheck
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    strategy:
      fail-fast: false

--- a/.github/workflows/pr-remove-waiting-label.yml
+++ b/.github/workflows/pr-remove-waiting-label.yml
@ -15,23 +15,19 @@ jobs:
        with:
          github-token: ${{ github.token }}
          script: |
-            async function removeLabel(owner, repo, issue_number, name) {
-              try {
-                await github.rest.issues.removeLabel({
-                  owner: owner,
-                  repo: repo,
-                  issue_number: issue_number,
-                  name: name,
-                });
-              } catch (error) {
-                if (error.status === 404) {
-                  //probably label wasn't set on the issue
-                  console.log('Failed to remove label ' + name + ' (probably label isn\'t on the PR): ' + error.message);
-                } else {
-                  throw error;
-                }
+            const [owner, repo] = context.payload.repository.full_name.split('/');
+            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;
              }
            }
-            const [owner, repo] = context.payload.repository.full_name.split('/');
-            removeLabel(owner, repo, context.payload.number, "Status: Waiting on Author");
-            removeLabel(owner, repo, context.payload.number, "Stale");
--- a/.github/workflows/support.yml
+++ b/.github/workflows/support.yml
@ -20,7 +20,10 @@ jobs:

            - Check our [Documentation](https://doc.pmmp.io) to see if you can find answers there

-            - Ask the community on our [Discord server](https://discord.gg/bmSAZBG)
+            - Ask the community on our [Discord server](https://discord.gg/bmSAZBG) or our [Forums](https://forums.pmmp.io)
+
+
+            [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bmSAZBG) | [Forums](https://forums.pmmp.io)

          close-issue: true
          lock-issue: false
--- a/.github/workflows/team-pr-auto-approve.yml
+++ b/.github/workflows/team-pr-auto-approve.yml
@ -22,7 +22,7 @@ jobs:
    steps:
      - name: Generate access token
        id: generate-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v1
        with:
          app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
          private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@ -6,12 +6,6 @@ $finder = PhpCsFixer\Finder::create()
 	->in(__DIR__ . '/tests')
 	->in(__DIR__ . '/tools')
 	->notPath('plugins/DevTools')
-	//JsonMapper will break if the FQNs in the doc comments for these are shortened :(
-	->notPath('crafting/json')
-	->notPath('inventory/json')
-	->notPath('data/bedrock/block/upgrade/model')
-	->notPath('data/bedrock/item/upgrade/model')
-
 	->notName('PocketMine.php');

 return (new PhpCsFixer\Config)
--- a/README.md
+++ b/README.md
@ -65,8 +65,6 @@ PocketMine-MP accepts community contributions! The following resources will be u
 * [Building and running PocketMine-MP from source](BUILDING.md)
 * [Contributing Guidelines](CONTRIBUTING.md)

-New here? Check out [issues with the "Easy task" label](https://github.com/pmmp/PocketMine-MP/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22Easy%20task%22) for things you could work to familiarise yourself with the codebase.
-
 ## Donate
 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.

--- a/build/dump-version-info.php
+++ b/build/dump-version-info.php
@ -31,12 +31,12 @@ require dirname(__DIR__) . '/vendor/autoload.php';
 */

 /**
- * @var string[]|Closure[] $options
- * @phpstan-var array<string, string|Closure() : string> $options
+ * @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, limit: 2)[0],
+	"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{
--- a/build/generate-bedrockdata-path-consts.php
+++ b/build/generate-bedrockdata-path-consts.php
@ -28,7 +28,6 @@ use function dirname;
 use function fclose;
 use function fopen;
 use function fwrite;
-use function is_dir;
 use function is_file;
 use function scandir;
 use function str_replace;
@ -60,7 +59,7 @@ foreach($files as $file){
 		continue;
 	}
 	$path = Path::join(BEDROCK_DATA_PATH, $file);
-	if(!is_file($path) && !is_dir($path)){
+	if(!is_file($path)){
 		continue;
 	}

@ -68,7 +67,6 @@ foreach($files as $file){
 		'README.md',
 		'LICENSE',
 		'composer.json',
-		'.github'
 	] as $ignored){
 		if($file === $ignored){
 			continue 2;
--- a/build/php
+++ b/build/php
--- a/build/server-phar.php
+++ b/build/server-phar.php
@ -129,7 +129,7 @@ function buildPhar(string $pharPath, string $basePath, array $includedPaths, arr
 }

 function main() : void{
-	if(ini_get("phar.readonly") === "1"){
+	if(ini_get("phar.readonly") == 1){
 		echo "Set phar.readonly to 0 with -dphar.readonly=0" . PHP_EOL;
 		exit(1);
 	}
--- a/changelogs/5.23.md
+++ b/changelogs/5.23.md
@ -127,13 +127,3 @@ Released 9th December 2024.

 ## Internals
 - Removed legacy `build/make-release.php` script. This script is no longer used, as all releases should now follow the PR workflow.
-
-# 5.23.3
-Released 22nd January 2025.
-
-## Fixes
- Fixed crashes with PHP internal stack frames being flagged as plugin crashes.
- Fixed note block instrument sounds in 1.21.50.
-
-## Internals
- Updated GitHub issue templates to use issue forms.
--- a/changelogs/5.24.md
+++ b/changelogs/5.24.md
@ -1,108 +0,0 @@
-# 5.24.0
-Released 22nd January 2025.
-
-This is a minor feature release, including new gameplay features, performance improvements, and minor API additions.
-
-**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.
-
-## Performance
- PHP garbage collection is now managed by the server, instead of being automatically triggered by PHP.
-  - The mechanism for GC triggering is designed to mimic PHP's to avoid behavioural changes. Only the place it's triggered from should be significantly different.
-  - This change also avoids unnecessary GCs during object-heavy operations, such as encoding `CraftingDataPacket`. As such, performance during server join should see an improvement.
-  - Timings is now able to directly measure the impact of GC. Previously, GC would show up as random spikes under random timers, skewing timing results.
- `ChunkCache` now uses `string` for completed caches directly instead of keeping them wrapped in `CompressBatchPromise`s. This reduces memory usage, improves performance, and reduces GC workload.
-
-## Configuration
- The following settings have been removed from `pocketmine.yml` and will no longer have any effect:
-  - `memory.garbage-collection.collect-async-worker` (now always `true`)
-  - `memory.garbage-collection.low-memory-trigger` (now always `true`)
-  - `memory.max-chunks.trigger-chunk-collect` (now always `true`)
-  - `memory.world-caches.disable-chunk-cache` (now always `true`)
-  - `memory.world-caches.low-memory-trigger` (now always `true`)
-
-## Gameplay
- Added the following new blocks:
-  - All types of pale oak wood, and leaves
-  - Resin
-  - Resin Bricks, Slabs, Stairs, and Walls
-  - Resin Clump
-  - Chiseled Resin Bricks
- Some blocks have had their tool tier requirements adjusted to match latest Bedrock updates.
- Added the following new items:
-  - Resin Brick
-  - Music Disc - Creator
-  - Music Disc - Creator (Music Box)
-  - Music Disc - Precipice
-  - Music Disc - Relic
-
-## API
-### General
- Many places had their PHPDoc improved to address issues highlighted by PHPStan 2.x. This may cause new, previously unreported issues to be reported in plugins using PHPStan.
-
-### `pocketmine`
- The following methods have been deprecated:
-  - `MemoryManager->canUseChunkCache()`
-  - `MemoryManager::dumpMemory()` - relocated to `MemoryDump` class
-
-### `pocketmine\item`
- The following new enum cases have been added:
-  - `RecordType::DISK_CREATOR`
-  - `RecordType::DISK_CREATOR_MUSIC_BOX`
-  - `RecordType::DISK_PRECIPICE`
-  - `RecordType::DISK_RELIC`
-
-### `pocketmine\player`
- The following new methods have been added:
-  - `public Player->getFlightSpeedMultiplier() : float` - a base multiplier for player's flight speed
-  - `public Player->setFlightSpeedMultiplier(float $flightSpeedMultiplier) : void` - sets the player's flight speed multiplier
- The following new constants have been added:
-  - `Player::DEFAULT_FLIGHT_SPEED_MULTIPLIER`
-
-### `pocketmine\utils`
- The following new methods have been added:
-  - `public static TextFormat::javaToBedrock(string $string) : string` - removes unsupported Java Edition format codes to prevent them being incorrectly displayed on Bedrock
- The following methods have behavioural changes:
-  - `TextFormat::toHTML()` now converts `§m` to redstone red (instead of strikethrough), and `§n` to copper orange (instead of underline). This is because the codes previously used for `STRIKETHROUGH` and `UNDERLINE` conflict with the new material codes introduced by Minecraft Bedrock.
-  - `Terminal::toANSI()` now converts `§m` to redstone red (instead of strikethrough), and `§n` to copper orange (instead of underline), as above. However, underline and strikethrough can still be used on the terminal using `Terminal::$FORMAT_UNDERLINE` and `Terminal::$FORMAT_STRIKETHROUGH` respectively.
- The following new constants have been added:
-  - `TextFormat::MATERIAL_QUARTZ`
-  - `TextFormat::MATERIAL_IRON`
-  - `TextFormat::MATERIAL_NETHERITE`
-  - `TextFormat::MATERIAL_REDSTONE`
-  - `TextFormat::MATERIAL_COPPER`
-  - `TextFormat::MATERIAL_GOLD`
-  - `TextFormat::MATERIAL_EMERALD`
-  - `TextFormat::MATERIAL_DIAMOND`
-  - `TextFormat::MATERIAL_LAPIS`
-  - `TextFormat::MATERIAL_AMETHYST`
- The following constants have been deprecated:
-  - `TextFormat::STRIKETHROUGH`
-  - `TextFormat::UNDERLINE`
- The following static properties have been added:
-  - `Terminal::$COLOR_MATERIAL_QUARTZ`
-  - `Terminal::$COLOR_MATERIAL_IRON`
-  - `Terminal::$COLOR_MATERIAL_NETHERITE`
-  - `Terminal::$COLOR_MATERIAL_REDSTONE`
-  - `Terminal::$COLOR_MATERIAL_COPPER`
-  - `Terminal::$COLOR_MATERIAL_GOLD`
-  - `Terminal::$COLOR_MATERIAL_EMERALD`
-  - `Terminal::$COLOR_MATERIAL_DIAMOND`
-  - `Terminal::$COLOR_MATERIAL_LAPIS`
-  - `Terminal::$COLOR_MATERIAL_AMETHYST`
-
-## Tools
- Fixed some UI issues in `tools/convert-world.php`
-
-## Internals
- Block cache in `World` is now size-limited. This prevents memory exhaustion when plugins call `getBlock()` many thousands of times with cache misses.
- `RakLibServer` now disables PHP GC. As RakLib doesn't generate any unmanaged cycles, GC is just a waste of CPU time in this context.
- `MemoryManager` now has the responsibility for triggering cycle GC. It's checked every tick, but GC won't take place unless the GC threshold is exceeded, similar to PHP.
-  - This mechanism could probably do with alterations to better suit PocketMine-MP, but it was chosen to mimic PHP's own GC to minimize behavioural changes for now.
- `AsyncTask` now triggers cycle GC after `onRun()` completes. As with `MemoryManager`, this is based on a threshold designed to mimic PHP's own behaviour.
- `FormatConverter` now performs world provider GC periodically. This is not needed with current active providers, but was found to be a problem while developing custom providers.
- Various internal adjustments were made to avoid returning incorrectly-keyed arrays in the code. These changes shouldn't affect anything as the arrays should have been properly ordered anyway.
- Many places that previously used `==` and `!=` have been updated to use strict variants. This kind of change needs to be done carefully to avoid breaking `int|float` comparisons.
--- a/changelogs/5.25.md
+++ b/changelogs/5.25.md
@ -1,52 +0,0 @@
-# 5.25.0
-Released 16th February 2025.
-
-This is a support release for Minecraft: Bedrock Edition 1.21.60. It also includes some minor API additions supporting new features in this version.
-
-**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.60.
- Removed support for earlier versions.
-
-## Documentation
- Fixed the documentation of `Utils::getOS()`. It now refers to the `Utils::OS_*` constants instead of a list of hardcoded strings.
-
-## API
-### `pocketmine\inventory`
-This release allows plugins to decide which creative tab they want to add their new items to.
-It also allows creating new collapsible groups of items, and modifying or removing existing ones.
-
- The following new methods have been added:
-  - `public CreativeInventory->getAllEntries() : list<CreativeInventoryEntry>` - returns an array of objects, each containing a creative item and information about its category and collapsible group (if applicable).
-  - `public CreativeInventory->getEntry(int $index) : ?CreativeInventoryEntry` - returns the creative item with the specified identifier, or `null` if not found
- The following methods have signature changes:
-  - `CreativeInventory->add()` now accepts two additional optional parameters: `CreativeCategory $category, ?CreativeGroup $group`. If not specified, the item will be added to the Items tab without a group.
- The following new classes have been added:
-  - `CreativeCategory` - enum of possible creative inventory categories (each has its own tab on the GUI)
-  - `CreativeGroup` - contains information about a collapsible group of creative items, including tooltip text and icon
-  - `CreativeInventoryEntry` - contains information about a creative inventory item, including its category and collapsible group (if applicable)
-
-## Internals
- `CreativeContentPacket` is no longer fully cached due to the requirement for translation context during construction. The individual items are still cached (which is the most expensive part), but the packet itself is now constructed on demand, and group entries are constructed on the fly. This may affect performance, but this has not been investigated.
- `BedrockDataFiles` now includes constants for folders at the top level of `BedrockData` as well as files.
- The structure of creative data in `BedrockData` was changed to accommodate item category and grouping information. `creativeitems.json` has been replaced by `creative/*.json`, which contain information about item grouping and also segregates item lists per category.
- New information was added to `required_item_list.json` in `BedrockData`, as the server is now required to send item component NBT data in some cases.
-
-# 5.25.1
-Released 26th February 2025.
-
-## Fixes
- Fixed confusing exception message when a block-breaking tool has an efficiency value of zero.
- Fixed incorrect facing of doors since 1.21.60 (resulted in mismatched AABBs between client & server, rendering glitches etc.)
- Resource pack UUIDs are now validated on load. Previously, invalid UUIDs would be accepted, and potentially cause a server crash on player join.
-
-# 5.25.2
-Released 4th March 2025.
-
-## Fixes
- Added limits to various `explode()` calls.
--- a/changelogs/5.26.md
+++ b/changelogs/5.26.md
@ -1,71 +0,0 @@
-# 5.26.0
-Released 22nd March 2025.
-
-This is a minor feature release focused on 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.
-
-## Performance
- Significantly improved performance of entity movement. Load testing with item entities showed a 3x increase in the number of entities supported without lag.
- Significantly improved performance of on-ground checks for player movement. This still needs further work, but optimisations implemented in this version should improve performance substantially.
- Updated `pocketmine/nbt` dependency with performance improvements to `TAG_Compound` and `TAG_List` comparison. This should improve performance of inventory-related actions.
- `InventoryTransaction` now avoids useless item clones when processing transactions, which should improve performance of inventory-related actions.
-
-## Dependencies
- `pocketmine/bedrock-protocol` has been updated to `36.2.0`, which adds new functions to access some packet fields.
- `pocketmine/nbt` has been updated to `1.1.0`, which improves performance when comparing NBT object trees.
-
-## Gameplay
- Block breaking animation speed now takes into account the following: jumping, being in water, haste, mining fatigue
-
-## Tools
- `blockstate-upgrade-schema-utils.php` now has a new `dump-table` command, which turns a `.bin` palette table file into human-readable text for debugging.
-
-## API
-### `pocketmine\block`
- The following methods have been added:
-  - `public RuntimeBlockStateRegistry->hasStateId(int $stateId) : bool` - checks whether the given state ID is registered
-
-### `pocketmine\crafting`
- The following methods have been deprecated:
-  - `CraftingManager::sort()` - this was implicitly internal anyway
-
-### `pocketmine\utils`
- The following constants have been added:
-  - `TextFormat::MATERIAL_RESIN`
- The following static properties have been added:
-  - `Terminal::$COLOR_MATERIAL_RESIN`
-
-### `pocketmine\data\bedrock\block`
- `BlockStateToObjectDeserializer` now permits overriding **deserializers** for Bedrock IDs. This may be useful to implement custom state handling, or to implement missing block variants (such as snow cauldron).
-  - This was originally prohibited since 5.0.0. However, there is no technical reason to disallow overriding **deserializers**.
-  - Overriding **serializers** is still **not permitted**. Reusing type IDs doesn't make any sense and would break internal design contracts.
-  - If you want to make a custom version of a vanilla block, create a custom type ID for it, exactly as you would for a regular custom block.
- The following methods have been added:
-  - `public BlockStateToObjectDeserializer->getDeserializerForId(string $id) : ?(\Closure(BlockStateReader) : Block)`
-
-### `pocketmine\data\bedrock\item`
- `ItemDeserializer` now permits overriding **deserializers** for Bedrock IDs. As above, this may be useful to implement custom data handling, or to implement missing variants of existing items.
-  - This was originally prohibited since 5.0.0. However, there is no technical reason to disallow overriding **deserializers**.
-  - Overriding **serializers** is still **not permitted**. Reusing type IDs doesn't make any sense and would break internal design contracts.
-  - As above, if you want to make a custom version of a vanilla item, create a custom type ID for it, exactly as you would for a regular custom item.
- The following methods have been added:
-  - `public ItemDeserializer->getDeserializerForId(string $id) : ?(\Closure(SavedItemData) : Item)`
-
-## Internals
- `new $class` is now banned on new internals code by a PHPStan rule. Closures or factory objects should be used instead for greater flexibility and better static analysis.
- `CraftingManager` now uses a more stable hash function for recipe output filtering.
- `ChunkCache` now accepts `int $dimensionId` in the constructor. This may be useful for plugins which implement the nether.
- `RuntimeBlockStateRegistry` now precomputes basic collision info about known states for fast paths.
-  - This permits specialization for common shapes like cubes and collisionless blocks, which allows skipping complex logic in entity movement calculation. This vastly improves performance.
-  - Any block whose class overrides `readStateFromWorld()` or `getModelPositionOffset()` will *not* be optimised.
-  - `Block->recalculateCollisionBoxes()` now has a hard requirement not to depend on anything other than available properties. It must not use `World` or its position.
-    - This change was problematic for `ChorusPlant`, which used nearby blocks to calculate its collision boxes.
-    - Blocks which need nearby blocks should override `readStateFromWorld()` and set dynamic state properties, similar to fences.
-    - This design flaw will be corrected with a major change to `Block` internals currently in planning for a future major version.
- `Block->getCollisionBoxes()` may not be called at all during gameplay for blocks with shapes determined to be simple, like cubes and collisionless blocks.
- `BlockStateToObjectDeserializer` now checks if the returned blockstate is registered in `RuntimeBlockStateRegistry` to promote earlier error detection (instead of crashing in random code paths).
--- a/changelogs/5.27.md
+++ b/changelogs/5.27.md
@ -1,24 +0,0 @@
-# 5.27.0
-Released 27th March 2025.
-
-This is a support release for Minecraft: Bedrock Edition 1.21.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.
-
-## Interim releases
-If you're upgrading from 5.25.x directly to 5.27.0, please also read the following changelogs, as the interim releases contain important changes:
- [5.26.0](https://github.com/pmmp/PocketMine-MP/blob/5.26.0/changelogs/5.26.md#5260) - Performance improvements and other internal improvements
-
-## General
- Aded support for Minecraft: Bedrock Edition 1.21.70.
- Removed support for earlier versions.
-
-# 5.27.1
-Released 6th April 2025.
-
-## Fixes
- Updated RakLib to get ping timestamp handling fixes.
--- a/changelogs/5.28.md
+++ b/changelogs/5.28.md
@ -1,34 +0,0 @@
-# 5.28.0
-Released 9th May 2025.
-
-This is a support release for Minecraft: Bedrock Edition 1.21.80.
-
-**Plugin compatibility:** Plugins for previous 5.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` or `pocketmine\data` namespace.
-Do not update plugin minimum API versions unless you need new features added in this release.
-
-**WARNING: If your plugin uses the `pocketmine\network\mcpe` namespace, you're not shielded by API change constraints.**
-Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you're using packets directly.
-
-## General
- Added support for Minecraft: Bedrock Edition 1.21.80.
- Removed support for earlier versions.
-
-## Fixes
- `AvailableEnchantmentRegistry` now requires provided tags to always be `string`. Previously, this wasn't enforced, leading to random crashes in core code related to enchanting.
- `Entity->setFireTicks()` and `Entity->setOnFire()` now truncate the fire time to the max value instead of throwing exceptions.
-
-## Internals
- Improved PHPStan error reporting for unsafe foreaches. Foreach on an array with implicit keys now generates different errors than foreach on an array with string keys.
-
-# 5.28.1
-Released 17th May 2025.
-
-## Fixes
- Fixed errors when PlayStation players attempt to join due to null `TitleID`.
-
-# 5.28.2
-Released 17th May 2025.
-
-## Fixes
- Fixed version constraints which were incorrectly updated during the 1.21.80 update. This led to an unnoticed failure to update BedrockProtocol in the previous patch release.
- Actually fixed PlayStation issues this time
--- a/changelogs/5.29.md
+++ b/changelogs/5.29.md
@ -1,25 +0,0 @@
-# 5.29.0
-Released 18th June 2025.
-
-This is a support release for Minecraft: Bedrock Edition 1.21.90.
-
-**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.90.
- Removed support for earlier versions.
-
-## Fixes
- Fixed thread crashes sometimes not reporting proper cause information in crashdumps.
- Fixed crash when a plugin replaced a player's held tool with a different tool with a damage exceeding the old tool's max damage during an action.
- Fixed performance issue of `PlayerAuthInputPacket` input flags handling (broken change detection).
- Fixed `BaseInventory->addItem()` triggering updates on empty slots when no items were added.
- Fixed slow check in `SubChunk` block layer garbage collection.
-
-## Internals
- `LoginPacketHandler->processLogin()` signature has changed. This will break any plugins overriding `LoginPacketHandler`. As noted above, this is _not_ covered by the API version guarantee.
- Automated branch sync for `minor-next` and `major-next` is now triggered by `repository_dispatch` from a cron job in this repository instead of `RestrictedActions`. The `RestrictedActions` cron job was getting automatically disabled by GitHub due to repo inactivity.
--- a/changelogs/5.30.md
+++ b/changelogs/5.30.md
@ -1,73 +0,0 @@
-# 5.30.0
-Released 18th June 2025.
-
-This is a minor feature release containing API additions, internals cleanup and user experience 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
- Significantly reduced log spam when unknown blocks, tiles and entities are found in saved worlds.
- The file name structure for crashdumps has been changed to improve sorting order in file browsers.
- Buffering is now skipped on the RakLib layer. In theory this could reduce player network latency by 10 ms (YMMV).
-
-## Gameplay
-### Blocks
- Many blocks have had their hardness and blast resistance updated to match vanilla.
- Implemented Respawn Anchor.
- Melon Stem and Pumpkin Stem drop amounts should now match vanilla (using binomial distribution).
-
-## API
-## General
- Verification of save registration has been added for blocks, entities and tiles. This is intended to make it easier to find mistakes when registering custom things, which previously would produce obscure core crashes.
-
-### `pocketmine\event\block`
- The following classes have been added:
-  - `BlockPreExplodeEvent` - called before a block tries to explode
-  - `BlockExplodeEvent` - called when after a block's explosion calculation has been done, but before any changes are applied
-
-### `pocketmine\event\entity`
- The following classes have been added:
-  - `EntityExtinguishEvent` - called when a burning entity is extinguished by water or other sources
-  - `EntityFrostWalkerEvent` - called every tick upon which an entity wearing Frost Walker boots moves; this can be used to customise or cancel the behaviour of the Frost Walker enchantment
-
-### `pocketmine\event\player`
- The following classes have been added:
-  - `PlayerRespawnAnchorUseEvent` - called when a player interacts with a charged respawn anchor
-
-### `pocketmine\entity`
- The following methods have been added:
-  - `public Entity->getStepHeight() : float`
-  - `public Entity->setStepHeight(float $stepHeight) : void`
-
-### `pocketmine\world\generator`
- Generator execution has been decoupled from `PopulationTask` and async tasks in general. The following classes have been added:
-  - `executor\GeneratorExecutor`
-  - `executor\SyncGeneratorExecutor` - runs a generator on the main thread (used for flat world generation, which doesn't need threads)
-  - `executor\AsyncGeneratorExecutor` - runs a generator inside an async task, as before
-  - `PopulationUtils` - contains population business logic previously baked into `PopulationTask` - this permits the reuse of that logic outside async tasks
- The following methods have signature changes:
-  - `GeneratorManager->addGenerator()` now accepts an optional `bool $fast` parameter, defaulting to `false`; setting this to `true` will cause your generator to run on the main thread
- The following methods have been added:
-  - `public GeneratorManagerEntry->isFast() : bool` - returns whether this generator should run on the main thread
- `PopulationTask` has been marked as `@internal`. In the next major version, it will move to the `generator\executor` namespace; however, for now it stays put because plugins currently have no other way to regenerate chunks.
-
-## Internals
- World data version numbers have been consolidated in `pocketmine\data\bedrock\WorldDataVersions`. This removes the need to modify several different files to support new world versions, and reduces the chances of things getting missed.
- Block hardness and blast resistance is now unit-tested against `block_properties_table.json` in `BedrockData`. This file comes from vanilla BDS, so we can use it to verify compliance.
- Protocol-layer "server auth block breaking" has been enabled. Functionally, this is no different from the previous system, it just works differently on the network layer.
- Various internal classes in the `pocketmine\world\generator` namespace have been moved to the `generator\executor` namespace.
- Removed `World->registerGenerator()` and `World->unregisterGenerator()`.
- Removed redundant calls to `curl_close()` (obsolete since PHP 8.0).
-
-# 5.30.1
-Released 23rd June 2025.
-
-## Fixes
- Fixed accidental break of backwards compatability in `EntityExplodeEvent` introduced in the previous release.
- Fixed placement of player holding block when exploding respawn anchor.
- Updated BedrockProtocol to fix incorrect encoding of `ServerScriptDebugDrawerPacket`.
- Disabled client-side locator bar, allowing plugins to write their own implementations.
--- a/composer.json
+++ b/composer.json
@ -33,34 +33,30 @@
      "composer-runtime-api": "^2.0",
      "adhocore/json-comment": "~1.2.0",
      "netresearch/jsonmapper": "~v5.0.0",
-      "pocketmine/bedrock-block-upgrade-schema": "~5.1.0+bedrock-1.21.60",
-      "pocketmine/bedrock-data": "~5.1.0+bedrock-1.21.90",
+      "pocketmine/bedrock-block-upgrade-schema": "~5.0.0+bedrock-1.21.40",
+      "pocketmine/bedrock-data": "~2.15.0+bedrock-1.21.50",
      "pocketmine/bedrock-item-upgrade-schema": "~1.14.0+bedrock-1.21.50",
-      "pocketmine/bedrock-protocol": "~39.0.0+bedrock-1.21.90",
+      "pocketmine/bedrock-protocol": "~35.0.0+bedrock-1.21.50",
      "pocketmine/binaryutils": "^0.2.1",
      "pocketmine/callback-validator": "^1.0.2",
      "pocketmine/color": "^0.3.0",
      "pocketmine/errorhandler": "^0.7.0",
-      "pocketmine/locale-data": "~2.25.0",
+      "pocketmine/locale-data": "~2.22.0",
      "pocketmine/log": "^0.4.0",
      "pocketmine/math": "~1.0.0",
-      "pocketmine/nbt": "~1.1.0",
-      "pocketmine/raklib": "~1.2.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.8.0",
+      "ramsey/uuid": "~4.7.0",
      "symfony/filesystem": "~6.4.0"
   },
   "require-dev": {
-      "phpstan/phpstan": "2.1.17",
-      "phpstan/phpstan-phpunit": "^2.0.0",
-      "phpstan/phpstan-strict-rules": "^2.0.0",
+      "phpstan/phpstan": "1.11.11",
+      "phpstan/phpstan-phpunit": "^1.1.0",
+      "phpstan/phpstan-strict-rules": "^1.2.0",
      "phpunit/phpunit": "^10.5.24"
   },
-   "replace": {
-      "symfony/polyfill-ctype": "*",
-      "symfony/polyfill-mbstring": "*"
-   },
   "autoload": {
      "psr-4": {
         "pocketmine\\": "src/"
--- 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": "9bf4984c23f688264d3ce6a729a6ec17",
+    "content-hash": "732102eca72dc1d29e7b67dfbce07653",
    "packages": [
        {
            "name": "adhocore/json-comment",
@ -67,16 +67,16 @@
        },
        {
            "name": "brick/math",
-            "version": "0.13.1",
+            "version": "0.12.1",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/math.git",
-                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04"
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04",
-                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                "shasum": ""
            },
            "require": {
@ -85,7 +85,7 @@
            "require-dev": {
                "php-coveralls/php-coveralls": "^2.2",
                "phpunit/phpunit": "^10.1",
-                "vimeo/psalm": "6.8.8"
+                "vimeo/psalm": "5.16.0"
            },
            "type": "library",
            "autoload": {
@ -115,7 +115,7 @@
            ],
            "support": {
                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.13.1"
+                "source": "https://github.com/brick/math/tree/0.12.1"
            },
            "funding": [
                {
@ -123,7 +123,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-03-29T13:50:30+00:00"
+            "time": "2023-11-29T23:19:16+00:00"
        },
        {
            "name": "netresearch/jsonmapper",
@ -178,16 +178,16 @@
        },
        {
            "name": "pocketmine/bedrock-block-upgrade-schema",
-            "version": "5.1.0",
+            "version": "5.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git",
-                "reference": "2218512e4b91f5bfd09ef55f7a4c4b04e169e41a"
+                "reference": "20dd5c11e9915bacea4fe2cf649e1d23697a6e52"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/2218512e4b91f5bfd09ef55f7a4c4b04e169e41a",
-                "reference": "2218512e4b91f5bfd09ef55f7a4c4b04e169e41a",
+                "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/20dd5c11e9915bacea4fe2cf649e1d23697a6e52",
+                "reference": "20dd5c11e9915bacea4fe2cf649e1d23697a6e52",
                "shasum": ""
            },
            "type": "library",
@ -198,22 +198,22 @@
            "description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves",
            "support": {
                "issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues",
-                "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/5.1.0"
+                "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/5.0.0"
            },
-            "time": "2025-02-11T17:41:44+00:00"
+            "time": "2024-11-03T14:13:50+00:00"
        },
        {
            "name": "pocketmine/bedrock-data",
-            "version": "5.1.0+bedrock-1.21.90",
+            "version": "2.15.0+bedrock-1.21.50",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockData.git",
-                "reference": "89ed34957aeccc63e517aa849af593adae958e98"
+                "reference": "6e819f36d781866ce63d2406be2ce7f2d1afd9ad"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/89ed34957aeccc63e517aa849af593adae958e98",
-                "reference": "89ed34957aeccc63e517aa849af593adae958e98",
+                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/6e819f36d781866ce63d2406be2ce7f2d1afd9ad",
+                "reference": "6e819f36d781866ce63d2406be2ce7f2d1afd9ad",
                "shasum": ""
            },
            "type": "library",
@ -224,9 +224,9 @@
            "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
            "support": {
                "issues": "https://github.com/pmmp/BedrockData/issues",
-                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.21.90"
+                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.21.50"
            },
-            "time": "2025-06-17T23:44:21+00:00"
+            "time": "2024-12-04T12:59:12+00:00"
        },
        {
            "name": "pocketmine/bedrock-item-upgrade-schema",
@ -256,16 +256,16 @@
        },
        {
            "name": "pocketmine/bedrock-protocol",
-            "version": "39.0.1+bedrock-1.21.90",
+            "version": "35.0.0+bedrock-1.21.50",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "fd231bad0d94024ff50169dc06e8c4fca5aa2eb3"
+                "reference": "bd1ec79bae8c88aa984e1c5f0c3313be5ae9b435"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/fd231bad0d94024ff50169dc06e8c4fca5aa2eb3",
-                "reference": "fd231bad0d94024ff50169dc06e8c4fca5aa2eb3",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/bd1ec79bae8c88aa984e1c5f0c3313be5ae9b435",
+                "reference": "bd1ec79bae8c88aa984e1c5f0c3313be5ae9b435",
                "shasum": ""
            },
            "require": {
@ -278,10 +278,10 @@
                "ramsey/uuid": "^4.1"
            },
            "require-dev": {
-                "phpstan/phpstan": "2.1.0",
-                "phpstan/phpstan-phpunit": "^2.0.0",
-                "phpstan/phpstan-strict-rules": "^2.0.0",
-                "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0"
+                "phpstan/phpstan": "1.11.9",
+                "phpstan/phpstan-phpunit": "^1.0.0",
+                "phpstan/phpstan-strict-rules": "^1.0.0",
+                "phpunit/phpunit": "^9.5 || ^10.0"
            },
            "type": "library",
            "autoload": {
@ -296,9 +296,9 @@
            "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP",
            "support": {
                "issues": "https://github.com/pmmp/BedrockProtocol/issues",
-                "source": "https://github.com/pmmp/BedrockProtocol/tree/39.0.1+bedrock-1.21.90"
+                "source": "https://github.com/pmmp/BedrockProtocol/tree/35.0.0+bedrock-1.21.50"
            },
-            "time": "2025-06-23T13:22:50+00:00"
+            "time": "2024-12-04T13:02:00+00:00"
        },
        {
            "name": "pocketmine/binaryutils",
@ -471,16 +471,16 @@
        },
        {
            "name": "pocketmine/locale-data",
-            "version": "2.25.1",
+            "version": "2.22.1",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/Language.git",
-                "reference": "8e6514f5a9638e69cdc2219c775fc7d3bb4c9fdd"
+                "reference": "fa4e377c437391cfcfdedd08eea3a848eabd1b49"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Language/zipball/8e6514f5a9638e69cdc2219c775fc7d3bb4c9fdd",
-                "reference": "8e6514f5a9638e69cdc2219c775fc7d3bb4c9fdd",
+                "url": "https://api.github.com/repos/pmmp/Language/zipball/fa4e377c437391cfcfdedd08eea3a848eabd1b49",
+                "reference": "fa4e377c437391cfcfdedd08eea3a848eabd1b49",
                "shasum": ""
            },
            "type": "library",
@ -488,9 +488,9 @@
            "description": "Language resources used by PocketMine-MP",
            "support": {
                "issues": "https://github.com/pmmp/Language/issues",
-                "source": "https://github.com/pmmp/Language/tree/2.25.1"
+                "source": "https://github.com/pmmp/Language/tree/2.22.1"
            },
-            "time": "2025-04-16T11:15:32+00:00"
+            "time": "2024-12-06T14:44:17+00:00"
        },
        {
            "name": "pocketmine/log",
@ -576,16 +576,16 @@
        },
        {
            "name": "pocketmine/nbt",
-            "version": "1.1.1",
+            "version": "1.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/NBT.git",
-                "reference": "c3c7b0a7295daeaf7873d90fed5c5d10381d12e1"
+                "reference": "20540271cb59e04672cb163dca73366f207974f1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/c3c7b0a7295daeaf7873d90fed5c5d10381d12e1",
-                "reference": "c3c7b0a7295daeaf7873d90fed5c5d10381d12e1",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/20540271cb59e04672cb163dca73366f207974f1",
+                "reference": "20540271cb59e04672cb163dca73366f207974f1",
                "shasum": ""
            },
            "require": {
@ -595,8 +595,8 @@
            },
            "require-dev": {
                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "2.1.0",
-                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpstan/phpstan": "1.10.25",
+                "phpstan/phpstan-strict-rules": "^1.0",
                "phpunit/phpunit": "^9.5"
            },
            "type": "library",
@ -612,22 +612,22 @@
            "description": "PHP library for working with Named Binary Tags",
            "support": {
                "issues": "https://github.com/pmmp/NBT/issues",
-                "source": "https://github.com/pmmp/NBT/tree/1.1.1"
+                "source": "https://github.com/pmmp/NBT/tree/1.0.0"
            },
-            "time": "2025-03-09T01:46:03+00:00"
+            "time": "2023-07-14T13:01:49+00:00"
        },
        {
            "name": "pocketmine/raklib",
-            "version": "1.2.0",
+            "version": "1.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "a28d05216d34dbd00e8aed827a58df6b4c11510b"
+                "reference": "be2783be516bf6e2872ff5c81fb9048596617b97"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/a28d05216d34dbd00e8aed827a58df6b4c11510b",
-                "reference": "a28d05216d34dbd00e8aed827a58df6b4c11510b",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/be2783be516bf6e2872ff5c81fb9048596617b97",
+                "reference": "be2783be516bf6e2872ff5c81fb9048596617b97",
                "shasum": ""
            },
            "require": {
@ -639,8 +639,8 @@
                "pocketmine/log": "^0.3.0 || ^0.4.0"
            },
            "require-dev": {
-                "phpstan/phpstan": "2.1.0",
-                "phpstan/phpstan-strict-rules": "^2.0"
+                "phpstan/phpstan": "1.10.1",
+                "phpstan/phpstan-strict-rules": "^1.0"
            },
            "type": "library",
            "autoload": {
@ -655,9 +655,9 @@
            "description": "A RakNet server implementation written in PHP",
            "support": {
                "issues": "https://github.com/pmmp/RakLib/issues",
-                "source": "https://github.com/pmmp/RakLib/tree/1.2.0"
+                "source": "https://github.com/pmmp/RakLib/tree/1.1.1"
            },
-            "time": "2025-06-08T17:36:06+00:00"
+            "time": "2024-03-04T14:02:14+00:00"
        },
        {
            "name": "pocketmine/raklib-ipc",
@ -742,16 +742,16 @@
        },
        {
            "name": "ramsey/collection",
-            "version": "2.1.1",
+            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/collection.git",
-                "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2"
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/344572933ad0181accbf4ba763e85a0306a8c5e2",
-                "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
                "shasum": ""
            },
            "require": {
@ -759,22 +759,25 @@
            },
            "require-dev": {
                "captainhook/plugin-composer": "^5.3",
-                "ergebnis/composer-normalize": "^2.45",
-                "fakerphp/faker": "^1.24",
+                "ergebnis/composer-normalize": "^2.28.3",
+                "fakerphp/faker": "^1.21",
                "hamcrest/hamcrest-php": "^2.0",
-                "jangregor/phpstan-prophecy": "^2.1",
-                "mockery/mockery": "^1.6",
+                "jangregor/phpstan-prophecy": "^1.0",
+                "mockery/mockery": "^1.5",
                "php-parallel-lint/php-console-highlighter": "^1.0",
-                "php-parallel-lint/php-parallel-lint": "^1.4",
-                "phpspec/prophecy-phpunit": "^2.3",
-                "phpstan/extension-installer": "^1.4",
-                "phpstan/phpstan": "^2.1",
-                "phpstan/phpstan-mockery": "^2.0",
-                "phpstan/phpstan-phpunit": "^2.0",
-                "phpunit/phpunit": "^10.5",
-                "ramsey/coding-standard": "^2.3",
-                "ramsey/conventional-commits": "^1.6",
-                "roave/security-advisories": "dev-latest"
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan": "^1.9",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5",
+                "psalm/plugin-mockery": "^1.1",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "ramsey/coding-standard": "^2.0.3",
+                "ramsey/conventional-commits": "^1.3",
+                "vimeo/psalm": "^5.4"
            },
            "type": "library",
            "extra": {
@ -812,26 +815,36 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/2.1.1"
+                "source": "https://github.com/ramsey/collection/tree/2.0.0"
            },
-            "time": "2025-03-22T05:38:12+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-12-31T21:50:55+00:00"
        },
        {
            "name": "ramsey/uuid",
-            "version": "4.8.1",
+            "version": "4.7.6",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                "ext-json": "*",
                "php": "^8.0",
                "ramsey/collection": "^1.2 || ^2.0"
@ -840,23 +853,26 @@
                "rhumsaa/uuid": "self.version"
            },
            "require-dev": {
-                "captainhook/captainhook": "^5.25",
+                "captainhook/captainhook": "^5.10",
                "captainhook/plugin-composer": "^5.3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-                "ergebnis/composer-normalize": "^2.47",
-                "mockery/mockery": "^1.6",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+                "doctrine/annotations": "^1.8",
+                "ergebnis/composer-normalize": "^2.15",
+                "mockery/mockery": "^1.3",
                "paragonie/random-lib": "^2",
-                "php-mock/php-mock": "^2.6",
-                "php-mock/php-mock-mockery": "^1.5",
-                "php-parallel-lint/php-parallel-lint": "^1.4.0",
-                "phpbench/phpbench": "^1.2.14",
-                "phpstan/extension-installer": "^1.4",
-                "phpstan/phpstan": "^2.1",
-                "phpstan/phpstan-mockery": "^2.0",
-                "phpstan/phpstan-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.6",
-                "slevomat/coding-standard": "^8.18",
-                "squizlabs/php_codesniffer": "^3.13"
+                "php-mock/php-mock": "^2.2",
+                "php-mock/php-mock-mockery": "^1.3",
+                "php-parallel-lint/php-parallel-lint": "^1.1",
+                "phpbench/phpbench": "^1.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9",
+                "ramsey/composer-repl": "^1.4",
+                "slevomat/coding-standard": "^8.4",
+                "squizlabs/php_codesniffer": "^3.5",
+                "vimeo/psalm": "^4.9"
            },
            "suggest": {
                "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
@ -891,9 +907,19 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
            },
-            "time": "2025-06-01T06:28:46+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-27T21:32:50+00:00"
        },
        {
            "name": "symfony/filesystem",
@ -960,21 +986,180 @@
                }
            ],
            "time": "2024-10-25T15:07:50+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.31.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.31.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
        }
    ],
    "packages-dev": [
        {
            "name": "myclabs/deep-copy",
-            "version": "1.13.1",
+            "version": "1.12.1",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
                "shasum": ""
            },
            "require": {
@ -1013,7 +1198,7 @@
            ],
            "support": {
                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
            },
            "funding": [
                {
@ -1021,20 +1206,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-29T12:36:36+00:00"
+            "time": "2024-11-08T17:47:46+00:00"
        },
        {
            "name": "nikic/php-parser",
-            "version": "v5.5.0",
+            "version": "v5.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                "shasum": ""
            },
            "require": {
@ -1077,9 +1262,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
            },
-            "time": "2025-05-31T08:24:38+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
        },
        {
            "name": "phar-io/manifest",
@ -1201,20 +1386,20 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.17",
+            "version": "1.11.11",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
                "shasum": ""
            },
            "require": {
-                "php": "^7.4|^8.0"
+                "php": "^7.2|^8.0"
            },
            "conflict": {
                "phpstan/phpstan-shim": "*"
@ -1255,35 +1440,34 @@
                    "type": "github"
                }
            ],
-            "time": "2025-05-21T20:55:28+00:00"
+            "time": "2024-08-19T14:37:29+00:00"
        },
        {
            "name": "phpstan/phpstan-phpunit",
-            "version": "2.0.6",
+            "version": "1.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-phpunit.git",
-                "reference": "6b92469f8a7995e626da3aa487099617b8dfa260"
+                "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/6b92469f8a7995e626da3aa487099617b8dfa260",
-                "reference": "6b92469f8a7995e626da3aa487099617b8dfa260",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/f3ea021866f4263f07ca3636bf22c64be9610c11",
+                "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11",
                "shasum": ""
            },
            "require": {
-                "php": "^7.4 || ^8.0",
-                "phpstan/phpstan": "^2.0.4"
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.11"
            },
            "conflict": {
                "phpunit/phpunit": "<7.0"
            },
            "require-dev": {
-                "nikic/php-parser": "^5",
+                "nikic/php-parser": "^4.13.0",
                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpstan-deprecation-rules": "^2.0",
-                "phpstan/phpstan-strict-rules": "^2.0",
-                "phpunit/phpunit": "^9.6"
+                "phpstan/phpstan-strict-rules": "^1.5.1",
+                "phpunit/phpunit": "^9.5"
            },
            "type": "phpstan-extension",
            "extra": {
@ -1306,33 +1490,34 @@
            "description": "PHPUnit extensions and rules for PHPStan",
            "support": {
                "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
-                "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.6"
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.0"
            },
-            "time": "2025-03-26T12:47:06+00:00"
+            "time": "2024-04-20T06:39:00+00:00"
        },
        {
            "name": "phpstan/phpstan-strict-rules",
-            "version": "2.0.4",
+            "version": "1.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a"
+                "reference": "363f921dd8441777d4fc137deb99beb486c77df1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
-                "reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/363f921dd8441777d4fc137deb99beb486c77df1",
+                "reference": "363f921dd8441777d4fc137deb99beb486c77df1",
                "shasum": ""
            },
            "require": {
-                "php": "^7.4 || ^8.0",
-                "phpstan/phpstan": "^2.0.4"
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.11"
            },
            "require-dev": {
+                "nikic/php-parser": "^4.13.0",
                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpstan-deprecation-rules": "^2.0",
-                "phpstan/phpstan-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.6"
+                "phpstan/phpstan-deprecation-rules": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.5"
            },
            "type": "phpstan-extension",
            "extra": {
@ -1354,9 +1539,9 @@
            "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/2.0.4"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.0"
            },
-            "time": "2025-03-18T11:42:40+00:00"
+            "time": "2024-04-20T06:37:51+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
@ -1681,16 +1866,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.47",
+            "version": "10.5.38",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3637b3e50d32ab3a0d1a33b3b6177169ec3d95a3"
+                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3637b3e50d32ab3a0d1a33b3b6177169ec3d95a3",
-                "reference": "3637b3e50d32ab3a0d1a33b3b6177169ec3d95a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
+                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
                "shasum": ""
            },
            "require": {
@ -1700,7 +1885,7 @@
                "ext-mbstring": "*",
                "ext-xml": "*",
                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.1",
+                "myclabs/deep-copy": "^1.12.0",
                "phar-io/manifest": "^2.0.4",
                "phar-io/version": "^3.2.1",
                "php": ">=8.1",
@ -1762,7 +1947,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.47"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
            },
            "funding": [
                {
@ -1773,20 +1958,12 @@
                    "url": "https://github.com/sebastianbergmann",
                    "type": "github"
                },
-                {
-                    "url": "https://liberapay.com/sebastianbergmann",
-                    "type": "liberapay"
-                },
-                {
-                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
-                    "type": "thanks_dev"
-                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-06-20T11:29:11+00:00"
+            "time": "2024-10-28T13:06:21+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@ -2757,7 +2934,7 @@
    ],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
@ -2788,7 +2965,7 @@
        "ext-zlib": ">=1.2.11",
        "composer-runtime-api": "^2.0"
    },
-    "platform-dev": {},
+    "platform-dev": [],
    "platform-overrides": {
        "php": "8.1.0"
    },
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@ -11,17 +11,14 @@ includes:

 rules:
 	- pocketmine\phpstan\rules\DeprecatedLegacyEnumAccessRule
-	- pocketmine\phpstan\rules\DisallowDynamicNewRule
 	- pocketmine\phpstan\rules\DisallowEnumComparisonRule
 	- pocketmine\phpstan\rules\DisallowForeachByReferenceRule
-	- pocketmine\phpstan\rules\ExplodeLimitRule
-	- pocketmine\phpstan\rules\UnsafeForeachRule
+	- pocketmine\phpstan\rules\UnsafeForeachArrayOfStringRule
 #	- pocketmine\phpstan\rules\ThreadedSupportedTypesRule

 parameters:
 	level: 9
 	checkMissingCallableSignature: true
-	rememberPossiblyImpureFunctionValues: false #risky to remember these, better for performance to avoid repeated calls anyway
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
 		- tests/phpstan/bootstrap.php
@ -34,7 +31,6 @@ parameters:
 	paths:
 		- build
 		- src
-		- tests/phpstan/DummyPluginOwned.php
 		- tests/phpstan/rules
 		- tests/phpunit
 		- tests/plugins/TesterPlugin
@ -48,7 +44,6 @@ parameters:
 		- pocketmine\DEBUG
 		- pocketmine\IS_DEVELOPMENT_BUILD
 	stubFiles:
-		- tests/phpstan/stubs/chunkutils2.stub
 		- tests/phpstan/stubs/JsonMapper.stub
 		- tests/phpstan/stubs/leveldb.stub
 		- tests/phpstan/stubs/pmmpthread.stub
--- a/src/GarbageCollectorManager.php
+++ b/src/GarbageCollectorManager.php
@ -31,7 +31,6 @@ use function hrtime;
 use function max;
 use function min;
 use function number_format;
-use function sprintf;

 /**
 * Allows threads to manually trigger the cyclic garbage collector using a threshold like PHP's own garbage collector,
@ -49,7 +48,6 @@ final class GarbageCollectorManager{

 	private int $threshold = self::GC_THRESHOLD_DEFAULT;
 	private int $collectionTimeTotalNs = 0;
-	private int $runs = 0;

 	private \Logger $logger;
 	private TimingsHandler $timings;
@ -98,16 +96,7 @@ final class GarbageCollectorManager{

 		$time = $end - $start;
 		$this->collectionTimeTotalNs += $time;
-		$this->runs++;
-		$this->logger->info(sprintf(
-			"Run #%d took %s ms (%s -> %s roots, %s cycles collected) - cumulative GC time: %s ms",
-			$this->runs,
-			number_format($time / 1_000_000, 2),
-			$rootsBefore,
-			$rootsAfter,
-			$cycles,
-			number_format($this->collectionTimeTotalNs / 1_000_000, 2)
-		));
+		$this->logger->debug("gc_collect_cycles: " . number_format($time) . " ns ($rootsBefore -> $rootsAfter roots, $cycles cycles collected) - total GC time: " . number_format($this->collectionTimeTotalNs) . " ns");

 		return $cycles;
 	}
--- a/src/MemoryDump.php
+++ b/src/MemoryDump.php
@ -253,12 +253,12 @@ final class MemoryDump{
 	}

 	/**
-	 * @param object[]|true[] $objects   reference parameter
-	 * @param int[]           $refCounts reference parameter
+	 * @param object[] $objects   reference parameter
+	 * @param int[]    $refCounts reference parameter
 	 *
-	 * @phpstan-param array<string, object|true> $objects
+	 * @phpstan-param array<string, object> $objects
 	 * @phpstan-param array<string, int> $refCounts
-	 * @phpstan-param-out array<string, object|true> $objects
+	 * @phpstan-param-out array<string, object> $objects
 	 * @phpstan-param-out array<string, int> $refCounts
 	 */
 	private static function continueDump(mixed $from, array &$objects, array &$refCounts, int $recursion, int $maxNesting, int $maxStringSize) : mixed{
--- a/src/PocketMine.php
+++ b/src/PocketMine.php
@ -264,7 +264,7 @@ JIT_WARNING
 		$composerGitHash = InstalledVersions::getReference('pocketmine/pocketmine-mp');
 		if($composerGitHash !== null){
 			//we can't verify dependency versions if we were installed without using git
-			$currentGitHash = explode("-", VersionInfo::GIT_HASH(), 2)[0];
+			$currentGitHash = explode("-", VersionInfo::GIT_HASH())[0];
 			if($currentGitHash !== $composerGitHash){
 				critical_error("Composer dependencies and/or autoloader are out of sync.");
 				critical_error("- Current revision is $currentGitHash");
--- a/src/Server.php
+++ b/src/Server.php
@ -36,7 +36,6 @@ use pocketmine\crafting\CraftingManager;
 use pocketmine\crafting\CraftingManagerFromDataHelper;
 use pocketmine\crash\CrashDump;
 use pocketmine\crash\CrashDumpRenderer;
-use pocketmine\data\bedrock\BedrockDataFiles;
 use pocketmine\entity\EntityDataHelper;
 use pocketmine\entity\Location;
 use pocketmine\event\HandlerListManager;
@ -139,7 +138,6 @@ use function file_put_contents;
 use function filemtime;
 use function fopen;
 use function get_class;
-use function gettype;
 use function ini_set;
 use function is_array;
 use function is_dir;
@ -699,7 +697,7 @@ class Server{

 	public function removeOp(string $name) : void{
 		$lowercaseName = strtolower($name);
-		foreach(Utils::promoteKeys($this->operators->getAll()) as $operatorName => $_){
+		foreach($this->operators->getAll() as $operatorName => $_){
 			$operatorName = (string) $operatorName;
 			if($lowercaseName === strtolower($operatorName)){
 				$this->operators->remove($operatorName);
@ -920,7 +918,6 @@ class Server{
 			TimingsHandler::getCollectCallbacks()->add(function() : array{
 				$promises = [];
 				foreach($this->asyncPool->getRunningWorkers() as $workerId){
-					/** @phpstan-var PromiseResolver<list<string>> $resolver */
 					$resolver = new PromiseResolver();
 					$this->asyncPool->submitTaskToWorker(new TimingsCollectionTask($resolver), $workerId);

@ -1006,7 +1003,7 @@ class Server{

 			$this->commandMap = new SimpleCommandMap($this);

-			$this->craftingManager = CraftingManagerFromDataHelper::make(BedrockDataFiles::RECIPES);
+			$this->craftingManager = CraftingManagerFromDataHelper::make(Path::join(\pocketmine\BEDROCK_DATA_PATH, "recipes"));

 			$this->resourceManager = new ResourcePackManager(Path::join($this->dataPath, "resource_packs"), $this->logger);

@ -1016,11 +1013,7 @@ class Server{
 				copy(Path::join(\pocketmine\RESOURCE_PATH, 'plugin_list.yml'), $graylistFile);
 			}
 			try{
-				$array = yaml_parse(Filesystem::fileGetContents($graylistFile));
-				if(!is_array($array)){
-					throw new \InvalidArgumentException("Expected array for root, but have " . gettype($array));
-				}
-				$pluginGraylist = PluginGraylist::fromArray($array);
+				$pluginGraylist = PluginGraylist::fromArray(yaml_parse(Filesystem::fileGetContents($graylistFile)));
 			}catch(\InvalidArgumentException $e){
 				$this->logger->emergency("Failed to load $graylistFile: " . $e->getMessage());
 				$this->forceShutdownExit();
@ -1181,7 +1174,7 @@ class Server{

 		if($this->worldManager->getDefaultWorld() === null){
 			$default = $this->configGroup->getConfigString(ServerProperties::DEFAULT_WORLD_NAME, "world");
-			if(trim($default) === ""){
+			if(trim($default) == ""){
 				$this->logger->warning("level-name cannot be null, using default");
 				$default = "world";
 				$this->configGroup->setConfigString(ServerProperties::DEFAULT_WORLD_NAME, "world");
@ -1618,7 +1611,7 @@ class Server{
 		if(!is_dir($crashFolder)){
 			mkdir($crashFolder);
 		}
-		$crashDumpPath = Path::join($crashFolder, date("Y-m-d_H.i.s_T", (int) $dump->getData()->time) . ".log");
+		$crashDumpPath = Path::join($crashFolder, date("D_M_j-H.i.s-T_Y", (int) $dump->getData()->time) . ".log");

 		$fp = @fopen($crashDumpPath, "wb");
 		if(!is_resource($fp)){
--- a/src/VersionInfo.php
+++ b/src/VersionInfo.php
@ -31,8 +31,8 @@ use function str_repeat;

 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "5.30.1";
-	public const IS_DEVELOPMENT_BUILD = false;
+	public const BASE_VERSION = "5.23.3";
+	public const IS_DEVELOPMENT_BUILD = true;
 	public const BUILD_CHANNEL = "stable";

 	/**
--- a/src/block/Anvil.php
+++ b/src/block/Anvil.php
@ -70,6 +70,9 @@ class Anvil extends Transparent implements Fallable{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->squash(Facing::axis(Facing::rotateY($this->facing, false)), 1 / 8)];
 	}
--- a/src/block/Bamboo.php
+++ b/src/block/Bamboo.php
@ -87,6 +87,9 @@ class Bamboo extends Transparent{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		//this places the BB at the northwest corner, not the center
 		$inset = 1 - (($this->thick ? 3 : 2) / 16);
--- a/src/block/BaseBanner.php
+++ b/src/block/BaseBanner.php
@ -30,6 +30,7 @@ use pocketmine\block\utils\SupportType;
 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;
@ -96,6 +97,9 @@ abstract class BaseBanner extends Transparent{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [];
 	}
--- a/src/block/BaseSign.php
+++ b/src/block/BaseSign.php
@ -34,6 +34,7 @@ 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;
@ -94,6 +95,9 @@ abstract class BaseSign extends Transparent{
 		return 16;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [];
 	}
--- a/src/block/Bed.php
+++ b/src/block/Bed.php
@ -76,6 +76,9 @@ class Bed extends Transparent{
 		}
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 7 / 16)];
 	}
--- a/src/block/Block.php
+++ b/src/block/Block.php
@ -75,10 +75,7 @@ class Block{
 	protected BlockTypeInfo $typeInfo;
 	protected Position $position;

-	/**
-	 * @var AxisAlignedBB[]|null
-	 * @phpstan-var list<AxisAlignedBB>|null
-	 */
+	/** @var AxisAlignedBB[]|null */
 	protected ?array $collisionBoxes = null;

 	private int $requiredBlockItemStateDataBits;
@ -910,7 +907,6 @@ class Block{
 	 * - anti-cheat checks in plugins
 	 *
 	 * @return AxisAlignedBB[]
-	 * @phpstan-return list<AxisAlignedBB>
 	 */
 	final public function getCollisionBoxes() : array{
 		if($this->collisionBoxes === null){
@ -935,7 +931,6 @@ class Block{

 	/**
 	 * @return AxisAlignedBB[]
-	 * @phpstan-return list<AxisAlignedBB>
 	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()];
--- a/src/block/BlockBreakInfo.php
+++ b/src/block/BlockBreakInfo.php
@ -73,7 +73,7 @@ class BlockBreakInfo{
 		return new self(0.0, $toolType, $toolHarvestLevel, 0.0);
 	}

-	public static function indestructible(float $blastResistance = 18000003.75) : self{
+	public static function indestructible(float $blastResistance = 18000000.0) : self{
 		return new self(-1.0, BlockToolType::NONE, 0, $blastResistance);
 	}

@ -95,7 +95,7 @@ class BlockBreakInfo{
 	 * Returns whether this block can be instantly broken.
 	 */
 	public function breaksInstantly() : bool{
-		return $this->hardness === 0.0;
+		return $this->hardness == 0.0;
 	}

 	/**
@ -154,7 +154,7 @@ class BlockBreakInfo{

 		$efficiency = $item->getMiningEfficiency(($this->toolType & $item->getBlockToolType()) !== 0);
 		if($efficiency <= 0){
-			throw new \InvalidArgumentException(get_class($item) . " must have a positive mining efficiency, but got $efficiency");
+			throw new \InvalidArgumentException(get_class($item) . " has invalid mining efficiency: expected >= 0, got $efficiency");
 		}

 		$base /= $efficiency;
--- a/src/block/BlockTypeIds.php
+++ b/src/block/BlockTypeIds.php
@ -786,9 +786,8 @@ final class BlockTypeIds{
 	public const RESIN_BRICKS = 10756;
 	public const RESIN_CLUMP = 10757;
 	public const CHISELED_RESIN_BRICKS = 10758;
-	public const RESPAWN_ANCHOR = 10759;

-	public const FIRST_UNUSED_BLOCK_ID = 10760;
+	public const FIRST_UNUSED_BLOCK_ID = 10759;

 	private static int $nextDynamicId = self::FIRST_UNUSED_BLOCK_ID;

--- a/src/block/Cactus.php
+++ b/src/block/Cactus.php
@ -43,6 +43,9 @@ class Cactus extends Transparent{
 		return true;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		$shrinkSize = 1 / 16;
 		return [AxisAlignedBB::one()->contract($shrinkSize, 0, $shrinkSize)->trim(Facing::UP, $shrinkSize)];
--- a/src/block/Cake.php
+++ b/src/block/Cake.php
@ -40,6 +40,9 @@ class Cake extends BaseCake{
 		$w->boundedIntAuto(0, self::MAX_BITES, $this->bites);
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [
 			AxisAlignedBB::one()
--- a/src/block/CakeWithCandle.php
+++ b/src/block/CakeWithCandle.php
@ -36,6 +36,9 @@ class CakeWithCandle extends BaseCake{
 		onInteract as onInteractCandle;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [
 			AxisAlignedBB::one()
--- a/src/block/Carpet.php
+++ b/src/block/Carpet.php
@ -36,6 +36,9 @@ class Carpet extends Flowable{
 		return true;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 15 / 16)];
 	}
--- a/src/block/Chest.php
+++ b/src/block/Chest.php
@ -36,6 +36,9 @@ use pocketmine\player\Player;
 class Chest extends Transparent{
 	use FacesOppositePlacingPlayerTrait;

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		//these are slightly bigger than in PC
 		return [AxisAlignedBB::one()->contract(0.025, 0, 0.025)->trim(Facing::UP, 0.05)];
--- a/src/block/ChorusPlant.php
+++ b/src/block/ChorusPlant.php
@ -34,16 +34,11 @@ use function mt_rand;
 final class ChorusPlant extends Flowable{
 	use StaticSupportTrait;

-	/**
-	 * @var true[]
-	 * @phpstan-var array<int, true>
-	 */
-	protected array $connections = [];
-
 	protected function recalculateCollisionBoxes() : array{
 		$bb = AxisAlignedBB::one();
-		foreach(Facing::ALL as $facing){
-			if(!isset($this->connections[$facing])){
+		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);
 			}
 		}
@ -51,26 +46,6 @@ final class ChorusPlant extends Flowable{
 		return [$bb];
 	}

-	public function readStateFromWorld() : Block{
-		parent::readStateFromWorld();
-
-		$this->collisionBoxes = null;
-
-		foreach(Facing::ALL as $facing){
-			$block = $this->getSide($facing);
-			if(match($block->getTypeId()){
-				BlockTypeIds::END_STONE, BlockTypeIds::CHORUS_FLOWER, $this->getTypeId() => true,
-				default => false
-			}){
-				$this->connections[$facing] = true;
-			}else{
-				unset($this->connections[$facing]);
-			}
-		}
-
-		return $this;
-	}
-
 	private function canBeSupportedBy(Block $block) : bool{
 		return $block->hasSameTypeId($this) || $block->getTypeId() === BlockTypeIds::END_STONE;
 	}
--- a/src/block/CocoaBlock.php
+++ b/src/block/CocoaBlock.php
@ -50,6 +50,9 @@ class CocoaBlock extends Flowable{
 		$w->boundedIntAuto(0, self::MAX_AGE, $this->age);
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [
 			AxisAlignedBB::one()
--- a/src/block/DaylightSensor.php
+++ b/src/block/DaylightSensor.php
@ -62,6 +62,9 @@ class DaylightSensor extends Transparent{
 		return 300;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 10 / 16)];
 	}
--- a/src/block/Door.php
+++ b/src/block/Door.php
@ -95,6 +95,9 @@ class Door extends Transparent{
 		return false;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		//TODO: doors are 0.1825 blocks thick, instead of 0.1875 like JE (https://bugs.mojang.com/browse/MCPE-19214)
 		return [AxisAlignedBB::one()->trim($this->open ? Facing::rotateY($this->facing, !$this->hingeRight) : $this->facing, 327 / 400)];
--- a/src/block/EnchantingTable.php
+++ b/src/block/EnchantingTable.php
@ -33,6 +33,9 @@ use pocketmine\player\Player;

 class EnchantingTable extends Transparent{

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 0.25)];
 	}
--- a/src/block/EndPortalFrame.php
+++ b/src/block/EndPortalFrame.php
@ -50,6 +50,9 @@ class EndPortalFrame extends Opaque{
 		return 1;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 3 / 16)];
 	}
--- a/src/block/EndRod.php
+++ b/src/block/EndRod.php
@ -52,6 +52,9 @@ class EndRod extends Flowable{
 		return 14;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		$myAxis = Facing::axis($this->facing);

--- a/src/block/EnderChest.php
+++ b/src/block/EnderChest.php
@ -40,6 +40,9 @@ class EnderChest extends Transparent{
 		return 7;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		//these are slightly bigger than in PC
 		return [AxisAlignedBB::one()->contract(0.025, 0, 0.025)->trim(Facing::UP, 0.05)];
--- a/src/block/Farmland.php
+++ b/src/block/Farmland.php
@ -94,6 +94,9 @@ class Farmland extends Transparent{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 1 / 16)];
 	}
--- a/src/block/Fence.php
+++ b/src/block/Fence.php
@ -54,9 +54,13 @@ class Fence extends Transparent{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		$inset = 0.5 - $this->getThickness() / 2;

+		/** @var AxisAlignedBB[] $bbs */
 		$bbs = [];

 		$connectWest = isset($this->connections[Facing::WEST]);
--- a/src/block/FenceGate.php
+++ b/src/block/FenceGate.php
@ -64,6 +64,9 @@ class FenceGate extends Transparent{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return $this->open ? [] : [AxisAlignedBB::one()->extend(Facing::UP, 0.5)->squash(Facing::axis($this->facing), 6 / 16)];
 	}
--- a/src/block/Flowable.php
+++ b/src/block/Flowable.php
@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;

 use pocketmine\block\utils\SupportType;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;

 /**
@ -45,6 +46,9 @@ abstract class Flowable extends Transparent{
 			parent::canBePlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [];
 	}
--- a/src/block/FlowerPot.php
+++ b/src/block/FlowerPot.php
@ -83,6 +83,9 @@ class FlowerPot extends Flowable{
 		return $block->hasTypeTag(BlockTypeTags::POTTABLE_PLANTS);
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->contract(3 / 16, 0, 3 / 16)->trim(Facing::UP, 5 / 8)];
 	}
--- a/src/block/GlowLichen.php
+++ b/src/block/GlowLichen.php
@ -28,6 +28,7 @@ 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;
@ -46,6 +47,9 @@ class GlowLichen extends Transparent{
 		return false;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [];
 	}
--- a/src/block/GrassPath.php
+++ b/src/block/GrassPath.php
@ -29,6 +29,9 @@ use pocketmine\math\Facing;

 class GrassPath extends Transparent{

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 1 / 16)];
 	}
--- a/src/block/Ladder.php
+++ b/src/block/Ladder.php
@ -58,6 +58,9 @@ class Ladder extends Transparent{
 		return true;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim($this->facing, 13 / 16)];
 	}
--- a/src/block/Lantern.php
+++ b/src/block/Lantern.php
@ -59,6 +59,9 @@ class Lantern extends Transparent{
 		return $this->lightLevel;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [
 			AxisAlignedBB::one()
--- a/src/block/Liquid.php
+++ b/src/block/Liquid.php
@ -30,6 +30,7 @@ use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Entity;
 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;
@ -88,6 +89,9 @@ abstract class Liquid extends Transparent{
 		return false;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [];
 	}
--- a/src/block/MobHead.php
+++ b/src/block/MobHead.php
@ -104,6 +104,9 @@ class MobHead extends Flowable{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		$collisionBox = AxisAlignedBB::one()
 			->contract(0.25, 0, 0.25)
--- a/src/block/NetherPortal.php
+++ b/src/block/NetherPortal.php
@ -28,6 +28,7 @@ use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
+use pocketmine\math\AxisAlignedBB;

 class NetherPortal extends Transparent{

@ -61,6 +62,9 @@ class NetherPortal extends Transparent{
 		return false;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [];
 	}
--- a/src/block/RedstoneComparator.php
+++ b/src/block/RedstoneComparator.php
@ -79,6 +79,9 @@ class RedstoneComparator extends Flowable{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 7 / 8)];
 	}
--- a/src/block/RedstoneRepeater.php
+++ b/src/block/RedstoneRepeater.php
@ -62,6 +62,9 @@ class RedstoneRepeater extends Flowable{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 7 / 8)];
 	}
--- a/src/block/RespawnAnchor.php
+++ b/src/block/RespawnAnchor.php
@ -1,123 +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\data\runtime\RuntimeDataDescriber;
-use pocketmine\event\block\BlockPreExplodeEvent;
-use pocketmine\event\player\PlayerRespawnAnchorUseEvent;
-use pocketmine\item\Item;
-use pocketmine\item\ItemTypeIds;
-use pocketmine\lang\KnownTranslationFactory;
-use pocketmine\math\Vector3;
-use pocketmine\player\Player;
-use pocketmine\utils\TextFormat;
-use pocketmine\world\Explosion;
-use pocketmine\world\Position;
-use pocketmine\world\sound\RespawnAnchorChargeSound;
-use pocketmine\world\sound\RespawnAnchorSetSpawnSound;
-
-final class RespawnAnchor extends Opaque{
-	private const MIN_CHARGES = 0;
-	private const MAX_CHARGES = 4;
-
-	private int $charges = self::MIN_CHARGES;
-
-	protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
-		$w->boundedIntAuto(self::MIN_CHARGES, self::MAX_CHARGES, $this->charges);
-	}
-
-	public function getCharges() : int{
-		return $this->charges;
-	}
-
-	/** @return $this */
-	public function setCharges(int $charges) : self{
-		if($charges < self::MIN_CHARGES || $charges > self::MAX_CHARGES){
-			throw new \InvalidArgumentException("Charges must be between " . self::MIN_CHARGES . " and " . self::MAX_CHARGES . ", given: $charges");
-		}
-		$this->charges = $charges;
-		return $this;
-	}
-
-	public function getLightLevel() : int{
-		return $this->charges > 0 ? ($this->charges * 4) - 1 : 0;
-	}
-
-	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
-		if($item->getTypeId() === ItemTypeIds::fromBlockTypeId(BlockTypeIds::GLOWSTONE) && $this->charges < self::MAX_CHARGES){
-			$this->position->getWorld()->setBlock($this->position, $this->setCharges($this->charges + 1));
-			$this->position->getWorld()->addSound($this->position, new RespawnAnchorChargeSound());
-			return true;
-		}
-
-		if($this->charges > self::MIN_CHARGES){
-			if($player === null){
-				return false;
-			}
-
-			$ev = new PlayerRespawnAnchorUseEvent($player, $this, PlayerRespawnAnchorUseEvent::ACTION_EXPLODE);
-			$ev->call();
-			if($ev->isCancelled()){
-				return false;
-			}
-
-			switch($ev->getAction()){
-				case PlayerRespawnAnchorUseEvent::ACTION_EXPLODE:
-					$this->explode($player);
-					return true;
-
-				case PlayerRespawnAnchorUseEvent::ACTION_SET_SPAWN:
-					if($player->getSpawn() !== null && $player->getSpawn()->equals($this->position)){
-						return true;
-					}
-
-					$player->setSpawn($this->position);
-					$this->position->getWorld()->addSound($this->position, new RespawnAnchorSetSpawnSound());
-					$player->sendMessage(KnownTranslationFactory::tile_respawn_anchor_respawnSet()->prefix(TextFormat::GRAY));
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private function explode(?Player $player) : void{
-		$ev = new BlockPreExplodeEvent($this, 5, $player);
-		$ev->setIncendiary(true);
-
-		$ev->call();
-		if($ev->isCancelled()){
-			return;
-		}
-
-		$this->position->getWorld()->setBlock($this->position, VanillaBlocks::AIR());
-
-		$explosion = new Explosion(Position::fromObject($this->position->add(0.5, 0.5, 0.5), $this->position->getWorld()), $ev->getRadius(), $this);
-		$explosion->setFireChance($ev->getFireChance());
-
-		if($ev->isBlockBreaking()){
-			$explosion->explodeA();
-		}
-		$explosion->explodeB();
-	}
-}
--- a/src/block/RuntimeBlockStateRegistry.php
+++ b/src/block/RuntimeBlockStateRegistry.php
@ -28,7 +28,6 @@ use pocketmine\block\BlockIdentifier as BID;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\SingletonTrait;
 use pocketmine\world\light\LightUpdate;
-use function count;
 use function min;

 /**
@ -41,11 +40,6 @@ use function min;
 class RuntimeBlockStateRegistry{
 	use SingletonTrait;

-	public const COLLISION_CUSTOM = 0;
-	public const COLLISION_CUBE = 1;
-	public const COLLISION_NONE = 2;
-	public const COLLISION_MAY_OVERFLOW = 3;
-
 	/**
 	 * @var Block[]
 	 * @phpstan-var array<int, Block>
@ -80,13 +74,6 @@ class RuntimeBlockStateRegistry{
 	 */
 	public array $blastResistance = [];

-	/**
-	 * Map of state ID -> useful AABB info to avoid unnecessary block allocations
-	 * @var int[]
-	 * @phpstan-var array<int, int>
-	 */
-	public array $collisionInfo = [];
-
 	public function __construct(){
 		foreach(VanillaBlocks::getAll() as $block){
 			$this->register($block);
@ -113,70 +100,6 @@ class RuntimeBlockStateRegistry{
 		}
 	}

-	/**
-	 * Checks if the given class method overrides a method in Block.
-	 * Used to determine if a block might need to disable fast path optimizations.
-	 *
-	 * @phpstan-param anyClosure $closure
-	 */
-	private static function overridesBlockMethod(\Closure $closure) : bool{
-		$declarer = (new \ReflectionFunction($closure))->getClosureScopeClass();
-		return $declarer !== null && $declarer->getName() !== Block::class;
-	}
-
-	/**
-	 * A big ugly hack to set up fast paths for handling collisions on blocks with common shapes.
-	 * The information returned here is stored in RuntimeBlockStateRegistry->collisionInfo, and is used during entity
-	 * collision box calculations to avoid complex logic and unnecessary block object allocations.
-	 * This hack allows significant performance improvements.
-	 *
-	 * TODO: We'll want to redesign block collision box handling and block shapes in the future, but that's a job for a
-	 * major version. For now, this hack nets major performance wins.
-	 */
-	private static function calculateCollisionInfo(Block $block) : int{
-		if(
-			self::overridesBlockMethod($block->getModelPositionOffset(...)) ||
-			self::overridesBlockMethod($block->readStateFromWorld(...))
-		){
-			//getModelPositionOffset() might cause AABBs to shift outside the cell
-			//readStateFromWorld() might cause overflow in ways we can't predict just by looking at known states
-			//TODO: excluding overriders of readStateFromWorld() also excludes blocks with tiles that don't do anything
-			//weird with their AABBs, but for now this is the best we can do.
-			return self::COLLISION_MAY_OVERFLOW;
-		}
-
-		//TODO: this could blow up if any recalculateCollisionBoxes() uses the world
-		//it shouldn't, but that doesn't mean that custom blocks won't...
-		$boxes = $block->getCollisionBoxes();
-		if(count($boxes) === 0){
-			return self::COLLISION_NONE;
-		}
-
-		if(
-			count($boxes) === 1 &&
-			$boxes[0]->minX === 0.0 &&
-			$boxes[0]->minY === 0.0 &&
-			$boxes[0]->minZ === 0.0 &&
-			$boxes[0]->maxX === 1.0 &&
-			$boxes[0]->maxY === 1.0 &&
-			$boxes[0]->maxZ === 1.0
-		){
-			return self::COLLISION_CUBE;
-		}
-
-		foreach($boxes as $box){
-			if(
-				$box->minX < 0 || $box->maxX > 1 ||
-				$box->minY < 0 || $box->maxY > 1 ||
-				$box->minZ < 0 || $box->maxZ > 1
-			){
-				return self::COLLISION_MAY_OVERFLOW;
-			}
-		}
-
-		return self::COLLISION_CUSTOM;
-	}
-
 	private function fillStaticArrays(int $index, Block $block) : void{
 		$fullId = $block->getStateId();
 		if($index !== $fullId){
@ -189,8 +112,6 @@ class RuntimeBlockStateRegistry{
 			if($block->blocksDirectSkyLight()){
 				$this->blocksDirectSkyLight[$index] = true;
 			}
-
-			$this->collisionInfo[$index] = self::calculateCollisionInfo($block);
 		}
 	}

@ -209,10 +130,6 @@ class RuntimeBlockStateRegistry{
 		return $block;
 	}

-	public function hasStateId(int $stateId) : bool{
-		return isset($this->fullList[$stateId]);
-	}
-
 	/**
 	 * @return Block[]
 	 * @phpstan-return array<int, Block>
--- a/src/block/SeaPickle.php
+++ b/src/block/SeaPickle.php
@ -26,6 +26,7 @@ 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;
 use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
@ -69,6 +70,9 @@ class SeaPickle extends Transparent{
 		return $this->underwater ? ($this->count + 1) * 3 : 0;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [];
 	}
--- a/src/block/Slab.php
+++ b/src/block/Slab.php
@ -93,6 +93,9 @@ class Slab extends Transparent{
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		if($this->slabType === SlabType::DOUBLE){
 			return [AxisAlignedBB::one()];
--- a/src/block/SnowLayer.php
+++ b/src/block/SnowLayer.php
@ -65,6 +65,9 @@ class SnowLayer extends Flowable implements Fallable{
 		return $this->layers < self::MAX_LAYERS;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		//TODO: this zero-height BB is intended to stay in lockstep with a MCPE bug
 		return [AxisAlignedBB::one()->trim(Facing::UP, $this->layers >= 4 ? 0.5 : 1)];
--- a/src/block/SoulSand.php
+++ b/src/block/SoulSand.php
@ -28,6 +28,9 @@ use pocketmine\math\Facing;

 class SoulSand extends Opaque{

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim(Facing::UP, 1 / 8)];
 	}
--- a/src/block/Stem.php
+++ b/src/block/Stem.php
@ -25,12 +25,11 @@ namespace pocketmine\block;

 use pocketmine\block\utils\BlockEventHelper;
 use pocketmine\block\utils\CropGrowthHelper;
-use pocketmine\block\utils\FortuneDropHelper;
 use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
-use pocketmine\item\VanillaItems;
 use pocketmine\math\Facing;
 use function array_rand;
+use function mt_rand;

 abstract class Stem extends Crops{
 	protected int $facing = Facing::UP;
@ -91,10 +90,8 @@ abstract class Stem extends Crops{
 	}

 	public function getDropsForCompatibleTool(Item $item) : array{
-		//TODO: bit annoying we have to pass an Item instance here
-		//this should not be affected by Fortune, but still follows a binomial distribution
 		return [
-			$this->asItem()->setCount(FortuneDropHelper::binomial(VanillaItems::AIR(), 0, chance: ($this->age + 1) / 15))
+			$this->asItem()->setCount(mt_rand(0, 2))
 		];
 	}
 }
--- a/src/block/Thin.php
+++ b/src/block/Thin.php
@ -56,6 +56,7 @@ class Thin extends Transparent{
 	protected function recalculateCollisionBoxes() : array{
 		$inset = 7 / 16;

+		/** @var AxisAlignedBB[] $bbs */
 		$bbs = [];

 		if(isset($this->connections[Facing::WEST]) || isset($this->connections[Facing::EAST])){
--- a/src/block/Trapdoor.php
+++ b/src/block/Trapdoor.php
@ -62,6 +62,9 @@ class Trapdoor extends Transparent{
 		return $this;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->trim($this->open ? $this->facing : ($this->top ? Facing::DOWN : Facing::UP), 13 / 16)];
 	}
--- a/src/block/VanillaBlocks.php
+++ b/src/block/VanillaBlocks.php
@ -694,7 +694,6 @@ use function strtolower;
 * @method static Stair RESIN_BRICK_STAIRS()
 * @method static Wall RESIN_BRICK_WALL()
 * @method static ResinClump RESIN_CLUMP()
- * @method static RespawnAnchor RESPAWN_ANCHOR()
 * @method static DoublePlant ROSE_BUSH()
 * @method static Sand SAND()
 * @method static Opaque SANDSTONE()
@ -860,7 +859,7 @@ final class VanillaBlocks{
 		$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(1.0, ToolType::AXE) extends BreakInfo{
+		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;
@ -868,7 +867,7 @@ final class VanillaBlocks{
 				return parent::getBreakTime($item);
 			}
 		}, [Tags::POTTABLE_PLANTS])));
-		self::register("bamboo_sapling", fn(BID $id) => new BambooSapling($id, "Bamboo Sapling", new Info(new BreakInfo(1.0))));
+		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);
@ -877,7 +876,7 @@ final class VanillaBlocks{
 		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(18000000.0))));
+		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))), TileBell::class);
@ -914,7 +913,7 @@ final class VanillaBlocks{

 		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(1.5, ToolTier::WOOD, 30.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));
@ -931,15 +930,15 @@ final class VanillaBlocks{
 		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, blastResistance: 45.0))));
+		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(18000000.0))));
+		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(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));

@ -963,7 +962,7 @@ final class VanillaBlocks{
 		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(0.5))));
+		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);
@ -971,28 +970,30 @@ final class VanillaBlocks{
 		$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(35.0, ToolTier::DIAMOND, 6000.0))));
+		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))));
+		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))));

-		self::register("grass", fn(BID $id) => new Grass($id, "Grass", new Info(BreakInfo::shovel(0.6), [Tags::DIRT])));
-		self::register("grass_path", fn(BID $id) => new GrassPath($id, "Grass Path", new Info(BreakInfo::shovel(0.65))));
+		$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))));

-		self::register("hardened_clay", fn(BID $id) => new HardenedClay($id, "Hardened Clay", new Info(BreakInfo::pickaxe(1.25, ToolTier::WOOD, 21.0))));
+		$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, 24.0))), TileHopper::class);
+		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(18000000.0))));
+		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));
@ -1005,16 +1006,16 @@ final class VanillaBlocks{
 		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(2.0, blastResistance: 30.0))), TileJukebox::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(3.5));
+		$lanternBreakInfo = new Info(BreakInfo::pickaxe(5.0));
 		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.5))), TileLectern::class);
+		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))));
@ -1064,15 +1065,14 @@ final class VanillaBlocks{
 		self::register("purpur_stairs", fn(BID $id) => new Stair($id, "Purpur Stairs", $purpurBreakInfo));

 		$quartzBreakInfo = new Info(BreakInfo::pickaxe(0.8, ToolTier::WOOD));
-		$smoothQuartzBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
 		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", $smoothQuartzBreakInfo));
+		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", $smoothQuartzBreakInfo));
+		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])));
@ -1127,13 +1127,13 @@ final class VanillaBlocks{
 		$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", new Info(BreakInfo::pickaxe(1.0, blastResistance: 3.75)), $cobblestone));
+		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", new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0))));
+		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));
@ -1146,6 +1146,7 @@ final class VanillaBlocks{
 		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))));

+		//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));
@ -1156,31 +1157,28 @@ final class VanillaBlocks{
 		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_cobblestone_slab", fn(BID $id) => new Slab($id, "Mossy Cobblestone", $stoneSlabBreakInfo));
-		self::register("purpur_slab", fn(BID $id) => new Slab($id, "Purpur", $stoneSlabBreakInfo));
-		self::register("smooth_red_sandstone_slab", fn(BID $id) => new Slab($id, "Smooth Red 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("end_stone_brick_slab", fn(BID $id) => new Slab($id, "End Stone Brick", new Info(BreakInfo::pickaxe(3.0, ToolTier::WOOD, 30.0))));
-
-		$lightStoneSlabBreakInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
-		self::register("dark_prismarine_slab", fn(BID $id) => new Slab($id, "Dark Prismarine", $lightStoneSlabBreakInfo));
-		self::register("prismarine_slab", fn(BID $id) => new Slab($id, "Prismarine", $lightStoneSlabBreakInfo));
-		self::register("prismarine_bricks_slab", fn(BID $id) => new Slab($id, "Prismarine Bricks", $lightStoneSlabBreakInfo));
-		self::register("andesite_slab", fn(BID $id) => new Slab($id, "Andesite", $lightStoneSlabBreakInfo));
-		self::register("diorite_slab", fn(BID $id) => new Slab($id, "Diorite", $lightStoneSlabBreakInfo));
-		self::register("granite_slab", fn(BID $id) => new Slab($id, "Granite", $lightStoneSlabBreakInfo));
-		self::register("polished_andesite_slab", fn(BID $id) => new Slab($id, "Polished Andesite", $lightStoneSlabBreakInfo));
-		self::register("polished_diorite_slab", fn(BID $id) => new Slab($id, "Polished Diorite", $lightStoneSlabBreakInfo));
-		self::register("polished_granite_slab", fn(BID $id) => new Slab($id, "Polished Granite", $lightStoneSlabBreakInfo));
-		self::register("mossy_stone_brick_slab", fn(BID $id) => new Slab($id, "Mossy Stone Brick", $lightStoneSlabBreakInfo));
-
 		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())));
@ -1239,26 +1237,25 @@ final class VanillaBlocks{
 		}

 		$sandstoneBreakInfo = new Info(BreakInfo::pickaxe(0.8, ToolTier::WOOD));
-		$smoothSandstoneBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
 		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", $smoothSandstoneBreakInfo));
+		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", $smoothSandstoneBreakInfo));
+		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", $smoothSandstoneBreakInfo));
+		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", $smoothSandstoneBreakInfo));
+		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", new Info(BreakInfo::pickaxe(1.25, ToolTier::WOOD, 6.25))));
+		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))));
@ -1275,26 +1272,22 @@ final class VanillaBlocks{
 			}
 		})));

-		self::register("end_stone_brick_wall", fn(BID $id) => new Wall($id, "End Stone Brick Wall", new Info(BreakInfo::pickaxe(3.0, ToolTier::WOOD, 45.0))));
-
-		$brickWallBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
-		self::register("cobblestone_wall", fn(BID $id) => new Wall($id, "Cobblestone Wall", $brickWallBreakInfo));
-		self::register("brick_wall", fn(BID $id) => new Wall($id, "Brick Wall", $brickWallBreakInfo));
-		self::register("mossy_cobblestone_wall", fn(BID $id) => new Wall($id, "Mossy Cobblestone Wall", $brickWallBreakInfo));
-		self::register("nether_brick_wall", fn(BID $id) => new Wall($id, "Nether Brick Wall", $brickWallBreakInfo));
-		self::register("red_nether_brick_wall", fn(BID $id) => new Wall($id, "Red Nether Brick Wall", $brickWallBreakInfo));
-
-		$stoneWallBreakInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
-		self::register("stone_brick_wall", fn(BID $id) => new Wall($id, "Stone Brick Wall", $stoneWallBreakInfo));
-		self::register("mossy_stone_brick_wall", fn(BID $id) => new Wall($id, "Mossy Stone Brick Wall", $stoneWallBreakInfo));
-		self::register("granite_wall", fn(BID $id) => new Wall($id, "Granite Wall", $stoneWallBreakInfo));
-		self::register("diorite_wall", fn(BID $id) => new Wall($id, "Diorite Wall", $stoneWallBreakInfo));
-		self::register("andesite_wall", fn(BID $id) => new Wall($id, "Andesite Wall", $stoneWallBreakInfo));
-		self::register("prismarine_wall", fn(BID $id) => new Wall($id, "Prismarine Wall", $stoneWallBreakInfo));
-
-		$sandstoneWallBreakInfo = new Info(BreakInfo::pickaxe(0.8, ToolTier::WOOD, 4.0));
-		self::register("red_sandstone_wall", fn(BID $id) => new Wall($id, "Red Sandstone Wall", $sandstoneWallBreakInfo));
-		self::register("sandstone_wall", fn(BID $id) => new Wall($id, "Sandstone Wall", $sandstoneWallBreakInfo));
+		//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();

@ -1327,8 +1320,8 @@ final class VanillaBlocks{
 		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.2, ToolType::HOE))));
-		self::register("reinforced_deepslate", fn(BID $id) => new class($id, "Reinforced Deepslate", new Info(new BreakInfo(55.0, ToolType::NONE, 0, 6000.0))) extends Opaque{
+		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 [];
 			}
@ -1544,7 +1537,7 @@ final class VanillaBlocks{
 		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, 15.0));
+		$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)));
@ -1588,10 +1581,10 @@ final class VanillaBlocks{
 		//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, 6000.0))) extends Opaque{
+		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, 6000.0));
+		$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; }
 		});
@ -1609,14 +1602,14 @@ final class VanillaBlocks{

 		self::register("gilded_blackstone", fn(BID $id) => new GildedBlackstone($id, "Gilded Blackstone", $blackstoneBreakInfo));

-		$polishedBlackstoneBreakInfo = new Info(BreakInfo::pickaxe(2.0, ToolTier::WOOD, 30.0));
+		//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(""), $polishedBlackstoneBreakInfo));
+		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)), 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"), $polishedBlackstoneBreakInfo));
-		self::register("polished_blackstone_wall", fn(BID $id) => new Wall($id, $prefix("Wall"), $polishedBlackstoneBreakInfo));
+		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" : "");
@ -1629,7 +1622,8 @@ final class VanillaBlocks{
 		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])));

-		self::register("soul_soil", fn(BID $id) => new Opaque($id, "Soul Soil", new Info(BreakInfo::shovel(0.5))));
+		//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; }
@ -1647,9 +1641,7 @@ final class VanillaBlocks{
 		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, 30.0))));
-
-		self::register("respawn_anchor", fn(BID $id) => new RespawnAnchor($id, "Respawn Anchor", new Info(BreakInfo::pickaxe(50.0, ToolTier::DIAMOND, 6000.0))));
+		self::register("chain", fn(BID $id) => new Chain($id, "Chain", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD))));
 	}

 	private static function registerBlocksR17() : void{
@ -1667,7 +1659,7 @@ final class VanillaBlocks{
 		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, 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()];
@ -1679,29 +1671,29 @@ final class VanillaBlocks{
 		});

 		//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, 30.0))));
+		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, 30.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, 30.0));
+		$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, 30.0));
+		$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, 30.0));
+		$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));
@ -1710,7 +1702,7 @@ final class VanillaBlocks{
 		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, 30.0));
+		$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));
@ -1738,8 +1730,8 @@ final class VanillaBlocks{
 		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(new BreakInfo(0.1))));
-		self::register("big_dripleaf_stem", fn(BID $id) => new BigDripleafStem($id, "Big Dripleaf Stem", new Info(new BreakInfo(0.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{
@ -1750,7 +1742,7 @@ final class VanillaBlocks{
 		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(1.5, ToolTier::WOOD, 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));
@ -1762,7 +1754,7 @@ final class VanillaBlocks{
 		self::register("resin", fn(BID $id) => new Opaque($id, "Block of Resin", new Info(BreakInfo::instant())));
 		self::register("resin_clump", fn(BID $id) => new ResinClump($id, "Resin Clump", new Info(BreakInfo::instant())));

-		$resinBricksInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD, 30.0));
+		$resinBricksInfo = new Info(BreakInfo::pickaxe(1.5, ToolTier::WOOD));
 		self::register("resin_brick_slab", fn(BID $id) => new Slab($id, "Resin Brick", $resinBricksInfo));
 		self::register("resin_brick_stairs", fn(BID $id) => new Stair($id, "Resin Brick Stairs", $resinBricksInfo));
 		self::register("resin_brick_wall", fn(BID $id) => new Wall($id, "Resin Brick Wall", $resinBricksInfo));
--- a/src/block/Water.php
+++ b/src/block/Water.php
@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;

 use pocketmine\entity\Entity;
-use pocketmine\event\entity\EntityExtinguishEvent;
 use pocketmine\world\sound\BucketEmptyWaterSound;
 use pocketmine\world\sound\BucketFillWaterSound;
 use pocketmine\world\sound\Sound;
@ -54,7 +53,7 @@ class Water extends Liquid{
 	public function onEntityInside(Entity $entity) : bool{
 		$entity->resetFallDistance();
 		if($entity->isOnFire()){
-			$entity->extinguish(EntityExtinguishEvent::CAUSE_WATER);
+			$entity->extinguish();
 		}
 		return true;
 	}
--- a/src/block/WaterCauldron.php
+++ b/src/block/WaterCauldron.php
@ -27,7 +27,6 @@ use pocketmine\block\tile\Cauldron as TileCauldron;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\color\Color;
 use pocketmine\entity\Entity;
-use pocketmine\event\entity\EntityExtinguishEvent;
 use pocketmine\item\Armor;
 use pocketmine\item\Banner;
 use pocketmine\item\Dye;
@ -184,7 +183,7 @@ final class WaterCauldron extends FillableCauldron{

 	public function onEntityInside(Entity $entity) : bool{
 		if($entity->isOnFire()){
-			$entity->extinguish(EntityExtinguishEvent::CAUSE_WATER_CAULDRON);
+			$entity->extinguish();
 			//TODO: particles

 			$this->position->getWorld()->setBlock($this->position, $this->withFillLevel($this->getFillLevel() - self::ENTITY_EXTINGUISH_USE_AMOUNT));
--- a/src/block/WaterLily.php
+++ b/src/block/WaterLily.php
@ -33,6 +33,9 @@ class WaterLily extends Flowable{
 		canBePlacedAt as supportedWhenPlacedAt;
 	}

+	/**
+	 * @return AxisAlignedBB[]
+	 */
 	protected function recalculateCollisionBoxes() : array{
 		return [AxisAlignedBB::one()->contract(1 / 16, 0, 1 / 16)->trim(Facing::UP, 63 / 64)];
 	}
--- a/src/block/tile/Sign.php
+++ b/src/block/tile/Sign.php
@ -62,10 +62,9 @@ class Sign extends Spawnable{

 	/**
 	 * @return string[]
-	 * @deprecated
 	 */
 	public static function fixTextBlob(string $blob) : array{
-		return array_slice(array_pad(explode("\n", $blob, limit: 5), 4, ""), 0, 4);
+		return array_slice(array_pad(explode("\n", $blob), 4, ""), 0, 4);
 	}

 	protected SignText $text;
--- a/src/block/tile/Spawnable.php
+++ b/src/block/tile/Spawnable.php
@ -32,7 +32,7 @@ use pocketmine\network\mcpe\protocol\types\CacheableNbt;
 use function get_class;

 abstract class Spawnable extends Tile{
-	/** @phpstan-var CacheableNbt<CompoundTag>|null */
+	/** @phpstan-var CacheableNbt<\pocketmine\nbt\tag\CompoundTag>|null */
 	private ?CacheableNbt $spawnCompoundCache = null;

 	/**
@ -73,7 +73,7 @@ abstract class Spawnable extends Tile{
 	 * Returns encoded NBT (varint, little-endian) used to spawn this tile to clients. Uses cache where possible,
 	 * populates cache if it is null.
 	 *
-	 * @phpstan-return CacheableNbt<CompoundTag>
+	 * @phpstan-return CacheableNbt<\pocketmine\nbt\tag\CompoundTag>
 	 */
 	final public function getSerializedSpawnCompound() : CacheableNbt{
 		if($this->spawnCompoundCache === null){
--- a/src/block/tile/TileFactory.php
+++ b/src/block/tile/TileFactory.php
@ -114,13 +114,6 @@ final class TileFactory{
 		$this->saveNames[$className] = reset($saveNames);
 	}

-	/**
-	 * @phpstan-param class-string<Tile> $class
-	 */
-	public function isRegistered(string $class) : bool{
-		return isset($this->saveNames[$class]);
-	}
-
 	/**
 	 * @internal
 	 * @throws SavedDataLoadingException
--- a/src/block/utils/CandleTrait.php
+++ b/src/block/utils/CandleTrait.php
@ -43,10 +43,7 @@ trait CandleTrait{
 		return $this->lit ? 3 : 0;
 	}

-	/**
-	 * @param Item[] &$returnedItems
-	 * @see Block::onInteract()
-	 */
+	/** @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){
--- a/src/block/utils/CopperMaterial.php
+++ b/src/block/utils/CopperMaterial.php
@ -30,15 +30,9 @@ interface CopperMaterial{

 	public function getOxidation() : CopperOxidation;

-	/**
-	 * @return $this
-	 */
 	public function setOxidation(CopperOxidation $oxidation) : CopperMaterial;

 	public function isWaxed() : bool;

-	/**
-	 * @return $this
-	 */
 	public function setWaxed(bool $waxed) : CopperMaterial;
 }
--- a/src/block/utils/CopperTrait.php
+++ b/src/block/utils/CopperTrait.php
@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace pocketmine\block\utils;

-use pocketmine\block\Block;
 use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Axe;
 use pocketmine\item\Item;
@ -59,10 +58,6 @@ trait CopperTrait{
 		return $this;
 	}

-	/**
-	 * @param Item[] &$returnedItems
-	 * @see Block::onInteract()
-	 */
 	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;
--- a/src/block/utils/SignText.php
+++ b/src/block/utils/SignText.php
@ -79,7 +79,7 @@ class SignText{
 	 * @throws \InvalidArgumentException if the text is not valid UTF-8
 	 */
 	public static function fromBlob(string $blob, ?Color $baseColor = null, bool $glowing = false) : SignText{
-		return new self(array_slice(array_pad(explode("\n", $blob, limit: self::LINE_COUNT + 1), self::LINE_COUNT, ""), 0, self::LINE_COUNT), $baseColor, $glowing);
+		return new self(array_slice(array_pad(explode("\n", $blob), self::LINE_COUNT, ""), 0, self::LINE_COUNT), $baseColor, $glowing);
 	}

 	/**
--- a/src/command/Command.php
+++ b/src/command/Command.php
@ -33,11 +33,9 @@ use pocketmine\permission\PermissionManager;
 use pocketmine\Server;
 use pocketmine\utils\BroadcastLoggerForwarder;
 use pocketmine\utils\TextFormat;
-use function array_values;
 use function explode;
 use function implode;
 use function str_replace;
-use const PHP_INT_MAX;

 abstract class Command{

@ -82,7 +80,6 @@ abstract class Command{

 	/**
 	 * @param string[] $args
-	 * @phpstan-param list<string> $args
 	 *
 	 * @return mixed
 	 * @throws CommandException
@ -114,7 +111,7 @@ abstract class Command{
 	}

 	public function setPermission(?string $permission) : void{
-		$this->setPermissions($permission === null ? [] : explode(";", $permission, limit: PHP_INT_MAX));
+		$this->setPermissions($permission === null ? [] : explode(";", $permission));
 	}

 	public function testPermission(CommandSender $target, ?string $permission = null) : bool{
@ -215,7 +212,6 @@ abstract class Command{
 	 * @phpstan-param list<string> $aliases
 	 */
 	public function setAliases(array $aliases) : void{
-		$aliases = array_values($aliases); //because plugins can and will pass crap
 		$this->aliases = $aliases;
 		if(!$this->isRegistered()){
 			$this->activeAliases = $aliases;
--- a/src/command/FormattedCommandAlias.php
+++ b/src/command/FormattedCommandAlias.php
@ -121,7 +121,6 @@ class FormattedCommandAlias extends Command{

 	/**
 	 * @param string[] $args
-	 * @phpstan-param list<string> $args
 	 */
 	private function buildCommand(string $formatString, array $args) : ?string{
 		$index = 0;
--- a/src/command/SimpleCommandMap.php
+++ b/src/command/SimpleCommandMap.php
@ -73,7 +73,6 @@ use pocketmine\timings\Timings;
 use pocketmine\utils\TextFormat;
 use pocketmine\utils\Utils;
 use function array_shift;
-use function array_values;
 use function count;
 use function implode;
 use function str_contains;
@ -164,7 +163,7 @@ class SimpleCommandMap implements CommandMap{
 				unset($aliases[$index]);
 			}
 		}
-		$command->setAliases(array_values($aliases));
+		$command->setAliases($aliases);

 		if(!$registered){
 			$command->setLabel($fallbackPrefix . ":" . $label);
--- a/src/command/defaults/HelpCommand.php
+++ b/src/command/defaults/HelpCommand.php
@ -39,7 +39,6 @@ use function ksort;
 use function min;
 use function sort;
 use function strtolower;
-use const PHP_INT_MAX;
 use const SORT_FLAG_CASE;
 use const SORT_NATURAL;

@ -109,7 +108,7 @@ class HelpCommand extends VanillaCommand{

 					$usage = $cmd->getUsage();
 					$usageString = $usage instanceof Translatable ? $lang->translate($usage) : $usage;
-					$sender->sendMessage(KnownTranslationFactory::pocketmine_command_help_specificCommand_usage(TextFormat::RESET . implode("\n" . TextFormat::RESET, explode("\n", $usageString, limit: PHP_INT_MAX)))
+					$sender->sendMessage(KnownTranslationFactory::pocketmine_command_help_specificCommand_usage(TextFormat::RESET . implode("\n" . TextFormat::RESET, explode("\n", $usageString)))
 						->prefix(TextFormat::GOLD));

 					$aliases = $cmd->getAliases();
--- a/src/command/defaults/ParticleCommand.php
+++ b/src/command/defaults/ParticleCommand.php
@ -219,11 +219,7 @@ class ParticleCommand extends VanillaCommand{
 				break;
 			case "blockdust":
 				if($data !== null){
-					//to preserve the old unlimited explode behaviour, allow this to split into at most 5 parts
-					//this allows the 4th argument to be processed normally if given without forcing it to also consume
-					//any unexpected parts
-					//we probably ought to error in this case, but this will do for now
-					$d = explode("_", $data, limit: 5);
+					$d = explode("_", $data);
 					if(count($d) >= 3){
 						return new DustParticle(new Color(
 							((int) $d[0]) & 0xff,
--- a/src/command/defaults/TimingsCommand.php
+++ b/src/command/defaults/TimingsCommand.php
@ -46,8 +46,6 @@ use function fwrite;
 use function http_build_query;
 use function implode;
 use function is_array;
-use function is_int;
-use function is_string;
 use function json_decode;
 use function mkdir;
 use function strtolower;
@ -180,7 +178,7 @@ class TimingsCommand extends VanillaCommand{
 					return;
 				}
 				$response = json_decode($result->getBody(), true);
-				if(is_array($response) && isset($response["id"]) && (is_int($response["id"]) || is_string($response["id"]))){
+				if(is_array($response) && isset($response["id"])){
 					Command::broadcastCommandMessage($sender, KnownTranslationFactory::pocketmine_command_timings_timingsRead(
 						"https://" . $host . "/?id=" . $response["id"]));
 				}else{
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dylan K. Taylor	fdae689f87	Fixed a series of mistakes that prevented converting from regionized leveldb to a different format	2024-12-23 19:11:59 +00:00
Dylan K. Taylor	8027c271fa	Remove regionized leveldb 32x32 and 64x64 these produce such small file sizes on average that the DB logs would probably take up a significant fraction of the world's footprint. My gut instinct is that 128 will probably be the sweet spot, as on average it should sit well below the threshold for level 3 compactions, and most worlds would likely fit into a single DB. 256 is probably not worthwhile, but might be worth trying.	2024-12-21 18:47:44 +00:00
Dylan K. Taylor	6abc40bb83	...	2024-12-21 18:13:59 +00:00
Dylan K. Taylor	07cd2e5542	Apparently intdiv() is fucking stupid	2024-12-21 18:10:25 +00:00
Dylan K. Taylor	5b435e783c	stfu	2024-12-21 18:03:41 +00:00
Dylan K. Taylor	1224055f66	Introduced a custom LevelDB impl with regions and better key format This new impl (which is not loadable by vanilla) is targeted at very large worlds, which experience significant I/O performance issues due to a variety of issues described in #6580. Two main changes are made in RegionizedLevelDB: - First, multiple LevelDBs are used, which cover a fixed NxN segment of terrain, similar to Anvil in Java. However, there's no constraint on these region sizes. Several experimental sizes are supported by default in WorldProviderManager. - Second, bigEndianLong(morton2d(chunkX, chunkZ)) is used for chunk keys instead of littleEndianInt(chunkX).littleEndianInt(chunkZ). This new scheme has much better cache locality than Mojang's version, which reduces overlap and costly DB compactions. The following new provider options are available as a result of this change: - custom-leveldb-regions-32 - custom-leveldb-regions-64 - custom-leveldb-regions-128 - custom-leveldb-regions-256 Smaller sizes will likely be less space-efficient, but will also probably have better performance. Once a sweet spot is found, a default will be introduced. Note that the different variations of custom-leveldb-regions-* are not cross-compatible. Conversion between the different formats is necessary if you want to change formats.	2024-12-21 17:56:09 +00:00