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

BlockStateDictionary: slash another 14% off memory usage by deduplicating block type names

Browse Source 
perhaps we could construct a dictionary from BlockTypeNames reflection??
This commit is contained in:
Dylan K. Taylor 2023-05-03 23:14:53 +01:00
parent ed021d193d
commit f9d9cbd0f6
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/mcpe/convert/BlockStateDictionary.php
View File

@ -130,6 +130,7 @@ final class BlockStateDictionary{
$entries = []; $entries = [];
$uniqueNames = [];
foreach(self::loadPaletteFromString($blockPaletteContents) as $i => $state){ foreach(self::loadPaletteFromString($blockPaletteContents) as $i => $state){
$meta = $metaMap[$i] ?? null; $meta = $metaMap[$i] ?? null;
if($meta === null){ if($meta === null){
@ -138,7 +139,8 @@ final class BlockStateDictionary{
if(!is_int($meta)){ if(!is_int($meta)){
throw new \InvalidArgumentException("Invalid metaMap offset $i, expected int, got " . get_debug_type($meta)); throw new \InvalidArgumentException("Invalid metaMap offset $i, expected int, got " . get_debug_type($meta));
} }
$entries[$i] = new BlockStateDictionaryEntry($state, $meta); $uniqueName = $uniqueNames[$state->getName()] ??= $state->getName();
$entries[$i] = new BlockStateDictionaryEntry($uniqueName, $state->getStates(), $meta);
} }
return new self($entries); return new self($entries);

10
src/network/mcpe/convert/BlockStateDictionaryEntry.php
View File

@ -34,15 +34,17 @@ use const SORT_STRING;
final class BlockStateDictionaryEntry{ final class BlockStateDictionaryEntry{
private string $stateName;
private string $rawStateProperties; private string $rawStateProperties;
/**
* @param Tag[] $stateProperties
*/
public function __construct( public function __construct(
BlockStateData $stateData, private string $stateName,
array $stateProperties,
private int $meta private int $meta
){ ){
$this->stateName = $stateData->getName(); $this->rawStateProperties = self::encodeStateProperties($stateProperties);
$this->rawStateProperties = self::encodeStateProperties($stateData->getStates());
} }
public function getStateName() : string{ return $this->stateName; } public function getStateName() : string{ return $this->stateName; }