From 6c92e73b4648c85d852ea9a76ee04320e2ef0fe9 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Thu, 12 May 2022 15:30:35 +0100
Subject: [PATCH] Switch to modernized BedrockData

---
 composer.json                                   |  2 +-
 composer.lock                                   | 17 +++++++++--------
 src/data/bedrock/LegacyBlockIdToStringIdMap.php |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 001acdafd..1362c107a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
       "fgrosse/phpasn1": "^2.3",
       "netresearch/jsonmapper": "^4.0",
       "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/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "^1.0.2",
diff --git a/composer.lock b/composer.lock
index 95591e8e4..1b627715e 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": "0d40189fe566643df70bf3eee5a9b126",
+    "content-hash": "f9bd717430394f8e47f421ce1aecaf32",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -276,16 +276,16 @@
         },
         {
             "name": "pocketmine/bedrock-data",
-            "version": "1.7.0+bedrock-1.18.30",
+            "version": "dev-modern-world-support",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockData.git",
-                "reference": "c8f323ff0cbdb36a5d95e7e4a23969f562445be0"
+                "reference": "5f94ed0af2e3f301671b1d10073219133178c9c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/c8f323ff0cbdb36a5d95e7e4a23969f562445be0",
-                "reference": "c8f323ff0cbdb36a5d95e7e4a23969f562445be0",
+                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/5f94ed0af2e3f301671b1d10073219133178c9c4",
+                "reference": "5f94ed0af2e3f301671b1d10073219133178c9c4",
                 "shasum": ""
             },
             "type": "library",
@@ -296,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/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",
@@ -3442,7 +3442,8 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "pocketmine/bedrock-block-upgrade-schema": 20
+        "pocketmine/bedrock-block-upgrade-schema": 20,
+        "pocketmine/bedrock-data": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/src/data/bedrock/LegacyBlockIdToStringIdMap.php b/src/data/bedrock/LegacyBlockIdToStringIdMap.php
index 5c52fa972..1165cf9e0 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'));
 	}
 }