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

Move block permutation generation into Block

Browse Source 
this allows sealing off a whole bunch of internal APIs.
This commit is contained in:
Dylan K. Taylor
2023-04-21 20:38:28 +01:00
parent 6c0ad9589b
commit d4ca566fd0
3 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/block/RuntimeBlockStateRegistry.php
View File

@ -25,11 +25,9 @@ namespace pocketmine\block;
use pocketmine\block\BlockBreakInfo as BreakInfo;
use pocketmine\block\BlockIdentifier as BID;
use pocketmine\data\runtime\InvalidSerializedRuntimeDataException;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\SingletonTrait;
use pocketmine\world\light\LightUpdate;
use function get_class;
use function min;
/**
@ -82,33 +80,6 @@ class RuntimeBlockStateRegistry{
}
}
/**
* Generates all the possible valid blockstates for a given block type.
*
* @phpstan-return \Generator<int, Block, void, void>
*/
private static function generateAllStatesForType(Block $block) : \Generator{
//TODO: this bruteforce approach to discovering all valid states is very inefficient for larger state data sizes
//at some point we'll need to find a better way to do this
$bits = $block->getRequiredTypeDataBits() + $block->getRequiredStateDataBits();
if($bits > Block::INTERNAL_STATE_DATA_BITS){
throw new \InvalidArgumentException("Block state data cannot use more than " . Block::INTERNAL_STATE_DATA_BITS . " bits");
}
for($stateData = 0; $stateData < (1 << $bits); ++$stateData){
$v = clone $block;
try{
$v->decodeTypeAndStateData($stateData);
if($v->computeTypeAndStateData() !== $stateData){
throw new \LogicException(get_class($block) . "::decodeStateData() accepts invalid state data (returned " . $v->computeTypeAndStateData() . " for input $stateData)");
}
}catch(InvalidSerializedRuntimeDataException){ //invalid property combination, leave it
continue;
}
yield $v;
}
}
/**
* Maps a block type to its corresponding type ID. This is necessary for the block to be recognized when loading
* from disk, and also when being read at runtime.
@ -130,7 +101,7 @@ class RuntimeBlockStateRegistry{
$this->typeIndex[$typeId] = clone $block;
foreach(self::generateAllStatesForType($block) as $v){
foreach($block->generateStatePermutations() as $v){
$this->fillStaticArrays($v->getStateId(), $v);
}
}