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

Now using new repository for block upgrade schemas

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-02-22 22:09:47 +00:00
parent 5415ca2fa9
commit a95749f968
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -34,7 +34,8 @@
"adhocore/json-comment": "^1.1",
"fgrosse/phpasn1": "^2.3",
"netresearch/jsonmapper": "^4.0",
"pocketmine/bedrock-data": "dev-experimental/upgrade-tables",
"pocketmine/bedrock-block-upgrade-schema": "dev-master@dev",
"pocketmine/bedrock-data": "~1.6.0+bedrock-1.18.10",
"pocketmine/bedrock-protocol": "~8.0.0+bedrock-1.18.10",
"pocketmine/binaryutils": "^0.2.1",
"pocketmine/callback-validator": "^1.0.2",

47
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "7b0434a812ea018e8e5491fcd4e81441",
"content-hash": "98a6d4ddd8c38237bc86945326a856d9",
"packages": [
{
"name": "adhocore/json-comment",
@ -248,17 +248,44 @@
"time": "2020-12-01T19:48:11+00:00"
},
{
"name": "pocketmine/bedrock-data",
"version": "dev-experimental/upgrade-tables",
"name": "pocketmine/bedrock-block-upgrade-schema",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/pmmp/BedrockData.git",
"reference": "b6ffd9dc61821358d65618d91f67e2ea21d421d0"
"url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git",
"reference": "871e5fa8ea56458c05154697f7bb2be3490441d7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/BedrockData/zipball/b6ffd9dc61821358d65618d91f67e2ea21d421d0",
"reference": "b6ffd9dc61821358d65618d91f67e2ea21d421d0",
"url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/871e5fa8ea56458c05154697f7bb2be3490441d7",
"reference": "871e5fa8ea56458c05154697f7bb2be3490441d7",
"shasum": ""
},
"default-branch": true,
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"CC0-1.0"
],
"description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves",
"support": {
"issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues",
"source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/master"
},
"time": "2022-02-22T22:00:27+00:00"
},
{
"name": "pocketmine/bedrock-data",
"version": "1.6.0+bedrock-1.18.10",
"source": {
"type": "git",
"url": "https://github.com/pmmp/BedrockData.git",
"reference": "e98c511584a7bd58a95986374d2df4b04c6a2ba0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/BedrockData/zipball/e98c511584a7bd58a95986374d2df4b04c6a2ba0",
"reference": "e98c511584a7bd58a95986374d2df4b04c6a2ba0",
"shasum": ""
},
"type": "library",
@ -269,9 +296,9 @@
"description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
"support": {
"issues": "https://github.com/pmmp/BedrockData/issues",
"source": "https://github.com/pmmp/BedrockData/tree/experimental/upgrade-tables"
"source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.18.10"
},
"time": "2022-02-11T20:20:39+00:00"
"time": "2022-02-08T19:13:47+00:00"
},
{
"name": "pocketmine/bedrock-protocol",
@ -3508,7 +3535,7 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"pocketmine/bedrock-data": 20
"pocketmine/bedrock-block-upgrade-schema": 20
},
"prefer-stable": false,
"prefer-lowest": false,

1
src/CoreConstants.php
View File

@ -37,4 +37,5 @@ define('pocketmine\PATH', dirname(__DIR__) . '/');
define('pocketmine\RESOURCE_PATH', dirname(__DIR__) . '/resources/');
define('pocketmine\BEDROCK_DATA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-data/');
define('pocketmine\LOCALE_DATA_PATH', dirname(__DIR__) . '/vendor/pocketmine/locale-data/');
define('pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-block-upgrade-schema/');
define('pocketmine\COMPOSER_AUTOLOADER_PATH', dirname(__DIR__) . '/vendor/autoload.php');

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

@ -38,7 +38,7 @@ use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap;
use pocketmine\errorhandler\ErrorToExceptionHandler;
use Webmozart\PathUtil\Path;
use function file_get_contents;
use const pocketmine\BEDROCK_DATA_PATH;
use const pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH;
/**
* Provides global access to blockstate serializers for all world providers.
@ -58,7 +58,7 @@ final class GlobalBlockStateHandlers{
return self::$blockStateDeserializer ??= new CachingBlockStateDeserializer(
new UpgradingBlockStateDeserializer(
new BlockStateUpgrader(BlockStateUpgradeSchemaUtils::loadSchemas(
Path::join(BEDROCK_DATA_PATH, 'upgrade_schema'),
Path::join(BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH, 'nbt_upgrade_schema'),
BlockStateData::CURRENT_VERSION
)),
new BlockStateToBlockObjectDeserializer()
@ -72,7 +72,10 @@ final class GlobalBlockStateHandlers{
public static function getLegacyBlockStateMapper() : LegacyBlockStateMapper{
return self::$legacyBlockStateMapper ??= LegacyBlockStateMapper::loadFromString(
ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents(Path::join(BEDROCK_DATA_PATH, 'r12_to_current_block_map.bin'))),
ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents(Path::join(
BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH,
'1.12.0_to_1.18.10_blockstate_map.bin'
))),
LegacyBlockIdToStringIdMap::getInstance()
);
}