mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-08 04:38:35 +00:00
Code Issues Projects Releases Wiki Activity

Changes for 1.20.40

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-10-26 12:32:59 +01:00
parent 9fcc9f4338
commit 53a740433f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
7 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -33,10 +33,10 @@
"composer-runtime-api": "^2.0", "composer-runtime-api": "^2.0",
"adhocore/json-comment": "~1.2.0", "adhocore/json-comment": "~1.2.0",
"pocketmine/netresearch-jsonmapper": "~v4.2.1000", "pocketmine/netresearch-jsonmapper": "~v4.2.1000",
"pocketmine/bedrock-block-upgrade-schema": "~3.2.0+bedrock-1.20.30", "pocketmine/bedrock-block-upgrade-schema": "~3.3.0+bedrock-1.20.40",
"pocketmine/bedrock-data": "~2.5.0+bedrock-1.20.30", "pocketmine/bedrock-data": "~2.6.0+bedrock-1.20.40",
"pocketmine/bedrock-item-upgrade-schema": "~1.5.0+bedrock-1.20.30", "pocketmine/bedrock-item-upgrade-schema": "~1.5.0+bedrock-1.20.30",
"pocketmine/bedrock-protocol": "~24.0.0+bedrock-1.20.30", "pocketmine/bedrock-protocol": "~25.0.0+bedrock-1.20.40",
"pocketmine/binaryutils": "^0.2.1", "pocketmine/binaryutils": "^0.2.1",
"pocketmine/callback-validator": "^1.0.2", "pocketmine/callback-validator": "^1.0.2",
"pocketmine/color": "^0.3.0", "pocketmine/color": "^0.3.0",

40
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "6c48ad06b67c3aa3890f004b197d17bc", "content-hash": "feefde772166966ee8065e613fe9a56e",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -122,16 +122,16 @@
}, },
{ {
"name": "pocketmine/bedrock-block-upgrade-schema", "name": "pocketmine/bedrock-block-upgrade-schema",
"version": "3.2.0", "version": "3.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git", "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git",
"reference": "874e1c0c9b7b620744d08b59c78354fe9f028dfa" "reference": "ee46b9367af262bbddd9f122d4d5b5b495b892e7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/874e1c0c9b7b620744d08b59c78354fe9f028dfa", "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/ee46b9367af262bbddd9f122d4d5b5b495b892e7",
"reference": "874e1c0c9b7b620744d08b59c78354fe9f028dfa", "reference": "ee46b9367af262bbddd9f122d4d5b5b495b892e7",
"shasum": "" "shasum": ""
}, },
"type": "library", "type": "library",
@ -142,22 +142,22 @@
"description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves", "description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves",
"support": { "support": {
"issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues", "issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues",
"source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/3.2.0" "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/3.3.0"
}, },
"time": "2023-09-20T17:03:43+00:00" "time": "2023-10-16T16:11:02+00:00"
}, },
{ {
"name": "pocketmine/bedrock-data", "name": "pocketmine/bedrock-data",
"version": "2.5.1+bedrock-1.20.30", "version": "2.6.0+bedrock-1.20.40",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/BedrockData.git", "url": "https://github.com/pmmp/BedrockData.git",
"reference": "8f9d96047a731c37b18b28c2bfcdfa2705bb303f" "reference": "37e780d28b470230bda3579b04cb50d406e3fbe6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/BedrockData/zipball/8f9d96047a731c37b18b28c2bfcdfa2705bb303f", "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/37e780d28b470230bda3579b04cb50d406e3fbe6",
"reference": "8f9d96047a731c37b18b28c2bfcdfa2705bb303f", "reference": "37e780d28b470230bda3579b04cb50d406e3fbe6",
"shasum": "" "shasum": ""
}, },
"type": "library", "type": "library",
@ -168,9 +168,9 @@
"description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP", "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
"support": { "support": {
"issues": "https://github.com/pmmp/BedrockData/issues", "issues": "https://github.com/pmmp/BedrockData/issues",
"source": "https://github.com/pmmp/BedrockData/tree/2.5.1+bedrock-1.20.30" "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.20.40"
}, },
"time": "2023-09-27T11:40:15+00:00" "time": "2023-10-26T10:39:13+00:00"
}, },
{ {
"name": "pocketmine/bedrock-item-upgrade-schema", "name": "pocketmine/bedrock-item-upgrade-schema",
@ -200,16 +200,16 @@
}, },
{ {
"name": "pocketmine/bedrock-protocol", "name": "pocketmine/bedrock-protocol",
"version": "24.0.0+bedrock-1.20.30", "version": "25.0.0+bedrock-1.20.40",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/BedrockProtocol.git", "url": "https://github.com/pmmp/BedrockProtocol.git",
"reference": "38a516274aa6641b0da38011af35a5587fc87895" "reference": "69c36c96f6835e93fc278071aa2bb9829abe5cf8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/38a516274aa6641b0da38011af35a5587fc87895", "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/69c36c96f6835e93fc278071aa2bb9829abe5cf8",
"reference": "38a516274aa6641b0da38011af35a5587fc87895", "reference": "69c36c96f6835e93fc278071aa2bb9829abe5cf8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -241,9 +241,9 @@
"description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP", "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP",
"support": { "support": {
"issues": "https://github.com/pmmp/BedrockProtocol/issues", "issues": "https://github.com/pmmp/BedrockProtocol/issues",
"source": "https://github.com/pmmp/BedrockProtocol/tree/24.0.0+bedrock-1.20.30" "source": "https://github.com/pmmp/BedrockProtocol/tree/25.0.0+bedrock-1.20.40"
}, },
"time": "2023-09-20T16:57:53+00:00" "time": "2023-10-26T11:03:10+00:00"
}, },
{ {
"name": "pocketmine/binaryutils", "name": "pocketmine/binaryutils",
@ -2964,5 +2964,5 @@
"platform-overrides": { "platform-overrides": {
"php": "8.1.0" "php": "8.1.0"
}, },
"plugin-api-version": "2.3.0" "plugin-api-version": "2.6.0"
} }

