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

Switch to modernized BedrockData

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-05-12 15:30:35 +01:00
parent c1a01e91bf
commit 6c92e73b46
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -35,7 +35,7 @@
"fgrosse/phpasn1": "^2.3", "fgrosse/phpasn1": "^2.3",
"netresearch/jsonmapper": "^4.0", "netresearch/jsonmapper": "^4.0",
"pocketmine/bedrock-block-upgrade-schema": "dev-master@dev", "pocketmine/bedrock-block-upgrade-schema": "dev-master@dev",
"pocketmine/bedrock-data": "~1.7.0+bedrock-1.18.30", "pocketmine/bedrock-data": "dev-modern-world-support@dev",
"pocketmine/bedrock-protocol": "~9.0.0+bedrock-1.18.30", "pocketmine/bedrock-protocol": "~9.0.0+bedrock-1.18.30",
"pocketmine/binaryutils": "^0.2.1", "pocketmine/binaryutils": "^0.2.1",
"pocketmine/callback-validator": "^1.0.2", "pocketmine/callback-validator": "^1.0.2",

17
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0d40189fe566643df70bf3eee5a9b126", "content-hash": "f9bd717430394f8e47f421ce1aecaf32",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -276,16 +276,16 @@
}, },
{ {
"name": "pocketmine/bedrock-data", "name": "pocketmine/bedrock-data",
"version": "1.7.0+bedrock-1.18.30", "version": "dev-modern-world-support",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/BedrockData.git", "url": "https://github.com/pmmp/BedrockData.git",
"reference": "c8f323ff0cbdb36a5d95e7e4a23969f562445be0" "reference": "5f94ed0af2e3f301671b1d10073219133178c9c4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/BedrockData/zipball/c8f323ff0cbdb36a5d95e7e4a23969f562445be0", "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/5f94ed0af2e3f301671b1d10073219133178c9c4",
"reference": "c8f323ff0cbdb36a5d95e7e4a23969f562445be0", "reference": "5f94ed0af2e3f301671b1d10073219133178c9c4",
"shasum": "" "shasum": ""
}, },
"type": "library", "type": "library",
@ -296,9 +296,9 @@
"description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP", "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
"support": { "support": {
"issues": "https://github.com/pmmp/BedrockData/issues", "issues": "https://github.com/pmmp/BedrockData/issues",
"source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.18.30" "source": "https://github.com/pmmp/BedrockData/tree/modern-world-support"
}, },
"time": "2022-04-20T12:40:59+00:00" "time": "2022-05-12T14:21:14+00:00"
}, },
{ {
"name": "pocketmine/bedrock-protocol", "name": "pocketmine/bedrock-protocol",
@ -3442,7 +3442,8 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"pocketmine/bedrock-block-upgrade-schema": 20 "pocketmine/bedrock-block-upgrade-schema": 20,
"pocketmine/bedrock-data": 20
}, },
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,

2
src/data/bedrock/LegacyBlockIdToStringIdMap.php
View File

@ -30,6 +30,6 @@ final class LegacyBlockIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
use SingletonTrait; use SingletonTrait;
public function __construct(){ 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'));
} }
} }