build(deps)!: update azalea and fix ecs changes

Author: ErrorNoInternet

Cargo.lock

@@ -30,7 +30,7 @@ function auto_fish()
 				sleep(3000)
 			end
 			hold_fishing_rod()
-			client:use_item()
+			client:start_use_item()
 		end
 	end, "auto-fish_watch-bobber")
 
@@ -41,7 +41,7 @@ function auto_fish()
 			end)[1]
 			if distance(current_bobber.position, particle.position) <= 0.75 then
 				FishLastCaught = os.time()
-				client:use_item()
+				client:start_use_item()
 			end
 		end
 	end, "auto-fish")
@@ -54,11 +54,11 @@ function auto_fish()
 
 		if os.time() - FishLastCaught >= 60 then
 			hold_fishing_rod()
-			client:use_item()
+			client:start_use_item()
 		end
 	end, "auto-fish_watchdog")
 
-	client:use_item()
+	client:start_use_item()
 end
 
 function stop_auto_fish()
@@ -71,7 +71,7 @@ function stop_auto_fish()
 		return e.id == FishingBobber.id
 	end)[1] then
 		FishingBobber = nil
-		client:use_item()
+		client:start_use_item()
 	end
 end
 
@@ -131,6 +131,6 @@ function check_food(hunger)
 			sleep(1000)
 			LastEaten = current_time
 		end
-		client:use_item()
+		client:start_use_item()
 	end
 end

lib/automation.lua

@@ -23,7 +23,7 @@ use crate::{
     replay::recorder::Recorder,
 };
 
-#[allow(clippy::too_many_lines)]
+#[allow(clippy::cognitive_complexity, clippy::too_many_lines)]
 pub async fn handle_event(client: Client, event: Event, state: State) -> Result<()> {
     match event {
         Event::AddPlayer(player_info) => {
@@ -35,6 +35,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
             let uuid = message.sender_uuid().map(|uuid| uuid.to_string());
             let is_whisper = message.is_whisper();
             let text = message.message();
+            let html_text = text.to_html();
             let ansi_text = text.to_ansi();
             info!("{ansi_text}");
 
@@ -86,6 +87,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
                 let table = state.lua.create_table()?;
                 table.set("text", text.to_string())?;
                 table.set("ansi_text", ansi_text)?;
+                table.set("html_text", html_text)?;
                 table.set("sender", sender)?;
                 table.set("content", content)?;
                 table.set("uuid", uuid)?;
@@ -101,6 +103,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
                     let message_table = state.lua.create_table()?;
                     message_table.set("text", packet.message.to_string())?;
                     message_table.set("ansi_text", packet.message.to_ansi())?;
+                    message_table.set("html_text", packet.message.to_html())?;
                     let table = state.lua.create_table()?;
                     table.set("message", message_table)?;
                     table.set("player_id", packet.player_id.0)?;
@@ -117,6 +120,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
                     let table = state.lua.create_table()?;
                     table.set("text", message.to_string())?;
                     table.set("ansi_text", message.to_ansi())?;
+                    table.set("html_text", message.to_html())?;
                     Ok(table)
                 })
                 .await
@@ -125,7 +129,6 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
             }
         }
         Event::KeepAlive(id) => call_listeners(&state, "keep_alive", || Ok(id)).await,
-        Event::Login => call_listeners(&state, "login", || Ok(())).await,
         Event::RemovePlayer(player_info) => {
             call_listeners(&state, "remove_player", || Ok(Player::from(player_info))).await
         }
@@ -201,6 +204,12 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
             }
             _ => Ok(()),
         },
+        Event::Login => {
+            #[cfg(feature = "matrix")]
+            matrix_init(&client, state.clone());
+
+            call_listeners(&state, "login", || Ok(())).await
+        }
         Event::Init => {
             debug!("received init event");
 
@@ -212,9 +221,6 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
                 exit(0);
             })?;
 
-            #[cfg(feature = "matrix")]
-            matrix_init(&client, state.clone());
-
             let globals = state.lua.globals();
             lua_init(client, &state, &globals).await?;
 

src/events.rs

@@ -3,19 +3,17 @@
 pub mod anti_knockback;
 
 use anti_knockback::anti_knockback;
-use azalea::{movement::handle_knockback, packet::game::process_packet_events};
+use azalea::{connection::read_packets, movement::handle_knockback};
 use bevy_app::{App, Plugin, PreUpdate};
-use bevy_ecs::schedule::IntoSystemConfigs;
+use bevy_ecs::schedule::IntoScheduleConfigs;
 
 pub struct HacksPlugin;
 
 impl Plugin for HacksPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
             PreUpdate,
-            anti_knockback
-                .after(process_packet_events)
-                .before(handle_knockback),
+            anti_knockback.after(read_packets).before(handle_knockback),
         );
     }
 }

