mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-27 13:49:55 +00:00
Code Issues Projects Releases Wiki Activity

Rename LegacyBlockStateMapper -> BlockIdMetaUpgrader

Browse Source 
this more accurately describes what it's used for.
This commit is contained in:
Dylan K. Taylor 2022-07-19 15:32:08 +01:00
parent b0a492c063
commit afaf9dbc88
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/bedrock/block/upgrade/BlockDataUpgrader.php
View File

@ -30,7 +30,7 @@ use pocketmine\nbt\tag\CompoundTag;
final class BlockDataUpgrader{ final class BlockDataUpgrader{
public function __construct( public function __construct(
private LegacyBlockStateMapper $legacyBlockStateMapper, private BlockIdMetaUpgrader $legacyBlockStateMapper,
private BlockStateUpgrader $blockStateUpgrader private BlockStateUpgrader $blockStateUpgrader
){} ){}

2
src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php → src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php
View File

@ -30,7 +30,7 @@ use pocketmine\utils\BinaryStream;
/** /**
* Handles translating legacy 1.12 block ID/meta into modern blockstates. * Handles translating legacy 1.12 block ID/meta into modern blockstates.
*/ */
final class LegacyBlockStateMapper{ final class BlockIdMetaUpgrader{
/** /**
* @param BlockStateData[][] $mappingTable * @param BlockStateData[][] $mappingTable
* @phpstan-param array<string, array<int, BlockStateData>> $mappingTable * @phpstan-param array<string, array<int, BlockStateData>> $mappingTable

4
src/world/format/io/GlobalBlockStateHandlers.php
View File

@ -31,10 +31,10 @@ use pocketmine\data\bedrock\block\CachingBlockStateSerializer;
use pocketmine\data\bedrock\block\convert\BlockObjectToBlockStateSerializer; use pocketmine\data\bedrock\block\convert\BlockObjectToBlockStateSerializer;
use pocketmine\data\bedrock\block\convert\BlockStateToBlockObjectDeserializer; use pocketmine\data\bedrock\block\convert\BlockStateToBlockObjectDeserializer;
use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader; use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader;
use pocketmine\data\bedrock\block\upgrade\BlockIdMetaUpgrader;
use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader; use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader;
use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils; use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils;
use pocketmine\data\bedrock\block\upgrade\LegacyBlockIdToStringIdMap; use pocketmine\data\bedrock\block\upgrade\LegacyBlockIdToStringIdMap;
use pocketmine\data\bedrock\block\upgrade\LegacyBlockStateMapper;
use pocketmine\errorhandler\ErrorToExceptionHandler; use pocketmine\errorhandler\ErrorToExceptionHandler;
use Webmozart\PathUtil\Path; use Webmozart\PathUtil\Path;
use function file_get_contents; use function file_get_contents;
@ -69,7 +69,7 @@ final class GlobalBlockStateHandlers{
BlockStateData::CURRENT_VERSION BlockStateData::CURRENT_VERSION
)); ));
self::$blockDataUpgrader = new BlockDataUpgrader( self::$blockDataUpgrader = new BlockDataUpgrader(
LegacyBlockStateMapper::loadFromString( BlockIdMetaUpgrader::loadFromString(
ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents(Path::join( ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents(Path::join(
BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH, BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH,
'1.12.0_to_1.18.10_blockstate_map.bin' '1.12.0_to_1.18.10_blockstate_map.bin'