Merge pull request #6658 from pmmp/minor-next-release

changelog: use more accurate terminology
Prepare 5.26.0 release
2025-09-15 05:45:05 +00:00 · 2025-03-22 18:32:15 +00:00 · 2025-03-22 18:16:33 +00:00 · 2025-03-22 17:59:20 +00:00 · 2025-03-17 13:20:59 +00:00 · 2025-03-15 20:53:49 +00:00
33 changed files with 529 additions and 1547 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@ -57,6 +57,9 @@ 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,6 +12,10 @@ 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,10 +20,7 @@ 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) or our [Forums](https://forums.pmmp.io)
-
-
-            [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bmSAZBG) | [Forums](https://forums.pmmp.io)
+            - Ask the community on our [Discord server](https://discord.gg/bmSAZBG)

          close-issue: true
          lock-issue: false
--- a/changelogs/5.26.md
+++ b/changelogs/5.26.md
@ -0,0 +1,71 @@
+# 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/composer.json
+++ b/composer.json
@ -36,7 +36,7 @@
      "pocketmine/bedrock-block-upgrade-schema": "~5.1.0+bedrock-1.21.60",
      "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": "~36.0.0+bedrock-1.21.60",
+      "pocketmine/bedrock-protocol": "~36.2.0+bedrock-1.21.60",
      "pocketmine/binaryutils": "^0.2.1",
      "pocketmine/callback-validator": "^1.0.2",
      "pocketmine/color": "^0.3.0",
@ -52,7 +52,7 @@
      "symfony/filesystem": "~6.4.0"
   },
   "require-dev": {
-      "phpstan/phpstan": "2.1.6",
+      "phpstan/phpstan": "2.1.8",
      "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": "2a56fc6dee1dac2ade34d965aa49dc82",
+    "content-hash": "6314ae9a7919042f10bd17f0a3ef6e9d",
    "packages": [
        {
            "name": "adhocore/json-comment",
@ -67,16 +67,16 @@
        },
        {
            "name": "brick/math",
-            "version": "0.12.2",
+            "version": "0.12.3",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/math.git",
-                "reference": "901eddb1e45a8e0f689302e40af871c181ecbe40"
+                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/901eddb1e45a8e0f689302e40af871c181ecbe40",
-                "reference": "901eddb1e45a8e0f689302e40af871c181ecbe40",
+                "url": "https://api.github.com/repos/brick/math/zipball/866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba",
                "shasum": ""
            },
            "require": {
@ -115,7 +115,7 @@
            ],
            "support": {
                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.2"
+                "source": "https://github.com/brick/math/tree/0.12.3"
            },
            "funding": [
                {
@ -123,7 +123,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-02-26T10:21:45+00:00"
+            "time": "2025-02-28T13:11:00+00:00"
        },
        {
            "name": "netresearch/jsonmapper",
@ -256,16 +256,16 @@
        },
        {
            "name": "pocketmine/bedrock-protocol",
-            "version": "36.0.0+bedrock-1.21.60",
+            "version": "36.2.0+bedrock-1.21.60",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "2057de319c5c551001c2a544e08d1bc7727d9963"
+                "reference": "6830e8a9ee9ecb6984b7b02f412473136ae92d50"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/2057de319c5c551001c2a544e08d1bc7727d9963",
-                "reference": "2057de319c5c551001c2a544e08d1bc7727d9963",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/6830e8a9ee9ecb6984b7b02f412473136ae92d50",
+                "reference": "6830e8a9ee9ecb6984b7b02f412473136ae92d50",
                "shasum": ""
            },
            "require": {
@ -296,9 +296,9 @@
            "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP",
            "support": {
                "issues": "https://github.com/pmmp/BedrockProtocol/issues",
-                "source": "https://github.com/pmmp/BedrockProtocol/tree/36.0.0+bedrock-1.21.60"
+                "source": "https://github.com/pmmp/BedrockProtocol/tree/36.2.0+bedrock-1.21.60"
            },
-            "time": "2025-02-16T15:59:08+00:00"
+            "time": "2025-03-14T17:17:21+00:00"
        },
        {
            "name": "pocketmine/binaryutils",
@ -471,16 +471,16 @@
        },
        {
            "name": "pocketmine/locale-data",
-            "version": "2.24.0",
+            "version": "2.24.1",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/Language.git",
-                "reference": "6ec5e92c77a2102b2692763733e4763012facae9"
+                "reference": "8f48cbe1fb5835a8bb573bed00ef04c65c26c7e5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Language/zipball/6ec5e92c77a2102b2692763733e4763012facae9",
-                "reference": "6ec5e92c77a2102b2692763733e4763012facae9",
+                "url": "https://api.github.com/repos/pmmp/Language/zipball/8f48cbe1fb5835a8bb573bed00ef04c65c26c7e5",
+                "reference": "8f48cbe1fb5835a8bb573bed00ef04c65c26c7e5",
                "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.0"
+                "source": "https://github.com/pmmp/Language/tree/2.24.1"
            },
-            "time": "2025-02-16T20:46:34+00:00"
+            "time": "2025-03-16T19:04:15+00:00"
        },
        {
            "name": "pocketmine/log",
@ -576,16 +576,16 @@
        },
        {
            "name": "pocketmine/nbt",
-            "version": "1.1.0",
+            "version": "1.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/NBT.git",
-                "reference": "cfd53a86166b851786967fc560cdb372e66fde96"
+                "reference": "c3c7b0a7295daeaf7873d90fed5c5d10381d12e1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/cfd53a86166b851786967fc560cdb372e66fde96",
-                "reference": "cfd53a86166b851786967fc560cdb372e66fde96",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/c3c7b0a7295daeaf7873d90fed5c5d10381d12e1",
+                "reference": "c3c7b0a7295daeaf7873d90fed5c5d10381d12e1",
                "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.0"
+                "source": "https://github.com/pmmp/NBT/tree/1.1.1"
            },
-            "time": "2025-02-01T21:20:26+00:00"
+            "time": "2025-03-09T01:46:03+00:00"
        },
        {
            "name": "pocketmine/raklib",
@ -742,16 +742,16 @@
        },
        {
            "name": "ramsey/collection",
-            "version": "2.0.0",
+            "version": "2.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/collection.git",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
                "shasum": ""
            },
            "require": {
@ -759,25 +759,22 @@
            },
            "require-dev": {
                "captainhook/plugin-composer": "^5.3",
-                "ergebnis/composer-normalize": "^2.28.3",
-                "fakerphp/faker": "^1.21",
+                "ergebnis/composer-normalize": "^2.45",
+                "fakerphp/faker": "^1.24",
                "hamcrest/hamcrest-php": "^2.0",
-                "jangregor/phpstan-prophecy": "^1.0",
-                "mockery/mockery": "^1.5",
+                "jangregor/phpstan-prophecy": "^2.1",
+                "mockery/mockery": "^1.6",
                "php-parallel-lint/php-console-highlighter": "^1.0",
-                "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"
+                "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"
            },
            "type": "library",
            "extra": {
@ -815,19 +812,9 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/2.0.0"
+                "source": "https://github.com/ramsey/collection/tree/2.1.0"
            },
-            "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"
+            "time": "2025-03-02T04:48:29+00:00"
        },
        {
            "name": "ramsey/uuid",
@ -1386,16 +1373,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.6",
+            "version": "2.1.8",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c"
+                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
-                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
+                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f",
                "shasum": ""
            },
            "require": {
@ -1440,7 +1427,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-02-19T15:46:42+00:00"
+            "time": "2025-03-09T09:30:48+00:00"
        },
        {
            "name": "phpstan/phpstan-phpunit",
@ -2967,5 +2954,5 @@
    "platform-overrides": {
        "php": "8.1.0"
    },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
--- a/src/GarbageCollectorManager.php
+++ b/src/GarbageCollectorManager.php
@ -31,6 +31,7 @@ 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,
@ -48,6 +49,7 @@ final class GarbageCollectorManager{

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

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

 		$time = $end - $start;
 		$this->collectionTimeTotalNs += $time;
-		$this->logger->debug("gc_collect_cycles: " . number_format($time) . " ns ($rootsBefore -> $rootsAfter roots, $cycles cycles collected) - total GC time: " . number_format($this->collectionTimeTotalNs) . " ns");
+		$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)
+		));

 		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.25.3";
-	public const IS_DEVELOPMENT_BUILD = true;
+	public const BASE_VERSION = "5.26.0";
+	public const IS_DEVELOPMENT_BUILD = false;
 	public const BUILD_CHANNEL = "stable";

 	/**
--- a/src/block/RuntimeBlockStateRegistry.php
+++ b/src/block/RuntimeBlockStateRegistry.php
@ -209,6 +209,10 @@ 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/inventory/AnvilInventory.php
+++ b/src/block/inventory/AnvilInventory.php
@ -25,7 +25,6 @@ namespace pocketmine\block\inventory;

 use pocketmine\inventory\SimpleInventory;
 use pocketmine\inventory\TemporaryInventory;
-use pocketmine\item\Item;
 use pocketmine\world\Position;

 class AnvilInventory extends SimpleInventory implements BlockInventory, TemporaryInventory{
@ -38,12 +37,4 @@ class AnvilInventory extends SimpleInventory implements BlockInventory, Temporar
 		$this->holder = $holder;
 		parent::__construct(2);
 	}
-
-	public function getInput() : Item {
-		return $this->getItem(self::SLOT_INPUT);
-	}
-
-	public function getMaterial() : Item {
-		return $this->getItem(self::SLOT_MATERIAL);
-	}
 }
--- a/src/block/utils/AnvilHelper.php
+++ b/src/block/utils/AnvilHelper.php
@ -1,66 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block\utils;
-
-use pocketmine\crafting\AnvilCraftResult;
-use pocketmine\item\Item;
-use pocketmine\Server;
-
-final class AnvilHelper{
-	private const COST_LIMIT = 39;
-
-	/**
-	 * Attempts to calculate the result of an anvil operation.
-	 *
-	 * Returns null if the operation can't do anything.
-	 */
-	public static function calculateResult(Item $base, Item $material, ?string $customName, bool $isCreative) : ?AnvilCraftResult{
-
-		$recipe = Server::getInstance()->getCraftingManager()->matchAnvilRecipe($base, $material);
-		if($recipe === null){
-			return null;
-		}
-		$result = $recipe->getResultFor($base, $material);
-
-		if($result !== null){
-			$resultItem = $result->getOutput();
-			$xpCost = $result->getXpCost();
-			if(($customName === null || $customName === "") && $resultItem->hasCustomName()){
-				$xpCost++;
-				$resultItem->clearCustomName();
-			}elseif($customName !== null && $resultItem->getCustomName() !== $customName){
-				$xpCost++;
-				$resultItem->setCustomName($customName);
-			}
-
-			$result = new AnvilCraftResult($xpCost, $resultItem, $result->getSacrificeResult());
-		}
-
-		if($result === null || $result->getXpCost() <= 0 || ($result->getXpCost() > self::COST_LIMIT && !$isCreative)){
-			return null;
-		}
-
-		return $result;
-	}
-}
--- a/src/block/utils/CopperMaterial.php
+++ b/src/block/utils/CopperMaterial.php
@ -30,9 +30,15 @@ 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/AnvilCraftResult.php
+++ b/src/crafting/AnvilCraftResult.php
@ -1,66 +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\crafting;
-
-use pocketmine\item\Item;
-
-/**
- * This class is here to hold the result of an anvil crafting process.
- */
-final class AnvilCraftResult{
-	/**
-	 * @param Item|null $sacrificeResult If the given item is considered as null (count <= 0), the value will be set to null.
-	 */
-	public function __construct(
-		private int $xpCost,
-		private Item $output,
-		private ?Item $sacrificeResult
-	){
-		if($this->sacrificeResult !== null && $this->sacrificeResult->isNull()){
-			$this->sacrificeResult = null;
-		}
-	}
-
-	/**
-	 * Represent the amount of experience points required to craft the output item.
-	 */
-	public function getXpCost() : int{
-		return $this->xpCost;
-	}
-
-	/**
-	 * Represent the item given as output of the crafting process.
-	 */
-	public function getOutput() : Item{
-		return $this->output;
-	}
-
-	/**
-	 * This result has to be null if the sacrifice slot need to be emptied.
-	 * If not null, it represent the item that will be left in the sacrifice slot after the crafting process.
-	 */
-	public function getSacrificeResult() : ?Item{
-		return $this->sacrificeResult;
-	}
-}
--- a/src/crafting/AnvilCraftingManagerDataFiller.php
+++ b/src/crafting/AnvilCraftingManagerDataFiller.php
@ -1,78 +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\crafting;
-
-use pocketmine\item\Durable;
-use pocketmine\item\ToolTier;
-use pocketmine\item\VanillaArmorMaterials;
-use pocketmine\item\VanillaItems;
-use pocketmine\world\format\io\GlobalItemDataHandlers;
-
-final class AnvilCraftingManagerDataFiller{
-	public static function fillData(CraftingManager $manager) : CraftingManager{
-		foreach([
-			[
-				VanillaItems::DIAMOND(),
-				[VanillaArmorMaterials::DIAMOND(), ToolTier::DIAMOND]
-			], [
-				VanillaItems::GOLD_INGOT(),
-				[VanillaArmorMaterials::GOLD(), ToolTier::GOLD]
-			], [
-				VanillaItems::IRON_INGOT(),
-				[VanillaArmorMaterials::IRON(), ToolTier::IRON]
-			], [
-				VanillaItems::NETHERITE_INGOT(),
-				[VanillaArmorMaterials::NETHERITE(), ToolTier::NETHERITE]
-			], [
-				VanillaItems::SCUTE(),
-				[VanillaArmorMaterials::TURTLE(), null]
-			], [
-				VanillaItems::LEATHER(),
-				[VanillaArmorMaterials::LEATHER(), null]
-			]
-		] as [$item, [$armorMaterial, $toolTier]]){
-			$manager->registerAnvilRecipe(new MaterialRepairRecipe(
-				new ArmorRecipeIngredient($armorMaterial),
-				new ExactRecipeIngredient($item)
-			));
-			if($toolTier !== null){
-				$manager->registerAnvilRecipe(new MaterialRepairRecipe(
-					new TieredToolRecipeIngredient($toolTier),
-					new ExactRecipeIngredient($item)
-				));
-			}
-		}
-
-		foreach(VanillaItems::getAll() as $item){
-			if($item instanceof Durable){
-				$itemId = GlobalItemDataHandlers::getSerializer()->serializeType($item)->getName();
-				$manager->registerAnvilRecipe(new ItemSelfCombineRecipe(
-					new MetaWildcardRecipeIngredient($itemId)
-				));
-			}
-		}
-
-		return $manager;
-	}
-}
--- a/src/crafting/AnvilRecipe.php
+++ b/src/crafting/AnvilRecipe.php
@ -1,30 +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\crafting;
-
-use pocketmine\item\Item;
-
-interface AnvilRecipe{
-	public function getResultFor(Item $input, Item $material) : ?AnvilCraftResult;
-}
--- a/src/crafting/ArmorRecipeIngredient.php
+++ b/src/crafting/ArmorRecipeIngredient.php
@ -1,50 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\crafting;
-
-use pocketmine\item\Armor;
-use pocketmine\item\ArmorMaterial;
-use pocketmine\item\Item;
-use function spl_object_id;
-
-class ArmorRecipeIngredient implements RecipeIngredient{
-	public function __construct(
-		private ArmorMaterial $material
-	){
-	}
-
-	public function getMaterial() : ArmorMaterial{ return $this->material; }
-
-	public function accepts(Item $item) : bool{
-		if($item->getCount() < 1){
-			return false;
-		}
-
-		return $item instanceof Armor && $item->getMaterial() === $this->material;
-	}
-
-	public function __toString() : string{
-		return "ArmorRecipeIngredient(ArmorMaterial@" . spl_object_id($this->material) . ")";
-	}
-}
--- a/src/crafting/CraftingManager.php
+++ b/src/crafting/CraftingManager.php
@ -80,18 +80,6 @@ class CraftingManager{
 	 */
 	private array $brewingRecipeCache = [];

-	/**
-	 * @var AnvilRecipe[]
-	 * @phpstan-var list<AnvilRecipe>
-	 */
-	private array $anvilRecipes = [];
-
-	/**
-	 * @var AnvilRecipe[][]
-	 * @phpstan-var array<int, array<int, AnvilRecipe>>
-	 */
-	private array $anvilRecipeCache = [];
-
 	/** @phpstan-var ObjectSet<\Closure() : void> */
 	private ObjectSet $recipeRegisteredCallbacks;

@ -199,14 +187,6 @@ class CraftingManager{
 		return $this->potionContainerChangeRecipes;
 	}

-	/**
-	 * @return AnvilRecipe[][]
-	 * @phpstan-return list<AnvilRecipe>
-	 */
-	public function getAnvilRecipes() : array{
-		return $this->anvilRecipes;
-	}
-
 	public function registerShapedRecipe(ShapedRecipe $recipe) : void{
 		$this->shapedRecipes[self::hashOutputs($recipe->getResults())][] = $recipe;
 		$this->craftingRecipeIndex[] = $recipe;
@ -241,14 +221,6 @@ class CraftingManager{
 		}
 	}

-	public function registerAnvilRecipe(AnvilRecipe $recipe) : void{
-		$this->anvilRecipes[] = $recipe;
-
-		foreach($this->recipeRegisteredCallbacks as $callback){
-			$callback();
-		}
-	}
-
 	/**
 	 * @param Item[] $outputs
 	 */
@ -322,21 +294,4 @@ class CraftingManager{

 		return null;
 	}
-
-	public function matchAnvilRecipe(Item $input, Item $material) : ?AnvilRecipe{
-		$inputHash = $input->getStateId();
-		$materialHash = $material->getStateId();
-		$cached = $this->anvilRecipeCache[$inputHash][$materialHash] ?? null;
-		if($cached !== null){
-			return $cached;
-		}
-
-		foreach($this->anvilRecipes as $recipe){
-			if($recipe->getResultFor($input, $material) !== null){
-				return $this->anvilRecipeCache[$inputHash][$materialHash] = $recipe;
-			}
-		}
-
-		return null;
-	}
 }
