merge main

Author: mat-1

Cargo.lock

@@ -33,16 +33,16 @@ aes = "0.8.4"
 anyhow = "1.0.95"
 async-recursion = "1.1.1"
 base64 = "0.22.1"
-bevy_app = "0.15.1"
-bevy_ecs = { version = "0.15.1", default-features = false }
-bevy_log = "0.15.1"
-bevy_tasks = "0.15.1"
-bevy_time = "0.15.1"
+bevy_app = "0.15.2"
+bevy_ecs = { version = "0.15.2", default-features = false }
+bevy_log = "0.15.2"
+bevy_tasks = "0.15.2"
+bevy_time = "0.15.2"
 byteorder = "1.5.0"
 cfb8 = "0.8.1"
 chrono = { version = "0.4.39", default-features = false }
 criterion = "0.5.1"
-derive_more = "1.0.0"
+derive_more = "2.0.1"
 enum-as-inner = "0.6.1"
 env_logger = "0.11.6"
 flate2 = "1.0.35"
@@ -61,20 +61,20 @@ regex = "1.11.1"
 reqwest = { version = "0.12.12", default-features = false }
 rsa = "0.9.7"
 rsa_public_encrypt_pkcs1 = "0.4.0"
-rustc-hash = "2.1.0"
+rustc-hash = "2.1.1"
 serde = "1.0.217"
 serde_json = "1.0.138"
 sha-1 = "0.10.1"
 sha2 = "0.10.8"
 simdnbt = "0.7"
 socks5-impl = "0.6.1"
-syn = "2.0.97"
+syn = "2.0.98"
 thiserror = "2.0.11"
 tokio = "1.43.0"
 tokio-util = "0.7.13"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
-hickory-resolver = { version = "0.24.2", default-features = false }
+hickory-resolver = { version = "0.24.3", default-features = false }
 uuid = "1.12.1"
 num-format = "0.4.4"
 indexmap = "2.7.1"

Cargo.toml

@@ -1,5 +1,4 @@
 #![doc = include_str!("../README.md")]
-#![feature(trait_upcasting)]
 
 mod behavior;
 pub mod block_state;

azalea-block/src/lib.rs

