tweak config defaults

Implement rate limits by packet read ops
for now this is configured to warn only by default, until we get the parameters for it dialled in
2025-09-10 11:38:08 +00:00 · 2025-03-12 01:06:01 +00:00 · 2025-03-12 01:03:34 +00:00 · 2025-03-11 14:28:44 +00:00 · 2025-03-11 12:41:59 +00:00
44 changed files with 644 additions and 1014 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@ -57,9 +57,6 @@ body:
    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:
--- 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/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/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,18 +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.
--- a/composer.json
+++ b/composer.json
@ -34,17 +34,17 @@
      "adhocore/json-comment": "~1.2.0",
      "netresearch/jsonmapper": "~v5.0.0",
      "pocketmine/bedrock-block-upgrade-schema": "~5.1.0+bedrock-1.21.60",
-      "pocketmine/bedrock-data": "~4.1.0+bedrock-1.21.70",
+      "pocketmine/bedrock-data": "~4.0.0+bedrock-1.21.60",
      "pocketmine/bedrock-item-upgrade-schema": "~1.14.0+bedrock-1.21.50",
-      "pocketmine/bedrock-protocol": "~37.0.0+bedrock-1.21.70",
-      "pocketmine/binaryutils": "^0.2.1",
+      "pocketmine/bedrock-protocol": "~36.0.0+bedrock-1.21.60",
+      "pocketmine/binaryutils": "dev-experimental/read-ops-accounting as 0.2.6",
      "pocketmine/callback-validator": "^1.0.2",
      "pocketmine/color": "^0.3.0",
      "pocketmine/errorhandler": "^0.7.0",
      "pocketmine/locale-data": "~2.24.0",
      "pocketmine/log": "^0.4.0",
      "pocketmine/math": "~1.0.0",
-      "pocketmine/nbt": "~1.1.0",
+      "pocketmine/nbt": "~1.0.0",
      "pocketmine/raklib": "~1.1.0",
      "pocketmine/raklib-ipc": "~1.0.0",
      "pocketmine/snooze": "^0.5.0",
@ -52,7 +52,7 @@
      "symfony/filesystem": "~6.4.0"
   },
   "require-dev": {
-      "phpstan/phpstan": "2.1.8",
+      "phpstan/phpstan": "2.1.6",
      "phpstan/phpstan-phpunit": "^2.0.0",
      "phpstan/phpstan-strict-rules": "^2.0.0",
      "phpunit/phpunit": "^10.5.24"
--- 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": "28b4de9a23a293646dbad2707cdfd9e0",
+    "content-hash": "415cb668882a32039066467bb308421f",
    "packages": [
        {
            "name": "adhocore/json-comment",
@ -67,16 +67,16 @@
        },
        {
            "name": "brick/math",
-            "version": "0.12.3",
+            "version": "0.12.2",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/math.git",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba"
+                "reference": "901eddb1e45a8e0f689302e40af871c181ecbe40"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/866551da34e9a618e64a819ee1e01c20d8a588ba",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "url": "https://api.github.com/repos/brick/math/zipball/901eddb1e45a8e0f689302e40af871c181ecbe40",
+                "reference": "901eddb1e45a8e0f689302e40af871c181ecbe40",
                "shasum": ""
            },
            "require": {
@ -115,7 +115,7 @@
            ],
            "support": {
                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.3"
+                "source": "https://github.com/brick/math/tree/0.12.2"
            },
            "funding": [
                {
@ -123,7 +123,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-02-28T13:11:00+00:00"
+            "time": "2025-02-26T10:21:45+00:00"
        },
        {
            "name": "netresearch/jsonmapper",
@ -204,16 +204,16 @@
        },
        {
            "name": "pocketmine/bedrock-data",
-            "version": "4.1.0+bedrock-1.21.70",
+            "version": "4.0.0+bedrock-1.21.60",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockData.git",
-                "reference": "d53fe98cb3b596ac016e275df5bd5e89b04a4817"
+                "reference": "2e5f16ec2facac653f3f894f22eb831d880ba98e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/d53fe98cb3b596ac016e275df5bd5e89b04a4817",
-                "reference": "d53fe98cb3b596ac016e275df5bd5e89b04a4817",
+                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/2e5f16ec2facac653f3f894f22eb831d880ba98e",
+                "reference": "2e5f16ec2facac653f3f894f22eb831d880ba98e",
                "shasum": ""
            },
            "type": "library",
@ -224,9 +224,9 @@
            "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
            "support": {
                "issues": "https://github.com/pmmp/BedrockData/issues",
-                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.21.70"
+                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.21.60"
            },
-            "time": "2025-03-25T19:43:31+00:00"
+            "time": "2025-02-16T15:56:56+00:00"
        },
        {
            "name": "pocketmine/bedrock-item-upgrade-schema",
@ -256,16 +256,16 @@
        },
        {
            "name": "pocketmine/bedrock-protocol",
-            "version": "37.0.0+bedrock-1.21.70",
+            "version": "36.0.0+bedrock-1.21.60",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "7091dad2c12ed4a4106432df21fc698960c6be9e"
+                "reference": "2057de319c5c551001c2a544e08d1bc7727d9963"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/7091dad2c12ed4a4106432df21fc698960c6be9e",
-                "reference": "7091dad2c12ed4a4106432df21fc698960c6be9e",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/2057de319c5c551001c2a544e08d1bc7727d9963",
+                "reference": "2057de319c5c551001c2a544e08d1bc7727d9963",
                "shasum": ""
            },
            "require": {
@ -296,22 +296,22 @@
            "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP",
            "support": {
                "issues": "https://github.com/pmmp/BedrockProtocol/issues",
-                "source": "https://github.com/pmmp/BedrockProtocol/tree/37.0.0+bedrock-1.21.70"
+                "source": "https://github.com/pmmp/BedrockProtocol/tree/36.0.0+bedrock-1.21.60"
            },
-            "time": "2025-03-27T15:19:36+00:00"
+            "time": "2025-02-16T15:59:08+00:00"
        },
        {
            "name": "pocketmine/binaryutils",
-            "version": "0.2.6",
+            "version": "dev-experimental/read-ops-accounting",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "ccfc1899b859d45814ea3592e20ebec4cb731c84"
+                "reference": "8cfa34c9d5aae11886a4142c172cff05f1e87ee2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/ccfc1899b859d45814ea3592e20ebec4cb731c84",
-                "reference": "ccfc1899b859d45814ea3592e20ebec4cb731c84",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/8cfa34c9d5aae11886a4142c172cff05f1e87ee2",
+                "reference": "8cfa34c9d5aae11886a4142c172cff05f1e87ee2",
                "shasum": ""
            },
            "require": {
@ -320,9 +320,9 @@
            },
            "require-dev": {
                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "~1.10.3",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.0.0",
+                "phpstan/phpstan": "2.1.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0.0",
                "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0"
            },
            "type": "library",
@ -338,9 +338,9 @@
            "description": "Classes and methods for conveniently handling binary data",
            "support": {
                "issues": "https://github.com/pmmp/BinaryUtils/issues",
-                "source": "https://github.com/pmmp/BinaryUtils/tree/0.2.6"
+                "source": "https://github.com/pmmp/BinaryUtils/tree/experimental/read-ops-accounting"
            },
-            "time": "2024-03-04T15:04:17+00:00"
+            "time": "2025-03-11T11:50:46+00:00"
        },
        {
            "name": "pocketmine/callback-validator",
@ -471,16 +471,16 @@
        },
        {
            "name": "pocketmine/locale-data",
-            "version": "2.24.1",
+            "version": "2.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/Language.git",
-                "reference": "8f48cbe1fb5835a8bb573bed00ef04c65c26c7e5"
+                "reference": "6ec5e92c77a2102b2692763733e4763012facae9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Language/zipball/8f48cbe1fb5835a8bb573bed00ef04c65c26c7e5",
-                "reference": "8f48cbe1fb5835a8bb573bed00ef04c65c26c7e5",
+                "url": "https://api.github.com/repos/pmmp/Language/zipball/6ec5e92c77a2102b2692763733e4763012facae9",
+                "reference": "6ec5e92c77a2102b2692763733e4763012facae9",
                "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.24.1"
+                "source": "https://github.com/pmmp/Language/tree/2.24.0"
            },
-            "time": "2025-03-16T19:04:15+00:00"
+            "time": "2025-02-16T20:46:34+00:00"
        },
        {
            "name": "pocketmine/log",
@ -576,16 +576,16 @@
        },
        {
            "name": "pocketmine/nbt",
-            "version": "1.1.1",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/NBT.git",
-                "reference": "c3c7b0a7295daeaf7873d90fed5c5d10381d12e1"
+                "reference": "53db37487bc5ddbfbd84247966e1a073bdcfdb7d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/c3c7b0a7295daeaf7873d90fed5c5d10381d12e1",
-                "reference": "c3c7b0a7295daeaf7873d90fed5c5d10381d12e1",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/53db37487bc5ddbfbd84247966e1a073bdcfdb7d",
+                "reference": "53db37487bc5ddbfbd84247966e1a073bdcfdb7d",
                "shasum": ""
            },
            "require": {
@ -612,9 +612,9 @@
            "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.1"
            },
-            "time": "2025-03-09T01:46:03+00:00"
+            "time": "2025-01-07T22:47:46+00:00"
        },
        {
            "name": "pocketmine/raklib",
@ -742,16 +742,16 @@
        },
        {
            "name": "ramsey/collection",
-            "version": "2.1.0",
+            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/collection.git",
-                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109"
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
-                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
+                "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,9 +815,19 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/2.1.0"
+                "source": "https://github.com/ramsey/collection/tree/2.0.0"
            },
-            "time": "2025-03-02T04:48:29+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",
@ -1373,16 +1386,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.8",
+            "version": "2.1.6",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
+                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
+                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
                "shasum": ""
            },
            "require": {
@ -1427,7 +1440,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-03-09T09:30:48+00:00"
+            "time": "2025-02-19T15:46:42+00:00"
        },
        {
            "name": "phpstan/phpstan-phpunit",
@ -1482,16 +1495,16 @@
        },
        {
            "name": "phpstan/phpstan-strict-rules",
-            "version": "2.0.4",
+            "version": "2.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a"
+                "reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba"
            },
            "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/8b88b5f818bfa301e0c99154ab622dace071c3ba",
+                "reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba",
                "shasum": ""
            },
            "require": {
@ -1524,9 +1537,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/2.0.3"
            },
-            "time": "2025-03-18T11:42:40+00:00"
+            "time": "2025-01-21T10:52:14+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
@ -2917,9 +2930,18 @@
            "time": "2024-03-03T12:36:25+00:00"
        }
    ],
-    "aliases": [],
+    "aliases": [
+        {
+            "package": "pocketmine/binaryutils",
+            "version": "dev-experimental/read-ops-accounting",
+            "alias": "0.2.6",
+            "alias_normalized": "0.2.6.0"
+        }
+    ],
    "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "pocketmine/binaryutils": 20
+    },
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@ -11,7 +11,6 @@ includes:

 rules:
 	- pocketmine\phpstan\rules\DeprecatedLegacyEnumAccessRule
-	- pocketmine\phpstan\rules\DisallowDynamicNewRule
 	- pocketmine\phpstan\rules\DisallowEnumComparisonRule
 	- pocketmine\phpstan\rules\DisallowForeachByReferenceRule
 	- pocketmine\phpstan\rules\ExplodeLimitRule
--- a/resources/pocketmine.yml
+++ b/resources/pocketmine.yml
@ -83,6 +83,29 @@ network:
  #DO NOT DISABLE THIS unless you understand the risks involved.
  enable-encryption: true

+  #EXPERIMENTAL! Limit packet read operations per network session.
+  #This is intended to stop exploitation of packets with arrays in them.
+  #Note that enabling this system may cause players to be unexpectedly kicked, or it may fail to stop attackers.
+  #As of March 2025, the system is still in development and subject to change.
+  packet-read-ops-limit:
+    #What to do when a session's read ops budget is depleted.
+    #Supported actions are "none", "warn" and "kick".
+    deplete-action: warn
+
+    #How many backlog ticks to budget for. 200 allows for a 10-second network lag spike, or a small number of complex
+    #packets.
+    session-budget-ticks: 200
+
+    #How much to top up each session's read operations budget per tick. Recommended to set this to about 2x the
+    #average number of read operations per tick per session.
+    #Exceeding this value won't cause any action to be taken. However, consistently exceeding it will cause the
+    #session's budget to be depleted, resulting in action being taken.
+    session-budget-per-tick: 100
+
+    #Whether to collect stats for debugging. This might impact performance.
+    #See NetworkSession::dumpDecodeCostStats() if you want to visualize the stats yourself.
+    collect-stats: false
+
 debug:
  #If > 1, it will show debug messages in the console
  level: 1
