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

RuntimeBlockMapping: unseal constructor to facilitate easier testing of new versions

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-04-20 14:00:20 +01:00
parent c085bf0db4
commit 6b4687a36b
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/mcpe/convert/RuntimeBlockMapping.php
View File

@ -48,9 +48,16 @@ final class RuntimeBlockMapping{
/** @var CompoundTag[] */ /** @var CompoundTag[] */
private $bedrockKnownStates; private $bedrockKnownStates;
private function __construct(){ private static function make() : self{
return new self(
Path::join(\pocketmine\BEDROCK_DATA_PATH, "canonical_block_states.nbt"),
Path::join(\pocketmine\BEDROCK_DATA_PATH, "r12_to_current_block_map.bin")
);
}
public function __construct(string $canonicalBlockStatesFile, string $r12ToCurrentBlockMapFile){
$stream = PacketSerializer::decoder( $stream = PacketSerializer::decoder(
Utils::assumeNotFalse(file_get_contents(Path::join(\pocketmine\BEDROCK_DATA_PATH, "canonical_block_states.nbt")), "Missing required resource file"), Utils::assumeNotFalse(file_get_contents($canonicalBlockStatesFile), "Missing required resource file"),
0, 0,
new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary()) new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary())
); );
@ -60,15 +67,15 @@ final class RuntimeBlockMapping{
} }
$this->bedrockKnownStates = $list; $this->bedrockKnownStates = $list;
$this->setupLegacyMappings(); $this->setupLegacyMappings($r12ToCurrentBlockMapFile);
} }
private function setupLegacyMappings() : void{ private function setupLegacyMappings(string $r12ToCurrentBlockMapFile) : void{
$legacyIdMap = LegacyBlockIdToStringIdMap::getInstance(); $legacyIdMap = LegacyBlockIdToStringIdMap::getInstance();
/** @var R12ToCurrentBlockMapEntry[] $legacyStateMap */ /** @var R12ToCurrentBlockMapEntry[] $legacyStateMap */
$legacyStateMap = []; $legacyStateMap = [];
$legacyStateMapReader = PacketSerializer::decoder( $legacyStateMapReader = PacketSerializer::decoder(
Utils::assumeNotFalse(file_get_contents(Path::join(\pocketmine\BEDROCK_DATA_PATH, "r12_to_current_block_map.bin")), "Missing required resource file"), Utils::assumeNotFalse(file_get_contents($r12ToCurrentBlockMapFile), "Missing required resource file"),
0, 0,
new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary()) new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary())
); );