src/hacks/mod.rs

@@ -60,7 +60,7 @@ pub async fn get_block_states(
                     true
                 })
             {
-                matched.push(block.id);
+                matched.push(block.id());
             }
         }
     }

src/lua/block.rs

@@ -4,7 +4,6 @@ use azalea::{
     prelude::ContainerClientExt,
     protocol::packets::game::ServerboundSetCarriedItem,
 };
-use log::error;
 use mlua::{Lua, Result, UserDataRef, Value};
 
 use super::{Client, Container, ContainerRef, ItemStack, Vec3};
@@ -126,11 +125,8 @@ pub fn set_held_slot(_lua: &Lua, client: &Client, slot: u8) -> Result<()> {
         inventory.selected_hotbar_slot = slot;
     };
 
-    if let Err(error) = client.write_packet(ServerboundSetCarriedItem {
+    client.write_packet(ServerboundSetCarriedItem {
         slot: u16::from(slot),
-    }) {
-        error!("failed to send SetCarriedItem packet: {error:?}");
-    }
-
+    });
     Ok(())
 }

src/lua/client/container.rs

@@ -1,9 +1,7 @@
 use azalea::{
-    BlockPos, BotClientExt,
-    protocol::packets::game::{ServerboundUseItem, s_interact::InteractionHand},
-    world::MinecraftEntityId,
+    BlockPos, BotClientExt, interact::StartUseItemEvent,
+    protocol::packets::game::s_interact::InteractionHand, world::MinecraftEntityId,
 };
-use log::error;
 use mlua::{Lua, Result, UserDataRef};
 
 use super::{Client, Vec3};
@@ -40,8 +38,8 @@ pub async fn mine(_lua: Lua, client: UserDataRef<Client>, position: Vec3) -> Res
     Ok(())
 }
 