--- 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/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.27.0";
-	public const IS_DEVELOPMENT_BUILD = false;
+	public const BASE_VERSION = "5.25.3";
+	public const IS_DEVELOPMENT_BUILD = true;
 	public const BUILD_CHANNEL = "stable";

 	/**
--- a/src/YmlServerProperties.php
+++ b/src/YmlServerProperties.php
@ -90,6 +90,11 @@ final class YmlServerProperties{
 	public const NETWORK_COMPRESSION_LEVEL = 'network.compression-level';
 	public const NETWORK_ENABLE_ENCRYPTION = 'network.enable-encryption';
 	public const NETWORK_MAX_MTU_SIZE = 'network.max-mtu-size';
+	public const NETWORK_PACKET_READ_OPS_LIMIT = 'network.packet-read-ops-limit';
+	public const NETWORK_PACKET_READ_OPS_LIMIT_COLLECT_STATS = 'network.packet-read-ops-limit.collect-stats';
+	public const NETWORK_PACKET_READ_OPS_LIMIT_DEPLETE_ACTION = 'network.packet-read-ops-limit.deplete-action';
+	public const NETWORK_PACKET_READ_OPS_LIMIT_SESSION_BUDGET_PER_TICK = 'network.packet-read-ops-limit.session-budget-per-tick';
+	public const NETWORK_PACKET_READ_OPS_LIMIT_SESSION_BUDGET_TICKS = 'network.packet-read-ops-limit.session-budget-ticks';
 	public const NETWORK_UPNP_FORWARDING = 'network.upnp-forwarding';
 	public const PLAYER = 'player';
 	public const PLAYER_SAVE_PLAYER_DATA = 'player.save-player-data';
--- 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/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/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/crafting/CraftingManager.php
+++ b/src/crafting/CraftingManager.php
@ -29,12 +29,8 @@ use pocketmine\nbt\TreeRoot;
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\DestructorCallbackTrait;
 use pocketmine\utils\ObjectSet;
-use function array_shift;
-use function count;
-use function implode;
-use function ksort;
 use function spl_object_id;
-use const SORT_STRING;
+use function usort;

 class CraftingManager{
 	use DestructorCallbackTrait;
@ -104,7 +100,6 @@ class CraftingManager{

 	/**
 	 * Function used to arrange Shapeless Recipe ingredient lists into a consistent order.
-	 * @deprecated
 	 */
 	public static function sort(Item $i1, Item $i2) : int{
 		//Use spaceship operator to compare each property, then try the next one if they are equivalent.
@ -113,30 +108,45 @@ class CraftingManager{
 		return $retval;
 	}

-	private static function hashOutput(Item $output) : string{
-		$write = new BinaryStream();
-		$write->putVarInt($output->getStateId());
-		$write->put((new LittleEndianNbtSerializer())->write(new TreeRoot($output->getNamedTag())));
+	/**
+	 * @param Item[] $items
+	 *
+	 * @return Item[]
+	 * @phpstan-return list<Item>
+	 */
+	private static function pack(array $items) : array{
+		$result = [];

-		return $write->getBuffer();
+		foreach($items as $item){
+			foreach($result as $otherItem){
+				if($item->canStackWith($otherItem)){
+					$otherItem->setCount($otherItem->getCount() + $item->getCount());
+					continue 2;
+				}
+			}
+
+			//No matching item found
+			$result[] = clone $item;
+		}
+
+		return $result;
 	}

 	/**
 	 * @param Item[] $outputs
 	 */
 	private static function hashOutputs(array $outputs) : string{
-		if(count($outputs) === 1){
-			return self::hashOutput(array_shift($outputs));
-		}
-		$unique = [];
+		$outputs = self::pack($outputs);
+		usort($outputs, [self::class, "sort"]);
+		$result = new BinaryStream();
 		foreach($outputs as $o){
 			//count is not written because the outputs might be from multiple repetitions of a single recipe
 			//this reduces the accuracy of the hash, but it won't matter in most cases.
-			$hash = self::hashOutput($o);
-			$unique[$hash] = $hash;
+			$result->putVarInt($o->getStateId());
+			$result->put((new LittleEndianNbtSerializer())->write(new TreeRoot($o->getNamedTag())));
 		}
-		ksort($unique, SORT_STRING);
-		return implode("", $unique);
+
+		return $result->getBuffer();
 	}

 	/**
--- a/src/data/bedrock/block/BlockStateData.php
+++ b/src/data/bedrock/block/BlockStateData.php
@ -45,8 +45,8 @@ final class BlockStateData{
 	public const CURRENT_VERSION =
 		(1 << 24) | //major
 		(21 << 16) | //minor
-		(70 << 8) | //patch
-		(1); //revision
+		(60 << 8) | //patch
+		(33); //revision

 	public const TAG_NAME = "name";
 	public const TAG_STATES = "states";
--- a/src/data/bedrock/block/BlockTypeNames.php
+++ b/src/data/bedrock/block/BlockTypeNames.php
@ -175,9 +175,7 @@ final class BlockTypeNames{
 	public const BUBBLE_CORAL_FAN = "minecraft:bubble_coral_fan";
 	public const BUBBLE_CORAL_WALL_FAN = "minecraft:bubble_coral_wall_fan";
 	public const BUDDING_AMETHYST = "minecraft:budding_amethyst";
-	public const BUSH = "minecraft:bush";
 	public const CACTUS = "minecraft:cactus";
-	public const CACTUS_FLOWER = "minecraft:cactus_flower";
 	public const CAKE = "minecraft:cake";
 	public const CALCITE = "minecraft:calcite";
 	public const CALIBRATED_SCULK_SENSOR = "minecraft:calibrated_sculk_sensor";
@ -547,7 +545,6 @@ final class BlockTypeNames{
 	public const FIRE_CORAL_BLOCK = "minecraft:fire_coral_block";
 	public const FIRE_CORAL_FAN = "minecraft:fire_coral_fan";
 	public const FIRE_CORAL_WALL_FAN = "minecraft:fire_coral_wall_fan";
-	public const FIREFLY_BUSH = "minecraft:firefly_bush";
 	public const FLETCHING_TABLE = "minecraft:fletching_table";
 	public const FLOWER_POT = "minecraft:flower_pot";
 	public const FLOWERING_AZALEA = "minecraft:flowering_azalea";
@ -688,7 +685,6 @@ final class BlockTypeNames{
 	public const LARGE_AMETHYST_BUD = "minecraft:large_amethyst_bud";
 	public const LARGE_FERN = "minecraft:large_fern";
 	public const LAVA = "minecraft:lava";
-	public const LEAF_LITTER = "minecraft:leaf_litter";
 	public const LECTERN = "minecraft:lectern";
 	public const LEVER = "minecraft:lever";
 	public const LIGHT_BLOCK_0 = "minecraft:light_block_0";
@ -1047,7 +1043,6 @@ final class BlockTypeNames{
 	public const SEA_LANTERN = "minecraft:sea_lantern";
 	public const SEA_PICKLE = "minecraft:sea_pickle";
 	public const SEAGRASS = "minecraft:seagrass";
-	public const SHORT_DRY_GRASS = "minecraft:short_dry_grass";
 	public const SHORT_GRASS = "minecraft:short_grass";
 	public const SHROOMLIGHT = "minecraft:shroomlight";
 	public const SILVER_GLAZED_TERRACOTTA = "minecraft:silver_glazed_terracotta";
@ -1145,7 +1140,6 @@ final class BlockTypeNames{
 	public const SUSPICIOUS_GRAVEL = "minecraft:suspicious_gravel";
 	public const SUSPICIOUS_SAND = "minecraft:suspicious_sand";
 	public const SWEET_BERRY_BUSH = "minecraft:sweet_berry_bush";
-	public const TALL_DRY_GRASS = "minecraft:tall_dry_grass";
 	public const TALL_GRASS = "minecraft:tall_grass";
 	public const TARGET = "minecraft:target";
 	public const TINTED_GLASS = "minecraft:tinted_glass";
@ -1273,7 +1267,6 @@ final class BlockTypeNames{
 	public const WHITE_TERRACOTTA = "minecraft:white_terracotta";
 	public const WHITE_TULIP = "minecraft:white_tulip";
 	public const WHITE_WOOL = "minecraft:white_wool";
-	public const WILDFLOWERS = "minecraft:wildflowers";
 	public const WITHER_ROSE = "minecraft:wither_rose";
 	public const WITHER_SKELETON_SKULL = "minecraft:wither_skeleton_skull";
 	public const WOODEN_BUTTON = "minecraft:wooden_button";
--- a/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
+++ b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
@ -214,7 +214,6 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
 		$this->registerLeavesSerializers();
 		$this->registerSaplingSerializers();
 		$this->registerMobHeadSerializers();
-		$this->registerCopperSerializers();
 		$this->registerSimpleSerializers();
 		$this->registerSerializers();
 	}
@ -792,178 +791,6 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
 		})->writeFacingWithoutDown($block->getFacing()));
 	}

-	private function registerCopperSerializers() : void{
-		$this->map(Blocks::COPPER(), function(Copper $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return new Writer($block->isWaxed() ?
-				Helper::selectCopperId($oxidation, Ids::WAXED_COPPER, Ids::WAXED_EXPOSED_COPPER, Ids::WAXED_WEATHERED_COPPER, Ids::WAXED_OXIDIZED_COPPER) :
-				Helper::selectCopperId($oxidation, Ids::COPPER_BLOCK, Ids::EXPOSED_COPPER, Ids::WEATHERED_COPPER, Ids::OXIDIZED_COPPER)
-			);
-		});
-		$this->map(Blocks::CHISELED_COPPER(), function(Copper $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return new Writer($block->isWaxed() ?
-				Helper::selectCopperId($oxidation,
-					Ids::WAXED_CHISELED_COPPER,
-					Ids::WAXED_EXPOSED_CHISELED_COPPER,
-					Ids::WAXED_WEATHERED_CHISELED_COPPER,
-					Ids::WAXED_OXIDIZED_CHISELED_COPPER
-				) :
-				Helper::selectCopperId($oxidation,
-					Ids::CHISELED_COPPER,
-					Ids::EXPOSED_CHISELED_COPPER,
-					Ids::WEATHERED_CHISELED_COPPER,
-					Ids::OXIDIZED_CHISELED_COPPER
-				)
-			);
-		});
-		$this->map(Blocks::COPPER_GRATE(), function(CopperGrate $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return new Writer($block->isWaxed() ?
-				Helper::selectCopperId($oxidation,
-					Ids::WAXED_COPPER_GRATE,
-					Ids::WAXED_EXPOSED_COPPER_GRATE,
-					Ids::WAXED_WEATHERED_COPPER_GRATE,
-					Ids::WAXED_OXIDIZED_COPPER_GRATE
-				) :
-				Helper::selectCopperId($oxidation,
-					Ids::COPPER_GRATE,
-					Ids::EXPOSED_COPPER_GRATE,
-					Ids::WEATHERED_COPPER_GRATE,
-					Ids::OXIDIZED_COPPER_GRATE
-				)
-			);
-		});
-		$this->map(Blocks::CUT_COPPER(), function(Copper $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return new Writer($block->isWaxed() ?
-				Helper::selectCopperId($oxidation, Ids::WAXED_CUT_COPPER, Ids::WAXED_EXPOSED_CUT_COPPER, Ids::WAXED_WEATHERED_CUT_COPPER, Ids::WAXED_OXIDIZED_CUT_COPPER) :
-				Helper::selectCopperId($oxidation, Ids::CUT_COPPER, Ids::EXPOSED_CUT_COPPER, Ids::WEATHERED_CUT_COPPER, Ids::OXIDIZED_CUT_COPPER)
-			);
-		});
-		$this->map(Blocks::CUT_COPPER_SLAB(), function(CopperSlab $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return Helper::encodeSlab(
-				$block,
-				($block->isWaxed() ?
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::WAXED_CUT_COPPER_SLAB,
-						Ids::WAXED_EXPOSED_CUT_COPPER_SLAB,
-						Ids::WAXED_WEATHERED_CUT_COPPER_SLAB,
-						Ids::WAXED_OXIDIZED_CUT_COPPER_SLAB
-					) :
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::CUT_COPPER_SLAB,
-						Ids::EXPOSED_CUT_COPPER_SLAB,
-						Ids::WEATHERED_CUT_COPPER_SLAB,
-						Ids::OXIDIZED_CUT_COPPER_SLAB
-					)
-				),
-				($block->isWaxed() ?
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::WAXED_DOUBLE_CUT_COPPER_SLAB,
-						Ids::WAXED_EXPOSED_DOUBLE_CUT_COPPER_SLAB,
-						Ids::WAXED_WEATHERED_DOUBLE_CUT_COPPER_SLAB,
-						Ids::WAXED_OXIDIZED_DOUBLE_CUT_COPPER_SLAB
-					) :
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::DOUBLE_CUT_COPPER_SLAB,
-						Ids::EXPOSED_DOUBLE_CUT_COPPER_SLAB,
-						Ids::WEATHERED_DOUBLE_CUT_COPPER_SLAB,
-						Ids::OXIDIZED_DOUBLE_CUT_COPPER_SLAB
-					)
-				)
-			);
-		});
-		$this->map(Blocks::CUT_COPPER_STAIRS(), function(CopperStairs $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return Helper::encodeStairs(
-				$block,
-				new Writer($block->isWaxed() ?
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::WAXED_CUT_COPPER_STAIRS,
-						Ids::WAXED_EXPOSED_CUT_COPPER_STAIRS,
-						Ids::WAXED_WEATHERED_CUT_COPPER_STAIRS,
-						Ids::WAXED_OXIDIZED_CUT_COPPER_STAIRS
-					) :
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::CUT_COPPER_STAIRS,
-						Ids::EXPOSED_CUT_COPPER_STAIRS,
-						Ids::WEATHERED_CUT_COPPER_STAIRS,
-						Ids::OXIDIZED_CUT_COPPER_STAIRS
-					)
-				)
-			);
-		});
-		$this->map(Blocks::COPPER_BULB(), function(CopperBulb $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return Writer::create($block->isWaxed() ?
-				Helper::selectCopperId($oxidation,
-					Ids::WAXED_COPPER_BULB,
-					Ids::WAXED_EXPOSED_COPPER_BULB,
-					Ids::WAXED_WEATHERED_COPPER_BULB,
-					Ids::WAXED_OXIDIZED_COPPER_BULB) :
-				Helper::selectCopperId($oxidation,
-					Ids::COPPER_BULB,
-					Ids::EXPOSED_COPPER_BULB,
-					Ids::WEATHERED_COPPER_BULB,
-					Ids::OXIDIZED_COPPER_BULB
-				))
-				->writeBool(StateNames::LIT, $block->isLit())
-				->writeBool(StateNames::POWERED_BIT, $block->isPowered());
-		});
-		$this->map(Blocks::COPPER_DOOR(), function(CopperDoor $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return Helper::encodeDoor(
-				$block,
-				new Writer($block->isWaxed() ?
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::WAXED_COPPER_DOOR,
-						Ids::WAXED_EXPOSED_COPPER_DOOR,
-						Ids::WAXED_WEATHERED_COPPER_DOOR,
-						Ids::WAXED_OXIDIZED_COPPER_DOOR
-					) :
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::COPPER_DOOR,
-						Ids::EXPOSED_COPPER_DOOR,
-						Ids::WEATHERED_COPPER_DOOR,
-						Ids::OXIDIZED_COPPER_DOOR
-					)
-				)
-			);
-		});
-		$this->map(Blocks::COPPER_TRAPDOOR(), function(CopperTrapdoor $block) : Writer{
-			$oxidation = $block->getOxidation();
-			return Helper::encodeTrapdoor(
-				$block,
-				new Writer($block->isWaxed() ?
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::WAXED_COPPER_TRAPDOOR,
-						Ids::WAXED_EXPOSED_COPPER_TRAPDOOR,
-						Ids::WAXED_WEATHERED_COPPER_TRAPDOOR,
-						Ids::WAXED_OXIDIZED_COPPER_TRAPDOOR
-					) :
-					Helper::selectCopperId(
-						$oxidation,
-						Ids::COPPER_TRAPDOOR,
-						Ids::EXPOSED_COPPER_TRAPDOOR,
-						Ids::WEATHERED_COPPER_TRAPDOOR,
-						Ids::OXIDIZED_COPPER_TRAPDOOR
-					)
-				)
-			);
-		});
-	}
-
 	private function registerSimpleSerializers() : void{
 		$this->mapSimple(Blocks::AIR(), Ids::AIR);
 		$this->mapSimple(Blocks::AMETHYST(), Ids::AMETHYST_BLOCK);
@ -1438,6 +1265,175 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
 		$this->mapSlab(Blocks::COBBLESTONE_SLAB(), Ids::COBBLESTONE_SLAB, Ids::COBBLESTONE_DOUBLE_SLAB);
 		$this->mapStairs(Blocks::COBBLESTONE_STAIRS(), Ids::STONE_STAIRS);
 		$this->map(Blocks::COBBLESTONE_WALL(), fn(Wall $block) => Helper::encodeWall($block, Writer::create(Ids::COBBLESTONE_WALL)));
+		$this->map(Blocks::COPPER(), function(Copper $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation, Ids::WAXED_COPPER, Ids::WAXED_EXPOSED_COPPER, Ids::WAXED_WEATHERED_COPPER, Ids::WAXED_OXIDIZED_COPPER) :
+				Helper::selectCopperId($oxidation, Ids::COPPER_BLOCK, Ids::EXPOSED_COPPER, Ids::WEATHERED_COPPER, Ids::OXIDIZED_COPPER)
+			);
+		});
+		$this->map(Blocks::CHISELED_COPPER(), function(Copper $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation,
+					Ids::WAXED_CHISELED_COPPER,
+					Ids::WAXED_EXPOSED_CHISELED_COPPER,
+					Ids::WAXED_WEATHERED_CHISELED_COPPER,
+					Ids::WAXED_OXIDIZED_CHISELED_COPPER
+				) :
+				Helper::selectCopperId($oxidation,
+					Ids::CHISELED_COPPER,
+					Ids::EXPOSED_CHISELED_COPPER,
+					Ids::WEATHERED_CHISELED_COPPER,
+					Ids::OXIDIZED_CHISELED_COPPER
+				)
+			);
+		});
+		$this->map(Blocks::COPPER_GRATE(), function(CopperGrate $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation,
+					Ids::WAXED_COPPER_GRATE,
+					Ids::WAXED_EXPOSED_COPPER_GRATE,
+					Ids::WAXED_WEATHERED_COPPER_GRATE,
+					Ids::WAXED_OXIDIZED_COPPER_GRATE
+				) :
+				Helper::selectCopperId($oxidation,
+					Ids::COPPER_GRATE,
+					Ids::EXPOSED_COPPER_GRATE,
+					Ids::WEATHERED_COPPER_GRATE,
+					Ids::OXIDIZED_COPPER_GRATE
+				)
+			);
+		});
+		$this->map(Blocks::CUT_COPPER(), function(Copper $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return new Writer($block->isWaxed() ?
+				Helper::selectCopperId($oxidation, Ids::WAXED_CUT_COPPER, Ids::WAXED_EXPOSED_CUT_COPPER, Ids::WAXED_WEATHERED_CUT_COPPER, Ids::WAXED_OXIDIZED_CUT_COPPER) :
+				Helper::selectCopperId($oxidation, Ids::CUT_COPPER, Ids::EXPOSED_CUT_COPPER, Ids::WEATHERED_CUT_COPPER, Ids::OXIDIZED_CUT_COPPER)
+			);
+		});
+		$this->map(Blocks::CUT_COPPER_SLAB(), function(CopperSlab $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeSlab(
+				$block,
+				($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_CUT_COPPER_SLAB,
+						Ids::WAXED_EXPOSED_CUT_COPPER_SLAB,
+						Ids::WAXED_WEATHERED_CUT_COPPER_SLAB,
+						Ids::WAXED_OXIDIZED_CUT_COPPER_SLAB
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::CUT_COPPER_SLAB,
+						Ids::EXPOSED_CUT_COPPER_SLAB,
+						Ids::WEATHERED_CUT_COPPER_SLAB,
+						Ids::OXIDIZED_CUT_COPPER_SLAB
+					)
+				),
+				($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WAXED_EXPOSED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WAXED_WEATHERED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WAXED_OXIDIZED_DOUBLE_CUT_COPPER_SLAB
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::DOUBLE_CUT_COPPER_SLAB,
+						Ids::EXPOSED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::WEATHERED_DOUBLE_CUT_COPPER_SLAB,
+						Ids::OXIDIZED_DOUBLE_CUT_COPPER_SLAB
+					)
+				)
+			);
+		});
+		$this->map(Blocks::CUT_COPPER_STAIRS(), function(CopperStairs $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeStairs(
+				$block,
+				new Writer($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_CUT_COPPER_STAIRS,
+						Ids::WAXED_EXPOSED_CUT_COPPER_STAIRS,
+						Ids::WAXED_WEATHERED_CUT_COPPER_STAIRS,
+						Ids::WAXED_OXIDIZED_CUT_COPPER_STAIRS
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::CUT_COPPER_STAIRS,
+						Ids::EXPOSED_CUT_COPPER_STAIRS,
+						Ids::WEATHERED_CUT_COPPER_STAIRS,
+						Ids::OXIDIZED_CUT_COPPER_STAIRS
+					)
+				)
+			);
+		});
+		$this->map(Blocks::COPPER_BULB(), function(CopperBulb $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Writer::create($block->isWaxed() ?
+				Helper::selectCopperId($oxidation,
+					Ids::WAXED_COPPER_BULB,
+					Ids::WAXED_EXPOSED_COPPER_BULB,
+					Ids::WAXED_WEATHERED_COPPER_BULB,
+					Ids::WAXED_OXIDIZED_COPPER_BULB) :
+				Helper::selectCopperId($oxidation,
+					Ids::COPPER_BULB,
+					Ids::EXPOSED_COPPER_BULB,
+					Ids::WEATHERED_COPPER_BULB,
+					Ids::OXIDIZED_COPPER_BULB
+				))
+				->writeBool(StateNames::LIT, $block->isLit())
+				->writeBool(StateNames::POWERED_BIT, $block->isPowered());
+		});
+		$this->map(Blocks::COPPER_DOOR(), function(CopperDoor $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeDoor(
+				$block,
+				new Writer($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_COPPER_DOOR,
+						Ids::WAXED_EXPOSED_COPPER_DOOR,
+						Ids::WAXED_WEATHERED_COPPER_DOOR,
+						Ids::WAXED_OXIDIZED_COPPER_DOOR
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::COPPER_DOOR,
+						Ids::EXPOSED_COPPER_DOOR,
+						Ids::WEATHERED_COPPER_DOOR,
+						Ids::OXIDIZED_COPPER_DOOR
+					)
+				)
+			);
+		});
+		$this->map(Blocks::COPPER_TRAPDOOR(), function(CopperTrapdoor $block) : Writer{
+			$oxidation = $block->getOxidation();
+			return Helper::encodeTrapdoor(
+				$block,
+				new Writer($block->isWaxed() ?
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::WAXED_COPPER_TRAPDOOR,
+						Ids::WAXED_EXPOSED_COPPER_TRAPDOOR,
+						Ids::WAXED_WEATHERED_COPPER_TRAPDOOR,
+						Ids::WAXED_OXIDIZED_COPPER_TRAPDOOR
+					) :
+					Helper::selectCopperId(
+						$oxidation,
+						Ids::COPPER_TRAPDOOR,
+						Ids::EXPOSED_COPPER_TRAPDOOR,
+						Ids::WEATHERED_COPPER_TRAPDOOR,
+						Ids::OXIDIZED_COPPER_TRAPDOOR
+					)
+				)
+			);
+		});
 		$this->map(Blocks::COCOA_POD(), function(CocoaBlock $block) : Writer{
 			return Writer::create(Ids::COCOA)
 				->writeInt(StateNames::AGE, $block->getAge())
--- a/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
+++ b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
@ -126,13 +126,7 @@ final class BlockStateDeserializerHelper{
 			->setOutputSignalStrength($in->readBoundedInt(BlockStateNames::REDSTONE_SIGNAL, 0, 15));
 	}

-	/**
-	 * @phpstan-template TDoor of Door
-	 * @phpstan-param TDoor $block
-	 * @phpstan-return TDoor
-	 *
-	 * @throws BlockStateDeserializeException
-	 */
+	/** @throws BlockStateDeserializeException */
 	public static function decodeDoor(Door $block, BlockStateReader $in) : Door{
 		//TODO: check if these need any special treatment to get the appropriate data to both halves of the door
 		return $block
@ -243,36 +237,18 @@ final class BlockStateDeserializerHelper{
 		return $block->setPressed($in->readBoundedInt(BlockStateNames::REDSTONE_SIGNAL, 0, 15) !== 0);
 	}

-	/**
-	 * @phpstan-template TSlab of Slab
-	 * @phpstan-param TSlab $block
-	 * @phpstan-return TSlab
-	 *
-	 * @throws BlockStateDeserializeException
-	 */
+	/** @throws BlockStateDeserializeException */
 	public static function decodeSingleSlab(Slab $block, BlockStateReader $in) : Slab{
 		return $block->setSlabType($in->readSlabPosition());
 	}

-	/**
-	 * @phpstan-template TSlab of Slab
-	 * @phpstan-param TSlab $block
-	 * @phpstan-return TSlab
-	 *
-	 * @throws BlockStateDeserializeException
-	 */
+	/** @throws BlockStateDeserializeException */
 	public static function decodeDoubleSlab(Slab $block, BlockStateReader $in) : Slab{
 		$in->ignored(StateNames::MC_VERTICAL_HALF);
 		return $block->setSlabType(SlabType::DOUBLE);
 	}

-	/**
-	 * @phpstan-template TStair of Stair
-	 * @phpstan-param TStair $block
-	 * @phpstan-return TStair
-	 *
-	 * @throws BlockStateDeserializeException
-	 */
+	/** @throws BlockStateDeserializeException */
 	public static function decodeStairs(Stair $block, BlockStateReader $in) : Stair{
 		return $block
 			->setUpsideDown($in->readBool(BlockStateNames::UPSIDE_DOWN_BIT))
@ -289,13 +265,7 @@ final class BlockStateDeserializerHelper{
 			->setFacing($facing === Facing::DOWN ? Facing::UP : $facing);
 	}

-	/**
-	 * @phpstan-template TTrapdoor of Trapdoor
-	 * @phpstan-param TTrapdoor $block
-	 * @phpstan-return TTrapdoor
-	 *
-	 * @throws BlockStateDeserializeException
-	 */
+	/** @throws BlockStateDeserializeException */
 	public static function decodeTrapdoor(Trapdoor $block, BlockStateReader $in) : Trapdoor{
 		return $block
 			->setFacing($in->read5MinusHorizontalFacing())
--- a/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
+++ b/src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
@ -33,13 +33,11 @@ use pocketmine\block\DoublePitcherCrop;
 use pocketmine\block\Opaque;
 use pocketmine\block\PinkPetals;
 use pocketmine\block\PitcherCrop;
-use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\block\Slab;
 use pocketmine\block\Stair;
 use pocketmine\block\SweetBerryBush;
 use pocketmine\block\utils\BrewingStandSlot;
 use pocketmine\block\utils\ChiseledBookshelfSlot;
-use pocketmine\block\utils\CopperMaterial;
 use pocketmine\block\utils\CopperOxidation;
 use pocketmine\block\utils\CoralType;
 use pocketmine\block\utils\DirtType;
@ -61,7 +59,6 @@ use pocketmine\data\bedrock\block\convert\BlockStateDeserializerHelper as Helper
 use pocketmine\data\bedrock\block\convert\BlockStateReader as Reader;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
-use pocketmine\utils\Utils;
 use function array_key_exists;
 use function count;
 use function min;
@ -90,7 +87,6 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 		$this->registerSaplingDeserializers();
 		$this->registerLightDeserializers();
 		$this->registerMobHeadDeserializers();
-		$this->registerCopperDeserializers();
 		$this->registerSimpleDeserializers();
 		$this->registerDeserializers();
 	}
@ -98,37 +94,19 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 	public function deserialize(BlockStateData $stateData) : int{
 		if(count($stateData->getStates()) === 0){
 			//if a block has zero properties, we can keep a map of string ID -> internal blockstate ID
-			return $this->simpleCache[$stateData->getName()] ??= $this->deserializeToStateId($stateData);
+			return $this->simpleCache[$stateData->getName()] ??= $this->deserializeBlock($stateData)->getStateId();
 		}

 		//we can't cache blocks that have properties - go ahead and deserialize the slow way
-		return $this->deserializeToStateId($stateData);
-	}
-
-	private function deserializeToStateId(BlockStateData $stateData) : int{
-		$stateId = $this->deserializeBlock($stateData)->getStateId();
-		//plugin devs seem to keep missing this and causing core crashes, so we need to verify this at the earliest
-		//available opportunity
-		if(!RuntimeBlockStateRegistry::getInstance()->hasStateId($stateId)){
-			throw new \LogicException("State ID $stateId returned by deserializer for " . $stateData->getName() . " is not registered in RuntimeBlockStateRegistry");
-		}
-		return $stateId;
+		return $this->deserializeBlock($stateData)->getStateId();
 	}

 	/** @phpstan-param \Closure(Reader) : Block $c */
 	public function map(string $id, \Closure $c) : void{
+		if(array_key_exists($id, $this->deserializeFuncs)){
+			throw new \InvalidArgumentException("Deserializer is already assigned for \"$id\"");
+		}
 		$this->deserializeFuncs[$id] = $c;
-		$this->simpleCache = [];
-	}
-
-	/**
-	 * Returns the existing data deserializer for the given ID, or null if none exists.
-	 * This may be useful if you need to override a deserializer, but still want to be able to fall back to the original.
-	 *
-	 * @phpstan-return ?\Closure(Reader) : Block
-	 */
-	public function getDeserializerForId(string $id) : ?\Closure{
-		return $this->deserializeFuncs[$id] ?? null;
 	}

 	/** @phpstan-param \Closure() : Block $getBlock */
@ -737,150 +715,6 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 		}
 	}

-	/**
-	 * @phpstan-param \Closure(Reader) : (CopperMaterial&Block) $deserializer
-	 */
-	private function mapCopper(
-		string $normalId,
-		string $waxedNormalId,
-		string $exposedId,
-		string $waxedExposedId,
-		string $weatheredId,
-		string $waxedWeatheredId,
-		string $oxidizedId,
-		string $waxedOxidizedId,
-		\Closure $deserializer
-	) : void{
-		foreach(Utils::stringifyKeys([
-			$normalId => [CopperOxidation::NONE, false],
-			$waxedNormalId => [CopperOxidation::NONE, true],
-			$exposedId => [CopperOxidation::EXPOSED, false],
-			$waxedExposedId => [CopperOxidation::EXPOSED, true],
-			$weatheredId => [CopperOxidation::WEATHERED, false],
-			$waxedWeatheredId => [CopperOxidation::WEATHERED, true],
-			$oxidizedId => [CopperOxidation::OXIDIZED, false],
-			$waxedOxidizedId => [CopperOxidation::OXIDIZED, true],
-		]) as $id => [$oxidation, $waxed]){
-			$this->map($id, fn(Reader $in) => $deserializer($in)->setOxidation($oxidation)->setWaxed($waxed));
-		}
-	}
-
-	private function registerCopperDeserializers() : void{
-		$this->mapCopper(
-			Ids::CUT_COPPER_SLAB,
-			Ids::WAXED_CUT_COPPER_SLAB,
-			Ids::EXPOSED_CUT_COPPER_SLAB,
-			Ids::WAXED_EXPOSED_CUT_COPPER_SLAB,
-			Ids::WEATHERED_CUT_COPPER_SLAB,
-			Ids::WAXED_WEATHERED_CUT_COPPER_SLAB,
-			Ids::OXIDIZED_CUT_COPPER_SLAB,
-			Ids::WAXED_OXIDIZED_CUT_COPPER_SLAB,
-			fn(Reader $in) => Helper::decodeSingleSlab(Blocks::CUT_COPPER_SLAB(), $in)
-		);
-		$this->mapCopper(
-			Ids::DOUBLE_CUT_COPPER_SLAB,
-			Ids::WAXED_DOUBLE_CUT_COPPER_SLAB,
-			Ids::EXPOSED_DOUBLE_CUT_COPPER_SLAB,
-			Ids::WAXED_EXPOSED_DOUBLE_CUT_COPPER_SLAB,
-			Ids::WEATHERED_DOUBLE_CUT_COPPER_SLAB,
-			Ids::WAXED_WEATHERED_DOUBLE_CUT_COPPER_SLAB,
-			Ids::OXIDIZED_DOUBLE_CUT_COPPER_SLAB,
-			Ids::WAXED_OXIDIZED_DOUBLE_CUT_COPPER_SLAB,
-			fn(Reader $in) => Helper::decodeDoubleSlab(Blocks::CUT_COPPER_SLAB(), $in)
-		);
-
-		$this->mapCopper(
-			Ids::COPPER_BULB,
-			Ids::WAXED_COPPER_BULB,
-			Ids::EXPOSED_COPPER_BULB,
-			Ids::WAXED_EXPOSED_COPPER_BULB,
-			Ids::WEATHERED_COPPER_BULB,
-			Ids::WAXED_WEATHERED_COPPER_BULB,
-			Ids::OXIDIZED_COPPER_BULB,
-			Ids::WAXED_OXIDIZED_COPPER_BULB,
-			fn(Reader $in) => Blocks::COPPER_BULB()
-				->setLit($in->readBool(StateNames::LIT))
-				->setPowered($in->readBool(StateNames::POWERED_BIT))
-		);
-		$this->mapCopper(
-			Ids::COPPER_DOOR,
-			Ids::WAXED_COPPER_DOOR,
-			Ids::EXPOSED_COPPER_DOOR,
-			Ids::WAXED_EXPOSED_COPPER_DOOR,
-			Ids::WEATHERED_COPPER_DOOR,
-			Ids::WAXED_WEATHERED_COPPER_DOOR,
-			Ids::OXIDIZED_COPPER_DOOR,
-			Ids::WAXED_OXIDIZED_COPPER_DOOR,
-			fn(Reader $in) => Helper::decodeDoor(Blocks::COPPER_DOOR(), $in)
-		);
-		$this->mapCopper(
-			Ids::COPPER_TRAPDOOR,
-			Ids::WAXED_COPPER_TRAPDOOR,
-			Ids::EXPOSED_COPPER_TRAPDOOR,
-			Ids::WAXED_EXPOSED_COPPER_TRAPDOOR,
-			Ids::WEATHERED_COPPER_TRAPDOOR,
-			Ids::WAXED_WEATHERED_COPPER_TRAPDOOR,
-			Ids::OXIDIZED_COPPER_TRAPDOOR,
-			Ids::WAXED_OXIDIZED_COPPER_TRAPDOOR,
-			fn(Reader $in) => Helper::decodeTrapdoor(Blocks::COPPER_TRAPDOOR(), $in)
-		);
-		$this->mapCopper(
-			Ids::COPPER_BLOCK,
-			Ids::WAXED_COPPER,
-			Ids::EXPOSED_COPPER,
-			Ids::WAXED_EXPOSED_COPPER,
-			Ids::WEATHERED_COPPER,
-			Ids::WAXED_WEATHERED_COPPER,
-			Ids::OXIDIZED_COPPER,
-			Ids::WAXED_OXIDIZED_COPPER,
-			fn(Reader $in) => Blocks::COPPER()
-		);
-		$this->mapCopper(
-			Ids::CHISELED_COPPER,
-			Ids::WAXED_CHISELED_COPPER,
-			Ids::EXPOSED_CHISELED_COPPER,
-			Ids::WAXED_EXPOSED_CHISELED_COPPER,
-			Ids::WEATHERED_CHISELED_COPPER,
-			Ids::WAXED_WEATHERED_CHISELED_COPPER,
-			Ids::OXIDIZED_CHISELED_COPPER,
-			Ids::WAXED_OXIDIZED_CHISELED_COPPER,
-			fn(Reader $in) => Blocks::CHISELED_COPPER()
-		);
-		$this->mapCopper(
-			Ids::COPPER_GRATE,
-			Ids::WAXED_COPPER_GRATE,
-			Ids::EXPOSED_COPPER_GRATE,
-			Ids::WAXED_EXPOSED_COPPER_GRATE,
-			Ids::WEATHERED_COPPER_GRATE,
-			Ids::WAXED_WEATHERED_COPPER_GRATE,
-			Ids::OXIDIZED_COPPER_GRATE,
-			Ids::WAXED_OXIDIZED_COPPER_GRATE,
-			fn(Reader $in) => Blocks::COPPER_GRATE()
-		);
-		$this->mapCopper(
-			Ids::CUT_COPPER,
-			Ids::WAXED_CUT_COPPER,
-			Ids::EXPOSED_CUT_COPPER,
-			Ids::WAXED_EXPOSED_CUT_COPPER,
-			Ids::WEATHERED_CUT_COPPER,
-			Ids::WAXED_WEATHERED_CUT_COPPER,
-			Ids::OXIDIZED_CUT_COPPER,
-			Ids::WAXED_OXIDIZED_CUT_COPPER,
-			fn(Reader $in) => Blocks::CUT_COPPER()
-		);
-		$this->mapCopper(
-			Ids::CUT_COPPER_STAIRS,
-			Ids::WAXED_CUT_COPPER_STAIRS,
-			Ids::EXPOSED_CUT_COPPER_STAIRS,
-			Ids::WAXED_EXPOSED_CUT_COPPER_STAIRS,
-			Ids::WEATHERED_CUT_COPPER_STAIRS,
-			Ids::WAXED_WEATHERED_CUT_COPPER_STAIRS,
-			Ids::OXIDIZED_CUT_COPPER_STAIRS,
-			Ids::WAXED_OXIDIZED_CUT_COPPER_STAIRS,
-			fn(Reader $in) => Helper::decodeStairs(Blocks::CUT_COPPER_STAIRS(), $in)
-		);
-	}
-
 	private function registerSimpleDeserializers() : void{
 		$this->mapSimple(Ids::AIR, fn() => Blocks::AIR());
 		$this->mapSimple(Ids::AMETHYST_BLOCK, fn() => Blocks::AMETHYST());
@ -1386,6 +1220,18 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 		$this->map(Ids::COMPOUND_CREATOR, fn(Reader $in) => Blocks::COMPOUND_CREATOR()
 			->setFacing(Facing::opposite($in->readLegacyHorizontalFacing()))
 		);
+		$this->map(Ids::COPPER_BLOCK, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::NONE));
+		$this->map(Ids::COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::NONE)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::NONE));
+		$this->map(Ids::COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::NONE));
+		$this->mapSlab(Ids::CUT_COPPER_SLAB, Ids::DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::NONE));
+		$this->mapStairs(Ids::CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::NONE));
 		$this->mapSlab(Ids::CUT_RED_SANDSTONE_SLAB, Ids::CUT_RED_SANDSTONE_DOUBLE_SLAB, fn() => Blocks::CUT_RED_SANDSTONE_SLAB());
 		$this->mapSlab(Ids::CUT_SANDSTONE_SLAB, Ids::CUT_SANDSTONE_DOUBLE_SLAB, fn() => Blocks::CUT_SANDSTONE_SLAB());
 		$this->mapSlab(Ids::DARK_PRISMARINE_SLAB, Ids::DARK_PRISMARINE_DOUBLE_SLAB, fn() => Blocks::DARK_PRISMARINE_SLAB());
