From 3abd592b1fbb3651c70dd9515c038c3359cbea72 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Mon, 3 Jul 2023 18:07:51 +0100
Subject: [PATCH] Update to pmmp/BedrockBlockUpgradeSchema@3.0.0

---
 composer.json                                    |  2 +-
 composer.lock                                    | 16 ++++++++--------
 src/world/format/io/GlobalBlockStateHandlers.php |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 5a9a68d50..75cc519b0 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
       "adhocore/json-comment": "~1.2.0",
       "fgrosse/phpasn1": "~2.5.0",
       "pocketmine/netresearch-jsonmapper": "~v4.2.999",
-      "pocketmine/bedrock-block-upgrade-schema": "~2.2.0+bedrock-1.20.0",
+      "pocketmine/bedrock-block-upgrade-schema": "~3.0.0",
       "pocketmine/bedrock-data": "~2.3.0+bedrock-1.20.0",
       "pocketmine/bedrock-item-upgrade-schema": "~1.3.0+bedrock-1.20.0",
       "pocketmine/bedrock-protocol": "~22.0.0+bedrock-1.20.0",
diff --git a/composer.lock b/composer.lock
index c3aa53e98..b32764127 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": "3b102702eabc31fd8b2651db6c259397",
+    "content-hash": "ff0fa864a7853011bf4620d870c47ac7",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -198,16 +198,16 @@
         },
         {
             "name": "pocketmine/bedrock-block-upgrade-schema",
-            "version": "2.2.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git",
-                "reference": "79bb3ad542ef19e828fdf1fa6adc54f1fa4b3bb5"
+                "reference": "8b72c47109e174ac7f17c3ac546748f8e49a5fdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/79bb3ad542ef19e828fdf1fa6adc54f1fa4b3bb5",
-                "reference": "79bb3ad542ef19e828fdf1fa6adc54f1fa4b3bb5",
+                "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/8b72c47109e174ac7f17c3ac546748f8e49a5fdf",
+                "reference": "8b72c47109e174ac7f17c3ac546748f8e49a5fdf",
                 "shasum": ""
             },
             "type": "library",
@@ -218,9 +218,9 @@
             "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/2.2.0"
+                "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/3.0.0"
             },
-            "time": "2023-05-04T21:49:36+00:00"
+            "time": "2023-07-03T16:35:44+00:00"
         },
         {
             "name": "pocketmine/bedrock-data",
@@ -3020,7 +3020,7 @@
         "ext-openssl": "*",
         "ext-pcre": "*",
         "ext-phar": "*",
-        "ext-pmmpthread": "^6.0.1",
+        "ext-pmmpthread": "^6.0.4",
         "ext-reflection": "*",
         "ext-simplexml": "*",
         "ext-sockets": "*",
diff --git a/src/world/format/io/GlobalBlockStateHandlers.php b/src/world/format/io/GlobalBlockStateHandlers.php
index ed162c8ca..c1d3934cf 100644
--- a/src/world/format/io/GlobalBlockStateHandlers.php
+++ b/src/world/format/io/GlobalBlockStateHandlers.php
@@ -70,7 +70,7 @@ final class GlobalBlockStateHandlers{
 				BlockIdMetaUpgrader::loadFromString(
 					Filesystem::fileGetContents(Path::join(
 						BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH,
-						'1.12.0_to_1.18.10_blockstate_map.bin'
+						'id_meta_to_nbt/1.12.0.bin'
 					)),
 					LegacyBlockIdToStringIdMap::getInstance(),
 					$blockStateUpgrader