Merge branch 'minor-next' into major-next

2025-08-20 10:00:31 +00:00 · 2025-08-08 01:09:17 +01:00 · 2025-08-08 01:09:17 +01:00 · 12f404b20d
commit 12f404b20d
parent c65f740ce5 959fd7e5e6
14 changed files with 128 additions and 46 deletions
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@ -4,6 +4,11 @@ on:
  release:
    types:
      - published
+  workflow_dispatch:
+    inputs:
+      release:
+        description: 'Tag name to build'
+        required: true

 jobs:
  build:
@ -33,11 +38,23 @@ jobs:
          repository: pmmp/PocketMine-Docker
          fetch-depth: 1

-      - name: Get tag names
+
+      - name: Get tag name
        id: tag-name
        run: |
-          VERSION=$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{')
-          echo TAG_NAME=$VERSION >> $GITHUB_OUTPUT
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            echo TAG_NAME="${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            echo TAG_NAME="${{ github.event.inputs.release }}" >> $GITHUB_OUTPUT
+          else
+            echo "Unsupported event type: ${{ github.event_name }}"
+            exit 1
+          fi
+
+      - name: Parse version
+        id: version
+        run: |
+          VERSION="${{ steps.tag-name.outputs.TAG_NAME }}"
          echo MAJOR=$(echo $VERSION | cut -d. -f1) >> $GITHUB_OUTPUT
          echo MINOR=$(echo $VERSION | cut -d. -f1-2) >> $GITHUB_OUTPUT

@ -71,8 +88,8 @@ jobs:
          push: true
          context: ./pocketmine-mp
          tags: |
-            ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MAJOR }}
-            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MAJOR }}
+            ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MAJOR }}
+            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MAJOR }}
          build-args: |
            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
            PMMP_REPO=${{ github.repository }}
@ -84,8 +101,8 @@ jobs:
          push: true
          context: ./pocketmine-mp
          tags: |
-            ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MINOR }}
-            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.MINOR }}
+            ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MINOR }}
+            ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MINOR }}
          build-args: |
            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
            PMMP_REPO=${{ github.repository }}
--- a/.github/workflows/discord-release-notify.yml
+++ b/.github/workflows/discord-release-notify.yml
@ -4,6 +4,11 @@ on:
  release:
    types:
      - published
+  workflow_dispatch:
+    inputs:
+      release:
+        description: 'Release to make notification for'
+        required: true

 jobs:
  build:
@ -30,9 +35,17 @@ jobs:
      - name: Install Composer dependencies
        run: composer install --no-dev --prefer-dist --no-interaction --ignore-platform-reqs

-      - name: Get actual tag name
+      - name: Get tag name
        id: tag-name
-        run: echo TAG_NAME=$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{') >> $GITHUB_OUTPUT
+        run: |
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            echo TAG_NAME="${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            echo TAG_NAME="${{ github.event.inputs.release }}" >> $GITHUB_OUTPUT
+          else
+            echo "Unsupported event type: ${{ github.event_name }}"
+            exit 1
+          fi

      - name: Run webhook post script
        run: php .github/workflows/discord-release-embed.php ${{ github.repository }} ${{ steps.tag-name.outputs.TAG_NAME }} ${{ github.token }} ${{ secrets.DISCORD_RELEASE_WEBHOOK }} ${{ secrets.DISCORD_NEWS_PING_ROLE_ID }}
--- a/.github/workflows/update-updater-api.yml
+++ b/.github/workflows/update-updater-api.yml
@ -4,6 +4,11 @@ on:
  release:
    types:
      - published
+  workflow_dispatch:
+    inputs:
+      release:
+        description: 'Release to publish info for'
+        required: true

 jobs:
  build:
@ -19,9 +24,17 @@ jobs:
          repository: ${{ github.repository_owner }}/update.pmmp.io
          ssh-key: ${{ secrets.UPDATE_PMMP_IO_DEPLOY_KEY }}

-      - name: Get actual tag name
+      - name: Get tag name
        id: tag-name
-        run: echo TAG_NAME=$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{') >> $GITHUB_OUTPUT
+        run: |
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            echo TAG_NAME="${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            echo TAG_NAME="${{ github.event.inputs.release }}" >> $GITHUB_OUTPUT
+          else
+            echo "Unsupported event type: ${{ github.event_name }}"
+            exit 1
+          fi

      - name: Download new release information
        run: curl -f -L ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ steps.tag-name.outputs.TAG_NAME }}/build_info.json -o new_build_info.json