-pub fn set_mining(_lua: &Lua, client: &Client, mining: bool) -> Result<()> {
-    client.left_click_mine(mining);
+pub fn set_mining(_lua: &Lua, client: &Client, state: bool) -> Result<()> {
+    client.left_click_mine(state);
     Ok(())
 }
 
@@ -55,18 +53,14 @@ pub fn start_mining(_lua: &Lua, client: &Client, position: Vec3) -> Result<()> {
     Ok(())
 }
 
-pub fn use_item(_lua: &Lua, client: &Client, hand: Option<u8>) -> Result<()> {
-    let direction = client.direction();
-    if let Err(error) = client.write_packet(ServerboundUseItem {
+pub fn start_use_item(_lua: &Lua, client: &Client, hand: Option<u8>) -> Result<()> {
+    client.ecs.lock().send_event(StartUseItemEvent {
+        entity: client.entity,
         hand: match hand {
             Some(1) => InteractionHand::OffHand,
             _ => InteractionHand::MainHand,
         },
-        sequence: 0,
-        yaw: direction.0,
-        pitch: direction.1,
-    }) {
-        error!("failed to send UseItem packet: {error:?}");
-    }
+        force_block: None,
+    });
     Ok(())
 }

src/lua/client/interaction.rs

@@ -64,14 +64,11 @@ impl UserData for Client {
         m.add_async_method("find_entities", world::find::entities);
         m.add_async_method("find_players", world::find::players);
         m.add_async_method("go_to", movement::go_to);
-        m.add_async_method(
-            "go_to_wait_until_reached",
-            movement::go_to_wait_until_reached,
-        );
         m.add_async_method("mine", interaction::mine);
         m.add_async_method("open_container_at", container::open_container_at);
         m.add_async_method("set_client_information", state::set_client_information);
         m.add_async_method("start_go_to", movement::start_go_to);
+        m.add_async_method("wait_until_goal_reached", movement::wait_until_goal_reached);
         m.add_method("attack", interaction::attack);
         m.add_method("best_tool_for_block", world::best_tool_for_block);
         m.add_method("block_interact", interaction::block_interact);
@@ -92,9 +89,9 @@ impl UserData for Client {
         m.add_method("set_sneaking", movement::set_sneaking);
         m.add_method("sprint", movement::sprint);
         m.add_method("start_mining", interaction::start_mining);
+        m.add_method("start_use_item", interaction::start_use_item);
         m.add_method("stop_pathfinding", movement::stop_pathfinding);
         m.add_method("stop_sleeping", movement::stop_sleeping);
-        m.add_method("use_item", interaction::use_item);
         m.add_method("walk", movement::walk);
     }
 }

src/lua/client/mod.rs

@@ -1,15 +1,15 @@
 use azalea::{
     BlockPos, BotClientExt, SprintDirection, WalkDirection,
+    core::hit_result::HitResult,
     entity::Position,
     interact::HitResultComponent,
     pathfinder::{
-        ExecutingPath, GotoEvent, Pathfinder, PathfinderClientExt,
+        ExecutingPath, Pathfinder, PathfinderClientExt,
         goals::{BlockPosGoal, Goal, InverseGoal, RadiusGoal, ReachBlockPosGoal, XZGoal, YGoal},
     },
     protocol::packets::game::{ServerboundPlayerCommand, s_player_command::Action},
     world::MinecraftEntityId,
 };
-use log::error;
 use mlua::{FromLua, Lua, Result, Table, UserDataRef, Value};
 
 use super::{Client, Direction, Vec3};
@@ -38,11 +38,13 @@ fn to_goal(lua: &Lua, client: &Client, data: Table, options: &Table, kind: u8) -
             })
         }
         2 => {
+            let distance = data.get("distance").unwrap_or(4.5);
             let pos = Vec3::from_lua(Value::Table(data), lua)?;
-            Box::new(ReachBlockPosGoal {
-                pos: BlockPos::new(pos.x as i32, pos.y as i32, pos.z as i32),
-                chunk_storage: client.world().read().chunks.clone(),
-            })
+            Box::new(ReachBlockPosGoal::new_with_distance(
+                BlockPos::new(pos.x as i32, pos.y as i32, pos.z as i32),
+                distance,
+                client.world().read().chunks.clone(),
+            ))
         }
         3 => Box::new(XZGoal {
             x: data.get("x")?,
@@ -70,11 +72,7 @@ pub fn go_to_reached(_lua: &Lua, client: &Client) -> Result<bool> {
     Ok(client.is_goto_target_reached())
 }
 
-pub async fn go_to_wait_until_reached(
-    _lua: Lua,
-    client: UserDataRef<Client>,
-    (): (),
-) -> Result<()> {
+pub async fn wait_until_goal_reached(_lua: Lua, client: UserDataRef<Client>, (): ()) -> Result<()> {
     client.wait_until_goto_target_reached().await;
     Ok(())
 }
@@ -121,11 +119,7 @@ pub async fn start_go_to(
     } else {
         client.start_goto(goal);
     }
-    while client.get_tick_broadcaster().recv().await.is_ok() {
-        if client.ecs.lock().get::<GotoEvent>(client.entity).is_none() {
-            break;
-        }
-    }
+    let _ = client.get_tick_broadcaster().recv().await;
 
     Ok(())
 }
@@ -148,16 +142,19 @@ pub fn jump(_lua: &Lua, client: &Client, (): ()) -> Result<()> {
 }
 
 pub fn looking_at(lua: &Lua, client: &Client) -> Result<Option<Table>> {
-    let result = client.component::<HitResultComponent>();
-    Ok(if result.miss {
-        None
-    } else {
-        let table = lua.create_table()?;
-        table.set("position", Vec3::from(result.block_pos))?;
-        table.set("inside", result.inside)?;
-        table.set("world_border", result.world_border)?;
-        Some(table)
-    })
+    Ok(
+        if let HitResult::Block(ref result) = *client.component::<HitResultComponent>() {
+            let table = lua.create_table()?;
+            table.set("direction", Vec3::from(result.direction.normal()))?;
+            table.set("inside", result.inside)?;
+            table.set("location", Vec3::from(result.location))?;
+            table.set("position", Vec3::from(result.block_pos))?;
+            table.set("world_border", result.world_border)?;
+            Some(table)
+        } else {
+            None
+        },
+    )
 }
 
 pub fn look_at(_lua: &Lua, client: &Client, position: Vec3) -> Result<()> {
@@ -215,17 +212,15 @@ pub fn set_position(_lua: &Lua, client: &Client, new_position: Vec3) -> Result<(
 }
 
 pub fn set_sneaking(_lua: &Lua, client: &Client, sneaking: bool) -> Result<()> {
-    if let Err(error) = client.write_packet(ServerboundPlayerCommand {
+    client.write_packet(ServerboundPlayerCommand {
         id: client.component::<MinecraftEntityId>(),
         action: if sneaking {
             Action::PressShiftKey
         } else {
             Action::ReleaseShiftKey
         },
         data: 0,
-    }) {
-        error!("failed to send PlayerCommand packet: {error:?}");
-    }
+    });
     Ok(())
 }
 
@@ -244,13 +239,11 @@ pub fn stop_pathfinding(_lua: &Lua, client: &Client, (): ()) -> Result<()> {
 }
 
 pub fn stop_sleeping(_lua: &Lua, client: &Client, (): ()) -> Result<()> {
-    if let Err(error) = client.write_packet(ServerboundPlayerCommand {
+    client.write_packet(ServerboundPlayerCommand {
         id: client.component::<MinecraftEntityId>(),
         action: Action::StopSleeping,
         data: 0,
-    }) {
-        error!("failed to send PlayerCommand packet: {error:?}");
-    }
+    });
     Ok(())
 }