4
src/data/bedrock/block/BlockStateData.php
View File

@ -42,8 +42,8 @@ final class BlockStateData{
public const CURRENT_VERSION = public const CURRENT_VERSION =
(1 << 24) | //major (1 << 24) | //major
(20 << 16) | //minor (20 << 16) | //minor
(30 << 8) | //patch (40 << 8) | //patch
(50); //revision (3); //revision
public const TAG_NAME = "name"; public const TAG_NAME = "name";
public const TAG_STATES = "states"; public const TAG_STATES = "states";

8
src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
View File

@ -1113,7 +1113,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
}); });
$this->map(Blocks::CHEST(), function(Chest $block) : Writer{ $this->map(Blocks::CHEST(), function(Chest $block) : Writer{
return Writer::create(Ids::CHEST) return Writer::create(Ids::CHEST)
->writeHorizontalFacing($block->getFacing()); ->writeCardinalHorizontalFacing($block->getFacing());
}); });
$this->map(Blocks::CHISELED_QUARTZ(), fn(SimplePillar $block) => Helper::encodeQuartz(StringValues::CHISEL_TYPE_CHISELED, $block->getAxis())); $this->map(Blocks::CHISELED_QUARTZ(), fn(SimplePillar $block) => Helper::encodeQuartz(StringValues::CHISEL_TYPE_CHISELED, $block->getAxis()));
$this->map(Blocks::CHISELED_RED_SANDSTONE(), fn() => Helper::encodeSandstone(Ids::RED_SANDSTONE, StringValues::SAND_STONE_TYPE_HEIROGLYPHS)); $this->map(Blocks::CHISELED_RED_SANDSTONE(), fn() => Helper::encodeSandstone(Ids::RED_SANDSTONE, StringValues::SAND_STONE_TYPE_HEIROGLYPHS));
@ -1274,7 +1274,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
$this->map(Blocks::ELEMENT_CONSTRUCTOR(), fn(ChemistryTable $block) => Helper::encodeChemistryTable($block, StringValues::CHEMISTRY_TABLE_TYPE_ELEMENT_CONSTRUCTOR, new Writer(Ids::CHEMISTRY_TABLE))); $this->map(Blocks::ELEMENT_CONSTRUCTOR(), fn(ChemistryTable $block) => Helper::encodeChemistryTable($block, StringValues::CHEMISTRY_TABLE_TYPE_ELEMENT_CONSTRUCTOR, new Writer(Ids::CHEMISTRY_TABLE)));
$this->map(Blocks::ENDER_CHEST(), function(EnderChest $block) : Writer{ $this->map(Blocks::ENDER_CHEST(), function(EnderChest $block) : Writer{
return Writer::create(Ids::ENDER_CHEST) return Writer::create(Ids::ENDER_CHEST)
->writeHorizontalFacing($block->getFacing()); ->writeCardinalHorizontalFacing($block->getFacing());
}); });
$this->map(Blocks::END_PORTAL_FRAME(), function(EndPortalFrame $block) : Writer{ $this->map(Blocks::END_PORTAL_FRAME(), function(EndPortalFrame $block) : Writer{
return Writer::create(Ids::END_PORTAL_FRAME) return Writer::create(Ids::END_PORTAL_FRAME)
@ -1606,7 +1606,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
}); });
$this->map(Blocks::STONE(), fn() => Helper::encodeStone(StringValues::STONE_TYPE_STONE)); $this->map(Blocks::STONE(), fn() => Helper::encodeStone(StringValues::STONE_TYPE_STONE));
$this->map(Blocks::STONECUTTER(), fn(Stonecutter $block) => Writer::create(Ids::STONECUTTER_BLOCK) $this->map(Blocks::STONECUTTER(), fn(Stonecutter $block) => Writer::create(Ids::STONECUTTER_BLOCK)
->writeHorizontalFacing($block->getFacing())); ->writeCardinalHorizontalFacing($block->getFacing()));
$this->map(Blocks::STONE_BRICKS(), fn() => Helper::encodeStoneBricks(StringValues::STONE_BRICK_TYPE_DEFAULT)); $this->map(Blocks::STONE_BRICKS(), fn() => Helper::encodeStoneBricks(StringValues::STONE_BRICK_TYPE_DEFAULT));
$this->map(Blocks::STONE_BRICK_SLAB(), fn(Slab $block) => Helper::encodeStoneSlab1($block, StringValues::STONE_SLAB_TYPE_STONE_BRICK)); $this->map(Blocks::STONE_BRICK_SLAB(), fn(Slab $block) => Helper::encodeStoneSlab1($block, StringValues::STONE_SLAB_TYPE_STONE_BRICK));
$this->mapStairs(Blocks::STONE_BRICK_STAIRS(), Ids::STONE_BRICK_STAIRS); $this->mapStairs(Blocks::STONE_BRICK_STAIRS(), Ids::STONE_BRICK_STAIRS);
@ -1637,7 +1637,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
}); });
$this->map(Blocks::TRAPPED_CHEST(), function(TrappedChest $block) : Writer{ $this->map(Blocks::TRAPPED_CHEST(), function(TrappedChest $block) : Writer{
return Writer::create(Ids::TRAPPED_CHEST) return Writer::create(Ids::TRAPPED_CHEST)
->writeHorizontalFacing($block->getFacing()); ->writeCardinalHorizontalFacing($block->getFacing());
}); });
$this->map(Blocks::TRIPWIRE(), function(Tripwire $block) : Writer{ $this->map(Blocks::TRIPWIRE(), function(Tripwire $block) : Writer{
return Writer::create(Ids::TRIP_WIRE) return Writer::create(Ids::TRIP_WIRE)

8
src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
View File

@ -994,7 +994,7 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
}); });
$this->map(Ids::CHEST, function(Reader $in) : Block{ $this->map(Ids::CHEST, function(Reader $in) : Block{
return Blocks::CHEST() return Blocks::CHEST()
->setFacing($in->readHorizontalFacing()); ->setFacing($in->readCardinalHorizontalFacing());
}); });
$this->map(Ids::CHORUS_FLOWER, function(Reader $in) : Block{ $this->map(Ids::CHORUS_FLOWER, function(Reader $in) : Block{
return Blocks::CHORUS_FLOWER() return Blocks::CHORUS_FLOWER()
@ -1095,7 +1095,7 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
}); });
$this->map(Ids::ENDER_CHEST, function(Reader $in) : Block{ $this->map(Ids::ENDER_CHEST, function(Reader $in) : Block{
return Blocks::ENDER_CHEST() return Blocks::ENDER_CHEST()
->setFacing($in->readHorizontalFacing()); ->setFacing($in->readCardinalHorizontalFacing());
}); });
$this->map(Ids::EXPOSED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::EXPOSED())); $this->map(Ids::EXPOSED_COPPER, fn() => Helper::decodeCopper(Blocks::COPPER(), CopperOxidation::EXPOSED()));
$this->map(Ids::EXPOSED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::EXPOSED())); $this->map(Ids::EXPOSED_CUT_COPPER, fn() => Helper::decodeCopper(Blocks::CUT_COPPER(), CopperOxidation::EXPOSED()));
@ -1504,7 +1504,7 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
}); });
$this->map(Ids::STONECUTTER_BLOCK, function(Reader $in) : Block{ $this->map(Ids::STONECUTTER_BLOCK, function(Reader $in) : Block{
return Blocks::STONECUTTER() return Blocks::STONECUTTER()
->setFacing($in->readHorizontalFacing()); ->setFacing($in->readCardinalHorizontalFacing());
}); });
$this->map(Ids::SWEET_BERRY_BUSH, function(Reader $in) : Block{ $this->map(Ids::SWEET_BERRY_BUSH, function(Reader $in) : Block{
//berry bush only wants 0-3, but it can be bigger in MCPE due to misuse of GROWTH state which goes up to 7 //berry bush only wants 0-3, but it can be bigger in MCPE due to misuse of GROWTH state which goes up to 7
@ -1530,7 +1530,7 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
}); });
$this->map(Ids::TRAPPED_CHEST, function(Reader $in) : Block{ $this->map(Ids::TRAPPED_CHEST, function(Reader $in) : Block{
return Blocks::TRAPPED_CHEST() return Blocks::TRAPPED_CHEST()
->setFacing($in->readHorizontalFacing()); ->setFacing($in->readCardinalHorizontalFacing());
}); });
$this->map(Ids::TRIP_WIRE, function(Reader $in) : Block{ $this->map(Ids::TRIP_WIRE, function(Reader $in) : Block{
return Blocks::TRIPWIRE() return Blocks::TRIPWIRE()

2
src/network/mcpe/NetworkSession.php
View File

@ -642,7 +642,7 @@ class NetworkSession{
}else{ }else{
$translated = $message; $translated = $message;
} }
$this->sendDataPacket(DisconnectPacket::create($translated)); $this->sendDataPacket(DisconnectPacket::create(0, $translated));
} }
/** /**

6
src/world/format/io/data/BedrockWorldData.php
View File

@ -51,12 +51,12 @@ use function time;
class BedrockWorldData extends BaseNbtWorldData{ class BedrockWorldData extends BaseNbtWorldData{
public const CURRENT_STORAGE_VERSION = 10; public const CURRENT_STORAGE_VERSION = 10;
public const CURRENT_STORAGE_NETWORK_VERSION = 618; public const CURRENT_STORAGE_NETWORK_VERSION = 622;
public const CURRENT_CLIENT_VERSION_TARGET = [ public const CURRENT_CLIENT_VERSION_TARGET = [
1, //major 1, //major
20, //minor 20, //minor
30, //patch 40, //patch
2, //revision 1, //revision
0 //is beta 0 //is beta
]; ];