--- a/changelogs/5.32.md
+++ b/changelogs/5.32.md
@ -0,0 +1,17 @@
+# 5.32.0
+Released 6th August 2025.
+
+This is a support release for Minecraft: Bedrock Edition 1.21.100.
+
+**Plugin compatibility:** Plugins for previous 5.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` or `pocketmine\data` namespace.
+Do not update plugin minimum API versions unless you need new features added in this release.
+
+**WARNING: If your plugin uses the `pocketmine\network\mcpe` namespace, you're not shielded by API change constraints.**
+Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you're using packets directly.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.21.100.
+- Removed support for earlier versions.
+
+## Fixes
+- Fixed deadlock on RakLib thread crash (e.g. due to port binding failure).
--- a/composer.json
+++ b/composer.json
@ -34,9 +34,9 @@
      "adhocore/json-comment": "~1.2.0",
      "netresearch/jsonmapper": "~v5.0.0",
      "pocketmine/bedrock-block-upgrade-schema": "~5.1.0+bedrock-1.21.60",
-      "pocketmine/bedrock-data": "~5.2.0+bedrock-1.21.93",
-      "pocketmine/bedrock-item-upgrade-schema": "~1.14.0+bedrock-1.21.50",
-      "pocketmine/bedrock-protocol": "~39.1.0+bedrock-1.21.93",
+      "pocketmine/bedrock-data": "~5.3.0+bedrock-1.21.100",
+      "pocketmine/bedrock-item-upgrade-schema": "~1.15.0+bedrock-1.21.100",
+      "pocketmine/bedrock-protocol": "~40.0.0+bedrock-1.21.100",
      "pocketmine/binaryutils": "^0.2.1",
      "pocketmine/callback-validator": "^1.0.2",
      "pocketmine/color": "^0.3.0",
--- 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": "3609ef73f066fbcfc0593d8aa6c94a51",
+    "content-hash": "6aac4fb3990be02fdbbe03c8dd33a6fa",
    "packages": [
        {
            "name": "adhocore/json-comment",
@ -204,16 +204,16 @@
        },
        {
            "name": "pocketmine/bedrock-data",
-            "version": "5.2.0+bedrock-1.21.93",
+            "version": "5.3.0+bedrock-1.21.100",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockData.git",
-                "reference": "740e18e490c6a102b774518ff2224a06762bcaf8"
+                "reference": "5279e76261df158d5af187cfaafc1618c1da9e3f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/740e18e490c6a102b774518ff2224a06762bcaf8",
-                "reference": "740e18e490c6a102b774518ff2224a06762bcaf8",
+                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/5279e76261df158d5af187cfaafc1618c1da9e3f",
+                "reference": "5279e76261df158d5af187cfaafc1618c1da9e3f",
                "shasum": ""
            },
            "type": "library",
@ -224,22 +224,22 @@
            "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
            "support": {
                "issues": "https://github.com/pmmp/BedrockData/issues",
-                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.21.93"
+                "source": "https://github.com/pmmp/BedrockData/tree/5.3.0+bedrock-1.21.100"
            },
-            "time": "2025-07-08T12:30:28+00:00"
+            "time": "2025-07-30T22:07:56+00:00"
        },
        {
            "name": "pocketmine/bedrock-item-upgrade-schema",
-            "version": "1.14.0",
+            "version": "1.15.0",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git",
-                "reference": "9fc7c9bbb558a017395c1cb7dd819c033ee971bb"
+                "reference": "09e0dbe9743f21a76b1fe04b2b4136785775f52b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/9fc7c9bbb558a017395c1cb7dd819c033ee971bb",
-                "reference": "9fc7c9bbb558a017395c1cb7dd819c033ee971bb",
+                "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/09e0dbe9743f21a76b1fe04b2b4136785775f52b",
+                "reference": "09e0dbe9743f21a76b1fe04b2b4136785775f52b",
                "shasum": ""
            },
            "type": "library",
@ -250,22 +250,22 @@
            "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves",
            "support": {
                "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues",
-                "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.14.0"
+                "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.15.0"
            },
-            "time": "2024-12-04T12:22:49+00:00"
+            "time": "2025-08-06T15:08:48+00:00"
        },
        {
            "name": "pocketmine/bedrock-protocol",
-            "version": "39.1.0+bedrock-1.21.93",
+            "version": "40.0.0+bedrock-1.21.100",
            "source": {
                "type": "git",
                "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "e9bc5fb691d18dab229a158462c13f0c6fea79c8"
+                "reference": "5e95cab3a6e6c24920e0c25ca4aaf887ed4b70ca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/e9bc5fb691d18dab229a158462c13f0c6fea79c8",
-                "reference": "e9bc5fb691d18dab229a158462c13f0c6fea79c8",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/5e95cab3a6e6c24920e0c25ca4aaf887ed4b70ca",
+                "reference": "5e95cab3a6e6c24920e0c25ca4aaf887ed4b70ca",
                "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/39.1.0+bedrock-1.21.93"
+                "source": "https://github.com/pmmp/BedrockProtocol/tree/40.0.0+bedrock-1.21.100"
            },
-            "time": "2025-07-08T12:31:39+00:00"
+            "time": "2025-08-06T15:13:45+00:00"
        },
        {
            "name": "pocketmine/binaryutils",
--- a/src/VersionInfo.php
+++ b/src/VersionInfo.php
@ -31,7 +31,7 @@ use function str_repeat;

 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "5.31.1";
+	public const BASE_VERSION = "5.32.1";
 	public const IS_DEVELOPMENT_BUILD = true;
 	public const BUILD_CHANNEL = "stable";

--- a/src/data/bedrock/WorldDataVersions.php
+++ b/src/data/bedrock/WorldDataVersions.php
@ -54,13 +54,13 @@ final class WorldDataVersions{
 	 * This may be lower than the current protocol version if PocketMine-MP does not yet support features of the newer
 	 * version. This allows the protocol to be updated independently of world format support.
 	 */
-	public const NETWORK = 818;
+	public const NETWORK = 827;

 	public const LAST_OPENED_IN = [
 		1, //major
 		21, //minor
-		90, //patch
-		3, //revision
+		100, //patch
+		23, //revision
 		0 //is beta
 	];
 }
--- a/src/data/bedrock/block/BlockTypeNames.php
+++ b/src/data/bedrock/block/BlockTypeNames.php
@ -255,6 +255,7 @@ final class BlockTypeNames{
 	public const CONDUIT = "minecraft:conduit";
 	public const COPPER_BLOCK = "minecraft:copper_block";
 	public const COPPER_BULB = "minecraft:copper_bulb";
+	public const COPPER_CHEST = "minecraft:copper_chest";
 	public const COPPER_DOOR = "minecraft:copper_door";
 	public const COPPER_GRATE = "minecraft:copper_grate";
 	public const COPPER_ORE = "minecraft:copper_ore";
@ -533,6 +534,7 @@ final class BlockTypeNames{
 	public const EXPOSED_CHISELED_COPPER = "minecraft:exposed_chiseled_copper";
 	public const EXPOSED_COPPER = "minecraft:exposed_copper";
 	public const EXPOSED_COPPER_BULB = "minecraft:exposed_copper_bulb";
+	public const EXPOSED_COPPER_CHEST = "minecraft:exposed_copper_chest";
 	public const EXPOSED_COPPER_DOOR = "minecraft:exposed_copper_door";
 	public const EXPOSED_COPPER_GRATE = "minecraft:exposed_copper_grate";
 	public const EXPOSED_COPPER_TRAPDOOR = "minecraft:exposed_copper_trapdoor";
@ -857,6 +859,7 @@ final class BlockTypeNames{
 	public const OXIDIZED_CHISELED_COPPER = "minecraft:oxidized_chiseled_copper";
 	public const OXIDIZED_COPPER = "minecraft:oxidized_copper";
 	public const OXIDIZED_COPPER_BULB = "minecraft:oxidized_copper_bulb";
+	public const OXIDIZED_COPPER_CHEST = "minecraft:oxidized_copper_chest";
 	public const OXIDIZED_COPPER_DOOR = "minecraft:oxidized_copper_door";
 	public const OXIDIZED_COPPER_GRATE = "minecraft:oxidized_copper_grate";
 	public const OXIDIZED_COPPER_TRAPDOOR = "minecraft:oxidized_copper_trapdoor";
@ -1211,6 +1214,7 @@ final class BlockTypeNames{
 	public const WAXED_CHISELED_COPPER = "minecraft:waxed_chiseled_copper";
 	public const WAXED_COPPER = "minecraft:waxed_copper";
 	public const WAXED_COPPER_BULB = "minecraft:waxed_copper_bulb";
+	public const WAXED_COPPER_CHEST = "minecraft:waxed_copper_chest";
 	public const WAXED_COPPER_DOOR = "minecraft:waxed_copper_door";
 	public const WAXED_COPPER_GRATE = "minecraft:waxed_copper_grate";
 	public const WAXED_COPPER_TRAPDOOR = "minecraft:waxed_copper_trapdoor";
@ -1221,6 +1225,7 @@ final class BlockTypeNames{
 	public const WAXED_EXPOSED_CHISELED_COPPER = "minecraft:waxed_exposed_chiseled_copper";
 	public const WAXED_EXPOSED_COPPER = "minecraft:waxed_exposed_copper";
 	public const WAXED_EXPOSED_COPPER_BULB = "minecraft:waxed_exposed_copper_bulb";
+	public const WAXED_EXPOSED_COPPER_CHEST = "minecraft:waxed_exposed_copper_chest";
 	public const WAXED_EXPOSED_COPPER_DOOR = "minecraft:waxed_exposed_copper_door";
 	public const WAXED_EXPOSED_COPPER_GRATE = "minecraft:waxed_exposed_copper_grate";
 	public const WAXED_EXPOSED_COPPER_TRAPDOOR = "minecraft:waxed_exposed_copper_trapdoor";
@ -1231,6 +1236,7 @@ final class BlockTypeNames{
 	public const WAXED_OXIDIZED_CHISELED_COPPER = "minecraft:waxed_oxidized_chiseled_copper";
 	public const WAXED_OXIDIZED_COPPER = "minecraft:waxed_oxidized_copper";
 	public const WAXED_OXIDIZED_COPPER_BULB = "minecraft:waxed_oxidized_copper_bulb";
+	public const WAXED_OXIDIZED_COPPER_CHEST = "minecraft:waxed_oxidized_copper_chest";
 	public const WAXED_OXIDIZED_COPPER_DOOR = "minecraft:waxed_oxidized_copper_door";
 	public const WAXED_OXIDIZED_COPPER_GRATE = "minecraft:waxed_oxidized_copper_grate";
 	public const WAXED_OXIDIZED_COPPER_TRAPDOOR = "minecraft:waxed_oxidized_copper_trapdoor";
@ -1241,6 +1247,7 @@ final class BlockTypeNames{
 	public const WAXED_WEATHERED_CHISELED_COPPER = "minecraft:waxed_weathered_chiseled_copper";
 	public const WAXED_WEATHERED_COPPER = "minecraft:waxed_weathered_copper";
 	public const WAXED_WEATHERED_COPPER_BULB = "minecraft:waxed_weathered_copper_bulb";
+	public const WAXED_WEATHERED_COPPER_CHEST = "minecraft:waxed_weathered_copper_chest";
 	public const WAXED_WEATHERED_COPPER_DOOR = "minecraft:waxed_weathered_copper_door";
 	public const WAXED_WEATHERED_COPPER_GRATE = "minecraft:waxed_weathered_copper_grate";
 	public const WAXED_WEATHERED_COPPER_TRAPDOOR = "minecraft:waxed_weathered_copper_trapdoor";
@ -1251,6 +1258,7 @@ final class BlockTypeNames{
 	public const WEATHERED_CHISELED_COPPER = "minecraft:weathered_chiseled_copper";
 	public const WEATHERED_COPPER = "minecraft:weathered_copper";
 	public const WEATHERED_COPPER_BULB = "minecraft:weathered_copper_bulb";
+	public const WEATHERED_COPPER_CHEST = "minecraft:weathered_copper_chest";
 	public const WEATHERED_COPPER_DOOR = "minecraft:weathered_copper_door";
 	public const WEATHERED_COPPER_GRATE = "minecraft:weathered_copper_grate";
 	public const WEATHERED_COPPER_TRAPDOOR = "minecraft:weathered_copper_trapdoor";
--- a/src/data/bedrock/item/ItemTypeNames.php
+++ b/src/data/bedrock/item/ItemTypeNames.php
@ -153,8 +153,19 @@ final class ItemTypeNames{
 	public const COOKED_RABBIT = "minecraft:cooked_rabbit";
 	public const COOKED_SALMON = "minecraft:cooked_salmon";
 	public const COOKIE = "minecraft:cookie";
+	public const COPPER_AXE = "minecraft:copper_axe";
+	public const COPPER_BOOTS = "minecraft:copper_boots";
+	public const COPPER_CHESTPLATE = "minecraft:copper_chestplate";
 	public const COPPER_DOOR = "minecraft:copper_door";
+	public const COPPER_GOLEM_SPAWN_EGG = "minecraft:copper_golem_spawn_egg";
+	public const COPPER_HELMET = "minecraft:copper_helmet";
+	public const COPPER_HOE = "minecraft:copper_hoe";
 	public const COPPER_INGOT = "minecraft:copper_ingot";
+	public const COPPER_LEGGINGS = "minecraft:copper_leggings";
+	public const COPPER_NUGGET = "minecraft:copper_nugget";
+	public const COPPER_PICKAXE = "minecraft:copper_pickaxe";
+	public const COPPER_SHOVEL = "minecraft:copper_shovel";
+	public const COPPER_SWORD = "minecraft:copper_sword";
 	public const CORAL = "minecraft:coral";
 	public const CORAL_BLOCK = "minecraft:coral_block";
 	public const CORAL_FAN = "minecraft:coral_fan";
--- a/src/network/mcpe/handler/PreSpawnPacketHandler.php
+++ b/src/network/mcpe/handler/PreSpawnPacketHandler.php
@ -108,6 +108,7 @@ class PreSpawnPacketHandler extends PacketHandler{
 				Uuid::fromString(Uuid::NIL),
 				false,
 				false,
+				false,
 				new NetworkPermissions(disableClientSounds: true),
 				[],
 				0,
--- a/src/network/mcpe/raklib/RakLibServer.php
+++ b/src/network/mcpe/raklib/RakLibServer.php
@ -68,9 +68,10 @@ class RakLibServer extends Thread{
 	public function startAndWait(int $options = NativeThread::INHERIT_NONE) : void{
 		$this->start($options);
 		$this->synchronized(function() : void{
-			while(!$this->ready && $this->getCrashInfo() === null){
+			while(!$this->ready && !$this->isTerminated()){
 				$this->wait();
 			}
+		});
 		$crashInfo = $this->getCrashInfo();
 		if($crashInfo !== null){
 			if($crashInfo->getType() === SocketException::class){
@ -78,7 +79,6 @@ class RakLibServer extends Thread{
 			}
 			throw new ThreadCrashException("RakLib failed to start", $crashInfo);
 		}
-		});
 	}

 	protected function onRun() : void{
--- a/src/thread/CommonThreadPartsTrait.php
+++ b/src/thread/CommonThreadPartsTrait.php
@ -100,6 +100,8 @@ trait CommonThreadPartsTrait{
 		//*before* the shutdown handler is invoked, so we might land here before the crash info has been set.
 		//In the future this should probably be fixed by running the shutdown handlers before setting isTerminated,
 		//but this workaround should be good enough for now.
+		//WARNING: Do not call this inside a synchronized block on this thread's context. Because the shutdown handler
+		//runs in a synchronized block, this will result in a deadlock.
 		if($this->isTerminated() && !$this->isJoined()){
 			$this->join();
 		}
--- a/src/world/biome/model/BiomeDefinitionEntryData.php
+++ b/src/world/biome/model/BiomeDefinitionEntryData.php
@ -28,7 +28,7 @@ namespace pocketmine\world\biome\model;
 */
 final class BiomeDefinitionEntryData{
 	/** @required */
-	public ?int $id;
+	public int $id;

 	/** @required */
 	public float $temperature;