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

BlockStateData: introduce and use current()

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-02-02 16:21:50 +00:00
parent 6b7a4e2c41
commit da5302ca86
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,14 @@ final class BlockStateData{
private int $version
){}
/**
* @param Tag[] $states
* @phpstan-param array<string, Tag> $states
*/
public static function current(string $name, array $states) : self{
return new self($name, $states, self::CURRENT_VERSION);
}
public function getName() : string{ return $this->name; }
/**

2
src/data/bedrock/block/convert/BlockStateWriter.php
View File

@ -281,6 +281,6 @@ final class BlockStateWriter{
}
public function getBlockStateData() : BlockStateData{
return new BlockStateData($this->id, $this->states, BlockStateData::CURRENT_VERSION);
return BlockStateData::current($this->id, $this->states);
}
}

2
src/data/bedrock/block/upgrade/BlockDataUpgrader.php
View File

@ -51,7 +51,7 @@ final class BlockDataUpgrader{
$blockStateData = $this->upgradeStringIdMeta($id, $data);
if($blockStateData === null){
//unknown block, invalid ID
$blockStateData = new BlockStateData(BlockTypeNames::INFO_UPDATE, [], BlockStateData::CURRENT_VERSION);
$blockStateData = BlockStateData::current(BlockTypeNames::INFO_UPDATE, []);
}
}else{
//Modern (post-1.13) blockstate