mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-14 23:45:34 +00:00
Code Issues Projects Releases Wiki Activity

BlockStateLookupCache: combine arrays for stateless and stateful blocks

Browse Source 
this reduces memory usage by another 20 KB or so.
This commit is contained in:
Dylan K. Taylor 2023-05-04 15:29:27 +01:00
parent d2c37d8bcf
commit 897ba9f2d9
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/network/mcpe/convert/BlockStateLookupCache.php
View File

@ -27,6 +27,8 @@ use pocketmine\data\bedrock\block\BlockStateData;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
use function array_key_first; use function array_key_first;
use function count; use function count;
use function is_array;
use function is_int;
/** /**
* Facilitates quickly looking up a block's state ID based on its NBT. * Facilitates quickly looking up a block's state ID based on its NBT.
@ -34,31 +36,27 @@ use function count;
final class BlockStateLookupCache{ final class BlockStateLookupCache{
/** /**
* @var int[][] * @var int[][]|int[]
* @phpstan-var array<string, array<string, int>> * @phpstan-var array<string, array<string, int>|int>
*/ */
private array $nameToNetworkIdsLookup = []; private array $nameToNetworkIdsLookup = [];
/**
* @var int[]
* @phpstan-var array<string, int>
*/
private array $nameToSingleNetworkIdLookup = [];
/** /**
* @param BlockStateDictionaryEntry[] $blockStates * @param BlockStateDictionaryEntry[] $blockStates
* @phpstan-param list<BlockStateDictionaryEntry> $blockStates * @phpstan-param list<BlockStateDictionaryEntry> $blockStates
*/ */
public function __construct(array $blockStates){ public function __construct(array $blockStates){
$table = [];
foreach($blockStates as $stateId => $stateNbt){ foreach($blockStates as $stateId => $stateNbt){
$this->nameToNetworkIdsLookup[$stateNbt->getStateName()][$stateNbt->getRawStateProperties()] = $stateId; $table[$stateNbt->getStateName()][$stateNbt->getRawStateProperties()] = $stateId;
} }
//setup fast path for stateless blocks //setup fast path for stateless blocks
foreach(Utils::stringifyKeys($this->nameToNetworkIdsLookup) as $name => $stateIds){ foreach(Utils::stringifyKeys($table) as $name => $stateIds){
if(count($stateIds) === 1){ if(count($stateIds) === 1){
$this->nameToSingleNetworkIdLookup[$name] = $stateIds[array_key_first($stateIds)]; $this->nameToNetworkIdsLookup[$name] = $stateIds[array_key_first($stateIds)];
unset($this->nameToNetworkIdsLookup[$name]); }else{
$this->nameToNetworkIdsLookup[$name] = $stateIds;
} }
} }
} }
@ -70,10 +68,11 @@ final class BlockStateLookupCache{
public function lookupStateId(BlockStateData $data) : ?int{ public function lookupStateId(BlockStateData $data) : ?int{
$name = $data->getName(); $name = $data->getName();
if(isset($this->nameToSingleNetworkIdLookup[$name])){ $lookup = $this->nameToNetworkIdsLookup[$name] ?? null;
return $this->nameToSingleNetworkIdLookup[$name]; return match(true){
} $lookup === null => null,
is_int($lookup) => $lookup,
return $this->nameToNetworkIdsLookup[$name][BlockStateDictionaryEntry::encodeStateProperties($data->getStates())] ?? null; is_array($lookup) => $lookup[BlockStateDictionaryEntry::encodeStateProperties($data->getStates())] ?? null
};
} }
} }