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

Rename RuntimeBlockMapping -> BlockTranslator

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-05-03 22:18:27 +01:00
parent 01f340985a
commit 32e6fdd95a
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/generate-bedrock-data-from-packets.php
View File

@ -39,7 +39,7 @@ use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\TreeRoot;
use pocketmine\network\mcpe\convert\BlockStateDictionary;
use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
use pocketmine\network\mcpe\convert\BlockTranslator;
use pocketmine\network\mcpe\handler\PacketHandler;
use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket;
use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
@ -109,10 +109,10 @@ require dirname(__DIR__) . '/vendor/autoload.php';
class ParserPacketHandler extends PacketHandler{
public ?ItemTypeDictionary $itemTypeDictionary = null;
private RuntimeBlockMapping $blockMapping;
private BlockTranslator $blockTranslator;
public function __construct(private string $bedrockDataPath){
$this->blockMapping = new RuntimeBlockMapping(
$this->blockTranslator = new BlockTranslator(
BlockStateDictionary::loadFromString(
Filesystem::fileGetContents(Path::join($this->bedrockDataPath, "canonical_block_states.nbt")),
Filesystem::fileGetContents(Path::join($this->bedrockDataPath, "block_state_meta_map.json")),
@ -150,7 +150,7 @@ class ParserPacketHandler extends PacketHandler{
if($meta !== 0){
throw new PacketHandlingException("Unexpected non-zero blockitem meta");
}
$blockState = $this->blockMapping->getBlockStateDictionary()->getDataFromStateId($itemStack->getBlockRuntimeId()) ?? null;
$blockState = $this->blockTranslator->getBlockStateDictionary()->getDataFromStateId($itemStack->getBlockRuntimeId()) ?? null;
if($blockState === null){
throw new PacketHandlingException("Unmapped blockstate ID " . $itemStack->getBlockRuntimeId());
}
@ -268,9 +268,9 @@ class ParserPacketHandler extends PacketHandler{
}
$meta = $descriptor->getMeta();
if($meta !== 32767){
$blockStateId = $this->blockMapping->getBlockStateDictionary()->lookupStateIdFromIdMeta($data->name, $meta);
$blockStateId = $this->blockTranslator->getBlockStateDictionary()->lookupStateIdFromIdMeta($data->name, $meta);
if($blockStateId !== null){
$blockState = $this->blockMapping->getBlockStateDictionary()->getDataFromStateId($blockStateId);
$blockState = $this->blockTranslator->getBlockStateDictionary()->getDataFromStateId($blockStateId);
if($blockState !== null && count($blockState->getStates()) > 0){
$data->block_states = self::blockStatePropertiesToString($blockState);
}