From 84cd261118c9d1e3145d4d1751c0d22098cd8cd8 Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Tue, 9 Dec 2025 11:23:45 -0600 Subject: 1.21.11 (#273) * run codegen for 25w44a * 25w44a * 25w46a * rename ResourceLocation to Identifier per mojmap changes * update changelog * 1.21.11-pre1 * 1.21.11-pre2 * 1.21.11-pre3 * add AttackRange fields from pre4 * 1.21.11-rc3 * 1.21.11 --- azalea-protocol/src/common/client_information.rs | 8 +------- azalea-protocol/src/packets/game/c_horse_screen_open.rs | 12 ------------ azalea-protocol/src/packets/game/c_mount_screen_open.rs | 12 ++++++++++++ azalea-protocol/src/packets/game/c_set_entity_data.rs | 17 ----------------- azalea-protocol/src/packets/game/mod.rs | 2 +- azalea-protocol/src/packets/mod.rs | 4 ++-- 6 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 azalea-protocol/src/packets/game/c_horse_screen_open.rs create mode 100644 azalea-protocol/src/packets/game/c_mount_screen_open.rs (limited to 'azalea-protocol/src') diff --git a/azalea-protocol/src/common/client_information.rs b/azalea-protocol/src/common/client_information.rs index 5dedd1a8..c5dd83d7 100644 --- a/azalea-protocol/src/common/client_information.rs +++ b/azalea-protocol/src/common/client_information.rs @@ -2,6 +2,7 @@ use std::io::{self, Cursor}; use azalea_buf::{AzBuf, AzaleaRead, AzaleaWrite}; use azalea_core::bitset::FixedBitSet; +use azalea_entity::HumanoidArm; use bevy_ecs::component::Component; /// A component that contains some of the "settings" for this client that are @@ -60,13 +61,6 @@ pub enum ChatVisibility { Hidden = 2, } -#[derive(AzBuf, Clone, Copy, Debug, PartialEq, Eq, Default)] -pub enum HumanoidArm { - Left = 0, - #[default] - Right = 1, -} - #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct ModelCustomization { pub cape: bool, diff --git a/azalea-protocol/src/packets/game/c_horse_screen_open.rs b/azalea-protocol/src/packets/game/c_horse_screen_open.rs deleted file mode 100644 index 4d139c8a..00000000 --- a/azalea-protocol/src/packets/game/c_horse_screen_open.rs +++ /dev/null @@ -1,12 +0,0 @@ -use azalea_buf::AzBuf; -use azalea_protocol_macros::ClientboundGamePacket; -use azalea_world::MinecraftEntityId; - -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] -pub struct ClientboundHorseScreenOpen { - #[var] - pub container_id: i32, - #[var] - pub inventory_columns: u32, - pub entity_id: MinecraftEntityId, -} diff --git a/azalea-protocol/src/packets/game/c_mount_screen_open.rs b/azalea-protocol/src/packets/game/c_mount_screen_open.rs new file mode 100644 index 00000000..6669d8c1 --- /dev/null +++ b/azalea-protocol/src/packets/game/c_mount_screen_open.rs @@ -0,0 +1,12 @@ +use azalea_buf::AzBuf; +use azalea_protocol_macros::ClientboundGamePacket; +use azalea_world::MinecraftEntityId; + +#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +pub struct ClientboundMountScreenOpen { + #[var] + pub container_id: i32, + #[var] + pub inventory_columns: u32, + pub entity_id: MinecraftEntityId, +} diff --git a/azalea-protocol/src/packets/game/c_set_entity_data.rs b/azalea-protocol/src/packets/game/c_set_entity_data.rs index f51a42a4..88aa04d9 100644 --- a/azalea-protocol/src/packets/game/c_set_entity_data.rs +++ b/azalea-protocol/src/packets/game/c_set_entity_data.rs @@ -18,23 +18,6 @@ mod tests { use super::*; - #[test] - fn test_read_hypixel_entity_data_2() { - let contents = [ - 161, 21, 2, 6, 0, 5, 8, 0, 6, 21, 0, 7, 1, 0, 1, 1, 172, 2, 3, 8, 0, 4, 8, 0, 9, 1, 0, - 0, 0, 0, 8, 7, 1, 186, 9, 2, 0, 5, 10, 9, 0, 5, 101, 120, 116, 114, 97, 10, 0, 0, 0, 1, - 8, 0, 5, 99, 111, 108, 111, 114, 0, 9, 100, 97, 114, 107, 95, 97, 113, 117, 97, 1, 0, - 4, 98, 111, 108, 100, 1, 8, 0, 4, 116, 101, 120, 116, 0, 18, 67, 108, 111, 117, 100, - 32, 82, 101, 103, 101, 110, 101, 114, 97, 116, 105, 111, 110, 0, 8, 0, 4, 116, 101, - 120, 116, 0, 0, 1, 0, 6, 105, 116, 97, 108, 105, 99, 0, 0, 41, 1, 31, 0, 0, 0, 255, - ]; - let mut buf = Cursor::new(contents.as_slice()); - let packet = ClientboundSetEntityData::azalea_read(&mut buf).unwrap(); - println!("{packet:?}"); - - assert_eq!(buf.position(), contents.len() as u64); - } - #[test] fn test_read_6b6t_entity_data() { let contents = [ diff --git a/azalea-protocol/src/packets/game/mod.rs b/azalea-protocol/src/packets/game/mod.rs index 60de984d..3235231c 100644 --- a/azalea-protocol/src/packets/game/mod.rs +++ b/azalea-protocol/src/packets/game/mod.rs @@ -45,7 +45,7 @@ declare_state_packets!(GamePacket, forget_level_chunk, game_event, game_test_highlight_pos, - horse_screen_open, + mount_screen_open, hurt_animation, initialize_border, keep_alive, diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index cbcf4d6d..9d96b75c 100644 --- a/azalea-protocol/src/packets/mod.rs +++ b/azalea-protocol/src/packets/mod.rs @@ -11,8 +11,8 @@ use azalea_buf::{AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, BufReadError}; use crate::read::ReadPacketError; -pub const PROTOCOL_VERSION: i32 = 773; -pub const VERSION_NAME: &str = "1.21.10"; +pub const PROTOCOL_VERSION: i32 = 774; +pub const VERSION_NAME: &str = "1.21.11"; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum ConnectionProtocol { -- cgit v1.2.3