mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-16 03:51:37 +00:00
Code Issues Projects Releases Wiki Activity

RuntimeBlockMapping::toRuntimeId() now accepts a single integer instead of id/meta

Browse Source 
the expectation is that eventually this will receive arbitrary internal runtime IDs instead of static id/meta, and RuntimeBlockMapping doesn't really care about this crap anyway.
This commit is contained in:
Dylan K. Taylor
2020-09-20 12:16:11 +01:00
parent 42b184c113
commit 5661d0496f
11 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,21 +135,15 @@ final class RuntimeBlockMapping{
return $table;
}
public function toRuntimeId(int $id, int $meta = 0) : int{
/*
* try id+meta first
* if not found, try id+0 (strip meta)
* if still not found, return update! block
*/
return $this->legacyToRuntimeMap[($id << 4) | $meta] ?? $this->legacyToRuntimeMap[$id << 4] ?? $this->legacyToRuntimeMap[BlockLegacyIds::INFO_UPDATE << 4];
public function toRuntimeId(int $internalStateId) : int{
return $this->legacyToRuntimeMap[$internalStateId] ?? $this->legacyToRuntimeMap[BlockLegacyIds::INFO_UPDATE << 4];
}
/**
* @return int[] [id, meta]
* @return int
*/
public function fromRuntimeId(int $runtimeId) : array{
$v = $this->runtimeToLegacyMap[$runtimeId];
return [$v >> 4, $v & 0xf];
public function fromRuntimeId(int $runtimeId) : int{
return $this->runtimeToLegacyMap[$runtimeId];
}
private function registerMapping(int $staticRuntimeId, int $legacyId, int $legacyMeta) : void{

2
src/network/mcpe/serializer/ChunkSerializer.php
View File

@@ -71,7 +71,7 @@ final class ChunkSerializer{
//zigzag and just shift directly.
$stream->putUnsignedVarInt(count($palette) << 1); //yes, this is intentionally zigzag
foreach($palette as $p){
$stream->put(Binary::writeUnsignedVarInt($blockMapper->toRuntimeId($p >> 4, $p & 0xf) << 1));
$stream->put(Binary::writeUnsignedVarInt($blockMapper->toRuntimeId($p) << 1));
}
}
}