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

Rewrite RuntimeBlockMapping to use BlockStateSerializer

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-02-01 17:34:32 +00:00
parent cab9b6c862
commit 979f6f3d57
5 changed files with 221 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/mcpe/serializer/ChunkSerializer.php
View File

@ -25,7 +25,10 @@ namespace pocketmine\network\mcpe\serializer;
use pocketmine\block\tile\Spawnable;
use pocketmine\data\bedrock\BiomeIds;
use pocketmine\data\bedrock\blockstate\BlockStateData;
use pocketmine\data\bedrock\blockstate\BlockTypeNames;
use pocketmine\data\bedrock\LegacyBiomeIdToStringIdMap;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\TreeRoot;
use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
@ -97,6 +100,8 @@ final class ChunkSerializer{
$stream->putByte(count($layers));
$blockStateDictionary = $blockMapper->getBlockStateDictionary();
foreach($layers as $blocks){
$bitsPerBlock = $blocks->getBitsPerBlock();
$words = $blocks->getWordArray();
@ -113,7 +118,13 @@ final class ChunkSerializer{
if($persistentBlockStates){
$nbtSerializer = new NetworkNbtSerializer();
foreach($palette as $p){
$stream->put($nbtSerializer->write(new TreeRoot($blockMapper->getBedrockKnownStates()[$blockMapper->toRuntimeId($p)])));
//TODO: introduce a binary cache for this
$state = $blockStateDictionary->getDataFromStateId($blockMapper->toRuntimeId($p));
if($state === null){
$state = $blockMapper->getFallbackStateData();
}
$stream->put($nbtSerializer->write(new TreeRoot($state->toNbt())));
}
}else{
foreach($palette as $p){