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

Author: mat-1

CHANGELOG.md

@@ -17,7 +17,7 @@ is breaking anyways, semantic versioning is not followed.
 
 ### Changed
 
-- Update to Minecraft 1.21.10. (help from @eihqnh)
+- Update to Minecraft 1.21.11. (with help from @eihqnh)
 - Update to Bevy 0.17.
 - `Client::query`, `map_component`, and `map_get_component` were replaced by `Client::query_self`.
 - Rename `SendPacketEvent` to `SendGamePacketEvent` and `PingEvent` to `GamePingEvent`.

Cargo.lock

@@ -22,7 +22,7 @@ resolver = "3"
 # --- Workspace Settings ---
 
 [workspace.package]
-version = "0.14.0+mc1.21.10"
+version = "0.14.0+mc1.21.11"
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/azalea-rs/azalea"

Cargo.toml

@@ -10,7 +10,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.
 
 <!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->
 
-_Currently supported Minecraft version: `1.21.10`._
+_Currently supported Minecraft version: `1.21.11`._
 
 > [!WARNING]
 > Many parts of Azalea are still unfinished and will receive breaking changes in the future. Most breaking changes will be listed in the [changelog](CHANGELOG.md).

README.md

@@ -115,7 +115,7 @@ pub fn process_packet(ecs: &mut World, player: Entity, packet: &ClientboundGameP
             delete_chat,
             explode,
             forget_level_chunk,
-            horse_screen_open,
+            mount_screen_open,
             map_item_data,
             merchant_offers,
             move_vehicle,
@@ -1283,7 +1283,7 @@ impl GamePacketHandler<'_> {
         });
     }
 
-    pub fn horse_screen_open(&mut self, _p: &ClientboundHorseScreenOpen) {}
+    pub fn mount_screen_open(&mut self, _p: &ClientboundMountScreenOpen) {}
 
     pub fn map_item_data(&mut self, _p: &ClientboundMapItemData) {}
 

azalea-client/src/plugins/packet/game/mod.rs

@@ -7,14 +7,15 @@
 
 use std::{collections::HashMap, io::Cursor};
 
+use azalea_buf::AzBuf;
 use indexmap::IndexMap;
 use simdnbt::{
     Deserialize, FromNbtTag, Serialize, ToNbtTag,
     owned::{NbtCompound, NbtTag},
 };
 use tracing::error;
 
-use crate::identifier::Identifier;
+use crate::{codec_utils::*, identifier::Identifier};
 
 /// The base of the registry.
 ///
@@ -330,12 +331,16 @@ pub struct TrimPatternElement {
     pub pattern: HashMap<String, String>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(
+    Debug, Clone, serde::Serialize, simdnbt::Serialize, simdnbt::Deserialize, AzBuf, PartialEq,
+)]
 #[cfg_attr(feature = "strict_registry", simdnbt(deny_unknown_fields))]
 pub struct DamageTypeElement {
     pub message_id: String,
     pub scaling: String,
     pub exhaustion: f32,
+    #[serde(skip_serializing_if = "is_default")]
     pub effects: Option<String>,
+    #[serde(skip_serializing_if = "is_default")]
     pub death_message_type: Option<String>,
 }

azalea-core/src/registry_holder.rs

@@ -5,6 +5,6 @@ use crate::identifier::Identifier;
 
 #[derive(Clone, Debug, PartialEq, AzBuf, Serialize)]
 pub struct CustomSound {
-    pub location: Identifier,
-    pub fixed_range: Option<f32>,
+    pub sound_id: Identifier,
+    pub range: Option<f32>,
 }

azalea-core/src/sound.rs

