From f704bfb63ae83e5755220bf4a4493cee2d721c96 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 23 Feb 2023 21:52:17 +0000 Subject: [PATCH] Use BedrockData 2.0.0 --- composer.json | 2 +- composer.lock | 14 +++++++------- src/data/bedrock/BedrockDataFiles.php | 4 ---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index cef3836d0..7e2f99bbe 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "fgrosse/phpasn1": "^2.3", "netresearch/jsonmapper": "^4.0", "pocketmine/bedrock-block-upgrade-schema": "^1.0.0", - "pocketmine/bedrock-data": "~1.14.0+bedrock-1.19.60", + "pocketmine/bedrock-data": "~2.0.0+bedrock-1.19.60", "pocketmine/bedrock-item-upgrade-schema": "^1.0.0", "pocketmine/bedrock-protocol": "~19.3.0+bedrock-1.19.62", "pocketmine/binaryutils": "^0.2.1", diff --git a/composer.lock b/composer.lock index 55fe67b56..4ac53fdd4 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": "402f78d672d4e0bd8f092272bf7d82d7", + "content-hash": "751296f0dc345e8e74017e65b1a36ba3", "packages": [ { "name": "adhocore/json-comment", @@ -276,16 +276,16 @@ }, { "name": "pocketmine/bedrock-data", - "version": "1.14.0+bedrock-1.19.60", + "version": "2.0.0+bedrock-1.19.60", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockData.git", - "reference": "7b06234ec6e1f4fb06ad4b2f177e606c25df9b46" + "reference": "957e49b2381641af29f595e4f32ded3e76ce4723" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/7b06234ec6e1f4fb06ad4b2f177e606c25df9b46", - "reference": "7b06234ec6e1f4fb06ad4b2f177e606c25df9b46", + "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/957e49b2381641af29f595e4f32ded3e76ce4723", + "reference": "957e49b2381641af29f595e4f32ded3e76ce4723", "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.19.60" + "source": "https://github.com/pmmp/BedrockData/tree/2.0.0+bedrock-1.19.60" }, - "time": "2023-02-08T18:32:01+00:00" + "time": "2023-02-23T21:25:04+00:00" }, { "name": "pocketmine/bedrock-item-upgrade-schema", diff --git a/src/data/bedrock/BedrockDataFiles.php b/src/data/bedrock/BedrockDataFiles.php index 731c91120..2c9350ca3 100644 --- a/src/data/bedrock/BedrockDataFiles.php +++ b/src/data/bedrock/BedrockDataFiles.php @@ -34,7 +34,6 @@ final class BedrockDataFiles{ public const BIOME_DEFINITIONS_NBT = BEDROCK_DATA_PATH . '/biome_definitions.nbt'; public const BIOME_DEFINITIONS_FULL_NBT = BEDROCK_DATA_PATH . '/biome_definitions_full.nbt'; public const BIOME_ID_MAP_JSON = BEDROCK_DATA_PATH . '/biome_id_map.json'; - public const BLOCK_ID_MAP_JSON = BEDROCK_DATA_PATH . '/block_id_map.json'; public const BLOCK_ID_TO_ITEM_ID_MAP_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map.json'; public const BLOCK_STATE_META_MAP_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map.json'; public const CANONICAL_BLOCK_STATES_NBT = BEDROCK_DATA_PATH . '/canonical_block_states.nbt'; @@ -42,13 +41,10 @@ final class BedrockDataFiles{ public const CREATIVEITEMS_JSON = BEDROCK_DATA_PATH . '/creativeitems.json'; public const ENTITY_ID_MAP_JSON = BEDROCK_DATA_PATH . '/entity_id_map.json'; public const ENTITY_IDENTIFIERS_NBT = BEDROCK_DATA_PATH . '/entity_identifiers.nbt'; - public const ITEM_ID_MAP_JSON = BEDROCK_DATA_PATH . '/item_id_map.json'; public const ITEM_TAGS_JSON = BEDROCK_DATA_PATH . '/item_tags.json'; public const LEVEL_SOUND_ID_MAP_JSON = BEDROCK_DATA_PATH . '/level_sound_id_map.json'; public const PARTICLE_ID_MAP_JSON = BEDROCK_DATA_PATH . '/particle_id_map.json'; - public const R12_BLOCK_STATES_JSON = BEDROCK_DATA_PATH . '/r12_block_states.json'; public const R12_TO_CURRENT_BLOCK_MAP_BIN = BEDROCK_DATA_PATH . '/r12_to_current_block_map.bin'; public const R16_TO_CURRENT_ITEM_MAP_JSON = BEDROCK_DATA_PATH . '/r16_to_current_item_map.json'; - public const RECIPES_JSON = BEDROCK_DATA_PATH . '/recipes.json'; public const REQUIRED_ITEM_LIST_JSON = BEDROCK_DATA_PATH . '/required_item_list.json'; }