--- a/src/crafting/CraftingManagerFromDataHelper.php
+++ b/src/crafting/CraftingManagerFromDataHelper.php
@ -185,7 +185,6 @@ final class CraftingManagerFromDataHelper{

 	/**
 	 * @param mixed[] $data
-	 *
 	 * @return object[]
 	 *
 	 * @phpstan-template TRecipeData of object
@ -211,7 +210,7 @@ final class CraftingManagerFromDataHelper{
 		$result = new CraftingManager();

 		foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'shapeless_crafting.json'), ShapelessRecipeData::class) as $recipe){
-			$recipeType = match ($recipe->block) {
+			$recipeType = match($recipe->block){
 				"crafting_table" => ShapelessRecipeType::CRAFTING,
 				"stonecutter" => ShapelessRecipeType::STONECUTTER,
 				"smithing_table" => ShapelessRecipeType::SMITHING,
@ -272,7 +271,7 @@ final class CraftingManagerFromDataHelper{
 			));
 		}
 		foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'smelting.json'), FurnaceRecipeData::class) as $recipe){
-			$furnaceType = match ($recipe->block) {
+			$furnaceType = match ($recipe->block){
 				"furnace" => FurnaceType::FURNACE,
 				"blast_furnace" => FurnaceType::BLAST_FURNACE,
 				"smoker" => FurnaceType::SMOKER,
@ -334,8 +333,6 @@ final class CraftingManagerFromDataHelper{
 			));
 		}

-		$result = AnvilCraftingManagerDataFiller::fillData($result);
-
 		//TODO: smithing

 		return $result;
--- a/src/crafting/ItemCombineRecipe.php
+++ b/src/crafting/ItemCombineRecipe.php
@ -1,123 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\crafting;
-
-use pocketmine\inventory\transaction\TransactionValidationException;
-use pocketmine\item\Durable;
-use pocketmine\item\EnchantedBook;
-use pocketmine\item\enchantment\AvailableEnchantmentRegistry;
-use pocketmine\item\enchantment\EnchantmentInstance;
-use pocketmine\item\enchantment\Rarity;
-use pocketmine\item\Item;
-use function floor;
-use function max;
-use function min;
-
-abstract class ItemCombineRecipe implements AnvilRecipe{
-	abstract protected function validate(Item $input, Item $material) : bool;
-
-	public function getResultFor(Item $input, Item $material) : ?AnvilCraftResult{
-		if($this->validate($input, $material)){
-			$result = (clone $input);
-			$xpCost = 0;
-			if($result instanceof Durable && $material instanceof Durable && $this->repair($result, $material)){
-				// The two items are compatible for repair
-				$xpCost = 2;
-			}
-
-			// combining enchantments
-			foreach($material->getEnchantments() as $instance){
-				$enchantment = $instance->getType();
-				$level = $instance->getLevel();
-				if(!AvailableEnchantmentRegistry::getInstance()->isAvailableForItem($enchantment, $input)){
-					continue;
-				}
-				if(($targetEnchantment = $input->getEnchantment($enchantment)) !== null){
-					// Enchant already present on the target item
-					$targetLevel = $targetEnchantment->getLevel();
-					$newLevel = ($targetLevel === $level ? $targetLevel + 1 : max($targetLevel, $level));
-					$level = min($newLevel, $enchantment->getMaxLevel());
-					$instance = new EnchantmentInstance($enchantment, $level);
-				}else{
-					// Check if the enchantment is compatible with the existing enchantments
-					foreach($input->getEnchantments() as $testedInstance){
-						$testedEnchantment = $testedInstance->getType();
-						if(!$testedEnchantment->isCompatibleWith($enchantment)){
-							$xpCost++;
-							//TODO: XP COST
-							continue 2;
-						}
-					}
-				}
-
-				$costAddition = match ($enchantment->getRarity()) {
-					Rarity::COMMON => 1,
-					Rarity::UNCOMMON => 2,
-					Rarity::RARE => 4,
-					Rarity::MYTHIC => 8,
-					default => throw new TransactionValidationException("Invalid rarity " . $enchantment->getRarity() . " found")
-				};
-
-				if($material instanceof EnchantedBook){
-					// Enchanted books are half as expensive to combine
-					$costAddition = max(1, $costAddition / 2);
-				}
-				$levelDifference = $instance->getLevel() - $input->getEnchantmentLevel($instance->getType());
-				$xpCost += (int) floor($costAddition * $levelDifference);
-				$result->addEnchantment($instance);
-
-				$xpCost += 2 ** $input->getAnvilRepairCost() - 1;
-				$xpCost += 2 ** $material->getAnvilRepairCost() - 1;
-				$result->setAnvilRepairCost(
-					max($result->getAnvilRepairCost(), $material->getAnvilRepairCost()) + 1
-				);
-			}
-
-			if($xpCost !== 0){
-				return new AnvilCraftResult($xpCost, $result, null);
-			}
-		}
-
-		return null;
-	}
-
-	private function repair(Durable $result, Durable $material) : bool{
-		$damage = $result->getDamage();
-		if($damage === 0){
-			return false;
-		}
-
-		$baseMaxDurability = $result->getMaxDurability();
-		$baseDurability = $baseMaxDurability - $damage;
-		$materialDurability = $material->getMaxDurability() - $material->getDamage();
-		$addDurability = (int) ($baseMaxDurability * 12 / 100);
-
-		$result->setDamage($baseMaxDurability - min(
-				$baseMaxDurability,
-				$baseDurability + $materialDurability + $addDurability
-			));
-
-		return true;
-	}
-}
--- a/src/crafting/ItemDifferentCombineRecipe.php
+++ b/src/crafting/ItemDifferentCombineRecipe.php
@ -1,41 +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\crafting;
-
-use pocketmine\item\Item;
-
-/**
- * Represent a recipe that repair an item with a material in an anvil.
- */
-class ItemDifferentCombineRecipe extends ItemCombineRecipe{
-	public function __construct(
-		private RecipeIngredient $base,
-		private RecipeIngredient $material
-	){
-	}
-
-	protected function validate(Item $input, Item $material) : bool{
-		return $this->base->accepts($input) && $this->material->accepts($material);
-	}
-}
--- a/src/crafting/ItemSelfCombineRecipe.php
+++ b/src/crafting/ItemSelfCombineRecipe.php
@ -1,44 +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\crafting;
-
-use pocketmine\item\Item;
-
-/**
- * Represent a recipe that repair an item with a material in an anvil.
- */
-class ItemSelfCombineRecipe extends ItemCombineRecipe{
-	/**
-	 * @param RecipeIngredient $target The item that will be concerned by the combinaison.
-	 *                                 The input and material have to be accepted by this ingredient to be able to combine them.
-	 */
-	public function __construct(
-		private RecipeIngredient $target
-	){
-	}
-
-	protected function validate(Item $input, Item $material) : bool{
-		return $this->target->accepts($input) && $this->target->accepts($material);
-	}
-}
--- a/src/crafting/MaterialRepairRecipe.php
+++ b/src/crafting/MaterialRepairRecipe.php
@ -1,69 +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\crafting;
-
-use pocketmine\item\Durable;
-use pocketmine\item\Item;
-use function ceil;
-use function floor;
-use function max;
-use function min;
-
-/**
- * Represent a recipe that repair an item with a material in an anvil.
- */
-class MaterialRepairRecipe implements AnvilRecipe{
-	public function __construct(
-		private RecipeIngredient $input,
-		private RecipeIngredient $material
-	){
-	}
-
-	public function getInput() : RecipeIngredient{
-		return $this->input;
-	}
-
-	public function getMaterial() : RecipeIngredient{
-		return $this->material;
-	}
-
-	public function getResultFor(Item $input, Item $material) : ?AnvilCraftResult{
-		if($this->input->accepts($input) && $this->material->accepts($material) && $input instanceof Durable){
-			$damage = $input->getDamage();
-			if($damage !== 0){
-				$quarter = min($damage, (int) floor($input->getMaxDurability() / 4));
-				$numberRepair = min($material->getCount(), (int) ceil($damage / $quarter));
-				$damage -= $quarter * $numberRepair;
-
-				return new AnvilCraftResult(
-					$numberRepair,
-					(clone $input)->setDamage(max(0, $damage)),
-					(clone $material)->setCount($material->getCount() - $numberRepair)
-				);
-			}
-		}
-
-		return null;
-	}
-}
--- a/src/crafting/TieredToolRecipeIngredient.php
+++ b/src/crafting/TieredToolRecipeIngredient.php
@ -1,49 +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\crafting;
-
-use pocketmine\item\Item;
-use pocketmine\item\TieredTool;
-use pocketmine\item\ToolTier;
-
-class TieredToolRecipeIngredient implements RecipeIngredient{
-	public function __construct(
-		private ToolTier $tier
-	){
-	}
-
-	public function getTier() : ToolTier{ return $this->tier; }
-
-	public function accepts(Item $item) : bool{
-		if($item->getCount() < 1){
-			return false;
-		}
-
-		return $item instanceof TieredTool && $item->getTier() === $this->tier;
-	}
-
-	public function __toString() : string{
-		return "TieredToolRecipeIngredient(" . $this->tier->name . ")";
-	}
-}
--- a/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
+++ b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
@ -214,6 +214,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
 		$this->registerLeavesSerializers();
 		$this->registerSaplingSerializers();
 		$this->registerMobHeadSerializers();
+		$this->registerCopperSerializers();
 		$this->registerSimpleSerializers();
 		$this->registerSerializers();
 	}
