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

BlockStateData: use array<Tag> instead of CompoundTag to store state properties

Browse Source 
this reduces the footprint of RuntimeBlockMapping by a further 1 MB, as well as simplifying various parts of the code, and solidifying the immutability guarantee of BlockStateData.
This commit is contained in:
Dylan K. Taylor
2022-07-09 16:03:51 +01:00
parent 151f2c3f3a
commit ccb3c3cb05
17 changed files with 148 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/generate-block-palette-spec.php
View File

@ -62,7 +62,7 @@ $reportMap = [];
foreach($states as $state){
$name = $state->getName();
$reportMap[$name] ??= [];
foreach($state->getStates() as $propertyName => $value){
foreach(Utils::stringifyKeys($state->getStates()) as $propertyName => $value){
if($value instanceof IntTag || $value instanceof StringTag){
$rawValue = $value->getValue();
}elseif($value instanceof ByteTag){

18
tools/generate-blockstate-upgrade-schema.php
View File

@ -97,8 +97,8 @@ function processState(BlockStateData $old, BlockStateData $new, BlockStateUpgrad
$propertyRemoved = [];
$propertyAdded = [];
foreach($oldStates as $propertyName => $oldProperty){
$newProperty = $newStates->getTag($propertyName);
foreach(Utils::stringifyKeys($oldStates) as $propertyName => $oldProperty){
$newProperty = $new->getState($propertyName);
if($newProperty === null){
$propertyRemoved[$propertyName] = $oldProperty;
}elseif(!$newProperty->equals($oldProperty)){
@ -112,8 +112,8 @@ function processState(BlockStateData $old, BlockStateData $new, BlockStateUpgrad
}
}
foreach($newStates as $propertyName => $value){
if($oldStates->getTag($propertyName) === null){
foreach(Utils::stringifyKeys($newStates) as $propertyName => $value){
if($old->getState($propertyName) === null){
$propertyAdded[$propertyName] = $value;
}
}
@ -179,9 +179,9 @@ function processState(BlockStateData $old, BlockStateData $new, BlockStateUpgrad
}
}else{
$result->remappedStates[$oldName][] = new BlockStateUpgradeSchemaBlockRemap(
$oldStates->getValue(),
$oldStates,
$new->getName(),
$newStates->getValue()
$newStates
);
\GlobalLogger::get()->warning("warning: multiple properties added and removed for $oldName; added full state remap");;
}
@ -231,11 +231,11 @@ function generateBlockStateUpgradeSchema(array $upgradeTable) : BlockStateUpgrad
}else{
//block mapped to multiple different new IDs; we can't guess these, so we just do a plain old remap
foreach($blockStateMappings as $mapping){
if($mapping->old->getName() !== $mapping->new->getName() || !$mapping->old->getStates()->equals($mapping->new->getStates())){
if(!$mapping->old->equals($mapping->new)){
$result->remappedStates[$mapping->old->getName()][] = new BlockStateUpgradeSchemaBlockRemap(
$mapping->old->getStates()->getValue(),
$mapping->old->getStates(),
$mapping->new->getName(),
$mapping->new->getStates()->getValue()
$mapping->new->getStates()
);
}
}