diff --git a/composer.json b/composer.json index ce4994d4f..4f8aac42e 100644 --- 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": "dev-bedrock-1.21.100", + "pocketmine/bedrock-item-upgrade-schema": "dev-feature/1.21.100", + "pocketmine/bedrock-protocol": "dev-bedrock-1.21.100", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", "pocketmine/color": "^0.3.0", diff --git a/composer.lock b/composer.lock index 2e5e83a94..b45a95475 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4dc5ea726d881d8c52d1b5299485d940", + "content-hash": "c40fb331dadbb0a73b03794d9da9fe28", "packages": [ { "name": "adhocore/json-comment", @@ -204,16 +204,16 @@ }, { "name": "pocketmine/bedrock-data", - "version": "5.2.0+bedrock-1.21.93", + "version": "dev-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/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": "dev-feature/1.21.100", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", - "reference": "9fc7c9bbb558a017395c1cb7dd819c033ee971bb" + "reference": "3def834fe3a27a3cb7726e4f9acb08e36c5bed1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/9fc7c9bbb558a017395c1cb7dd819c033ee971bb", - "reference": "9fc7c9bbb558a017395c1cb7dd819c033ee971bb", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/3def834fe3a27a3cb7726e4f9acb08e36c5bed1e", + "reference": "3def834fe3a27a3cb7726e4f9acb08e36c5bed1e", "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/feature/1.21.100" }, - "time": "2024-12-04T12:22:49+00:00" + "time": "2025-07-30T21:04:46+00:00" }, { "name": "pocketmine/bedrock-protocol", - "version": "39.1.0+bedrock-1.21.93", + "version": "dev-bedrock-1.21.100", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockProtocol.git", - "reference": "e9bc5fb691d18dab229a158462c13f0c6fea79c8" + "reference": "1c9ffc37a73a73c06a75f8d1b8db0be92c8ce7d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/e9bc5fb691d18dab229a158462c13f0c6fea79c8", - "reference": "e9bc5fb691d18dab229a158462c13f0c6fea79c8", + "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/1c9ffc37a73a73c06a75f8d1b8db0be92c8ce7d5", + "reference": "1c9ffc37a73a73c06a75f8d1b8db0be92c8ce7d5", "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/bedrock-1.21.100" }, - "time": "2025-07-08T12:31:39+00:00" + "time": "2025-07-30T22:03:44+00:00" }, { "name": "pocketmine/binaryutils", @@ -2756,7 +2756,11 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "pocketmine/bedrock-data": 20, + "pocketmine/bedrock-item-upgrade-schema": 20, + "pocketmine/bedrock-protocol": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -2791,5 +2795,5 @@ "platform-overrides": { "php": "8.1.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/src/data/bedrock/WorldDataVersions.php b/src/data/bedrock/WorldDataVersions.php index ca36795fa..e682eb43a 100644 --- 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 ]; } diff --git a/src/data/bedrock/block/BlockTypeNames.php b/src/data/bedrock/block/BlockTypeNames.php index 527a01345..71402c74a 100644 --- 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"; diff --git a/src/data/bedrock/item/ItemTypeNames.php b/src/data/bedrock/item/ItemTypeNames.php index 3178386ca..5c648ff38 100644 --- 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"; diff --git a/src/network/mcpe/handler/PreSpawnPacketHandler.php b/src/network/mcpe/handler/PreSpawnPacketHandler.php index 99f65e78f..4aa8be227 100644 --- 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,