diff --git a/composer.lock b/composer.lock index f9a583ba7e..8ea0ef71aa 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": "96188ac156ef8d0a92c03ebd91d28a8d", + "content-hash": "cc78afec28d859d1d0c1a93cf9ad6384", "packages": [ { "name": "adhocore/json-comment", @@ -131,12 +131,12 @@ "source": { "type": "git", "url": "https://github.com/NetherGamesMC/BedrockData.git", - "reference": "2e8861f2cc2ce81f11baa5dee28dd23e01625893" + "reference": "c362136334a90b85a0a429ea1c558feab62e39d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/NetherGamesMC/BedrockData/zipball/2e8861f2cc2ce81f11baa5dee28dd23e01625893", - "reference": "2e8861f2cc2ce81f11baa5dee28dd23e01625893", + "url": "https://api.github.com/repos/NetherGamesMC/BedrockData/zipball/c362136334a90b85a0a429ea1c558feab62e39d0", + "reference": "c362136334a90b85a0a429ea1c558feab62e39d0", "shasum": "" }, "default-branch": true, @@ -148,7 +148,7 @@ "support": { "source": "https://github.com/NetherGamesMC/BedrockData/tree/master" }, - "time": "2024-10-23T22:00:31+00:00" + "time": "2024-12-05T08:09:30+00:00" }, { "name": "nethergamesmc/bedrock-protocol", @@ -156,12 +156,12 @@ "source": { "type": "git", "url": "https://github.com/NetherGamesMC/BedrockProtocol.git", - "reference": "b1ad8fa6321bafdd7057624e9ff3570309509995" + "reference": "42d92d093a91ce70d3dd7aa161990d08cfba9bf7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/NetherGamesMC/BedrockProtocol/zipball/b1ad8fa6321bafdd7057624e9ff3570309509995", - "reference": "b1ad8fa6321bafdd7057624e9ff3570309509995", + "url": "https://api.github.com/repos/NetherGamesMC/BedrockProtocol/zipball/42d92d093a91ce70d3dd7aa161990d08cfba9bf7", + "reference": "42d92d093a91ce70d3dd7aa161990d08cfba9bf7", "shasum": "" }, "require": { @@ -203,7 +203,7 @@ "support": { "source": "https://github.com/NetherGamesMC/BedrockProtocol/tree/master" }, - "time": "2024-10-24T13:25:25+00:00" + "time": "2024-12-05T08:09:02+00:00" }, { "name": "pocketmine/bedrock-block-upgrade-schema", @@ -233,16 +233,16 @@ }, { "name": "pocketmine/bedrock-item-upgrade-schema", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", - "reference": "1dee9bbd0aaa65ed108b377b402746defe10b3b0" + "reference": "9fc7c9bbb558a017395c1cb7dd819c033ee971bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/1dee9bbd0aaa65ed108b377b402746defe10b3b0", - "reference": "1dee9bbd0aaa65ed108b377b402746defe10b3b0", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/9fc7c9bbb558a017395c1cb7dd819c033ee971bb", + "reference": "9fc7c9bbb558a017395c1cb7dd819c033ee971bb", "shasum": "" }, "type": "library", @@ -253,9 +253,9 @@ "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.13.0" + "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.14.0" }, - "time": "2024-10-23T18:38:43+00:00" + "time": "2024-12-04T12:22:49+00:00" }, { "name": "pocketmine/binaryutils", diff --git a/src/data/bedrock/BedrockDataFiles.php b/src/data/bedrock/BedrockDataFiles.php index 14afc6413d..19784cdcf4 100644 --- a/src/data/bedrock/BedrockDataFiles.php +++ b/src/data/bedrock/BedrockDataFiles.php @@ -44,6 +44,7 @@ private function __construct(){ public const BLOCK_ID_TO_ITEM_ID_MAP_1_21_2_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.21.2.json'; public const BLOCK_ID_TO_ITEM_ID_MAP_1_21_20_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.21.20.json'; public const BLOCK_ID_TO_ITEM_ID_MAP_1_21_30_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.21.30.json'; + public const BLOCK_ID_TO_ITEM_ID_MAP_1_21_40_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.21.40.json'; public const BLOCK_ID_TO_ITEM_ID_MAP_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map.json'; public const BLOCK_PROPERTIES_TABLE_JSON = BEDROCK_DATA_PATH . '/block_properties_table.json'; public const BLOCK_STATE_META_MAP_1_20_0_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.20.0.json'; @@ -57,6 +58,7 @@ private function __construct(){ public const BLOCK_STATE_META_MAP_1_21_2_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.21.2.json'; public const BLOCK_STATE_META_MAP_1_21_20_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.21.20.json'; public const BLOCK_STATE_META_MAP_1_21_30_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.21.30.json'; + public const BLOCK_STATE_META_MAP_1_21_40_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.21.40.json'; public const BLOCK_STATE_META_MAP_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map.json'; public const CANONICAL_BLOCK_STATES_1_20_0_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.20.0.nbt'; public const CANONICAL_BLOCK_STATES_1_20_10_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.20.10.nbt'; @@ -69,6 +71,7 @@ private function __construct(){ public const CANONICAL_BLOCK_STATES_1_21_2_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.21.2.nbt'; public const CANONICAL_BLOCK_STATES_1_21_20_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.21.20.nbt'; public const CANONICAL_BLOCK_STATES_1_21_30_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.21.30.nbt'; + public const CANONICAL_BLOCK_STATES_1_21_40_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.21.40.nbt'; public const CANONICAL_BLOCK_STATES_NBT = BEDROCK_DATA_PATH . '/canonical_block_states.nbt'; public const COMMAND_ARG_TYPES_JSON = BEDROCK_DATA_PATH . '/command_arg_types.json'; public const CREATIVEITEMS_JSON = BEDROCK_DATA_PATH . '/creativeitems.json'; @@ -102,5 +105,6 @@ private function __construct(){ public const REQUIRED_ITEM_LIST_1_21_2_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.21.2.json'; public const REQUIRED_ITEM_LIST_1_21_20_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.21.20.json'; public const REQUIRED_ITEM_LIST_1_21_30_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.21.30.json'; + public const REQUIRED_ITEM_LIST_1_21_40_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.21.40.json'; public const REQUIRED_ITEM_LIST_JSON = BEDROCK_DATA_PATH . '/required_item_list.json'; } diff --git a/src/data/bedrock/ItemTagToIdMap.php b/src/data/bedrock/ItemTagToIdMap.php index a73ece1f6b..d25b5e051a 100644 --- a/src/data/bedrock/ItemTagToIdMap.php +++ b/src/data/bedrock/ItemTagToIdMap.php @@ -46,6 +46,7 @@ final class ItemTagToIdMap{ private const PATHS = [ ProtocolInfo::CURRENT_PROTOCOL => "", + ProtocolInfo::PROTOCOL_1_21_40 => "", ProtocolInfo::PROTOCOL_1_21_30 => "", ProtocolInfo::PROTOCOL_1_21_20 => "", ProtocolInfo::PROTOCOL_1_21_2 => "", diff --git a/src/network/mcpe/convert/BlockTranslator.php b/src/network/mcpe/convert/BlockTranslator.php index f0d99b85ac..89de6a3e70 100644 --- a/src/network/mcpe/convert/BlockTranslator.php +++ b/src/network/mcpe/convert/BlockTranslator.php @@ -46,6 +46,10 @@ final class BlockTranslator{ self::CANONICAL_BLOCK_STATES_PATH => '', self::BLOCK_STATE_META_MAP_PATH => '', ], + ProtocolInfo::PROTOCOL_1_21_40 => [ + self::CANONICAL_BLOCK_STATES_PATH => '-1.21.40', + self::BLOCK_STATE_META_MAP_PATH => '-1.21.40', + ], ProtocolInfo::PROTOCOL_1_21_30 => [ self::CANONICAL_BLOCK_STATES_PATH => '-1.21.30', self::BLOCK_STATE_META_MAP_PATH => '-1.21.30', diff --git a/src/network/mcpe/convert/ItemTranslator.php b/src/network/mcpe/convert/ItemTranslator.php index 98131b7792..febd41fb49 100644 --- a/src/network/mcpe/convert/ItemTranslator.php +++ b/src/network/mcpe/convert/ItemTranslator.php @@ -137,6 +137,8 @@ public function fromNetworkId(int $networkId, int $networkMeta, int $networkBloc public static function getItemSchemaId(int $protocolId) : int{ return match($protocolId){ + ProtocolInfo::PROTOCOL_1_21_50 => 231, + ProtocolInfo::PROTOCOL_1_21_40 => 221, ProtocolInfo::PROTOCOL_1_21_30 => 211, diff --git a/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php b/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php index 573ce72961..a1fc86cae0 100644 --- a/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php +++ b/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php @@ -41,6 +41,7 @@ final class ItemTypeDictionaryFromDataHelper{ private const PATHS = [ ProtocolInfo::CURRENT_PROTOCOL => "", + ProtocolInfo::PROTOCOL_1_21_40 => "-1.21.40", ProtocolInfo::PROTOCOL_1_21_30 => "-1.21.30", ProtocolInfo::PROTOCOL_1_21_20 => "-1.21.20", ProtocolInfo::PROTOCOL_1_21_2 => "-1.21.2",