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

Get rid of useless closure

Browse Source
This commit is contained in:
ShockedPlot7560 2025-07-31 08:33:36 +02:00
parent f5867851a5
commit 90cc104b05
No known key found for this signature in database
GPG Key ID: 894B86FF21BB1EF5
1 changed files with 13 additions and 9 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

@ -195,8 +195,8 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
* These callables actually accept Block, but for the sake of type completeness, it has to be never, since we can't * These callables actually accept Block, but for the sake of type completeness, it has to be never, since we can't
* describe the bottom type of a type hierarchy only containing Block. * describe the bottom type of a type hierarchy only containing Block.
* *
* @var \Closure[] * @var (\Closure|string)[]
* @phpstan-var array<int, (\Closure(never) : Writer|string)> * @phpstan-var array<int, \Closure(never) : (Writer|string)|string>
*/ */
private array $serializers = []; private array $serializers = [];
@ -233,9 +233,9 @@ 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|string) $serializer * @phpstan-param \Closure(TBlockType) : (Writer|string)|string $serializer
*/ */
public function map(Block $block, \Closure $serializer) : void{ public function map(Block $block, \Closure|string $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");
} }
@ -243,7 +243,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
} }
public function mapSimple(Block $block, string $id) : void{ public function mapSimple(Block $block, string $id) : void{
$this->map($block, fn() => $id); $this->map($block, $id);
} }
public function mapSlab(Slab $block, string $singleId, string $doubleId) : void{ public function mapSlab(Slab $block, string $singleId, string $doubleId) : void{
@ -277,13 +277,17 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
* the type ID of the block (which never makes sense, even in a world where overriding block types is a thing). * the type ID of the block (which never makes sense, even in a world where overriding block types is a thing).
* 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 $serializer * @var \Closure|string $serializer
* @phpstan-var (\Closure(TBlockType) : Writer|string) $serializer * @phpstan-var \Closure(TBlockType) : (Writer|string)|string $serializer
*/ */
$serializer = $locatedSerializer; $serializer = $locatedSerializer;
if(is_callable($serializer)){
/** @var Writer|string $writerOrId */ /** @var Writer|string $writerOrId */
$writerOrId = $serializer($blockState); $writerOrId = $serializer($blockState);
}else{
$writerOrId = $serializer;
}
return $writerOrId instanceof Writer ? return $writerOrId instanceof Writer ?
$writerOrId->getBlockStateData() : $writerOrId->getBlockStateData() :
BlockStateData::current($writerOrId, []); BlockStateData::current($writerOrId, []);