1.21.40 BC

NetherGamesMC · Dec 5, 2024 · 0420e77 · 0420e77
1 parent 2780ce3
commit 0420e77
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/composer.lock b/composer.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",