@@ -86,7 +86,7 @@ pub fn handle_attack_event(
         send_packet_events.send(SendPacketEvent::new(
             event.entity,
             ServerboundInteract {
-                entity_id: *event.target,
+                entity_id: event.target,
                 action: s_interact::ActionType::Attack,
                 using_secondary_action: **sneaking,
             },

azalea-client/src/attack.rs

@@ -717,7 +717,7 @@ impl Client {
     ///
     /// This is a shortcut for `*bot.component::<TabList>()`.
     pub fn tab_list(&self) -> HashMap<Uuid, PlayerInfo> {
-        self.component::<TabList>().deref().clone()
+        (*self.component::<TabList>()).clone()
     }
 
     /// Call the given function with the client's [`RegistryHolder`].

azalea-client/src/client.rs

@@ -5,7 +5,6 @@
 //! [`azalea_protocol`]: https://docs.rs/azalea-protocol
 //! [`azalea`]: https://docs.rs/azalea
 
-#![allow(incomplete_features)]
 #![feature(error_generic_member_access)]
 
 mod account;

azalea-client/src/lib.rs

@@ -303,7 +303,7 @@ fn send_sprinting_if_needed(
             send_packet_events.send(SendPacketEvent::new(
                 entity,
                 ServerboundPlayerCommand {
-                    id: **minecraft_entity_id,
+                    id: *minecraft_entity_id,
                     action: sprinting_action,
                     data: 0,
                 },

azalea-client/src/movement.rs

@@ -25,7 +25,7 @@ use tracing::{debug, error, trace, warn};
 
 use crate::{
     chat::{ChatPacket, ChatReceivedEvent},
-    chunks,
+    chunks, declare_packet_handlers,
     disconnect::DisconnectEvent,
     inventory::{
         ClientSideCloseContainerEvent, Inventory, MenuOpenedEvent, SetContainerContentEvent,
@@ -38,23 +38,6 @@ use crate::{
     ClientInformation, PlayerInfo,
 };
 
-macro_rules! packets {
-    (
-        $packetenum:ident,
-        $packetvar:ident,
-        $handler:ident,
-        [$($packet:path),+ $(,)?]
-    ) => {
-        paste::paste! {
-           match $packetvar.as_ref() {
-                $(
-                    $packetenum::[< $packet:camel >](p) => $handler.$packet(p),
-                )+
-            }
-        }
-    };
-}
-
 pub fn process_packet_events(ecs: &mut World) {
     let mut events_owned = Vec::<(Entity, Arc<ClientboundGamePacket>)>::new();
 
@@ -77,7 +60,7 @@ pub fn process_packet_events(ecs: &mut World) {
             ecs,
         };
 
-        packets!(
+        declare_packet_handlers!(
             ClientboundGamePacket,
             packet,
             handler,
@@ -321,7 +304,7 @@ impl GamePacketHandler<'_> {
                         azalea_registry::EntityKind::Player,
                         new_instance_name,
                     );
-                    let entity_id = MinecraftEntityId(p.player_id);
+                    let entity_id = p.player_id;
                     // insert our components into the ecs :)
                     commands.entity(self.player).insert((
                         entity_id,
@@ -682,7 +665,7 @@ impl GamePacketHandler<'_> {
                 let (mut entity_id_index, instance_name, tab_list) =
                     query.get_mut(self.player).unwrap();
 
-                let entity_id = MinecraftEntityId(p.id);
+                let entity_id = p.id;
 
                 let Some(instance_name) = instance_name else {
                     warn!("got add player packet but we haven't gotten a login packet yet");
@@ -759,7 +742,7 @@ impl GamePacketHandler<'_> {
         )>(self.ecs, |(mut commands, query, entity_kind_query)| {
             let (entity_id_index, instance_holder) = query.get(self.player).unwrap();
 
-            let entity = entity_id_index.get(MinecraftEntityId(p.id));
+            let entity = entity_id_index.get(p.id);
 
             let Some(entity) = entity else {
                 // some servers like hypixel trigger this a lot :(
@@ -813,7 +796,7 @@ impl GamePacketHandler<'_> {
             |(mut commands, query)| {
                 let (entity_id_index, instance_holder) = query.get(self.player).unwrap();
 
-                let Some(entity) = entity_id_index.get(MinecraftEntityId(p.id)) else {
+                let Some(entity) = entity_id_index.get(p.id) else {
                     // note that this log (and some other ones like the one in RemoveEntities)
                     // sometimes happens when killing mobs. it seems to be a vanilla bug, which is
                     // why it's a debug log instead of a warning
@@ -886,7 +869,7 @@ impl GamePacketHandler<'_> {
             |(mut commands, mut query)| {
                 let (entity_id_index, instance_holder) = query.get_mut(self.player).unwrap();
 
-                let Some(entity) = entity_id_index.get(MinecraftEntityId(p.id)) else {
+                let Some(entity) = entity_id_index.get(p.id) else {
                     warn!("Got teleport entity packet for unknown entity id {}", p.id);
                     return;
                 };
@@ -931,7 +914,7 @@ impl GamePacketHandler<'_> {
 
                 debug!("Got move entity pos packet {p:?}");
 
-                let Some(entity) = entity_id_index.get(MinecraftEntityId(p.entity_id)) else {
+                let Some(entity) = entity_id_index.get(p.entity_id) else {
                     debug!(
                         "Got move entity pos packet for unknown entity id {}",
                         p.entity_id
@@ -971,7 +954,7 @@ impl GamePacketHandler<'_> {
 
                 debug!("Got move entity pos rot packet {p:?}");
 
-                let entity = entity_id_index.get(MinecraftEntityId(p.entity_id));
+                let entity = entity_id_index.get(p.entity_id);
 
                 let Some(entity) = entity else {
                     // often triggered by hypixel :(
@@ -1023,7 +1006,7 @@ impl GamePacketHandler<'_> {
             |(mut commands, mut query)| {
                 let (entity_id_index, instance_holder) = query.get_mut(self.player).unwrap();
 
-                let entity = entity_id_index.get(MinecraftEntityId(p.entity_id));
+                let entity = entity_id_index.get(p.entity_id);
                 if let Some(entity) = entity {
                     let new_look_direction = LookDirection {
                         x_rot: (p.x_rot as i32 * 360) as f32 / 256.,
@@ -1053,25 +1036,6 @@ impl GamePacketHandler<'_> {
         );
     }
     pub fn keep_alive(&mut self, p: &ClientboundKeepAlive) {
-        /*
-        debug!("Got keep alive packet {p:?} for {player_entity:?}");
-
-        let mut system_state: SystemState<(
-            EventWriter<KeepAliveEvent>,
-            EventWriter<SendPacketEvent>,
-        )> = SystemState::new(ecs);
-        let (mut keepalive_events, mut send_packet_events) = system_state.get_mut(ecs);
-
-        keepalive_events.send(KeepAliveEvent {
-            entity: player_entity,
-            id: p.id,
-        });
-        send_packet_events.send(SendPacketEvent::new(
-            player_entity,
-            ServerboundKeepAlive { id: p.id },
-        ));
-        */
-
         debug!("Got keep alive packet {p:?} for {:?}", self.player);
 
         as_system::<(EventWriter<KeepAliveEvent>, EventWriter<SendPacketEvent>)>(
@@ -1101,7 +1065,7 @@ impl GamePacketHandler<'_> {
                 };
 
                 for &id in &p.entity_ids {
-                    let Some(entity) = entity_id_index.remove(MinecraftEntityId(id)) else {
+                    let Some(entity) = entity_id_index.remove(id) else {
                         debug!("Tried to remove entity with id {id} but it wasn't in the EntityIdIndex");
                         continue;
                     };
@@ -1417,7 +1381,7 @@ impl GamePacketHandler<'_> {
         )>(self.ecs, |(mut commands, mut query, mut events)| {
             let (entity_id, dead) = query.get_mut(self.player).unwrap();
 
-            if **entity_id == p.player_id && dead.is_none() {
+            if *entity_id == p.player_id && dead.is_none() {
                 commands.entity(self.player).insert(Dead);
                 events.send(DeathEvent {
                     entity: self.player,
@@ -1551,7 +1515,7 @@ impl GamePacketHandler<'_> {
             |(mut commands, mut query)| {
                 let (entity_id_index, instance_holder) = query.get_mut(self.player).unwrap();
 
-                let Some(entity) = entity_id_index.get(MinecraftEntityId(p.id)) else {
+                let Some(entity) = entity_id_index.get(p.id) else {
                     debug!("Got teleport entity packet for unknown entity id {}", p.id);
                     return;
                 };

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

@@ -79,3 +79,21 @@ impl Plugin for PacketHandlerPlugin {
         .add_event::<SendLoginPacketEvent>();
     }
 }
+
+#[macro_export]
+macro_rules! declare_packet_handlers {
+    (
+        $packetenum:ident,
+        $packetvar:ident,
+        $handler:ident,
+        [$($packet:path),+ $(,)?]
+    ) => {
+        paste::paste! {
+           match $packetvar.as_ref() {
+                $(
+                    $packetenum::[< $packet:camel >](p) => $handler.$packet(p),
+                )+
+            }
+        }
+    };
+}

azalea-client/src/packet/mod.rs

@@ -22,7 +22,7 @@ use azalea_protocol::packets::{
     ConnectionProtocol, Packet, ProtocolPacket,
 };
 use azalea_registry::DimensionType;
-use azalea_world::Instance;
+use azalea_world::{Instance, MinecraftEntityId};
 use bevy_app::App;
 use bevy_app::PluginGroup;
 use bevy_ecs::{prelude::*, schedule::ExecutorKind};
@@ -67,7 +67,7 @@ fn test_set_health_before_login() {
     assert_eq!(*simulation.component::<Health>(), 15.);
 
     simulation.receive_packet(ClientboundLogin {
-        player_id: 0,
+        player_id: MinecraftEntityId(0),
         hardcore: false,
         levels: vec![],
         max_players: 20,