@ -1440,6 +1286,19 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 			return Blocks::ENDER_CHEST()
 				->setFacing($in->readCardinalHorizontalFacing());
 		});
+		$this->map(Ids::EXPOSED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_CHISELED_COPPER, fn() => Helper::decodeCopper(Blocks::CHISELED_COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::EXPOSED));
+		$this->mapSlab(Ids::EXPOSED_CUT_COPPER_SLAB, Ids::EXPOSED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::EXPOSED));
+		$this->mapStairs(Ids::EXPOSED_CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::EXPOSED));
+		$this->map(Ids::EXPOSED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::EXPOSED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::EXPOSED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::EXPOSED), $in));
+		$this->map(Ids::EXPOSED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::EXPOSED), $in));
 		$this->map(Ids::FARMLAND, function(Reader $in) : Block{
 			return Blocks::FARMLAND()
 				->setWetness($in->readBoundedInt(StateNames::MOISTURIZED_AMOUNT, 0, 7));
@ -1592,6 +1451,19 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 		$this->mapSlab(Ids::NORMAL_STONE_SLAB, Ids::NORMAL_STONE_DOUBLE_SLAB, fn() => Blocks::STONE_SLAB());
 		$this->mapStairs(Ids::NORMAL_STONE_STAIRS, fn() => Blocks::STONE_STAIRS());
 		$this->map(Ids::OCHRE_FROGLIGHT, fn(Reader $in) => Blocks::FROGLIGHT()->setFroglightType(FroglightType::OCHRE)->setAxis($in->readPillarAxis()));
+		$this->map(Ids::OXIDIZED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_CHISELED_COPPER, fn() => Helper::decodeCopper(Blocks::CHISELED_COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::OXIDIZED));
+		$this->mapSlab(Ids::OXIDIZED_CUT_COPPER_SLAB, Ids::OXIDIZED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::OXIDIZED));
+		$this->mapStairs(Ids::OXIDIZED_CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::OXIDIZED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::OXIDIZED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::OXIDIZED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::OXIDIZED), $in));
+		$this->map(Ids::OXIDIZED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::OXIDIZED), $in));
 		$this->map(Ids::PEARLESCENT_FROGLIGHT, fn(Reader $in) => Blocks::FROGLIGHT()->setFroglightType(FroglightType::PEARLESCENT)->setAxis($in->readPillarAxis()));
 		$this->mapSlab(Ids::PETRIFIED_OAK_SLAB, Ids::PETRIFIED_OAK_DOUBLE_SLAB, fn() => Blocks::FAKE_WOODEN_SLAB());
 		$this->map(Ids::PINK_PETALS, function(Reader $in) : Block{
@ -1864,7 +1736,71 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 				->setFacing($in->readHorizontalFacing());
 		});
 		$this->map(Ids::WATER, fn(Reader $in) => Helper::decodeStillLiquid(Blocks::WATER(), $in));