@ -791,6 +792,178 @@ 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);
@ -1265,175 +1438,6 @@ 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,7 +126,13 @@ final class BlockStateDeserializerHelper{
 			->setOutputSignalStrength($in->readBoundedInt(BlockStateNames::REDSTONE_SIGNAL, 0, 15));
 	}

-	/** @throws BlockStateDeserializeException */
+	/**
+	 * @phpstan-template TDoor of Door
+	 * @phpstan-param TDoor $block
+	 * @phpstan-return TDoor
+	 *
+	 * @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
@ -237,18 +243,36 @@ final class BlockStateDeserializerHelper{
 		return $block->setPressed($in->readBoundedInt(BlockStateNames::REDSTONE_SIGNAL, 0, 15) !== 0);
 	}

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

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

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

-	/** @throws BlockStateDeserializeException */
+	/**
+	 * @phpstan-template TTrapdoor of Trapdoor
+	 * @phpstan-param TTrapdoor $block
+	 * @phpstan-return TTrapdoor
+	 *
+	 * @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,11 +33,13 @@ 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;
@ -59,6 +61,7 @@ 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;
@ -87,6 +90,7 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
 		$this->registerSaplingDeserializers();
 		$this->registerLightDeserializers();
 		$this->registerMobHeadDeserializers();
+		$this->registerCopperDeserializers();
 		$this->registerSimpleDeserializers();
 		$this->registerDeserializers();
 	}
@ -94,11 +98,21 @@ 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->deserializeBlock($stateData)->getStateId();
+			return $this->simpleCache[$stateData->getName()] ??= $this->deserializeToStateId($stateData);
 		}

 		//we can't cache blocks that have properties - go ahead and deserialize the slow way
-		return $this->deserializeBlock($stateData)->getStateId();
+		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;
 	}

 	/** @phpstan-param \Closure(Reader) : Block $c */
