From 3c46bf01c609d4459dbcb322c53469e3adad87cc Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 2 Feb 2023 14:47:38 +0000 Subject: [PATCH] Begin removing dependence on obsolete files from BedrockData these files were only kept for backwards compatibility, and aren't actively maintained. They are only needed for legacy conversions in the modern day era. --- composer.json | 2 + composer.lock | 54 ++++++++++++++++++- src/CoreConstants.php | 2 + .../bedrock/LegacyBlockIdToStringIdMap.php | 2 +- .../bedrock/LegacyItemIdToStringIdMap.php | 2 +- 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c4570bb09..bd1a85af9 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,9 @@ "adhocore/json-comment": "^1.1", "fgrosse/phpasn1": "^2.3", "netresearch/jsonmapper": "^4.0", + "pocketmine/bedrock-block-upgrade-schema": "^1.0.0", "pocketmine/bedrock-data": "~1.13.0+bedrock-1.19.50", + "pocketmine/bedrock-item-upgrade-schema": "^1.0.0", "pocketmine/bedrock-protocol": "~18.1.0+bedrock-1.19.50", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", diff --git a/composer.lock b/composer.lock index e8987fccf..6829f4a65 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "2c0f273b515174abfdcef4fc4ad3c262", + "content-hash": "a9e05a8358faee33178bac5279d864f4", "packages": [ { "name": "adhocore/json-comment", @@ -248,6 +248,32 @@ }, "time": "2022-12-08T20:46:14+00:00" }, + { + "name": "pocketmine/bedrock-block-upgrade-schema", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git", + "reference": "a05ce434eb7f8c11058d26833bc975fe635b23b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/a05ce434eb7f8c11058d26833bc975fe635b23b4", + "reference": "a05ce434eb7f8c11058d26833bc975fe635b23b4", + "shasum": "" + }, + "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/1.0.0" + }, + "time": "2023-02-01T21:09:54+00:00" + }, { "name": "pocketmine/bedrock-data", "version": "1.13.0+bedrock-1.19.50", @@ -274,6 +300,32 @@ }, "time": "2022-11-30T16:19:59+00:00" }, + { + "name": "pocketmine/bedrock-item-upgrade-schema", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", + "reference": "7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7", + "reference": "7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7", + "shasum": "" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "CC0-1.0" + ], + "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves", + "support": { + "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues", + "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.0.0" + }, + "time": "2023-02-01T22:50:02+00:00" + }, { "name": "pocketmine/bedrock-protocol", "version": "18.1.0+bedrock-1.19.50", diff --git a/src/CoreConstants.php b/src/CoreConstants.php index 7b0345b1c..c18486237 100644 --- a/src/CoreConstants.php +++ b/src/CoreConstants.php @@ -37,4 +37,6 @@ 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\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-item-upgrade-schema/'); define('pocketmine\COMPOSER_AUTOLOADER_PATH', dirname(__DIR__) . '/vendor/autoload.php'); diff --git a/src/data/bedrock/LegacyBlockIdToStringIdMap.php b/src/data/bedrock/LegacyBlockIdToStringIdMap.php index 35c24caf9..8b4a1365c 100644 --- a/src/data/bedrock/LegacyBlockIdToStringIdMap.php +++ b/src/data/bedrock/LegacyBlockIdToStringIdMap.php @@ -30,6 +30,6 @@ final class LegacyBlockIdToStringIdMap extends LegacyToStringBidirectionalIdMap{ use SingletonTrait; public function __construct(){ - parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'block_id_map.json')); + parent::__construct(Path::join(\pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH, 'block_legacy_id_map.json')); } } diff --git a/src/data/bedrock/LegacyItemIdToStringIdMap.php b/src/data/bedrock/LegacyItemIdToStringIdMap.php index 254ad96bb..9f5c257dd 100644 --- a/src/data/bedrock/LegacyItemIdToStringIdMap.php +++ b/src/data/bedrock/LegacyItemIdToStringIdMap.php @@ -30,6 +30,6 @@ final class LegacyItemIdToStringIdMap extends LegacyToStringBidirectionalIdMap{ use SingletonTrait; public function __construct(){ - parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'item_id_map.json')); + parent::__construct(Path::join(\pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, 'item_id_map.json')); } }