-
+		$this->map(Ids::WAXED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::NONE));
+		$this->mapSlab(Ids::WAXED_CUT_COPPER_SLAB, Ids::WAXED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::NONE));
+		$this->mapStairs(Ids::WAXED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::NONE));
+		$this->map(Ids::WAXED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::NONE)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::WAXED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::NONE), $in));
+		$this->map(Ids::WAXED_EXPOSED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::EXPOSED));
+		$this->mapSlab(Ids::WAXED_EXPOSED_CUT_COPPER_SLAB, Ids::WAXED_EXPOSED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::EXPOSED));
+		$this->mapStairs(Ids::WAXED_EXPOSED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::EXPOSED));
+		$this->map(Ids::WAXED_EXPOSED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::EXPOSED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_EXPOSED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::EXPOSED), $in));
+		$this->map(Ids::WAXED_EXPOSED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::EXPOSED), $in));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::OXIDIZED));
+		$this->mapSlab(Ids::WAXED_OXIDIZED_CUT_COPPER_SLAB, Ids::WAXED_OXIDIZED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::OXIDIZED));
+		$this->mapStairs(Ids::WAXED_OXIDIZED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::OXIDIZED));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::OXIDIZED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::OXIDIZED), $in));
+		$this->map(Ids::WAXED_OXIDIZED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::OXIDIZED), $in));
+		$this->map(Ids::WAXED_WEATHERED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_CHISELED_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CHISELED_COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_COPPER_GRATE, fn() => Helper::decodeWaxedCopper(Blocks::COPPER_GRATE(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_CUT_COPPER, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER(), CopperOxidation::WEATHERED));
+		$this->mapSlab(Ids::WAXED_WEATHERED_CUT_COPPER_SLAB, Ids::WAXED_WEATHERED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::WEATHERED));
+		$this->mapStairs(Ids::WAXED_WEATHERED_CUT_COPPER_STAIRS, fn() => Helper::decodeWaxedCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WAXED_WEATHERED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeWaxedCopper(Blocks::COPPER_BULB(), CopperOxidation::WEATHERED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WAXED_WEATHERED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeWaxedCopper(Blocks::COPPER_DOOR(), CopperOxidation::WEATHERED), $in));
+		$this->map(Ids::WAXED_WEATHERED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeWaxedCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::WEATHERED), $in));
+		$this->map(Ids::WEATHERED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_CHISELED_COPPER, fn() => Helper::decodeCopper(Blocks::CHISELED_COPPER(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_COPPER_GRATE, fn() => Helper::decodeCopper(Blocks::COPPER_GRATE(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::WEATHERED));
+		$this->mapSlab(Ids::WEATHERED_CUT_COPPER_SLAB, Ids::WEATHERED_DOUBLE_CUT_COPPER_SLAB, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_SLAB(), CopperOxidation::WEATHERED));
+		$this->mapStairs(Ids::WEATHERED_CUT_COPPER_STAIRS, fn() => Helper::decodeCopper(Blocks::CUT_COPPER_STAIRS(), CopperOxidation::WEATHERED));
+		$this->map(Ids::WEATHERED_COPPER_BULB, function(Reader $in) : Block{
+			return Helper::decodeCopper(Blocks::COPPER_BULB(), CopperOxidation::WEATHERED)
+				->setLit($in->readBool(StateNames::LIT))
+				->setPowered($in->readBool(StateNames::POWERED_BIT));
+		});
+		$this->map(Ids::WEATHERED_COPPER_DOOR, fn(Reader $in) => Helper::decodeDoor(Helper::decodeCopper(Blocks::COPPER_DOOR(), CopperOxidation::WEATHERED), $in));
+		$this->map(Ids::WEATHERED_COPPER_TRAPDOOR, fn(Reader $in) => Helper::decodeTrapdoor(Helper::decodeCopper(Blocks::COPPER_TRAPDOOR(), CopperOxidation::WEATHERED), $in));
 		$this->map(Ids::WEEPING_VINES, function(Reader $in) : Block{
 			return Blocks::WEEPING_VINES()
 				->setAge($in->readBoundedInt(StateNames::WEEPING_VINES_AGE, 0, 25));
--- a/src/data/bedrock/item/ItemDeserializer.php
+++ b/src/data/bedrock/item/ItemDeserializer.php
@ -51,19 +51,12 @@ final class ItemDeserializer{
 	 * @phpstan-param \Closure(Data) : Item $deserializer
 	 */
 	public function map(string $id, \Closure $deserializer) : void{
+		if(isset($this->deserializers[$id])){
+			throw new \InvalidArgumentException("Deserializer is already assigned for \"$id\"");
+		}
 		$this->deserializers[$id] = $deserializer;
 	}

-	/**
-	 * Returns the existing data deserializer for the given ID, or null if none exists.
-	 * This may be useful if you need to override a deserializer, but still want to be able to fall back to the original.
-	 *
-	 * @phpstan-return ?\Closure(Data) : Item
-	 */
-	public function getDeserializerForId(string $id) : ?\Closure{
-		return $this->deserializers[$id] ?? null;
-	}
-
 	/**
 	 * @phpstan-param \Closure(Data) : Block $deserializer
 	 */
--- a/src/data/bedrock/item/ItemTypeNames.php
+++ b/src/data/bedrock/item/ItemTypeNames.php
@ -75,7 +75,6 @@ final class ItemTypeNames{
 	public const BLEACH = "minecraft:bleach";
 	public const BLUE_BUNDLE = "minecraft:blue_bundle";
 	public const BLUE_DYE = "minecraft:blue_dye";
-	public const BLUE_EGG = "minecraft:blue_egg";
 	public const BOARD = "minecraft:board";
 	public const BOAT = "minecraft:boat";
 	public const BOGGED_SPAWN_EGG = "minecraft:bogged_spawn_egg";
@ -94,7 +93,6 @@ final class ItemTypeNames{
 	public const BRICK = "minecraft:brick";
 	public const BROWN_BUNDLE = "minecraft:brown_bundle";
 	public const BROWN_DYE = "minecraft:brown_dye";
-	public const BROWN_EGG = "minecraft:brown_egg";
 	public const BRUSH = "minecraft:brush";
 	public const BUCKET = "minecraft:bucket";
 	public const BUNDLE = "minecraft:bundle";
--- a/src/inventory/transaction/InventoryTransaction.php
+++ b/src/inventory/transaction/InventoryTransaction.php
@ -144,9 +144,8 @@ class InventoryTransaction{
 		$needItems = [];
 		$haveItems = [];
 		foreach($this->actions as $key => $action){
-			$targetItem = $action->getTargetItem();
-			if(!$targetItem->isNull()){
-				$needItems[] = $targetItem;
+			if(!$action->getTargetItem()->isNull()){
+				$needItems[] = $action->getTargetItem();
 			}

 			try{
@ -155,9 +154,8 @@ class InventoryTransaction{
 				throw new TransactionValidationException(get_class($action) . "#" . spl_object_id($action) . ": " . $e->getMessage(), 0, $e);
 			}

-			$sourceItem = $action->getSourceItem();
-			if(!$sourceItem->isNull()){
-				$haveItems[] = $sourceItem;
+			if(!$action->getSourceItem()->isNull()){
+				$haveItems[] = $action->getSourceItem();
 			}
 		}

--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@ -113,10 +113,11 @@ use pocketmine\utils\BinaryDataException;
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\ObjectSet;
 use pocketmine\utils\TextFormat;
+use pocketmine\utils\Utils;
 use pocketmine\world\format\io\GlobalItemDataHandlers;
 use pocketmine\world\Position;
 use pocketmine\world\World;
-use pocketmine\YmlServerProperties;
+use pocketmine\YmlServerProperties as Yml;
 use function array_map;
 use function base64_encode;
 use function bin2hex;
@ -126,6 +127,9 @@ use function implode;
 use function in_array;
 use function is_string;
 use function json_encode;
+use function max;
+use function microtime;
+use function min;
 use function ord;
 use function random_bytes;
 use function str_split;
@ -136,6 +140,7 @@ use function substr;
 use function time;
 use function ucfirst;
 use const JSON_THROW_ON_ERROR;
+use const PHP_INT_MAX;

 class NetworkSession{
 	private const INCOMING_PACKET_BATCH_PER_TICK = 2; //usually max 1 per tick, but transactions arrive separately
@ -144,9 +149,17 @@ class NetworkSession{
 	private const INCOMING_GAME_PACKETS_PER_TICK = 2;
 	private const INCOMING_GAME_PACKETS_BUFFER_TICKS = 100;

+	private const READ_OPS_PER_TICK = 100; //subject to change
+	private const READ_OPS_BUFFER_TICKS = 200; //subject to change
+
 	private PacketRateLimiter $packetBatchLimiter;
 	private PacketRateLimiter $gamePacketLimiter;

+	private PacketRateLimiter $readOpsLimiter;
+	private PacketRateLimiterAction $readOpsLimiterAction;
+
+	private bool $readOpsStats;
+
 	private \PrefixedLogger $logger;
 	private ?Player $player = null;
 	private ?PlayerInfo $info = null;
@ -194,6 +207,28 @@ class NetworkSession{
 	 */
 	private ObjectSet $disposeHooks;

+	/**
+	 * @var int[]
+	 * @phpstan-var array<string, int>
+	 */
+	private array $readOpsPerPacketMin = [];
+	/**
+	 * @var int[]
+	 * @phpstan-var array<string, int>
+	 */
+	private array $readOpsPerPacketMax = [];
+	/**
+	 * @var int[]
+	 * @phpstan-var array<string, int>
+	 */
+	private array $readOpsPerPacketTotal = [];
+	/**
+	 * @var int[]
+	 * @phpstan-var array<string, int>
+	 */
+	private array $receivedPacketCounts = [];
+	private int $totalReadOpsUsed = 0;
+
 	public function __construct(
 		private Server $server,
 		private NetworkSessionManager $manager,
@ -216,6 +251,15 @@ class NetworkSession{
 		$this->packetBatchLimiter = new PacketRateLimiter("Packet Batches", self::INCOMING_PACKET_BATCH_PER_TICK, self::INCOMING_PACKET_BATCH_BUFFER_TICKS);
 		$this->gamePacketLimiter = new PacketRateLimiter("Game Packets", self::INCOMING_GAME_PACKETS_PER_TICK, self::INCOMING_GAME_PACKETS_BUFFER_TICKS);

+		$serverConfigGroup = $this->server->getConfigGroup();
+		$this->readOpsLimiter = new PacketRateLimiter(
+			"Packet Read Operations",
+			$serverConfigGroup->getPropertyInt(Yml::NETWORK_PACKET_READ_OPS_LIMIT_SESSION_BUDGET_PER_TICK, self::READ_OPS_PER_TICK),
+			$serverConfigGroup->getPropertyInt(Yml::NETWORK_PACKET_READ_OPS_LIMIT_SESSION_BUDGET_TICKS, self::READ_OPS_BUFFER_TICKS),
+		);
+		$this->readOpsLimiterAction = PacketRateLimiterAction::from($serverConfigGroup->getPropertyString(Yml::NETWORK_PACKET_READ_OPS_LIMIT_DEPLETE_ACTION, PacketRateLimiterAction::WARN->value));
+		$this->readOpsStats = $serverConfigGroup->getPropertyBool(Yml::NETWORK_PACKET_READ_OPS_LIMIT_COLLECT_STATS, false);
+
 		$this->setHandler(new SessionStartPacketHandler(
 			$this,
 			$this->onSessionStartSuccess(...)
@ -450,7 +494,36 @@ class NetworkSession{
 			try{
 				$stream = PacketSerializer::decoder($buffer, 0);
 				try{
-					$packet->decode($stream);
+					if($this->readOpsLimiterAction === PacketRateLimiterAction::NONE){
+						$packet->decode($stream);
+					}else{
+						$this->readOpsLimiter->update();
+						$stream->setReadOpsLimit(
+							$this->readOpsLimiterAction === PacketRateLimiterAction::KICK ?
+								$this->readOpsLimiter->getBudget() :
+								PHP_INT_MAX //don't bail out of decoding if we're only warning
+						);
+
+						$packet->decode($stream);
+						$readOps = $stream->getReadOps();
+						//If we exceeded the budget, a PacketDecodeException has already been thrown if we're in KICK
+						//mode, so we can assume we're in WARN mode here
+						if($this->readOpsLimiter->getBudget() < $readOps){
+							$this->getLogger()->warning("Decoding " . $packet->getName() . " exceeded read ops budget! $readOps > " . $this->readOpsLimiter->getBudget());
+							$this->readOpsLimiter->reset();
+						}else{
+							$this->readOpsLimiter->decrement($readOps);
+						}
+
+						if($this->readOpsStats){
+							$this->totalReadOpsUsed += $readOps;
+							$key = $packet->getName();
+							$this->readOpsPerPacketTotal[$key] = ($this->readOpsPerPacketTotal[$key] ?? 0) + $readOps;
+							$this->readOpsPerPacketMin[$key] = min($this->readOpsPerPacketMin[$key] ?? PHP_INT_MAX, $readOps);
+							$this->readOpsPerPacketMax[$key] = max($this->readOpsPerPacketMax[$key] ?? 0, $readOps);
+							$this->receivedPacketCounts[$key] = ($this->receivedPacketCounts[$key] ?? 0) + 1;
+						}
+					}
 				}catch(PacketDecodeException $e){
 					throw PacketHandlingException::wrap($e);
 				}
@ -483,6 +556,30 @@ class NetworkSession{
 		}
 	}

+	/**
+	 * @return int[]|float[]
+	 * @phpstan-return array<string, int|float|array<string, int|float>>
+	 */
+	public function dumpDecodeCostStats() : array{
+		if(!$this->readOpsStats){
+			throw new \LogicException("Not collecting stats for this session");
+		}
+		$sessionTime = microtime(true) - $this->connectTime;
+		$packetDecodeAverages = [];
+		$packetCostsPerSecondAverages = [];
+		foreach(Utils::stringifyKeys($this->readOpsPerPacketTotal) as $packet => $total){
+			$packetDecodeAverages[$packet] = $total / $this->receivedPacketCounts[$packet];
+			$packetCostsPerSecondAverages[$packet] = $total / $sessionTime;
+		}
+		return [
+			"readOpsAvgPerSecondTotal" => $this->totalReadOpsUsed / $sessionTime,
+			"readOpsAvgPerPacketPerSecond" => $packetCostsPerSecondAverages,
+			"readOpsAvgPerPacket" => $packetDecodeAverages,
+			"readOpsMinPerPacket" => $this->readOpsPerPacketMin,
+			"readOpsMaxPerPacket" => $this->readOpsPerPacketMax
+		];
+	}
+
 	public function handleAckReceipt(int $receiptId) : void{
 		if(!$this->connected){
 			return;
@ -857,7 +954,7 @@ class NetworkSession{
 		}
 		$this->logger->debug("Xbox Live authenticated: " . ($this->authenticated ? "YES" : "NO"));

-		$checkXUID = $this->server->getConfigGroup()->getPropertyBool(YmlServerProperties::PLAYER_VERIFY_XUID, true);
+		$checkXUID = $this->server->getConfigGroup()->getPropertyBool(Yml::PLAYER_VERIFY_XUID, true);
 		$myXUID = $this->info instanceof XboxLivePlayerInfo ? $this->info->getXuid() : "";
 		$kickForXUIDMismatch = function(string $xuid) use ($checkXUID, $myXUID) : bool{
 			if($checkXUID && $myXUID !== $xuid){
--- a/src/network/mcpe/PacketRateLimiter.php
+++ b/src/network/mcpe/PacketRateLimiter.php
@ -62,6 +62,14 @@ final class PacketRateLimiter{
 		$this->budget -= $amount;
 	}

+	public function getBudget() : int{
+		return $this->budget;
+	}
+
+	public function reset() : void{
+		$this->budget = $this->maxBudget;
+	}
+
 	public function update() : void{
 		$nowNs = hrtime(true);
 		$timeSinceLastUpdateNs = $nowNs - $this->lastUpdateTimeNs;
--- a/src/network/mcpe/PacketRateLimiterAction.php
+++ b/src/network/mcpe/PacketRateLimiterAction.php
@ -0,0 +1,30 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe;
+
+enum PacketRateLimiterAction : string{
+	case NONE = "none";
+	case WARN = "warn";
+	case KICK = "kick";
+}
--- a/src/network/mcpe/cache/ChunkCache.php
+++ b/src/network/mcpe/cache/ChunkCache.php
@ -88,13 +88,9 @@ class ChunkCache implements ChunkListener{
 	private int $hits = 0;
 	private int $misses = 0;

-	/**
-	 * @phpstan-param DimensionIds::* $dimensionId
-	 */
 	private function __construct(
 		private World $world,
-		private Compressor $compressor,
-		private int $dimensionId = DimensionIds::OVERWORLD
+		private Compressor $compressor
 	){}

 	private function prepareChunkAsync(int $chunkX, int $chunkZ, int $chunkHash) : CompressBatchPromise{
@ -113,7 +109,7 @@ class ChunkCache implements ChunkListener{
 				new ChunkRequestTask(
 					$chunkX,
 					$chunkZ,
-					$this->dimensionId,
+					DimensionIds::OVERWORLD, //TODO: not hardcode this
 					$chunk,
 					$promise,
 					$this->compressor
--- a/src/network/mcpe/handler/InGamePacketHandler.php
+++ b/src/network/mcpe/handler/InGamePacketHandler.php
@ -64,6 +64,7 @@ use pocketmine\network\mcpe\protocol\ItemStackResponsePacket;
 use pocketmine\network\mcpe\protocol\LabTablePacket;
 use pocketmine\network\mcpe\protocol\LecternUpdatePacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacketV1;
 use pocketmine\network\mcpe\protocol\MapInfoRequestPacket;
 use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
 use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
@ -295,6 +296,10 @@ class InGamePacketHandler extends PacketHandler{
 		return $packetHandled;
 	}

+	public function handleLevelSoundEventPacketV1(LevelSoundEventPacketV1 $packet) : bool{
+		return true; //useless leftover from 1.8
+	}
+
 	public function handleActorEvent(ActorEventPacket $packet) : bool{
 		if($packet->actorRuntimeId !== $this->player->getId()){
 			//TODO HACK: EATING_ITEM is sent back to the server when the server sends it for other players (1.14 bug, maybe earlier)
--- a/src/player/SurvivalBlockBreakHandler.php
+++ b/src/player/SurvivalBlockBreakHandler.php
@ -25,8 +25,6 @@ namespace pocketmine\player;

 use pocketmine\block\Block;
 use pocketmine\entity\animation\ArmSwingAnimation;
-use pocketmine\entity\effect\VanillaEffects;
-use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
@ -67,29 +65,11 @@ final class SurvivalBlockBreakHandler{
 		if(!$this->block->getBreakInfo()->isBreakable()){
 			return 0.0;
 		}
+		//TODO: improve this to take stuff like swimming, ladders, enchanted tools into account, fix wrong tool break time calculations for bad tools (pmmp/PocketMine-MP#211)
 		$breakTimePerTick = $this->block->getBreakInfo()->getBreakTime($this->player->getInventory()->getItemInHand()) * 20;
-		if(!$this->player->isOnGround() && !$this->player->isFlying()){
-			$breakTimePerTick *= 5;
-		}
-		if($this->player->isUnderwater() && !$this->player->getArmorInventory()->getHelmet()->hasEnchantment(VanillaEnchantments::AQUA_AFFINITY())){
-			$breakTimePerTick *= 5;
-		}
+
 		if($breakTimePerTick > 0){
-			$progressPerTick = 1 / $breakTimePerTick;
-
-			$haste = $this->player->getEffects()->get(VanillaEffects::HASTE());
-			if($haste !== null){
-				$hasteLevel = $haste->getEffectLevel();
-				$progressPerTick *= (1 + 0.2 * $hasteLevel) * (1.2 ** $hasteLevel);
-			}
-
-			$miningFatigue = $this->player->getEffects()->get(VanillaEffects::MINING_FATIGUE());
-			if($miningFatigue !== null){
-				$miningFatigueLevel = $miningFatigue->getEffectLevel();
-				$progressPerTick *= 0.21 ** $miningFatigueLevel;
-			}
-
-			return $progressPerTick;
+			return 1 / $breakTimePerTick;
 		}
 		return 1;
 	}
@ -102,10 +82,7 @@ final class SurvivalBlockBreakHandler{
 		$newBreakSpeed = $this->calculateBreakProgressPerTick();
 		if(abs($newBreakSpeed - $this->breakSpeed) > 0.0001){
 			$this->breakSpeed = $newBreakSpeed;
-			$this->player->getWorld()->broadcastPacketToViewers(
-				$this->blockPos,
-				LevelEventPacket::create(LevelEvent::BLOCK_BREAK_SPEED, (int) (65535 * $this->breakSpeed), $this->blockPos)
-			);
+			//TODO: sync with client
 		}

 		$this->breakProgress += $this->breakSpeed;
--- a/src/utils/Terminal.php
+++ b/src/utils/Terminal.php
@ -69,7 +69,6 @@ abstract class Terminal{
 	public static string $COLOR_MATERIAL_DIAMOND = "";
 	public static string $COLOR_MATERIAL_LAPIS = "";
 	public static string $COLOR_MATERIAL_AMETHYST = "";
-	public static string $COLOR_MATERIAL_RESIN = "";

 	private static ?bool $formattingCodes = null;

@ -132,7 +131,6 @@ abstract class Terminal{
 		self::$COLOR_MATERIAL_DIAMOND = $color(37);
 		self::$COLOR_MATERIAL_LAPIS = $color(24);
 		self::$COLOR_MATERIAL_AMETHYST = $color(98);
-		self::$COLOR_MATERIAL_RESIN = $color(208);
 	}

 	protected static function getEscapeCodes() : void{
@ -176,12 +174,11 @@ abstract class Terminal{
 			self::$COLOR_MATERIAL_DIAMOND = $colors >= 256 ? $setaf(37) : $setaf(14);
 			self::$COLOR_MATERIAL_LAPIS = $colors >= 256 ? $setaf(24) : $setaf(12);
 			self::$COLOR_MATERIAL_AMETHYST = $colors >= 256 ? $setaf(98) : $setaf(13);
-			self::$COLOR_MATERIAL_RESIN = $colors >= 256 ? $setaf(208) : $setaf(11);
 		}else{
 			self::$COLOR_BLACK = self::$COLOR_DARK_GRAY = self::$COLOR_MATERIAL_NETHERITE = $setaf(0);
 			self::$COLOR_RED = self::$COLOR_DARK_RED = self::$COLOR_MATERIAL_REDSTONE = self::$COLOR_MATERIAL_COPPER = $setaf(1);
 			self::$COLOR_GREEN = self::$COLOR_DARK_GREEN = self::$COLOR_MATERIAL_EMERALD = $setaf(2);
-			self::$COLOR_YELLOW = self::$COLOR_GOLD = self::$COLOR_MINECOIN_GOLD = self::$COLOR_MATERIAL_GOLD = self::$COLOR_MATERIAL_RESIN = $setaf(3);
+			self::$COLOR_YELLOW = self::$COLOR_GOLD = self::$COLOR_MINECOIN_GOLD = self::$COLOR_MATERIAL_GOLD = $setaf(3);
 			self::$COLOR_BLUE = self::$COLOR_DARK_BLUE = self::$COLOR_MATERIAL_LAPIS = $setaf(4);
 			self::$COLOR_LIGHT_PURPLE = self::$COLOR_PURPLE = self::$COLOR_MATERIAL_AMETHYST = $setaf(5);
 			self::$COLOR_AQUA = self::$COLOR_DARK_AQUA = self::$COLOR_MATERIAL_DIAMOND = $setaf(6);
@ -256,7 +253,6 @@ abstract class Terminal{
 				TextFormat::MATERIAL_DIAMOND => Terminal::$COLOR_MATERIAL_DIAMOND,
 				TextFormat::MATERIAL_LAPIS => Terminal::$COLOR_MATERIAL_LAPIS,
 				TextFormat::MATERIAL_AMETHYST => Terminal::$COLOR_MATERIAL_AMETHYST,
-				TextFormat::MATERIAL_RESIN => Terminal::$COLOR_MATERIAL_RESIN,
 				default => $token,
 			};
 		}
--- a/src/utils/TextFormat.php
+++ b/src/utils/TextFormat.php
@ -73,7 +73,6 @@ abstract class TextFormat{
 	public const MATERIAL_DIAMOND = TextFormat::ESCAPE . "s";
 	public const MATERIAL_LAPIS = TextFormat::ESCAPE . "t";
 	public const MATERIAL_AMETHYST = TextFormat::ESCAPE . "u";
-	public const MATERIAL_RESIN = TextFormat::ESCAPE . "v";

 	public const COLORS = [
 		self::BLACK => self::BLACK,
@ -103,7 +102,6 @@ abstract class TextFormat{
 		self::MATERIAL_DIAMOND => self::MATERIAL_DIAMOND,
 		self::MATERIAL_LAPIS => self::MATERIAL_LAPIS,
 		self::MATERIAL_AMETHYST => self::MATERIAL_AMETHYST,
-		self::MATERIAL_RESIN => self::MATERIAL_RESIN,
 	];

 	public const OBFUSCATED = TextFormat::ESCAPE . "k";
@ -152,7 +150,7 @@ abstract class TextFormat{
 	 * @return string[]
 	 */
 	public static function tokenize(string $string) : array{
-		$result = preg_split("/(" . TextFormat::ESCAPE . "[0-9a-v])/u", $string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+		$result = preg_split("/(" . TextFormat::ESCAPE . "[0-9a-u])/u", $string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 		if($result === false) throw self::makePcreError();
 		return $result;
 	}
@ -166,7 +164,7 @@ abstract class TextFormat{
 		$string = mb_scrub($string, 'UTF-8');
 		$string = self::preg_replace("/[\x{E000}-\x{F8FF}]/u", "", $string); //remove unicode private-use-area characters (they might break the console)
 		if($removeFormat){
-			$string = str_replace(TextFormat::ESCAPE, "", self::preg_replace("/" . TextFormat::ESCAPE . "[0-9a-v]/u", "", $string));
+			$string = str_replace(TextFormat::ESCAPE, "", self::preg_replace("/" . TextFormat::ESCAPE . "[0-9a-u]/u", "", $string));
 		}
 		return str_replace("\x1b", "", self::preg_replace("/\x1b[\\(\\][[0-9;\\[\\(]+[Bm]/u", "", $string));
 	}
@ -177,7 +175,7 @@ abstract class TextFormat{
 	 * @param string $placeholder default "&"
 	 */
 	public static function colorize(string $string, string $placeholder = "&") : string{
-		return self::preg_replace('/' . preg_quote($placeholder, "/") . '([0-9a-v])/u', TextFormat::ESCAPE . '$1', $string);
+		return self::preg_replace('/' . preg_quote($placeholder, "/") . '([0-9a-u])/u', TextFormat::ESCAPE . '$1', $string);
 	}

 	/**
@ -254,7 +252,6 @@ abstract class TextFormat{
 				TextFormat::MATERIAL_DIAMOND => "color:#2cb9a8",
 				TextFormat::MATERIAL_LAPIS => "color:#20487a",
 				TextFormat::MATERIAL_AMETHYST => "color:#9a5cc5",
-				TextFormat::MATERIAL_RESIN => "color:#fc7812",
 				TextFormat::BOLD => "font-weight:bold",
 				TextFormat::ITALIC => "font-style:italic",
 				default => null
--- a/src/world/World.php
+++ b/src/world/World.php
@ -375,8 +375,6 @@ class World implements ChunkManager{

 	private \Logger $logger;

-	private RuntimeBlockStateRegistry $blockStateRegistry;
-
 	/**
 	 * @phpstan-return ChunkPosHash
 	 */
@ -490,7 +488,6 @@ class World implements ChunkManager{
 		$this->displayName = $this->provider->getWorldData()->getName();
 		$this->logger = new \PrefixedLogger($server->getLogger(), "World: $this->displayName");

-		$this->blockStateRegistry = RuntimeBlockStateRegistry::getInstance();
 		$this->minY = $this->provider->getWorldMinY();
 		$this->maxY = $this->provider->getWorldMaxY();

@ -562,7 +559,7 @@ class World implements ChunkManager{
 				}catch(BlockStateDeserializeException){
 					continue;
 				}
-				$block = $this->blockStateRegistry->fromStateId(GlobalBlockStateHandlers::getDeserializer()->deserialize($blockStateData));
+				$block = RuntimeBlockStateRegistry::getInstance()->fromStateId(GlobalBlockStateHandlers::getDeserializer()->deserialize($blockStateData));
 			}else{
 				//TODO: we probably ought to log an error here
 				continue;
@ -573,7 +570,7 @@ class World implements ChunkManager{
 			}
 		}

-		foreach($this->blockStateRegistry->getAllKnownStates() as $state){
+		foreach(RuntimeBlockStateRegistry::getInstance()->getAllKnownStates() as $state){
 			$dontTickName = $dontTickBlocks[$state->getTypeId()] ?? null;
 			if($dontTickName === null && $state->ticksRandomly()){
 				$this->randomTickBlocks[$state->getStateId()] = true;
@ -1397,7 +1394,7 @@ class World implements ChunkManager{
 			$entity->onRandomUpdate();
 		}

-		$blockFactory = $this->blockStateRegistry;
+		$blockFactory = RuntimeBlockStateRegistry::getInstance();
 		foreach($chunk->getSubChunks() as $Y => $subChunk){
 			if(!$subChunk->isEmptyFast()){
 				$k = 0;
@ -1531,48 +1528,24 @@ class World implements ChunkManager{

 		$collides = [];

-		$collisionInfo = $this->blockStateRegistry->collisionInfo;
 		if($targetFirst){
 			for($z = $minZ; $z <= $maxZ; ++$z){
-				$zOverflow = $z === $minZ || $z === $maxZ;
 				for($x = $minX; $x <= $maxX; ++$x){
-					$zxOverflow = $zOverflow || $x === $minX || $x === $maxX;
 					for($y = $minY; $y <= $maxY; ++$y){
-						$overflow = $zxOverflow || $y === $minY || $y === $maxY;
-
-						$stateCollisionInfo = $this->getBlockCollisionInfo($x, $y, $z, $collisionInfo);
-						if($overflow ?
-							$stateCollisionInfo === RuntimeBlockStateRegistry::COLLISION_MAY_OVERFLOW && $this->getBlockAt($x, $y, $z)->collidesWithBB($bb) :
-							match ($stateCollisionInfo) {
-								RuntimeBlockStateRegistry::COLLISION_CUBE => true,
-								RuntimeBlockStateRegistry::COLLISION_NONE => false,
-								default => $this->getBlockAt($x, $y, $z)->collidesWithBB($bb)
-							}
-						){
-							return [$this->getBlockAt($x, $y, $z)];
+						$block = $this->getBlockAt($x, $y, $z);
+						if($block->collidesWithBB($bb)){
+							return [$block];
 						}
 					}
 				}
 			}
 		}else{
-			//TODO: duplicated code :( this way is better for performance though
 			for($z = $minZ; $z <= $maxZ; ++$z){
-				$zOverflow = $z === $minZ || $z === $maxZ;
 				for($x = $minX; $x <= $maxX; ++$x){
-					$zxOverflow = $zOverflow || $x === $minX || $x === $maxX;
 					for($y = $minY; $y <= $maxY; ++$y){
-						$overflow = $zxOverflow || $y === $minY || $y === $maxY;
-
-						$stateCollisionInfo = $this->getBlockCollisionInfo($x, $y, $z, $collisionInfo);
-						if($overflow ?
-							$stateCollisionInfo === RuntimeBlockStateRegistry::COLLISION_MAY_OVERFLOW && $this->getBlockAt($x, $y, $z)->collidesWithBB($bb) :
-							match ($stateCollisionInfo) {
-								RuntimeBlockStateRegistry::COLLISION_CUBE => true,
-								RuntimeBlockStateRegistry::COLLISION_NONE => false,
-								default => $this->getBlockAt($x, $y, $z)->collidesWithBB($bb)
-							}
-						){
-							$collides[] = $this->getBlockAt($x, $y, $z);
+						$block = $this->getBlockAt($x, $y, $z);
+						if($block->collidesWithBB($bb)){
+							$collides[] = $block;
 						}
 					}
 				}
@ -1582,64 +1555,24 @@ class World implements ChunkManager{
 		return $collides;
 	}

-	/**
-	 * @param int[] $collisionInfo
-	 * @phpstan-param array<int, int> $collisionInfo
-	 */
-	private function getBlockCollisionInfo(int $x, int $y, int $z, array $collisionInfo) : int{
-		if(!$this->isInWorld($x, $y, $z)){
-			return RuntimeBlockStateRegistry::COLLISION_NONE;
-		}
-		$chunk = $this->getChunk($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE);
-		if($chunk === null){
-			return RuntimeBlockStateRegistry::COLLISION_NONE;
-		}
-		$stateId = $chunk
-			->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)
-			->getBlockStateId(
-				$x & SubChunk::COORD_MASK,
-				$y & SubChunk::COORD_MASK,
-				$z & SubChunk::COORD_MASK
-			);
-		return $collisionInfo[$stateId];
-	}
-
 	/**
 	 * Returns a list of all block AABBs which overlap the full block area at the given coordinates.
 	 * This checks a padding of 1 block around the coordinates to account for oversized AABBs of blocks like fences.
 	 * Larger AABBs (>= 2 blocks on any axis) are not accounted for.
 	 *
-	 * @param int[] $collisionInfo
-	 * @phpstan-param array<int, int> $collisionInfo
-	 *
 	 * @return AxisAlignedBB[]
 	 * @phpstan-return list<AxisAlignedBB>
 	 */
-	private function getBlockCollisionBoxesForCell(int $x, int $y, int $z, array $collisionInfo) : array{
-		$stateCollisionInfo = $this->getBlockCollisionInfo($x, $y, $z, $collisionInfo);
-		$boxes = match($stateCollisionInfo){
-			RuntimeBlockStateRegistry::COLLISION_NONE => [],
-			RuntimeBlockStateRegistry::COLLISION_CUBE => [AxisAlignedBB::one()->offset($x, $y, $z)],
-			default => $this->getBlockAt($x, $y, $z)->getCollisionBoxes()
-		};
+	private function getBlockCollisionBoxesForCell(int $x, int $y, int $z) : array{
+		$block = $this->getBlockAt($x, $y, $z);
+		$boxes = $block->getCollisionBoxes();

-		//overlapping AABBs can't make any difference if this is a cube, so we can save some CPU cycles in this common case
-		if($stateCollisionInfo !== RuntimeBlockStateRegistry::COLLISION_CUBE){
-			$cellBB = null;
-			foreach(Facing::OFFSET as [$dx, $dy, $dz]){
-				$offsetX = $x + $dx;
-				$offsetY = $y + $dy;
-				$offsetZ = $z + $dz;
-				$stateCollisionInfo = $this->getBlockCollisionInfo($offsetX, $offsetY, $offsetZ, $collisionInfo);
-				if($stateCollisionInfo === RuntimeBlockStateRegistry::COLLISION_MAY_OVERFLOW){
-					//avoid allocating this unless it's needed
-					$cellBB ??= AxisAlignedBB::one()->offset($x, $y, $z);
-					$extraBoxes = $this->getBlockAt($offsetX, $offsetY, $offsetZ)->getCollisionBoxes();
-					foreach($extraBoxes as $extraBox){
-						if($extraBox->intersectsWith($cellBB)){
-							$boxes[] = $extraBox;
-						}
-					}
+		$cellBB = AxisAlignedBB::one()->offset($x, $y, $z);
+		foreach(Facing::OFFSET as [$dx, $dy, $dz]){
+			$extraBoxes = $this->getBlockAt($x + $dx, $y + $dy, $z + $dz)->getCollisionBoxes();
+			foreach($extraBoxes as $extraBox){
+				if($extraBox->intersectsWith($cellBB)){
+					$boxes[] = $extraBox;
 				}
 			}
 		}
@ -1661,15 +1594,13 @@ class World implements ChunkManager{

 		$collides = [];

-		$collisionInfo = $this->blockStateRegistry->collisionInfo;
-
 		for($z = $minZ; $z <= $maxZ; ++$z){
 			for($x = $minX; $x <= $maxX; ++$x){
 				$chunkPosHash = World::chunkHash($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE);
 				for($y = $minY; $y <= $maxY; ++$y){
 					$relativeBlockHash = World::chunkBlockHash($x, $y, $z);

-					$boxes = $this->blockCollisionBoxCache[$chunkPosHash][$relativeBlockHash] ??= $this->getBlockCollisionBoxesForCell($x, $y, $z, $collisionInfo);
+					$boxes = $this->blockCollisionBoxCache[$chunkPosHash][$relativeBlockHash] ??= $this->getBlockCollisionBoxesForCell($x, $y, $z);

 					foreach($boxes as $blockBB){
 						if($blockBB->intersectsWith($bb)){
@ -1864,7 +1795,7 @@ class World implements ChunkManager{
 			return;
 		}

-		$blockFactory = $this->blockStateRegistry;
+		$blockFactory = RuntimeBlockStateRegistry::getInstance();
 		$this->timings->doBlockSkyLightUpdates->startTiming();
 		if($this->skyLightUpdate === null){
 			$this->skyLightUpdate = new SkyLightUpdate(new SubChunkExplorer($this), $blockFactory->lightFilter, $blockFactory->blocksDirectSkyLight);
@ -1983,7 +1914,7 @@ class World implements ChunkManager{

 			$chunk = $this->chunks[$chunkHash] ?? null;
 			if($chunk !== null){
-				$block = $this->blockStateRegistry->fromStateId($chunk->getBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
+				$block = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
 			}else{
 				$addToCache = false;
 				$block = VanillaBlocks::AIR();
@ -2642,7 +2573,7 @@ class World implements ChunkManager{
 				$localY = $tilePosition->getFloorY();
 				$localZ = $tilePosition->getFloorZ() & Chunk::COORD_MASK;

-				$newBlock = $this->blockStateRegistry->fromStateId($chunk->getBlockStateId($localX, $localY, $localZ));
+				$newBlock = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($localX, $localY, $localZ));
 				$expectedTileClass = $newBlock->getIdInfo()->getTileClass();
 				if(
 					$expectedTileClass === null || //new block doesn't expect a tile
--- a/src/world/format/io/data/BedrockWorldData.php
+++ b/src/world/format/io/data/BedrockWorldData.php
@ -51,12 +51,12 @@ use function time;
 class BedrockWorldData extends BaseNbtWorldData{

 	public const CURRENT_STORAGE_VERSION = 10;
-	public const CURRENT_STORAGE_NETWORK_VERSION = 786;
+	public const CURRENT_STORAGE_NETWORK_VERSION = 776;
 	public const CURRENT_CLIENT_VERSION_TARGET = [
 		1, //major
 		21, //minor
-		70, //patch
-		3, //revision
+		60, //patch
+		33, //revision
 		0 //is beta
 	];

--- a/src/world/sound/EntityAttackNoDamageSound.php
+++ b/src/world/sound/EntityAttackNoDamageSound.php
@ -39,8 +39,7 @@ class EntityAttackNoDamageSound implements Sound{
 			-1,
 			"minecraft:player",
 			false,
-			false,
-			-1
+			false
 		)];
 	}
 }
--- a/src/world/sound/EntityAttackSound.php
+++ b/src/world/sound/EntityAttackSound.php
@ -39,8 +39,7 @@ class EntityAttackSound implements Sound{
 			-1,
 			"minecraft:player",
 			false,
-			false,
-			-1
+			false
 		)];
 	}
 }
--- a/src/world/sound/EntityLandSound.php
+++ b/src/world/sound/EntityLandSound.php
@ -46,8 +46,7 @@ class EntityLandSound implements Sound{
 			TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($this->blockLandedOn->getStateId()),
 			$this->entity::getNetworkTypeId(),
 			false, //TODO: does isBaby have any relevance here?
-			false,
-			$this->entity->getId()
+			false
 		)];
 	}
 }
--- a/src/world/sound/EntityLongFallSound.php
+++ b/src/world/sound/EntityLongFallSound.php
@ -42,8 +42,7 @@ class EntityLongFallSound implements Sound{
 			-1,
 			$this->entity::getNetworkTypeId(),
 			false, //TODO: is isBaby relevant here?
-			false,
-			$this->entity->getId()
+			false
 		)];
 	}
 }
--- a/src/world/sound/EntityShortFallSound.php
+++ b/src/world/sound/EntityShortFallSound.php
@ -41,8 +41,7 @@ class EntityShortFallSound implements Sound{
 			-1,
 			$this->entity::getNetworkTypeId(),
 			false, //TODO: does isBaby have any relevance here?
-			false,
-			-1
+			false
 		)];
 	}
 }
--- a/src/world/sound/ThrowSound.php
+++ b/src/world/sound/ThrowSound.php
@ -30,6 +30,6 @@ use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 class ThrowSound implements Sound{

 	public function encode(Vector3 $pos) : array{
-		return [LevelSoundEventPacket::create(LevelSoundEvent::THROW, $pos, -1, "minecraft:player", false, false, -1)];
+		return [LevelSoundEventPacket::create(LevelSoundEvent::THROW, $pos, -1, "minecraft:player", false, false)];
 	}
 }
--- a/src/world/sound/WaterSplashSound.php
+++ b/src/world/sound/WaterSplashSound.php
@ -42,8 +42,7 @@ final class WaterSplashSound implements Sound{
 			(int) ($this->volume * 16777215),
 			":",
 			false,
-			false,
-			-1
+			false
 		)];
 	}
 }
--- a/tests/phpstan/configs/actual-problems.neon
+++ b/tests/phpstan/configs/actual-problems.neon
@ -18,12 +18,6 @@ parameters:
 			count: 1
 			path: ../../../src/Server.php

-		-
-			message: '#^Dynamic new is not allowed\.$#'
-			identifier: pocketmine.new.dynamic
-			count: 1
-			path: ../../../src/Server.php
-
 		-
 			message: '#^Method pocketmine\\Server\:\:getCommandAliases\(\) should return array\<string, list\<string\>\> but returns array\<string, array\<mixed\>\>\.$#'
 			identifier: return.type
@ -60,12 +54,6 @@ parameters:
 			count: 1
 			path: ../../../src/VersionInfo.php

-		-
-			message: '#^Dynamic new is not allowed\.$#'
-			identifier: pocketmine.new.dynamic
-			count: 1
-			path: ../../../src/block/Block.php
-
 		-
 			message: '#^Parameter \#1 \$x of method pocketmine\\world\\World\:\:getBlockAt\(\) expects int, float\|int given\.$#'
 			identifier: argument.type
@ -522,12 +510,6 @@ parameters:
 			count: 3
 			path: ../../../src/block/tile/Spawnable.php

-		-
-			message: '#^Dynamic new is not allowed\.$#'
-			identifier: pocketmine.new.dynamic
-			count: 1
-			path: ../../../src/block/tile/TileFactory.php
-
 		-
 			message: '#^Parameter \#1 \$x of method pocketmine\\world\\World\:\:getPotentialLightAt\(\) expects int, float\|int given\.$#'
 			identifier: argument.type
@ -954,12 +936,6 @@ parameters:
 			count: 4
 			path: ../../../src/plugin/PluginManager.php

-		-
-			message: '#^Dynamic new is not allowed\.$#'
-			identifier: pocketmine.new.dynamic
-			count: 1
-			path: ../../../src/plugin/PluginManager.php
-
 		-
 			message: '#^Method pocketmine\\resourcepacks\\ZippedResourcePack\:\:getPackSize\(\) should return int but returns int\<0, max\>\|false\.$#'
 			identifier: return.type
@ -1272,12 +1248,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/format/io/region/RegionLoader.php

-		-
-			message: '#^Dynamic new is not allowed\.$#'
-			identifier: pocketmine.new.dynamic
-			count: 1
-			path: ../../../src/world/generator/GeneratorRegisterTask.php
-
 		-
 			message: '#^Method pocketmine\\world\\generator\\biome\\BiomeSelector\:\:pickBiome\(\) should return pocketmine\\world\\biome\\Biome but returns pocketmine\\world\\biome\\Biome\|null\.$#'
 			identifier: return.type
--- a/tests/phpstan/rules/DisallowDynamicNewRule.php
+++ b/tests/phpstan/rules/DisallowDynamicNewRule.php
@ -1,55 +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\phpstan\rules;
-
-use PhpParser\Node;
-use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\New_;
-use PHPStan\Analyser\Scope;
-use PHPStan\Rules\Rule;
-use PHPStan\Rules\RuleErrorBuilder;
-
-/**
- * @phpstan-implements Rule<New_>
- */
-final class DisallowDynamicNewRule implements Rule{
-
-	public function getNodeType() : string{
-		return New_::class;
-	}
-
-	public function processNode(Node $node, Scope $scope) : array{
-		/** @var New_ $node */
-		if($node->class instanceof Expr){
-			return [
-				RuleErrorBuilder::message("Dynamic new is not allowed.")
-					->tip("For factories, use closures instead. Closures can implement custom logic, are statically analyzable, and don't restrict the constructor signature.")
-					->identifier("pocketmine.new.dynamic")
-					->build()
-			];
-		}
-
-		return [];
-	}
-}
--- a/tools/blockstate-upgrade-schema-utils.php
+++ b/tools/blockstate-upgrade-schema-utils.php
@ -51,10 +51,8 @@ use function array_unique;
 use function array_values;
 use function count;
 use function dirname;
-use function fclose;
 use function file_exists;
 use function file_put_contents;
-use function fopen;
 use function fwrite;
 use function get_class;
 use function get_debug_type;
@ -887,44 +885,6 @@ function cmdUpdateAll(array $argv) : int{
 	return 0;
 }

-/**
- * @param string[] $argv
- */
-function cmdDumpTable(array $argv) : int{
-	$tableFile = $argv[2];
-	$outputFile = $argv[3];
-
-	$output = fopen($outputFile, 'wb');
-	if($output === false){
-		fwrite(STDERR, "Failed to open output file: $outputFile\n");
-		return 1;
-	}
-
-	$table = loadUpgradeTableFromFile($tableFile, reverse: false);
-	ksort($table, SORT_STRING);
-
-	foreach(Utils::stringifyKeys($table) as $oldName => $mappings){
-		fwrite($output, "---------- MAPPING LIST: $oldName ----------\n");
-		foreach($mappings as $mapping){
-			$oldNbt = $mapping->old->toVanillaNbt();
-			$oldNbt->setInt("version", $mapping->new->getVersion());
-
-			//intentionally not reused result of toVanillaNbt otherwise output wouldn't include version
-			fwrite($output, "OLD: " . $mapping->old->toVanillaNbt() . "\n");
-			if(!$oldNbt->equals($mapping->new->toVanillaNbt())){
-				fwrite($output, "NEW: " . $mapping->new->toVanillaNbt() . "\n");
-			}else{
-				fwrite($output, "NEW: version bump only (" . $mapping->new->getVersion() . ")\n");
-			}
-			fwrite($output, "-----\n");
-		}
-	}
-
-	fclose($output);
-	\GlobalLogger::get()->info("Table dump file $outputFile generated successfully.");
-	return 0;
-}
-
 /**
 * @param string[] $argv
 */
@ -933,8 +893,7 @@ function main(array $argv) : int{
 		"generate" => [["palette upgrade table file", "schema output file"], cmdGenerate(...)],
 		"test" => [["palette upgrade table file", "schema output file"], cmdTest(...)],
 		"update" => [["schema input file", "old palette file", "updated schema output file"], cmdUpdate(...)],
-		"update-all" => [["schema folder", "path to BlockPaletteArchive"], cmdUpdateAll(...)],
-		"dump-table" => [["palette upgrade table file", "txt output file"], cmdDumpTable(...)]
+		"update-all" => [["schema folder", "path to BlockPaletteArchive"], cmdUpdateAll(...)]
 	];

 	$selected = $argv[1] ?? null;
Author	SHA1	Message	Date
Dylan K. Taylor	fc072b05d6	tweak config defaults	2025-03-12 01:06:01 +00:00
Dylan K. Taylor	2589fcb31d	Implement rate limits by packet read ops for now this is configured to warn only by default, until we get the parameters for it dialled in	2025-03-12 01:03:34 +00:00
Dylan K. Taylor	8d255a6512	...	2025-03-11 14:28:44 +00:00
Dylan K. Taylor	41789bc67a	Report debug stats for cost accounting every 10 seconds	2025-03-11 12:41:59 +00:00