mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-22 03:11:33 +00:00
Code Issues Projects Releases Wiki Activity

tidy

Browse Source
This commit is contained in:
Dylan K. Taylor 2025-08-15 20:05:37 +01:00
parent 46199eb301
commit 314277fff8
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,6 +189,7 @@ use pocketmine\data\bedrock\block\convert\BlockStateWriter as Writer;
use pocketmine\math\Axis; use pocketmine\math\Axis;
use pocketmine\math\Facing; use pocketmine\math\Facing;
use function get_class; use function get_class;
use function is_string;
final class BlockObjectToStateSerializer implements BlockStateSerializer{ final class BlockObjectToStateSerializer implements BlockStateSerializer{
/** /**
@ -196,7 +197,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
* describe the bottom type of a type hierarchy only containing Block. * describe the bottom type of a type hierarchy only containing Block.
* *
* @var (\Closure|BlockStateData)[] * @var (\Closure|BlockStateData)[]
* @phpstan-var array<int, \Closure(never) : (Writer|BlockStateData)|BlockStateData> * @phpstan-var array<int, \Closure(never) : (Writer|BlockStateData|string)|BlockStateData>
*/ */
private array $serializers = []; private array $serializers = [];
@ -233,12 +234,13 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
/** /**
* @phpstan-template TBlockType of Block * @phpstan-template TBlockType of Block
* @phpstan-param TBlockType $block * @phpstan-param TBlockType $block
* @phpstan-param \Closure(TBlockType) : (Writer|BlockStateData)|Writer|BlockStateData $serializer * @phpstan-param \Closure(TBlockType) : (Writer|BlockStateData|string)|Writer|BlockStateData $serializer
*/ */
public function map(Block $block, \Closure|Writer|BlockStateData $serializer) : void{ public function map(Block $block, \Closure|Writer|BlockStateData $serializer) : void{
if(isset($this->serializers[$block->getTypeId()])){ if(isset($this->serializers[$block->getTypeId()])){
throw new \InvalidArgumentException("Block type ID " . $block->getTypeId() . " already has a serializer registered"); throw new \InvalidArgumentException("Block type ID " . $block->getTypeId() . " already has a serializer registered");
} }
//writer accepted for convenience only
$this->serializers[$block->getTypeId()] = $serializer instanceof Writer ? $serializer->getBlockStateData() : $serializer; $this->serializers[$block->getTypeId()] = $serializer instanceof Writer ? $serializer->getBlockStateData() : $serializer;
} }
@ -272,7 +274,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
throw new BlockStateSerializeException("No serializer registered for " . get_class($blockState) . " with type ID $typeId"); throw new BlockStateSerializeException("No serializer registered for " . get_class($blockState) . " with type ID $typeId");
} }
if($locatedSerializer instanceof BlockStateData){ if($locatedSerializer instanceof BlockStateData){ //static data, not dependent on state
return $locatedSerializer; return $locatedSerializer;
} }
@ -282,11 +284,17 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
* In the future we'll need some way to guarantee that type IDs are never reused (perhaps spl_object_id()?) * In the future we'll need some way to guarantee that type IDs are never reused (perhaps spl_object_id()?)
* *
* @var \Closure $locatedSerializer * @var \Closure $locatedSerializer
* @phpstan-var \Closure(TBlockType) : (Writer|BlockStateData) $locatedSerializer * @phpstan-var \Closure(TBlockType) : (Writer|BlockStateData|string) $locatedSerializer
*/ */
$writerOrState = $locatedSerializer($blockState); $result = $locatedSerializer($blockState);
return $writerOrState instanceof Writer ? $writerOrState->getBlockStateData() : $writerOrState; if($result instanceof Writer){ //builder
return $result->getBlockStateData();
}
if(is_string($result)){ //ID only
return BlockStateData::current($result, []);
}
return $result; //data, no builder
} }
private function registerCandleSerializers() : void{ private function registerCandleSerializers() : void{