@ -723,6 +737,150 @@ 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());
@ -1228,18 +1386,6 @@ 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());
@ -1294,19 +1440,6 @@ 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));
@ -1459,19 +1592,6 @@ 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{
@ -1744,71 +1864,7 @@ 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/entity/Entity.php
+++ b/src/entity/Entity.php
@ -1495,7 +1495,7 @@ abstract class Entity{
 			$this->getId(), //TODO: actor unique ID
 			$this->getId(),
 			static::getNetworkTypeId(),
-			$this->location->asVector3(),
+			$this->getOffsetPosition($this->location->asVector3()),
 			$this->getMotion(),
 			$this->location->pitch,
 			$this->location->yaw,
--- a/src/event/player/PlayerUseAnvilEvent.php
+++ b/src/event/player/PlayerUseAnvilEvent.php
@ -1,86 +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\event\player;
-
-use pocketmine\event\Cancellable;
-use pocketmine\event\CancellableTrait;
-use pocketmine\item\Item;
-use pocketmine\player\Player;
-
-/**
- * Called when a player uses an anvil (renaming, repairing, combining items).
- * This event is called once per action even if multiple tasks are performed at once.
- */
-class PlayerUseAnvilEvent extends PlayerEvent implements Cancellable{
-	use CancellableTrait;
-
-	public function __construct(
-		Player $player,
-		private Item $baseItem,
-		private ?Item $materialItem,
-		private Item $resultItem,
-		private ?string $customName,
-		private int $xpCost
-	){
-		$this->player = $player;
-	}
-
-	/**
-	 * Returns the item that the player is using as the base item (left slot).
-	 */
-	public function getBaseItem() : Item{
-		return $this->baseItem;
-	}
-
-	/**
-	 * Returns the item that the player is using as the material item (right slot), or null if there is no material item
-	 * (e.g. when renaming an item).
-	 */
-	public function getMaterialItem() : ?Item{
-		return $this->materialItem;
-	}
-
-	/**
-	 * Returns the item that the player will receive as a result of the anvil operation.
-	 */
-	public function getResultItem() : Item{
-		return $this->resultItem;
-	}
-
-	/**
-	 * Returns the custom name that the player is setting on the item, or null if the player is not renaming the item.
-	 *
-	 * This value is defined when the base item is already renamed.
-	 */
-	public function getCustomName() : ?string{
-		return $this->customName;
-	}
-
-	/**
-	 * Returns the amount of XP levels that the player will spend on this anvil operation.
-	 */
-	public function getXpCost() : int{
-		return $this->xpCost;
-	}
-}
--- a/src/inventory/transaction/AnvilTransaction.php
+++ b/src/inventory/transaction/AnvilTransaction.php
@ -1,155 +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\inventory\transaction;
-
-use pocketmine\block\Anvil;
-use pocketmine\block\inventory\AnvilInventory;
-use pocketmine\block\utils\AnvilHelper;
-use pocketmine\block\VanillaBlocks;
-use pocketmine\crafting\AnvilCraftResult;
-use pocketmine\event\player\PlayerUseAnvilEvent;
-use pocketmine\item\Item;
-use pocketmine\item\VanillaItems;
-use pocketmine\player\Player;
-use pocketmine\utils\AssumptionFailedError;
-use pocketmine\world\sound\AnvilBreakSound;
-use pocketmine\world\sound\AnvilUseSound;
-use function count;
-use function mt_rand;
-
-class AnvilTransaction extends InventoryTransaction{
-	private ?Item $baseItem = null;
-	private ?Item $materialItem = null;
-
-	public function __construct(
-		Player $source,
-		private readonly AnvilCraftResult $expectedResult,
-		private readonly ?string $customName
-	){
-		parent::__construct($source);
-	}
-
-	private function validateFiniteResources(int $xpSpent) : void{
-		$expectedXpCost = $this->expectedResult->getXpCost();
-		if($xpSpent !== $expectedXpCost){
-			throw new TransactionValidationException("Expected the amount of xp spent to be $expectedXpCost, but received $xpSpent");
-		}
-
-		$xpLevel = $this->source->getXpManager()->getXpLevel();
-		if($xpLevel < $expectedXpCost){
-			throw new TransactionValidationException("Player's XP level $xpLevel is less than the required XP level $expectedXpCost");
-		}
-	}
-
-	private function validateInputs(Item $base, Item $material, Item $expectedOutput) : ?int{
-		$calculAttempt = AnvilHelper::calculateResult($base, $material, $this->customName, $this->source->isCreative());
-		if($calculAttempt === null){
-			return null;
-		}
-		$result = $calculAttempt->getOutput();
-		if(!$result->equalsExact($expectedOutput)){
-			return null;
-		}
-
-		$this->baseItem = $base;
-		$this->materialItem = $material;
-
-		return $calculAttempt->getXpCost();
-	}
-
-	public function validate() : void{
-		if(count($this->actions) < 1){
-			throw new TransactionValidationException("Transaction must have at least one action to be executable");
-		}
-
-		/** @var Item[] $inputs */
-		$inputs = [];
-		/** @var Item[] $outputs */
-		$outputs = [];
-		$this->matchItems($outputs, $inputs);
-
-		if(($outputCount = count($outputs)) !== 1){
-			throw new TransactionValidationException("Expected 1 output item, but received $outputCount");
-		}
-		$outputItem = $outputs[0];
-
-		if(($inputCount = count($inputs)) < 1){
-			throw new TransactionValidationException("Expected at least 1 input item, but received $inputCount");
-		}
-		if($inputCount > 2){
-			throw new TransactionValidationException("Expected at most 2 input items, but received $inputCount");
-		}
-
-		if(count($inputs) < 2){
-			$xpCost = $this->validateInputs($inputs[0], VanillaItems::AIR(), $outputItem) ??
-				throw new TransactionValidationException("Inputs do not match expected result");
-		}else{
-			$xpCost = $this->validateInputs($inputs[0], $inputs[1], $outputItem) ??
-				$this->validateInputs($inputs[1], $inputs[0], $outputItem) ??
-				throw new TransactionValidationException("Inputs do not match expected result");
-		}
-
-		if($this->source->hasFiniteResources()){
-			$this->validateFiniteResources($xpCost);
-		}
-	}
-
-	public function execute() : void{
-		parent::execute();
-
-		if($this->source->hasFiniteResources()){
-			$this->source->getXpManager()->subtractXpLevels($this->expectedResult->getXpCost());
-		}
-
-		$inventory = $this->source->getCurrentWindow();
-		if($inventory instanceof AnvilInventory){
-			$world = $inventory->getHolder()->getWorld();
-			if(mt_rand(0, 12) === 0){
-				$anvilBlock = $world->getBlock($inventory->getHolder());
-				if($anvilBlock instanceof Anvil){
-					$newDamage = $anvilBlock->getDamage() + 1;
-					if($newDamage > Anvil::VERY_DAMAGED){
-						$newBlock = VanillaBlocks::AIR();
-						$world->addSound($inventory->getHolder(), new AnvilBreakSound());
-					}else{
-						$newBlock = $anvilBlock->setDamage($newDamage);
-					}
-					$world->setBlock($inventory->getHolder(), $newBlock);
-				}
-
-			}
-			$world->addSound($inventory->getHolder(), new AnvilUseSound());
-		}
-	}
-
-	protected function callExecuteEvent() : bool{
-		if($this->baseItem === null){
-			throw new AssumptionFailedError("Expected that baseItem are not null before executing the event");
-		}
-
-		$ev = new PlayerUseAnvilEvent($this->source, $this->baseItem, $this->materialItem, $this->expectedResult->getOutput(), $this->customName, $this->expectedResult->getXpCost());
-		$ev->call();
-		return !$ev->isCancelled();
-	}
-}
--- a/src/item/Item.php
+++ b/src/item/Item.php
@ -69,7 +69,6 @@ class Item implements \JsonSerializable{

 	public const TAG_DISPLAY_NAME = "Name";
 	public const TAG_DISPLAY_LORE = "Lore";
-	public const TAG_REPAIR_COST = "RepairCost";

 	public const TAG_KEEP_ON_DEATH = "minecraft:keep_on_death";

@ -85,7 +84,6 @@ class Item implements \JsonSerializable{
 	protected string $customName = "";
 	/** @var string[] */
 	protected array $lore = [];
-	protected int $anvilRepairCost = 0;
 	/** TODO: this needs to die in a fire */
 	protected ?CompoundTag $blockEntityTag = null;

@ -284,30 +282,6 @@ class Item implements \JsonSerializable{
 		return $this;
 	}

-	/**
-	 * Returns the anvil repair cost of the item.
-	 * This value is used in anvil to determine the XP cost of repairing the item.
-	 *
-	 * In vanilla, this value is stored in the "RepairCost" tag.
-	 */
-	public function getAnvilRepairCost() : int{
-		return $this->anvilRepairCost;
-	}
-
-	/**
-	 * Sets the anvil repair cost value of the item.
-	 * This value is used in anvil to determine the XP cost of repairing the item.
-	 * Higher cost means more XP is required to repair the item.
-	 *
-	 * In vanilla, this value is stored in the "RepairCost" tag.
-	 *
-	 * @return $this
-	 */
-	public function setAnvilRepairCost(int $cost) : self{
-		$this->anvilRepairCost = $cost;
-		return $this;
-	}
-
 	/**
 	 * @throws NbtException
 	 */
@ -364,7 +338,6 @@ class Item implements \JsonSerializable{
 		}

 		$this->keepOnDeath = $tag->getByte(self::TAG_KEEP_ON_DEATH, 0) !== 0;
-		$this->anvilRepairCost = $tag->getInt(self::TAG_REPAIR_COST, 0);
 	}

 	protected function serializeCompoundTag(CompoundTag $tag) : void{
@ -433,12 +406,6 @@ class Item implements \JsonSerializable{
 		}else{
 			$tag->removeTag(self::TAG_KEEP_ON_DEATH);
 		}
-
-		if($this->anvilRepairCost > 0){
-			$tag->setInt(self::TAG_REPAIR_COST, $this->anvilRepairCost);
-		}else{
-			$tag->removeTag(self::TAG_REPAIR_COST);
-		}
 	}

 	public function getCount() : int{
--- a/src/network/mcpe/handler/ItemStackRequestExecutor.php
+++ b/src/network/mcpe/handler/ItemStackRequestExecutor.php
@ -23,14 +23,11 @@ declare(strict_types=1);

 namespace pocketmine\network\mcpe\handler;

-use pocketmine\block\inventory\AnvilInventory;
 use pocketmine\block\inventory\EnchantInventory;
-use pocketmine\block\utils\AnvilHelper;
 use pocketmine\inventory\Inventory;
 use pocketmine\inventory\transaction\action\CreateItemAction;
 use pocketmine\inventory\transaction\action\DestroyItemAction;
 use pocketmine\inventory\transaction\action\DropItemAction;
-use pocketmine\inventory\transaction\AnvilTransaction;
 use pocketmine\inventory\transaction\CraftingTransaction;
 use pocketmine\inventory\transaction\EnchantingTransaction;
 use pocketmine\inventory\transaction\InventoryTransaction;
@ -42,7 +39,6 @@ use pocketmine\network\mcpe\protocol\types\inventory\ContainerUIIds;
 use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftingConsumeInputStackRequestAction;
 use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftingCreateSpecificResultStackRequestAction;
 use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftRecipeAutoStackRequestAction;
-use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftRecipeOptionalStackRequestAction;
 use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CraftRecipeStackRequestAction;
 use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\CreativeCreateStackRequestAction;
 use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\DeprecatedCraftingResultsStackRequestAction;
@ -294,7 +290,7 @@ class ItemStackRequestExecutor{
 	 * @throws ItemStackRequestProcessException
 	 */
 	private function assertDoingCrafting() : void{
-		if(!$this->specialTransaction instanceof CraftingTransaction && !$this->specialTransaction instanceof EnchantingTransaction && !$this->specialTransaction instanceof AnvilTransaction){
+		if(!$this->specialTransaction instanceof CraftingTransaction && !$this->specialTransaction instanceof EnchantingTransaction){
 			if($this->specialTransaction === null){
 				throw new ItemStackRequestProcessException("Expected CraftRecipe or CraftRecipeAuto action to precede this action");
 			}else{
@ -352,15 +348,6 @@ class ItemStackRequestExecutor{
 			}
 		}elseif($action instanceof CraftRecipeAutoStackRequestAction){
 			$this->beginCrafting($action->getRecipeId(), $action->getRepetitions());
-		}elseif($action instanceof CraftRecipeOptionalStackRequestAction){
-			$window = $this->player->getCurrentWindow();
-			if($window instanceof AnvilInventory){
-				$result = AnvilHelper::calculateResult($window->getInput(), $window->getMaterial(), $this->request->getFilterStrings()[0] ?? null, $this->player->isCreative());
-				if($result !== null){
-					$this->specialTransaction = new AnvilTransaction($this->player, $result, $this->request->getFilterStrings()[0] ?? null);
-					$this->setNextCreatedItem($result->getOutput());
-				}
-			}
 		}elseif($action instanceof CraftingConsumeInputStackRequestAction){
 			$this->assertDoingCrafting();
 			$this->removeItemFromSlot($action->getSource(), $action->getCount()); //output discarded - we allow CraftingTransaction to verify the balance
--- a/tests/phpunit/crafting/AnvilCraftTest.php
+++ b/tests/phpunit/crafting/AnvilCraftTest.php
@ -1,194 +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\crafting;
-
-use Generator;
-use PHPUnit\Framework\TestCase;
-use pocketmine\item\enchantment\EnchantmentInstance;
-use pocketmine\item\enchantment\VanillaEnchantments;
-use pocketmine\item\Item;
-use pocketmine\item\VanillaItems;
-use function floor;
-
-class AnvilCraftTest extends TestCase{
-	public static function materialRepairRecipeProvider() : Generator{
-		yield "No repair available" => [
-			VanillaItems::DIAMOND_PICKAXE(),
-			VanillaItems::DIAMOND(),
-			null
-		];
-
-		yield "Repair one damage" => [
-			VanillaItems::DIAMOND_PICKAXE()->setDamage(1),
-			VanillaItems::DIAMOND(),
-			new AnvilCraftResult(1, VanillaItems::DIAMOND_PICKAXE(), null)
-		];
-
-		yield "Repair one damage with more materials than expected" => [
-			VanillaItems::DIAMOND_PICKAXE()->setDamage(1),
-			VanillaItems::DIAMOND()->setCount(2),
-			new AnvilCraftResult(1, VanillaItems::DIAMOND_PICKAXE(), VanillaItems::DIAMOND())
-		];
-
-		$diamondPickaxeQuarter = (int) floor(VanillaItems::DIAMOND_PICKAXE()->getMaxDurability() / 4);
-		yield "Repair one quarter" => [
-			VanillaItems::DIAMOND_PICKAXE()->setDamage($diamondPickaxeQuarter),
-			VanillaItems::DIAMOND()->setCount(1),
-			new AnvilCraftResult(1, VanillaItems::DIAMOND_PICKAXE(), null)
-		];
-
-		yield "Repair one quarter plus 1" => [
-			VanillaItems::DIAMOND_PICKAXE()->setDamage($diamondPickaxeQuarter + 1),
-			VanillaItems::DIAMOND()->setCount(1),
-			new AnvilCraftResult(1, VanillaItems::DIAMOND_PICKAXE()->setDamage(1), null)
-		];
-
-		yield "Repair more than one quarter" => [
-			VanillaItems::DIAMOND_PICKAXE()->setDamage($diamondPickaxeQuarter * 2),
-			VanillaItems::DIAMOND()->setCount(2),
-			new AnvilCraftResult(2, VanillaItems::DIAMOND_PICKAXE(), null)
-		];
-
-		yield "Repair more than one quarter with more materials than expected" => [
-			VanillaItems::DIAMOND_PICKAXE()->setDamage($diamondPickaxeQuarter * 2),
-			VanillaItems::DIAMOND()->setCount(3),
-			new AnvilCraftResult(2, VanillaItems::DIAMOND_PICKAXE(), VanillaItems::DIAMOND()->setCount(1))
-		];
-	}
-
-	/**
-	 * @dataProvider materialRepairRecipeProvider
-	 */
-	public function testMaterialRepairRecipe(Item $base, Item $material, ?AnvilCraftResult $expected) : void{
-		$recipe = new MaterialRepairRecipe(
-			new WildcardRecipeIngredient(),
-			new WildcardRecipeIngredient()
-		);
-		self::assertAnvilCraftResultEquals($expected, $recipe->getResultFor($base, $material));
-	}
-
-	public static function itemSelfCombineRecipeProvider() : Generator{
-		yield "Combine two identical items without damage and enchants" => [
-			VanillaItems::DIAMOND_PICKAXE(),
-			VanillaItems::DIAMOND_PICKAXE(),
-			null
-		];
-
-		yield "Enchant on base item and no enchants on material with no damage" => [
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)),
-			VanillaItems::DIAMOND_PICKAXE(),
-			null
-		];
-
-		yield "No enchant on base item and one enchant on material" => [
-			VanillaItems::DIAMOND_PICKAXE(),
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)),
-			new AnvilCraftResult(2, VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)), null)
-		];
-
-		yield "Combine two identical items with damage" => [
-			VanillaItems::DIAMOND_PICKAXE()->setDamage(10),
-			VanillaItems::DIAMOND_PICKAXE(),
-			new AnvilCraftResult(1, VanillaItems::DIAMOND_PICKAXE()->setDamage(0), null)
-		];
-
-		yield "Combine two identical items with damage for material" => [
-			VanillaItems::DIAMOND_PICKAXE(),
-			VanillaItems::DIAMOND_PICKAXE()->setDamage(10),
-			null
-		];
-
-		yield "Combine two identical items with different enchantments" => [
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::EFFICIENCY(), 2)),
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)),
-			new AnvilCraftResult(2, VanillaItems::DIAMOND_PICKAXE()
-				->addEnchantment(new EnchantmentInstance(VanillaEnchantments::EFFICIENCY(), 2))
-				->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)),
-				null)
-		];
-
-		yield "Combine two identical items with different enchantments with damage" => [
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::EFFICIENCY(), 2))->setDamage(10),
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)),
-			new AnvilCraftResult(4, VanillaItems::DIAMOND_PICKAXE()
-				->addEnchantment(new EnchantmentInstance(VanillaEnchantments::EFFICIENCY(), 2))
-				->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)),
-				null)
-		];
-
-		yield "Combine two identical items with different enchantments with damage for material" => [
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::EFFICIENCY(), 2)),
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1))->setDamage(10),
-			new AnvilCraftResult(2, VanillaItems::DIAMOND_PICKAXE()
-				->addEnchantment(new EnchantmentInstance(VanillaEnchantments::EFFICIENCY(), 2))
-				->addEnchantment(new EnchantmentInstance(VanillaEnchantments::UNBREAKING(), 1)),
-				null)
-		];
-
-		yield "Combine two identical items with same enchantment level" => [
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 1)),
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 1)),
-			new AnvilCraftResult(8, VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 2)), null)
-		];
-
-		yield "Combine two identical items with same enchantment level and damage" => [
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 1))->setDamage(10),
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 1)),
-			new AnvilCraftResult(10, VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 2))->setDamage(0), null)
-		];
-
-		yield "Combine two identical items with same enchantment level and damage for material" => [
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 1)),
-			VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 1))->setDamage(10),
-			new AnvilCraftResult(8, VanillaItems::DIAMOND_PICKAXE()->addEnchantment(new EnchantmentInstance(VanillaEnchantments::FORTUNE(), 2)), null)
-		];
-	}
-
-	/**
-	 * @dataProvider itemSelfCombineRecipeProvider
-	 */
-	public function testItemSelfCombineRecipe(Item $base, Item $combined, ?AnvilCraftResult $expected) : void{
-		$recipe = new ItemSelfCombineRecipe(new WildcardRecipeIngredient());
-		self::assertAnvilCraftResultEquals($expected, $recipe->getResultFor($base, $combined));
-	}
-
-	private static function assertAnvilCraftResultEquals(?AnvilCraftResult $expected, ?AnvilCraftResult $actual) : void{
-		if($expected === null){
-			self::assertNull($actual, "Recipe did not match expected result");
-			return;
-		}else{
-			self::assertNotNull($actual, "Recipe did not match expected result");
-		}
-		self::assertEquals($expected->getXpCost(), $actual->getXpCost(), "XP cost did not match expected result");
-		self::assertTrue($expected->getOutput()->equalsExact($actual->getOutput()), "Recipe output did not match expected result");
-		$sacrificeResult = $expected->getSacrificeResult();
-		if($sacrificeResult !== null){
-			$resultExpected = $actual->getSacrificeResult();
-			self::assertNotNull($resultExpected, "Recipe sacrifice result did not match expected result");
-			self::assertTrue($sacrificeResult->equalsExact($resultExpected), "Recipe sacrifice result did not match expected result");
-		}else{
-			self::assertNull($actual->getSacrificeResult(), "Recipe sacrifice result did not match expected result");
-		}
-	}
-}
--- a/tests/phpunit/crafting/WildcardRecipeIngredient.php
+++ b/tests/phpunit/crafting/WildcardRecipeIngredient.php
@ -1,37 +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\crafting;
-
-use pocketmine\item\Item;
-
-final class WildcardRecipeIngredient implements RecipeIngredient{
-
-	public function __toString() : string{
-		return "WildcardRecipeIngredient()";
-	}
-
-	public function accepts(Item $item) : bool{
-		return true;
-	}
-}
Author	SHA1	Message	Date
Dylan T.	f416cb8902	Merge pull request #6658 from pmmp/minor-next-release	2025-03-22 18:32:15 +00:00
Dylan T.	f123df5e0d	changelog: use more accurate terminology	2025-03-22 18:16:33 +00:00
Dylan K. Taylor	de26ebd124	Prepare 5.26.0 release	2025-03-22 17:59:20 +00:00
dependabot[bot]	1c6a4bde86	Bump pocketmine/locale-data in the production-patch-updates group (#6656 )	2025-03-17 13:20:59 +00:00
Dylan K. Taylor	c2f8e9365b	BlockStateToObjectDeserializer: check that the returned state is actually registered if not, this will cause random crashes in core code, which assumes that state IDs found on runtime chunk memory are valid and registered. this problem exists in other places too, and probably requires a rethink of how we're dealing with this, but for now, this will do as a band-aid.	2025-03-15 20:53:49 +00:00
Dylan K. Taylor	4ef21fabab	Merge branch 'stable' into minor-next	2025-03-15 20:37:28 +00:00
Dylan K. Taylor	4407e585e4	Update composer dependencies (minor-next)	2025-03-15 20:36:39 +00:00
Dylan K. Taylor	463be36b72	Update composer dependencies	2025-03-15 20:33:47 +00:00
Dylan K. Taylor	8b57e9007a	👺	2025-03-15 01:33:29 +00:00
Dylan K. Taylor	e03c586c86	GarbageCollectorManager: promote debug message to info this has such a big impact on performance that I think this is warranted. Should also make it more obvious what the GC is doing without needing to enable ALL debug info.	2025-03-15 01:29:49 +00:00
pmmp-admin-bot[bot]	802e373bf3	Merge 'stable' into 'minor-next' Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/13868087288	2025-03-15 01:26:47 +00:00
Dylan T.	09acbfab4c	dependabot: ignore phpstan/phpstan updates these are noisy and cause conflicts. Since they also usually cause new errors to be reported, we often can't directly update it anyway. Better to test & update this locally.	2025-03-15 00:03:09 +00:00
Dylan K. Taylor	7cfaf04b87	stfu	2025-03-14 16:10:56 +00:00
Dylan K. Taylor	d9e0e51e14	Reduce code duplication in copper block serialization handling	2025-03-14 16:08:06 +00:00
Dylan K. Taylor	069ecf007f	Merge branch 'stable' into minor-next	2025-03-14 15:41:46 +00:00
Dylan K. Taylor	341c7a03a9	CopperMaterial: fixed missing @return $this docs	2025-03-14 15:40:27 +00:00
pmmp-admin-bot[bot]	7ae90dda5d	Merge 'stable' into 'minor-next' Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/13825107599	2025-03-13 01:36:47 +00:00
Dylan T.	73a4b076d6	actions: tidy support response message	2025-03-12 16:19:11 +00:00
Dylan T.	00df508727	Update bug-report.yml	2025-03-12 13:06:57 +00:00
pmmp-admin-bot[bot]	a6553097f4	Merge 'stable' into 'minor-next' Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/13754675430	2025-03-10 01:14:10 +00:00
Lee Siu San	afc4a3c7f1	Fixed entity position offset not being included in AddActorPacket (#6643 ) this was causing TNT and falling blocks to briefly appear half a block lower than their true position, because their positions are measured from the center and not the base.	2025-03-09 02:09:53 +00:00