@@ -90,6 +90,7 @@ pub enum EntityDataValue {
     WolfSoundVariant(azalea_registry::WolfSoundVariant),
     FrogVariant(azalea_registry::FrogVariant),
     PigVariant(azalea_registry::PigVariant),
+    ZombieNautilusVariant(azalea_registry::ZombieNautilusVariant),
     OptionalGlobalPos(Option<GlobalPos>),
     PaintingVariant(azalea_registry::PaintingVariant),
     SnifferState(SnifferStateKind),
@@ -99,6 +100,7 @@ pub enum EntityDataValue {
     Vector3(Vec3f32),
     Quaternion(Quaternion),
     ResolvableProfile(components::Profile),
+    HumanoidArm(HumanoidArm),
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -209,3 +211,10 @@ pub enum WeatheringCopperStateKind {
     Weathered,
     Oxidized,
 }
+
+#[derive(AzBuf, Clone, Copy, Debug, PartialEq, Eq, Default)]
+pub enum HumanoidArm {
+    Left = 0,
+    #[default]
+    Right = 1,
+}

azalea-entity/src/data.rs

@@ -79,6 +79,7 @@ impl From<EntityKind> for EntityDimensions {
             EntityKind::Breeze => EntityDimensions::new(0.6, 1.77).eye_height(1.3452),
             EntityKind::BreezeWindCharge => EntityDimensions::new(0.3125, 0.3125).eye_height(0.0),
             EntityKind::Camel => EntityDimensions::new(1.7, 2.375).eye_height(2.275),
+            EntityKind::CamelHusk => EntityDimensions::new(1.7, 2.375).eye_height(2.275),
             EntityKind::Cat => EntityDimensions::new(0.6, 0.7).eye_height(0.35),
             EntityKind::CaveSpider => EntityDimensions::new(0.7, 0.5).eye_height(0.45),
             EntityKind::CherryBoat => EntityDimensions::new(1.375, 0.5625).eye_height(0.5625),
@@ -150,6 +151,7 @@ impl From<EntityKind> for EntityDimensions {
             EntityKind::Minecart => EntityDimensions::new(0.98, 0.7),
             EntityKind::Mooshroom => EntityDimensions::new(0.9, 1.4).eye_height(1.3),
             EntityKind::Mule => EntityDimensions::new(1.39648, 1.6).eye_height(1.52),
+            EntityKind::Nautilus => EntityDimensions::new(0.875, 0.95).eye_height(0.2751),
             EntityKind::OakBoat => EntityDimensions::new(1.375, 0.5625).eye_height(0.5625),
             EntityKind::OakChestBoat => EntityDimensions::new(1.375, 0.5625).eye_height(0.5625),
             EntityKind::Ocelot => EntityDimensions::new(0.6, 0.7),
@@ -158,6 +160,7 @@ impl From<EntityKind> for EntityDimensions {
             EntityKind::PaleOakBoat => EntityDimensions::new(1.375, 0.5625).eye_height(0.5625),
             EntityKind::PaleOakChestBoat => EntityDimensions::new(1.375, 0.5625).eye_height(0.5625),
             EntityKind::Panda => EntityDimensions::new(1.3, 1.25),
+            EntityKind::Parched => EntityDimensions::new(0.6, 1.99).eye_height(1.74),
             EntityKind::Parrot => EntityDimensions::new(0.5, 0.9).eye_height(0.54),
             EntityKind::Phantom => EntityDimensions::new(0.9, 0.5).eye_height(0.175),
             EntityKind::Pig => EntityDimensions::new(0.9, 0.9),
@@ -212,6 +215,7 @@ impl From<EntityKind> for EntityDimensions {
             EntityKind::Zoglin => EntityDimensions::new(1.39648, 1.4),
             EntityKind::Zombie => EntityDimensions::new(0.6, 1.95).eye_height(1.74),
             EntityKind::ZombieHorse => EntityDimensions::new(1.39648, 1.6).eye_height(1.52),
+            EntityKind::ZombieNautilus => EntityDimensions::new(0.875, 0.95).eye_height(0.2751),
             EntityKind::ZombieVillager => EntityDimensions::new(0.6, 1.95).eye_height(1.74),
             EntityKind::ZombifiedPiglin => EntityDimensions::new(0.6, 1.95).eye_height(1.79),
         }