refactor(commands): directly use native encryption function

Should work on 1.21.5 now.

.github/workflows/build.yaml

@@ -10,12 +10,17 @@ on:
 
 jobs:
     errornowatcher:
-        name: errornowatcher (${{ matrix.os }})
+        name: errornowatcher (${{ matrix.os }}, ${{ matrix.feature.name }})
         runs-on: ${{ matrix.os }}
 
         strategy:
             matrix:
                 os: [ubuntu-24.04, ubuntu-24.04-arm]
+                feature:
+                    - name: default
+
+                    - name: mimalloc
+                      flags: "-F mimalloc"
 
         steps:
             - name: Clone repository
@@ -33,16 +38,15 @@ jobs:
                       ~/.cargo/registry/cache/
                       ~/.cargo/git/db/
                       target/
-                  key: build-${{ matrix.os }}-${{ hashFiles('**.toml', 'Cargo.*') }}
+                  key: build_${{ matrix.os }}_${{ matrix.feature.name }}_${{ hashFiles('**.toml', 'Cargo.*') }}
 
             - name: Switch to nightly toolchain
               run: rustup default nightly
 
-            - name: Build in release mode
-              run: cargo build --release
+            - run: cargo build --release ${{ matrix.feature.flags }}
 
             - name: Upload build artifacts
               uses: actions/upload-artifact@v4
               with:
-                  name: errornowatcher_${{ matrix.os }}
+                  name: errornowatcher_${{ matrix.feature.name }}_${{ matrix.os }}
                   path: target/release/errornowatcher

.github/workflows/lint.yaml

@@ -28,9 +28,23 @@ jobs:
               run: taplo fmt --check Cargo.toml
 
     rust:
-        name: Rust
+        name: Rust (${{ matrix.feature.name }})
         runs-on: ubuntu-24.04
 
+        strategy:
+            matrix:
+                feature:
+                    - name: default
+
+                    - name: minimal+mimalloc
+                      flags: "--no-default-features -F mimalloc"
+
+                    - name: minimal
+                      flags: "--no-default-features"
+
+                    - name: mimalloc
+                      flags: "-F mimalloc"
+
         steps:
             - name: Clone repository
               uses: actions/checkout@v4
@@ -47,7 +61,7 @@ jobs:
                       ~/.cargo/registry/cache/
                       ~/.cargo/git/db/
                       target/
-                  key: build-${{ matrix.os }}-${{ hashFiles('**.toml', 'Cargo.*') }}
+                  key: lint_${{ matrix.feature.name }}_${{ hashFiles('**.toml', 'Cargo.*') }}
 
             - name: Switch to nightly toolchain
               run: rustup default nightly
@@ -55,9 +69,7 @@ jobs:
             - name: Install components
               run: rustup component add clippy rustfmt
 
-            - name: cargo clippy
-              run: cargo clippy -- -D clippy::pedantic
+            - run: cargo clippy ${{ matrix.feature.flags }} -- -D warnings -D clippy::pedantic
 
-            - name: cargo fmt
-              if: always()
+            - if: always()
               run: cargo fmt --check

Cargo.toml

@@ -21,27 +21,31 @@ built = { git = "https://github.com/lukaslueg/built", features = ["git2"] }
 [dependencies]
 anyhow = "1"
 azalea = { git = "https://github.com/azalea-rs/azalea" }
-azalea-hax = { git = "https://github.com/azalea-rs/azalea-hax" }
 bevy_app = "0"
 bevy_ecs = "0"
 bevy_log = "0"
 clap = { version = "4", features = ["derive", "string"] }
 console-subscriber = { version = "0", optional = true }
-ctrlc = { version = "3", features = ["termination"] }
+ctrlc = "3"
+dirs = { version = "6", optional = true }
 futures = "0"
 futures-locks = "0"
 http-body-util = "0"
 hyper = { version = "1", features = ["server"] }
 hyper-util = "0"
-log = { version = "0" }
+log = "0"
+matrix-sdk = { version = "0", features = ["anyhow"], optional = true }
 mimalloc = { version = "0", optional = true }
 mlua = { version = "0", features = ["async", "luajit", "send"] }
 ncr = { version = "0", features = ["cfb8", "ecb", "gcm"] }
 parking_lot = "0"
+serde = "1"
 serde_json = "1"
-tokio = { version = "1", features = ["macros"] }
+tokio = { version = "1", features = ["full"] }
 zip = { version = "2", default-features = false, features = ["flate2"] }
 
 [features]
 console-subscriber = ["dep:console-subscriber"]
+default = ["matrix"]
+matrix = ["dep:dirs", "dep:matrix-sdk"]
 mimalloc = ["dep:mimalloc"]

README.md

@@ -5,14 +5,15 @@ A Minecraft bot with Lua scripting support, written in Rust with [azalea](https:
 ## Features
 
 - Running Lua from
-    - `errornowatcher.lua`
     - in-game chat messages
+    - Matrix chat messages
     - POST requests to HTTP server
 - Listening to in-game events
 - Pathfinding (from azalea)
 - Entity and chest interaction
 - NoChatReports encryption
 - Saving ReplayMod recordings
+- Matrix integration (w/ E2EE)
 
 ## Usage
 
@@ -23,4 +24,4 @@ $ cargo build --release
 $ # ./target/release/errornowatcher
 ```
 
-Make sure the `Server` and `Username` globals are defined in `errornowatcher.lua` before starting the bot.
+Make sure the `Server` and `Username` globals are defined in `main.lua` before starting the bot.

lib/automation.lua

@@ -111,6 +111,10 @@ function attack_entities(target_kind, minimum)
 end
 
 function check_food(hunger)
+	if not hunger then
+		hunger = client.hunger
+	end
+
 	if hunger.food >= 20 then
 		return
 	end

lib/events.lua

@@ -63,7 +63,7 @@ function update_listeners()
 			end,
 			eat = function()
 				sleep(5000)
-				check_food(client.hunger)
+				check_food()
 			end,
 		},
 		death = {

lib/inventory.lua

@@ -35,9 +35,6 @@ end
 function steal(item_name)
 	for _, chest_pos in ipairs(client:find_blocks(client.position, get_block_states({ "chest" }))) do
 		client:go_to({ position = chest_pos, radius = 3 }, { type = RADIUS_GOAL })
-		while client.pathfinder.is_calculating or client.pathfinder.is_executing do
-			sleep(500)
-		end
 		client:look_at(chest_pos)
 
 		local container = client:open_container_at(chest_pos)

lib/utils.lua

@@ -45,30 +45,28 @@ function entity_speed(uuid, seconds)
 	return speed
 end
 
-function tps(seconds)
-	if not seconds then
-		seconds = 1
+function tps(ms)
+	if not ms then
+		ms = 1000
 	end
 
 	add_listener("tick", function()
 		if not TpsTracking.ticks then
 			TpsTracking.ticks = 0
-			TpsTracking.start = clock_gettime(0)
+			sleep(ms)
+			TpsTracking.result = TpsTracking.ticks
+			remove_listeners("tick", "tps_tracking")
 		else
 			TpsTracking.ticks = TpsTracking.ticks + 1
-			if TpsTracking.ticks >= seconds * 20 then
-				TpsTracking.stop = clock_gettime(0)
-				remove_listeners("tick", "tps_tracking")
-			end
 		end
 	end, "tps_tracking")
 
-	sleep(seconds * 1000)
+	sleep(ms)
 	repeat
 		sleep(20)
-	until TpsTracking.stop
+	until TpsTracking.result
 
-	local tps = seconds * 20 / (TpsTracking.stop - TpsTracking.start)
+	local tps = TpsTracking.result / (ms / 1000)
 	TpsTracking = {}
 	return tps
 end
@@ -95,9 +93,6 @@ function nether_travel(pos, go_to_opts)
 
 	info(string.format("currently in nether, going to %.2f %.2f", nether_pos.x, nether_pos.z))
 	client:go_to(nether_pos, { type = XZ_GOAL })
-	while client.pathfinder.is_calculating or client.pathfinder.is_executing do
-		sleep(1000)
-	end
 
 	info("arrived, looking for nearest portal")
 	local portals_nether = client:find_blocks(client.position, portal_block_states)
@@ -146,10 +141,6 @@ function interact_bed()
 	end
 
 	client:go_to({ position = bed, radius = 2 }, { type = RADIUS_GOAL, options = { without_mining = true } })
-	while client.pathfinder.is_calculating or client.pathfinder.is_executing do
-		sleep(500)
-	end
-
 	client:look_at(bed)
 	client:block_interact(bed)
 end

main.lua

@@ -2,6 +2,7 @@ Server = "localhost"
 Username = "ErrorNoWatcher"
 HttpAddress = "127.0.0.1:8080"
 Owners = { "ErrorNoInternet" }
+MatrixOptions = { owners = { "@errornointernet:envs.net" } }
 
 for _, module in ipairs({
 	"lib",

rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly"

rustfmt.toml

@@ -0,0 +1 @@
+group_imports = "StdExternalCrate"

src/arguments.rs

@@ -1,16 +1,18 @@
-use crate::build_info;
-use clap::Parser;
 use std::path::PathBuf;
 
+use clap::Parser;
+
+use crate::build_info;
+
 /// A Minecraft bot with Lua scripting support
 #[derive(Parser)]
 #[command(version = build_info::version_formatted())]
 pub struct Arguments {
-    /// Path to Lua entry point
-    #[arg(short, long, default_value = "errornowatcher.lua")]
-    pub script: PathBuf,
+    /// Path to main Lua file
+    #[arg(short, long)]
+    pub script: Option<PathBuf>,
 
-    /// Code to execute after loading script
+    /// Code to execute (after script)
     #[arg(short, long)]
     pub exec: Option<String>,
 }

src/commands.rs

@@ -1,11 +1,16 @@
-use crate::{
-    State,
-    lua::{eval, exec, reload},
-};
 use azalea::{brigadier::prelude::*, chat::ChatPacket, prelude::*};
 use futures::lock::Mutex;
-use mlua::{Function, Table};
-use ncr::utils::prepend_header;
+use mlua::{Error, Result, Table, UserDataRef};
+use ncr::{
+    encoding::{Base64Encoding, Base64rEncoding, NewBase64rEncoding},
+    encryption::{CaesarEncryption, Cfb8Encryption, EcbEncryption, Encryption, GcmEncryption},
+    utils::prepend_header,
+};
+
+use crate::{
+    State, crypt,
+    lua::{eval, exec, nochatreports::key::AesKey, reload},
+};
 
 pub type Ctx = CommandContext<Mutex<CommandSource>>;
 
@@ -18,21 +23,26 @@ pub struct CommandSource {
 
 impl CommandSource {
     pub fn reply(&self, message: &str) {
+        fn encrypt(options: &Table, plaintext: &str) -> Result<String> {
+            Ok(crypt!(encrypt, options, &prepend_header(plaintext)))
+        }
+
         for mut chunk in message
             .chars()
             .collect::<Vec<char>>()
             .chunks(if self.ncr_options.is_some() { 150 } else { 236 })
             .map(|chars| chars.iter().collect::<String>())
         {
-            if let Some(options) = &self.ncr_options
-                && let Ok(encrypt) = self.state.lua.globals().get::<Function>("ncr_encrypt")
-                && let Ok(ciphertext) = encrypt.call::<String>((options, prepend_header(&chunk)))
+            if let Some(ciphertext) = self
+                .ncr_options
+                .as_ref()
+                .and_then(|options| encrypt(options, &chunk).ok())
             {
                 chunk = ciphertext;
             }
             self.client.chat(
                 &(if self.message.is_whisper()
-                    && let Some(username) = self.message.username()
+                    && let Some(username) = self.message.sender()
                 {
                     format!("/w {username} {chunk}")
                 } else {
@@ -48,10 +58,10 @@ pub fn register(commands: &mut CommandDispatcher<Mutex<CommandSource>>) {
         let source = ctx.source.clone();
         tokio::spawn(async move {
             let source = source.lock().await;
-            source.reply(&format!(
-                "{:?}",
-                reload(&source.state.lua, source.message.username())
-            ));
+            source.reply(
+                &reload(&source.state.lua, source.message.sender())
+                    .map_or_else(|error| error.to_string(), |()| String::from("ok")),
+            );
         });
         1
     }));
@@ -62,10 +72,11 @@ pub fn register(commands: &mut CommandDispatcher<Mutex<CommandSource>>) {
             let code = get_string(ctx, "code").expect("argument should exist");
             tokio::spawn(async move {
                 let source = source.lock().await;
-                source.reply(&format!(
-                    "{:?}",
-                    eval(&source.state.lua, &code, source.message.username()).await
-                ));
+                source.reply(
+                    &eval(&source.state.lua, &code, source.message.sender())
+                        .await
+                        .unwrap_or_else(|error| error.to_string()),
+                );
             });
             1
         })),
@@ -77,10 +88,11 @@ pub fn register(commands: &mut CommandDispatcher<Mutex<CommandSource>>) {
             let code = get_string(ctx, "code").expect("argument should exist");
             tokio::spawn(async move {
                 let source = source.lock().await;
-                source.reply(&format!(
-                    "{:?}",
-                    exec(&source.state.lua, &code, source.message.username()).await
-                ));
+                source.reply(
+                    &exec(&source.state.lua, &code, source.message.sender())
+                        .await
+                        .map_or_else(|error| error.to_string(), |()| String::from("ok")),
+                );
             });
             1
         })),

src/events.rs

@@ -1,11 +1,5 @@
-use crate::{
-    State,
-    commands::CommandSource,
-    http::serve,
-    lua::{client, direction::Direction, player::Player, vec3::Vec3},
-    particle,
-    replay::recorder::Recorder,
-};
+use std::{net::SocketAddr, process::exit};
+
 use anyhow::{Context, Result};
 use azalea::{
     brigadier::exceptions::BuiltInExceptions::DispatcherUnknownCommand, prelude::*,
@@ -16,10 +10,20 @@ use hyper_util::rt::TokioIo;
 use log::{debug, error, info, trace};
 use mlua::{Error, Function, IntoLuaMulti, Table};
 use ncr::utils::trim_header;
-use std::{net::SocketAddr, process::exit};
 use tokio::net::TcpListener;
+#[cfg(feature = "matrix")]
+use {crate::matrix, std::time::Duration, tokio::time::sleep};
 
-#[allow(clippy::too_many_lines)]
+use crate::{
+    State,
+    commands::CommandSource,
+    http::serve,
+    lua::{client, direction::Direction, player::Player, vec3::Vec3},
+    particle,
+    replay::recorder::Recorder,
+};
+
+#[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) => {
@@ -28,7 +32,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
         Event::Chat(message) => {
             let globals = state.lua.globals();
             let (sender, mut content) = message.split_sender_and_content();
-            let uuid = message.uuid().map(|uuid| uuid.to_string());
+            let uuid = message.sender_uuid().map(|uuid| uuid.to_string());
             let is_whisper = message.is_whisper();
             let text = message.message();
             let ansi_text = text.to_ansi();
@@ -43,7 +47,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
                         .call::<String>((options.clone(), content.clone()))
                         .ok()
                         .as_deref()
-                        .and_then(|s| trim_header(s).ok())
+                        .and_then(|string| trim_header(string).ok())
                 {
                     is_encrypted = true;
                     ncr_options = Some(options);
@@ -125,6 +129,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
         Event::RemovePlayer(player_info) => {
             call_listeners(&state, "remove_player", || Ok(Player::from(player_info))).await
         }
+        Event::Spawn => call_listeners(&state, "spawn", || Ok(())).await,
         Event::Tick => call_listeners(&state, "tick", || Ok(())).await,
         Event::UpdatePlayer(player_info) => {
             call_listeners(&state, "update_player", || Ok(Player::from(player_info))).await
@@ -207,6 +212,9 @@ 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?;
 
@@ -249,6 +257,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
                 });
             }
         }
+        _ => todo!(),
     }
 }
 
@@ -269,7 +278,24 @@ async fn lua_init(client: Client, state: &State, globals: &Table) -> Result<()>
     call_listeners(state, "init", || Ok(())).await
 }
 
-async fn call_listeners<T, F>(state: &State, event_type: &'static str, getter: F) -> Result<()>
+#[cfg(feature = "matrix")]
+fn matrix_init(client: &Client, state: State) {
+    let globals = state.lua.globals();
+    if let Ok(options) = globals.get::<Table>("MatrixOptions") {
+        let name = client.username();
+        tokio::spawn(async move {
+            loop {
+                let name = name.clone();
+                if let Err(error) = matrix::login(&state, &options, &globals, name).await {
+                    error!("failed to log into matrix: {error:?}");
+                }
+                sleep(Duration::from_secs(10)).await;
+            }
+        });
+    }
+}
+
+pub async fn call_listeners<T, F>(state: &State, event_type: &'static str, getter: F) -> Result<()>
 where
     T: Clone + IntoLuaMulti + Send + 'static,
     F: FnOnce() -> Result<T>,
@@ -280,7 +306,7 @@ where
             let data = data.clone();
             tokio::spawn(async move {
                 if let Err(error) = callback.call_async::<()>(data).await {
-                    error!("failed to call lua event listener {id} for {event_type}: {error:?}");
+                    error!("failed to call lua event listener {id} for {event_type}: {error}");
                 }
             });
         }

src/hacks/anti_knockback.rs

@@ -0,0 +1,20 @@
+use azalea::{
+    Vec3,
+    movement::{KnockbackEvent, KnockbackType},
+    prelude::Component,
+};
+use bevy_ecs::{event::EventMutator, query::With, system::Query};
+
+#[derive(Component)]
+pub struct AntiKnockback;
+
+pub fn anti_knockback(
+    mut events: EventMutator<KnockbackEvent>,
+    entity_query: Query<(), With<AntiKnockback>>,
+) {
+    for event in events.read() {
+        if entity_query.get(event.entity).is_ok() {
+            event.knockback = KnockbackType::Add(Vec3::default());
+        }
+    }
+}

src/hacks/mod.rs

@@ -0,0 +1,21 @@
+#![allow(clippy::needless_pass_by_value)]
+
+pub mod anti_knockback;
+
+use anti_knockback::anti_knockback;
+use azalea::{movement::handle_knockback, packet::game::process_packet_events};
+use bevy_app::{App, Plugin, PreUpdate};
+use bevy_ecs::schedule::IntoSystemConfigs;
+
+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),
+        );
+    }
+}

src/http.rs

@@ -1,38 +1,40 @@
-use crate::{
-    State,
-    lua::{eval, exec, reload},
-};
 use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
 use hyper::{
     Error, Method, Request, Response, StatusCode,
     body::{Bytes, Incoming},
 };
 
+use crate::{
+    State,
+    lua::{eval, exec, reload},
+};
+
 pub async fn serve(
     request: Request<Incoming>,
     state: State,
 ) -> Result<Response<BoxBody<Bytes, Error>>, Error> {
-    macro_rules! handle_code {
-        ($handler:ident) => {
-            match std::str::from_utf8(&request.into_body().collect().await?.to_bytes()) {
-                Ok(code) => Response::new(full(format!(
-                    "{:#?}",
-                    $handler(&state.lua, code, None).await
-                ))),
-                Err(error) => status_code_response(
-                    StatusCode::BAD_REQUEST,
-                    full(format!("invalid utf-8 data received: {error:?}")),
-                ),
-            }
-        };
-    }
-
     Ok(match (request.method(), request.uri().path()) {
-        (&Method::POST, "/reload") => {
-            Response::new(full(format!("{:#?}", reload(&state.lua, None))))
-        }
-        (&Method::POST, "/eval") => handle_code!(eval),
-        (&Method::POST, "/exec") => handle_code!(exec),
+        (&Method::POST, "/reload") => Response::new(
+            reload(&state.lua, None).map_or_else(|error| full(error.to_string()), |()| empty()),
+        ),
+        (&Method::POST, "/eval") => Response::new(full(
+            eval(
+                &state.lua,
+                &String::from_utf8_lossy(&request.into_body().collect().await?.to_bytes()),
+                None,
+            )
+            .await
+            .unwrap_or_else(|error| error.to_string()),
+        )),
+        (&Method::POST, "/exec") => Response::new(
+            exec(
+                &state.lua,
+                &String::from_utf8_lossy(&request.into_body().collect().await?.to_bytes()),
+                None,
+            )
+            .await
+            .map_or_else(|error| full(error.to_string()), |()| empty()),
+        ),
         (&Method::GET, "/ping") => Response::new(full("pong!")),
         _ => status_code_response(StatusCode::NOT_FOUND, empty()),
     })
@@ -47,13 +49,13 @@ fn status_code_response(
     response
 }
 
-fn full<T: Into<Bytes>>(chunk: T) -> BoxBody<Bytes, hyper::Error> {
+fn full<T: Into<Bytes>>(chunk: T) -> BoxBody<Bytes, Error> {
     Full::new(chunk.into())
         .map_err(|never| match never {})
         .boxed()
 }
 
-fn empty() -> BoxBody<Bytes, hyper::Error> {
+fn empty() -> BoxBody<Bytes, Error> {
     Empty::<Bytes>::new()
         .map_err(|never| match never {})
         .boxed()

src/lua/client/container.rs

@@ -1,4 +1,3 @@
-use super::{Client, Container, ContainerRef, ItemStack, Vec3};
 use azalea::{
     BlockPos,
     inventory::{Inventory, Menu, Player, SlotList},
@@ -8,6 +7,8 @@ use azalea::{
 use log::error;
 use mlua::{Lua, Result, UserDataRef, Value};
 
+use super::{Client, Container, ContainerRef, ItemStack, Vec3};
+
 pub fn container(_lua: &Lua, client: &Client) -> Result<Option<ContainerRef>> {
     Ok(client.get_open_container().map(ContainerRef))
 }
@@ -22,9 +23,10 @@ pub fn held_slot(_lua: &Lua, client: &Client) -> Result<u8> {
 
 #[allow(clippy::too_many_lines)]
 pub fn menu(lua: &Lua, client: &Client) -> Result<Value> {
-    fn from_slot_list<const N: usize>(s: SlotList<N>) -> Vec<ItemStack> {
-        s.iter()
-            .map(|i| ItemStack(i.to_owned()))
+    fn from_slot_list<const N: usize>(slot_list: SlotList<N>) -> Vec<ItemStack> {
+        slot_list
+            .iter()
+            .map(|item_stack| ItemStack(item_stack.to_owned()))
             .collect::<Vec<_>>()
     }
 
@@ -106,7 +108,7 @@ pub async fn open_container_at(
         .map(Container))
 }
 
-pub fn open_inventory(_lua: &Lua, client: &mut Client, _: ()) -> Result<Option<Container>> {
+pub fn open_inventory(_lua: &Lua, client: &Client, (): ()) -> Result<Option<Container>> {
     Ok(client.open_inventory().map(Container))
 }
 

src/lua/client/interaction.rs

@@ -1,4 +1,3 @@
-use super::{Client, Vec3};
 use azalea::{
     BlockPos, BotClientExt,
     protocol::packets::game::{ServerboundUseItem, s_interact::InteractionHand},
@@ -7,12 +6,14 @@ use azalea::{
 use log::error;
 use mlua::{Lua, Result, UserDataRef};
 
-pub fn attack(_lua: &Lua, client: &mut Client, entity_id: i32) -> Result<()> {
+use super::{Client, Vec3};
+
+pub fn attack(_lua: &Lua, client: &Client, entity_id: i32) -> Result<()> {
     client.attack(MinecraftEntityId(entity_id));
     Ok(())
 }
 
-pub fn block_interact(_lua: &Lua, client: &mut Client, position: Vec3) -> Result<()> {
+pub fn block_interact(_lua: &Lua, client: &Client, position: Vec3) -> Result<()> {
     #[allow(clippy::cast_possible_truncation)]
     client.block_interact(BlockPos::new(
         position.x as i32,
@@ -44,7 +45,7 @@ pub fn set_mining(_lua: &Lua, client: &Client, mining: bool) -> Result<()> {
     Ok(())
 }
 
-pub fn start_mining(_lua: &Lua, client: &mut Client, position: Vec3) -> Result<()> {
+pub fn start_mining(_lua: &Lua, client: &Client, position: Vec3) -> Result<()> {
     #[allow(clippy::cast_possible_truncation)]
     client.start_mining(BlockPos::new(
         position.x as i32,

src/lua/client/mod.rs

@@ -6,15 +6,17 @@ mod movement;
 mod state;
 mod world;
 
+use std::ops::{Deref, DerefMut};
+
+use azalea::{Client as AzaleaClient, world::MinecraftEntityId};
+use mlua::{Lua, Result, UserData, UserDataFields, UserDataMethods};
+
 use super::{
     container::{Container, ContainerRef, item_stack::ItemStack},
     direction::Direction,
     player::Player,
     vec3::Vec3,
 };
-use azalea::{Client as AzaleaClient, world::MinecraftEntityId};
-use mlua::{Lua, Result, UserData, UserDataFields, UserDataMethods};
-use std::ops::{Deref, DerefMut};
 
 pub struct Client(pub Option<AzaleaClient>);
 
@@ -39,6 +41,7 @@ impl UserData for Client {
         f.add_field_method_get("dimension", world::dimension);
         f.add_field_method_get("direction", movement::direction);
         f.add_field_method_get("eye_position", movement::eye_position);
+        f.add_field_method_get("go_to_reached", movement::go_to_reached);
         f.add_field_method_get("has_attack_cooldown", interaction::has_attack_cooldown);
         f.add_field_method_get("health", state::health);
         f.add_field_method_get("held_item", container::held_item);
@@ -56,38 +59,43 @@ impl UserData for Client {
     }
 
     fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
-        m.add_async_method("find_all_entities", world::find_all_entities);
-        m.add_async_method("find_all_players", world::find_all_players);
-        m.add_async_method("find_entities", world::find_entities);
-        m.add_async_method("find_players", world::find_players);
+        m.add_async_method("find_all_entities", world::find::all_entities);
+        m.add_async_method("find_all_players", world::find::all_players);
+        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_method("attack", interaction::attack);
         m.add_method("best_tool_for_block", world::best_tool_for_block);
+        m.add_method("block_interact", interaction::block_interact);
         m.add_method("chat", chat);
         m.add_method("disconnect", disconnect);
-        m.add_method("find_blocks", world::find_blocks);
+        m.add_method("find_blocks", world::find::blocks);
         m.add_method("get_block_state", world::get_block_state);
         m.add_method("get_fluid_state", world::get_fluid_state);
+        m.add_method("jump", movement::jump);
+        m.add_method("look_at", movement::look_at);
+        m.add_method("open_inventory", container::open_inventory);
         m.add_method("set_component", state::set_component);
+        m.add_method("set_direction", movement::set_direction);
         m.add_method("set_held_slot", container::set_held_slot);
+        m.add_method("set_jumping", movement::set_jumping);
         m.add_method("set_mining", interaction::set_mining);
         m.add_method("set_position", movement::set_position);
         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("stop_pathfinding", movement::stop_pathfinding);
         m.add_method("stop_sleeping", movement::stop_sleeping);
         m.add_method("use_item", interaction::use_item);
-        m.add_method_mut("attack", interaction::attack);
-        m.add_method_mut("block_interact", interaction::block_interact);
-        m.add_method_mut("jump", movement::jump);
-        m.add_method_mut("look_at", movement::look_at);
-        m.add_method_mut("open_inventory", container::open_inventory);
-        m.add_method_mut("set_direction", movement::set_direction);
-        m.add_method_mut("set_jumping", movement::set_jumping);
-        m.add_method_mut("sprint", movement::sprint);
-        m.add_method_mut("start_mining", interaction::start_mining);
-        m.add_method_mut("walk", movement::walk);
+        m.add_method("walk", movement::walk);
     }
 }
 
@@ -96,7 +104,7 @@ fn chat(_lua: &Lua, client: &Client, message: String) -> Result<()> {
     Ok(())
 }
 
-fn disconnect(_lua: &Lua, client: &Client, _: ()) -> Result<()> {
+fn disconnect(_lua: &Lua, client: &Client, (): ()) -> Result<()> {
     client.disconnect();
     Ok(())
 }

src/lua/client/movement.rs

@@ -1,4 +1,3 @@
-use super::{Client, Direction, Vec3};
 use azalea::{
     BlockPos, BotClientExt, SprintDirection, WalkDirection,
     entity::Position,
@@ -13,6 +12,124 @@ use azalea::{
 use log::error;
 use mlua::{FromLua, Lua, Result, Table, UserDataRef, Value};
 
+use super::{Client, Direction, Vec3};
+
+#[derive(Debug)]
+struct AnyGoal(Box<dyn Goal>);
+
+impl Goal for AnyGoal {
+    fn success(&self, n: BlockPos) -> bool {
+        self.0.success(n)
+    }
+
+    fn heuristic(&self, n: BlockPos) -> f32 {
+        self.0.heuristic(n)
+    }
+}
+
+#[allow(clippy::cast_possible_truncation)]
+fn to_goal(lua: &Lua, client: &Client, data: Table, options: &Table, kind: u8) -> Result<AnyGoal> {
+    let goal: Box<dyn Goal> = match kind {
+        1 => {
+            let pos = Vec3::from_lua(data.get("position")?, lua)?;
+            Box::new(RadiusGoal {
+                pos: azalea::Vec3::new(pos.x, pos.y, pos.z),
+                radius: data.get("radius")?,
+            })
+        }
+        2 => {
+            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(),
+            })
+        }
+        3 => Box::new(XZGoal {
+            x: data.get("x")?,
+            z: data.get("z")?,
+        }),
+        4 => Box::new(YGoal { y: data.get("y")? }),
+        _ => {
+            let pos = Vec3::from_lua(Value::Table(data), lua)?;
+            Box::new(BlockPosGoal(BlockPos::new(
+                pos.x as i32,
+                pos.y as i32,
+                pos.z as i32,
+            )))
+        }
+    };
+
+    Ok(AnyGoal(if options.get("inverse").unwrap_or_default() {
+        Box::new(InverseGoal(AnyGoal(goal)))
+    } else {
+        goal
+    }))
+}
+
+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<()> {
+    client.wait_until_goto_target_reached().await;
+    Ok(())
+}
+
+pub async fn go_to(
+    lua: Lua,
+    client: UserDataRef<Client>,
+    (data, metadata): (Table, Option<Table>),
+) -> Result<()> {
+    let metadata = metadata.unwrap_or(lua.create_table()?);
+    let options = metadata.get("options").unwrap_or(lua.create_table()?);
+    let goal = to_goal(
+        &lua,
+        &client,
+        data,
+        &options,
+        metadata.get("type").unwrap_or_default(),
+    )?;
+    if options.get("without_mining").unwrap_or_default() {
+        client.start_goto_without_mining(goal);
+        client.wait_until_goto_target_reached().await;
+    } else {
+        client.goto(goal).await;
+    }
+    Ok(())
+}
+
+pub async fn start_go_to(
+    lua: Lua,
+    client: UserDataRef<Client>,
+    (data, metadata): (Table, Option<Table>),
+) -> Result<()> {
+    let metadata = metadata.unwrap_or(lua.create_table()?);
+    let options = metadata.get("options").unwrap_or(lua.create_table()?);
+    let goal = to_goal(
+        &lua,
+        &client,
+        data,
+        &options,
+        metadata.get("type").unwrap_or_default(),
+    )?;
+    if options.get("without_mining").unwrap_or_default() {
+        client.start_goto_without_mining(goal);
+    } 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;
+        }
+    }
+
+    Ok(())
+}
+
 pub fn direction(_lua: &Lua, client: &Client) -> Result<Direction> {
     let direction = client.direction();
     Ok(Direction {
@@ -25,78 +142,7 @@ pub fn eye_position(_lua: &Lua, client: &Client) -> Result<Vec3> {
     Ok(Vec3::from(client.eye_position()))
 }
 
-pub async fn go_to(
-    lua: Lua,
-    client: UserDataRef<Client>,
-    (data, metadata): (Table, Option<Table>),
-) -> Result<()> {
-    fn goto_with_options<G: Goal + Send + Sync + 'static>(
-        client: &Client,
-        options: &Table,
-        goal: G,
-    ) {
-        if options.get("without_mining").unwrap_or_default() {
-            client.goto_without_mining(goal);
-        } else {
-            client.goto(goal);
-        }
-    }
-
-    let table = metadata.unwrap_or(lua.create_table()?);
-    let goal_type = table.get("type").unwrap_or_default();
-    let options = table.get("options").unwrap_or(lua.create_table()?);
-
-    macro_rules! goto {
-        ($goal:expr) => {
-            if options.get("inverse").unwrap_or_default() {
-                goto_with_options(&client, &options, InverseGoal($goal));
-            } else {
-                goto_with_options(&client, &options, $goal);
-            }
-        };
-    }
-
-    #[allow(clippy::cast_possible_truncation)]
-    match goal_type {
-        1 => {
-            let p = Vec3::from_lua(data.get("position")?, &lua)?;
-            goto!(RadiusGoal {
-                pos: azalea::Vec3::new(p.x, p.y, p.z),
-                radius: data.get("radius")?,
-            });
-        }
-        2 => {
-            let p = Vec3::from_lua(Value::Table(data), &lua)?;
-            goto!(ReachBlockPosGoal {
-                pos: BlockPos::new(p.x as i32, p.y as i32, p.z as i32),
-                chunk_storage: client.world().read().chunks.clone(),
-            });
-        }
-        3 => {
-            goto!(XZGoal {
-                x: data.get("x")?,
-                z: data.get("z")?,
-            });
-        }
-        4 => goto!(YGoal { y: data.get("y")? }),
-        _ => {
-            let p = Vec3::from_lua(Value::Table(data), &lua)?;
-            goto!(BlockPosGoal(BlockPos::new(
-                p.x as i32, p.y as i32, p.z as i32
-            )));
-        }
-    }
-
-    while client.get_tick_broadcaster().recv().await.is_ok() {
-        if client.ecs.lock().get::<GotoEvent>(client.entity).is_none() {
-            break;
-        }
-    }
-
-    Ok(())
-}
-
-pub fn jump(_lua: &Lua, client: &mut Client, _: ()) -> Result<()> {
+pub fn jump(_lua: &Lua, client: &Client, (): ()) -> Result<()> {
     client.jump();
     Ok(())
 }
@@ -114,7 +160,7 @@ pub fn looking_at(lua: &Lua, client: &Client) -> Result<Option<Table>> {
     })
 }
 
-pub fn look_at(_lua: &Lua, client: &mut Client, position: Vec3) -> Result<()> {
+pub fn look_at(_lua: &Lua, client: &Client, position: Vec3) -> Result<()> {
     client.look_at(azalea::Vec3::new(position.x, position.y, position.z));
     Ok(())
 }
@@ -149,12 +195,12 @@ pub fn position(_lua: &Lua, client: &Client) -> Result<Vec3> {
     Ok(Vec3::from(&client.component::<Position>()))
 }
 
-pub fn set_direction(_lua: &Lua, client: &mut Client, direction: Direction) -> Result<()> {
+pub fn set_direction(_lua: &Lua, client: &Client, direction: Direction) -> Result<()> {
     client.set_direction(direction.y, direction.x);
     Ok(())
 }
 
-pub fn set_jumping(_lua: &Lua, client: &mut Client, jumping: bool) -> Result<()> {
+pub fn set_jumping(_lua: &Lua, client: &Client, jumping: bool) -> Result<()> {
     client.set_jumping(jumping);
     Ok(())
 }
@@ -183,7 +229,7 @@ pub fn set_sneaking(_lua: &Lua, client: &Client, sneaking: bool) -> Result<()> {
     Ok(())
 }
 
-pub fn sprint(_lua: &Lua, client: &mut Client, direction: u8) -> Result<()> {
+pub fn sprint(_lua: &Lua, client: &Client, direction: u8) -> Result<()> {
     client.sprint(match direction {
         5 => SprintDirection::ForwardRight,
         6 => SprintDirection::ForwardLeft,
@@ -192,12 +238,12 @@ pub fn sprint(_lua: &Lua, client: &mut Client, direction: u8) -> Result<()> {
     Ok(())
 }
 
-pub fn stop_pathfinding(_lua: &Lua, client: &Client, _: ()) -> Result<()> {
+pub fn stop_pathfinding(_lua: &Lua, client: &Client, (): ()) -> Result<()> {
     client.stop_pathfinding();
     Ok(())
 }
 
-pub fn stop_sleeping(_lua: &Lua, client: &Client, _: ()) -> Result<()> {
+pub fn stop_sleeping(_lua: &Lua, client: &Client, (): ()) -> Result<()> {
     if let Err(error) = client.write_packet(ServerboundPlayerCommand {
         id: client.component::<MinecraftEntityId>(),
         action: Action::StopSleeping,
@@ -208,7 +254,7 @@ pub fn stop_sleeping(_lua: &Lua, client: &Client, _: ()) -> Result<()> {
     Ok(())
 }
 
-pub fn walk(_lua: &Lua, client: &mut Client, direction: u8) -> Result<()> {
+pub fn walk(_lua: &Lua, client: &Client, direction: u8) -> Result<()> {
     client.walk(match direction {
         1 => WalkDirection::Forward,
         2 => WalkDirection::Backward,

src/lua/client/state.rs

@@ -1,14 +1,14 @@
-use super::Client;
 use azalea::{
     ClientInformation,
     entity::metadata::{AirSupply, Score},
     pathfinder::PathfinderDebugParticles,
     protocol::common::client_information::ModelCustomization,
 };
-use azalea_hax::AntiKnockback;
-use log::error;
 use mlua::{Error, Lua, Result, Table, UserDataRef};
 
+use super::Client;
+use crate::hacks::anti_knockback::AntiKnockback;
+
 pub fn air_supply(_lua: &Lua, client: &Client) -> Result<i32> {
     Ok(client.component::<AirSupply>().0)
 }
@@ -35,8 +35,7 @@ pub async fn set_client_information(
     info: Table,
 ) -> Result<()> {
     let get_bool = |table: &Table, name| table.get(name).unwrap_or(true);
-
-    if let Err(error) = client
+    client
         .set_client_information(ClientInformation {
             allows_listing: info.get("allows_listing")?,
             model_customization: info
@@ -55,10 +54,7 @@ pub async fn set_client_information(
             ..ClientInformation::default()
         })
         .await
-    {
-        error!("failed to set client client information: {error:?}");
-    }
-    Ok(())
+        .map_err(Error::external)
 }
 
 pub fn set_component(

src/lua/client/world/find.rs

@@ -0,0 +1,122 @@
+use azalea::{
+    BlockPos,
+    blocks::{BlockState, BlockStates},
+    ecs::query::{With, Without},
+    entity::{
+        Dead, EntityKind, EntityUuid, LookDirection, Pose, Position as AzaleaPosition,
+        metadata::{CustomName, Owneruuid, Player},
+    },
+    world::MinecraftEntityId,
+};
+use mlua::{Function, Lua, Result, Table, UserDataRef};
+
+use super::{Client, Direction, Vec3};
+
+pub fn blocks(
+    _lua: &Lua,
+    client: &Client,
+    (nearest_to, block_states): (Vec3, Vec<u16>),
+) -> Result<Vec<Vec3>> {
+    #[allow(clippy::cast_possible_truncation)]
+    Ok(client
+        .world()
+        .read()
+        .find_blocks(
+            BlockPos::new(
+                nearest_to.x as i32,
+                nearest_to.y as i32,
+                nearest_to.z as i32,
+            ),
+            &BlockStates {
+                set: block_states.iter().map(|&id| BlockState { id }).collect(),
+            },
+        )
+        .map(Vec3::from)
+        .collect())
+}
+
+pub async fn all_entities(lua: Lua, client: UserDataRef<Client>, (): ()) -> Result<Vec<Table>> {
+    let mut matched = Vec::with_capacity(256);
+    for (position, custom_name, kind, uuid, direction, id, owner_uuid, pose) in
+        get_entities!(client)
+    {
+        let table = lua.create_table()?;
+        table.set("position", position)?;
+        table.set("custom_name", custom_name)?;
+        table.set("kind", kind)?;
+        table.set("uuid", uuid)?;
+        table.set("direction", direction)?;
+        table.set("id", id)?;
+        table.set(
+            "owner_uuid",
+            owner_uuid.and_then(|v| *v).map(|v| v.to_string()),
+        )?;
+        table.set("pose", pose)?;
+        matched.push(table);
+    }
+    Ok(matched)
+}
+
+pub async fn entities(
+    lua: Lua,
+    client: UserDataRef<Client>,
+    filter_fn: Function,
+) -> Result<Vec<Table>> {
+    let mut matched = Vec::new();
+    for (position, custom_name, kind, uuid, direction, id, owner_uuid, pose) in
+        get_entities!(client)
+    {
+        let table = lua.create_table()?;
+        table.set("position", position)?;
+        table.set("custom_name", custom_name)?;
+        table.set("kind", kind)?;
+        table.set("uuid", uuid)?;
+        table.set("direction", direction)?;
+        table.set("id", id)?;
+        table.set(
+            "owner_uuid",
+            owner_uuid.and_then(|v| *v).map(|v| v.to_string()),
+        )?;
+        table.set("pose", pose)?;
+        if filter_fn.call_async::<bool>(&table).await? {
+            matched.push(table);
+        }
+    }
+    Ok(matched)
+}
+
+pub async fn all_players(lua: Lua, client: UserDataRef<Client>, (): ()) -> Result<Vec<Table>> {
+    let mut matched = Vec::new();
+    for (id, uuid, kind, position, direction, pose) in get_players!(client) {
+        let table = lua.create_table()?;
+        table.set("id", id)?;
+        table.set("uuid", uuid)?;
+        table.set("kind", kind)?;
+        table.set("position", position)?;
+        table.set("direction", direction)?;
+        table.set("pose", pose)?;
+        matched.push(table);
+    }
+    Ok(matched)
+}
+
+pub async fn players(
+    lua: Lua,
+    client: UserDataRef<Client>,
+    filter_fn: Function,
+) -> Result<Vec<Table>> {
+    let mut matched = Vec::new();
+    for (id, uuid, kind, position, direction, pose) in get_players!(client) {
+        let table = lua.create_table()?;
+        table.set("id", id)?;
+        table.set("uuid", uuid)?;
+        table.set("kind", kind)?;
+        table.set("position", position)?;
+        table.set("direction", direction)?;
+        table.set("pose", pose)?;
+        if filter_fn.call_async::<bool>(&table).await? {
+            matched.push(table);
+        }
+    }
+    Ok(matched)
+}

src/lua/client/world/mod.rs

@@ -1,23 +1,14 @@
 #[macro_use]
 mod queries;
+pub mod find;
+
+use azalea::{BlockPos, auto_tool::AutoToolClientExt, blocks::BlockState, world::InstanceName};
+use mlua::{Lua, Result, Table};
 
 use super::{Client, Direction, Vec3};
-use azalea::{
-    BlockPos,
-    auto_tool::AutoToolClientExt,
-    blocks::{BlockState, BlockStates},
-    ecs::query::{With, Without},
-    entity::{
-        Dead, EntityKind, EntityUuid, LookDirection, Pose, Position as AzaleaPosition,
-        metadata::{CustomName, Owneruuid, Player},
-    },
-    world::{InstanceName, MinecraftEntityId},
-};
-use mlua::{Function, Lua, Result, Table, UserDataRef};
 
 pub fn best_tool_for_block(lua: &Lua, client: &Client, block_state: u16) -> Result<Table> {
     let result = client.best_tool_in_hotbar_for_block(BlockState { id: block_state });
-
     let table = lua.create_table()?;
     table.set("index", result.index)?;
     table.set("percentage_per_tick", result.percentage_per_tick)?;
@@ -28,119 +19,6 @@ pub fn dimension(_lua: &Lua, client: &Client) -> Result<String> {
     Ok(client.component::<InstanceName>().to_string())
 }
 
-pub fn find_blocks(
-    _lua: &Lua,
-    client: &Client,
-    (nearest_to, block_states): (Vec3, Vec<u16>),
-) -> Result<Vec<Vec3>> {
-    #[allow(clippy::cast_possible_truncation)]
-    Ok(client
-        .world()
-        .read()
-        .find_blocks(
-            BlockPos::new(
-                nearest_to.x as i32,
-                nearest_to.y as i32,
-                nearest_to.z as i32,
-            ),
-            &BlockStates {
-                set: block_states.iter().map(|&id| BlockState { id }).collect(),
-            },
-        )
-        .map(Vec3::from)
-        .collect())
-}
-
-pub async fn find_all_entities(
-    lua: Lua,
-    client: UserDataRef<Client>,
-    (): (),
-) -> Result<Vec<Table>> {
-    let mut matched = Vec::with_capacity(256);
-    for (position, custom_name, kind, uuid, direction, id, owner_uuid, pose) in
-        get_entities!(client)
-    {
-        let table = lua.create_table()?;
-        table.set("position", position)?;
-        table.set("custom_name", custom_name)?;
-        table.set("kind", kind)?;
-        table.set("uuid", uuid)?;
-        table.set("direction", direction)?;
-        table.set("id", id)?;
-        table.set(
-            "owner_uuid",
-            owner_uuid.and_then(|v| *v).map(|v| v.to_string()),
-        )?;
-        table.set("pose", pose)?;
-        matched.push(table);
-    }
-    Ok(matched)
-}
-
-pub async fn find_entities(
-    lua: Lua,
-    client: UserDataRef<Client>,
-    filter_fn: Function,
-) -> Result<Vec<Table>> {
-    let mut matched = Vec::new();
-    for (position, custom_name, kind, uuid, direction, id, owner_uuid, pose) in
-        get_entities!(client)
-    {
-        let table = lua.create_table()?;
-        table.set("position", position)?;
-        table.set("custom_name", custom_name)?;
-        table.set("kind", kind)?;
-        table.set("uuid", uuid)?;
-        table.set("direction", direction)?;
-        table.set("id", id)?;
-        table.set(
-            "owner_uuid",
-            owner_uuid.and_then(|v| *v).map(|v| v.to_string()),
-        )?;
-        table.set("pose", pose)?;
-        if filter_fn.call_async::<bool>(&table).await? {
-            matched.push(table);
-        }
-    }
-    Ok(matched)
-}
-
-pub async fn find_all_players(lua: Lua, client: UserDataRef<Client>, (): ()) -> Result<Vec<Table>> {
-    let mut matched = Vec::new();
-    for (id, uuid, kind, position, direction, pose) in get_players!(client) {
-        let table = lua.create_table()?;
-        table.set("id", id)?;
-        table.set("uuid", uuid)?;
-        table.set("kind", kind)?;
-        table.set("position", position)?;
-        table.set("direction", direction)?;
-        table.set("pose", pose)?;
-        matched.push(table);
-    }
-    Ok(matched)
-}
-
-pub async fn find_players(
-    lua: Lua,
-    client: UserDataRef<Client>,
-    filter_fn: Function,
-) -> Result<Vec<Table>> {
-    let mut matched = Vec::new();
-    for (id, uuid, kind, position, direction, pose) in get_players!(client) {
-        let table = lua.create_table()?;
-        table.set("id", id)?;
-        table.set("uuid", uuid)?;
-        table.set("kind", kind)?;
-        table.set("position", position)?;
-        table.set("direction", direction)?;
-        table.set("pose", pose)?;
-        if filter_fn.call_async::<bool>(&table).await? {
-            matched.push(table);
-        }
-    }
-    Ok(matched)
-}
-
 pub fn get_block_state(_lua: &Lua, client: &Client, position: Vec3) -> Result<Option<u16>> {
     #[allow(clippy::cast_possible_truncation)]
     Ok(client
@@ -151,24 +29,23 @@ pub fn get_block_state(_lua: &Lua, client: &Client, position: Vec3) -> Result<Op
             position.y as i32,
             position.z as i32,
         ))
-        .map(|b| b.id))
+        .map(|block| block.id))
 }
 
+#[allow(clippy::cast_possible_truncation)]
 pub fn get_fluid_state(lua: &Lua, client: &Client, position: Vec3) -> Result<Option<Table>> {
-    #[allow(clippy::cast_possible_truncation)]
-    Ok(
-        if let Some(state) = client.world().read().get_fluid_state(&BlockPos::new(
-            position.x as i32,
-            position.y as i32,
-            position.z as i32,
-        )) {
-            let table = lua.create_table()?;
-            table.set("kind", state.kind as u8)?;
-            table.set("amount", state.amount)?;
-            table.set("falling", state.falling)?;
-            Some(table)
-        } else {
-            None
-        },
-    )
+    let fluid_state = client.world().read().get_fluid_state(&BlockPos::new(
+        position.x as i32,
+        position.y as i32,
+        position.z as i32,
+    ));
+    Ok(if let Some(state) = fluid_state {
+        let table = lua.create_table()?;
+        table.set("kind", state.kind as u8)?;
+        table.set("amount", state.amount)?;
+        table.set("falling", state.falling)?;
+        Some(table)
+    } else {
+        None
+    })
 }

src/lua/container/item_stack.rs

@@ -1,6 +1,6 @@
 use azalea::inventory::{
     self,
-    components::{CustomName, Damage, Food, MaxDamage},
+    components::{Consumable, CustomName, Damage, Food, MaxDamage},
 };
 use mlua::{UserData, UserDataFields, UserDataMethods};
 
@@ -32,6 +32,24 @@ impl UserData for ItemStack {
                 .map(|data| data.components.get::<MaxDamage>().map(|d| d.amount)))
         });
 
+        f.add_field_method_get("consumable", |lua, this| {
+            Ok(
+                if let Some(consumable) = this
+                    .0
+                    .as_present()
+                    .and_then(|data| data.components.get::<Consumable>())
+                {
+                    let table = lua.create_table()?;
+                    table.set("animation", consumable.animation as u8)?;
+                    table.set("consume_seconds", consumable.consume_seconds)?;
+                    table.set("has_consume_particles", consumable.has_consume_particles)?;
+                    Some(table)
+                } else {
+                    None
+                },
+            )
+        });
+
         f.add_field_method_get("food", |lua, this| {
             Ok(
                 if let Some(food) = this
@@ -53,9 +71,7 @@ impl UserData for ItemStack {
     }
 
     fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
-        m.add_method_mut("split", |_, this, count: u32| {
-            Ok(ItemStack(this.0.split(count)))
-        });
+        m.add_method_mut("split", |_, this, count: u32| Ok(Self(this.0.split(count))));
         m.add_method_mut("update_empty", |_, this, (): ()| {
             this.0.update_empty();
             Ok(())

src/lua/direction.rs

@@ -1,5 +1,5 @@
 use azalea::entity::LookDirection;
-use mlua::{FromLua, IntoLua, Lua, Result, Value};
+use mlua::{Error, FromLua, IntoLua, Lua, Result, Value};
 
 #[derive(Clone)]
 pub struct Direction {
@@ -37,7 +37,7 @@ impl FromLua for Direction {
                 }
             })
         } else {
-            Err(mlua::Error::FromLuaConversionError {
+            Err(Error::FromLuaConversionError {
                 from: value.type_name(),
                 to: "Direction".to_string(),
                 message: None,

src/lua/events.rs

@@ -1,7 +1,9 @@
-use crate::ListenerMap;
+use std::time::{SystemTime, UNIX_EPOCH};
+
 use futures::executor::block_on;
 use mlua::{Function, Lua, Result, Table};
-use std::time::{SystemTime, UNIX_EPOCH};
+
+use crate::ListenerMap;
 
 pub fn register_globals(lua: &Lua, globals: &Table, event_listeners: ListenerMap) -> Result<()> {
     let m = event_listeners.clone();
@@ -11,13 +13,15 @@ pub fn register_globals(lua: &Lua, globals: &Table, event_listeners: ListenerMap
             move |_, (event_type, callback, optional_id): (String, Function, Option<String>)| {
                 let m = m.clone();
                 let id = optional_id.unwrap_or_else(|| {
-                    callback.info().name.unwrap_or(format!(
-                        "anonymous @ {}",
-                        SystemTime::now()
-                            .duration_since(UNIX_EPOCH)
-                            .unwrap_or_default()
-                            .as_millis()
-                    ))
+                    callback.info().name.unwrap_or_else(|| {
+                        format!(
+                            "anonymous @ {}",
+                            SystemTime::now()
+                                .duration_since(UNIX_EPOCH)
+                                .unwrap_or_default()
+                                .as_millis()
+                        )
+                    })
                 });
                 tokio::spawn(async move {
                     m.write()
@@ -38,12 +42,10 @@ pub fn register_globals(lua: &Lua, globals: &Table, event_listeners: ListenerMap
             let m = m.clone();
             tokio::spawn(async move {
                 let mut m = m.write().await;
-                let empty = if let Some(listeners) = m.get_mut(&event_type) {
+                let empty = m.get_mut(&event_type).is_some_and(|listeners| {
                     listeners.retain(|(id, _)| target_id != *id);
                     listeners.is_empty()
-                } else {
-                    false
-                };
+                });
                 if empty {
                     m.remove(&event_type);
                 }

src/lua/matrix/client.rs

@@ -0,0 +1,63 @@
+use std::sync::Arc;
+
+use matrix_sdk::{
+    Client as MatrixClient,
+    ruma::{RoomId, UserId},
+};
+use mlua::{Error, UserData, UserDataFields, UserDataMethods};
+
+use super::room::Room;
+
+pub struct Client(pub Arc<MatrixClient>);
+
+impl UserData for Client {
+    fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
+        f.add_field_method_get("invited_rooms", |_, this| {
+            Ok(this
+                .0
+                .invited_rooms()
+                .into_iter()
+                .map(Room)
+                .collect::<Vec<_>>())
+        });
+        f.add_field_method_get("joined_rooms", |_, this| {
+            Ok(this
+                .0
+                .joined_rooms()
+                .into_iter()
+                .map(Room)
+                .collect::<Vec<_>>())
+        });
+        f.add_field_method_get("left_rooms", |_, this| {
+            Ok(this
+                .0
+                .left_rooms()
+                .into_iter()
+                .map(Room)
+                .collect::<Vec<_>>())
+        });
+        f.add_field_method_get("rooms", |_, this| {
+            Ok(this.0.rooms().into_iter().map(Room).collect::<Vec<_>>())
+        });
+        f.add_field_method_get("user_id", |_, this| {
+            Ok(this.0.user_id().map(ToString::to_string))
+        });
+    }
+
+    fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
+        m.add_async_method("create_dm", async |_, this, user_id: String| {
+            this.0
+                .create_dm(&UserId::parse(user_id).map_err(Error::external)?)
+                .await
+                .map_err(Error::external)
+                .map(Room)
+        });
+        m.add_async_method("join_room_by_id", async |_, this, room_id: String| {
+            this.0
+                .join_room_by_id(&RoomId::parse(room_id).map_err(Error::external)?)
+                .await
+                .map_err(Error::external)
+                .map(Room)
+        });
+    }
+}

src/lua/matrix/member.rs

@@ -0,0 +1,12 @@
+use matrix_sdk::room::RoomMember;
+use mlua::{UserData, UserDataFields};
+
+pub struct Member(pub RoomMember);
+
+impl UserData for Member {
+    fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
+        f.add_field_method_get("id", |_, this| Ok(this.0.user_id().to_string()));
+        f.add_field_method_get("name", |_, this| Ok(this.0.name().to_owned()));
+        f.add_field_method_get("power_level", |_, this| Ok(this.0.power_level()));
+    }
+}

src/lua/matrix/mod.rs

@@ -0,0 +1,3 @@
+pub mod client;
+pub mod member;
+pub mod room;

src/lua/matrix/room.rs

@@ -0,0 +1,89 @@
+use matrix_sdk::{
+    RoomMemberships,
+    room::Room as MatrixRoom,
+    ruma::{EventId, UserId, events::room::message::RoomMessageEventContent},
+};
+use mlua::{Error, UserData, UserDataFields, UserDataMethods};
+
+use super::member::Member;
+
+pub struct Room(pub MatrixRoom);
+
+impl UserData for Room {
+    fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
+        f.add_field_method_get("id", |_, this| Ok(this.0.room_id().to_string()));
+        f.add_field_method_get("name", |_, this| Ok(this.0.name()));
+        f.add_field_method_get("topic", |_, this| Ok(this.0.topic()));
+        f.add_field_method_get("type", |_, this| {
+            Ok(this.0.room_type().map(|room_type| room_type.to_string()))
+        });
+    }
+
+    fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
+        m.add_async_method(
+            "ban_user",
+            async |_, this, (user_id, reason): (String, Option<String>)| {
+                this.0
+                    .ban_user(
+                        &UserId::parse(user_id).map_err(Error::external)?,
+                        reason.as_deref(),
+                    )
+                    .await
+                    .map_err(Error::external)
+            },
+        );
+        m.add_async_method("get_members", async |_, this, (): ()| {
+            this.0
+                .members(RoomMemberships::all())
+                .await
+                .map_err(Error::external)
+                .map(|members| members.into_iter().map(Member).collect::<Vec<_>>())
+        });
+        m.add_async_method(
+            "kick_user",
+            async |_, this, (user_id, reason): (String, Option<String>)| {
+                this.0
+                    .kick_user(
+                        &UserId::parse(user_id).map_err(Error::external)?,
+                        reason.as_deref(),
+                    )
+                    .await
+                    .map_err(Error::external)
+            },
+        );
+        m.add_async_method("leave", async |_, this, (): ()| {
+            this.0.leave().await.map_err(Error::external)
+        });
+        m.add_async_method(
+            "redact",
+            async |_, this, (event_id, reason): (String, Option<String>)| {
+                this.0
+                    .redact(
+                        &EventId::parse(event_id).map_err(Error::external)?,
+                        reason.as_deref(),
+                        None,
+                    )
+                    .await
+                    .map_err(Error::external)
+                    .map(|response| response.event_id.to_string())
+            },
+        );
+        m.add_async_method("send", async |_, this, body: String| {
+            this.0
+                .send(RoomMessageEventContent::text_plain(body))
+                .await
+                .map_err(Error::external)
+                .map(|response| response.event_id.to_string())
+        });
+        m.add_async_method(
+            "send_html",
+            async |_, this, (body, html_body): (String, String)| {
+                this.0
+                    .send(RoomMessageEventContent::text_html(body, html_body))
+                    .await
+                    .map_err(Error::external)
+                    .map(|response| response.event_id.to_string())
+            },
+        );
+    }
+}

src/lua/mod.rs

@@ -7,14 +7,22 @@ pub mod logging;
 pub mod nochatreports;
 pub mod player;
 pub mod system;
+pub mod thread;
 pub mod vec3;
 
-use crate::{ListenerMap, build_info::built};
+#[cfg(feature = "matrix")]
+pub mod matrix;
+
+use std::{
+    fmt::{self, Display, Formatter},
+    io,
+};
+
 use mlua::{Lua, Table};
-use std::{io, time::Duration};
+
+use crate::{ListenerMap, build_info::built};
 
 #[derive(Debug)]
-#[allow(dead_code)]
 pub enum Error {
     CreateEnv(mlua::Error),
     EvalChunk(mlua::Error),
@@ -24,6 +32,23 @@ pub enum Error {
     ReadFile(io::Error),
 }
 
+impl Display for Error {
+    fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
+        write!(
+            formatter,
+            "failed to {}",
+            match self {
+                Self::CreateEnv(error) => format!("create environment: {error}"),
+                Self::EvalChunk(error) => format!("evaluate chunk: {error}"),
+                Self::ExecChunk(error) => format!("execute chunk: {error}"),
+                Self::LoadChunk(error) => format!("load chunk: {error}"),
+                Self::MissingPath(error) => format!("get SCRIPT_PATH global: {error}"),
+                Self::ReadFile(error) => format!("read script file: {error}"),
+            }
+        )
+    }
+}
+
 pub fn register_globals(
     lua: &Lua,
     globals: &Table,
@@ -33,19 +58,12 @@ pub fn register_globals(
     globals.set("GIT_COMMIT_HASH", built::GIT_COMMIT_HASH)?;
     globals.set("GIT_COMMIT_HASH_SHORT", built::GIT_COMMIT_HASH_SHORT)?;
 
-    globals.set(
-        "sleep",
-        lua.create_async_function(async |_, duration: u64| {
-            tokio::time::sleep(Duration::from_millis(duration)).await;
-            Ok(())
-        })?,
-    )?;
-
     block::register_globals(lua, globals)?;
     events::register_globals(lua, globals, event_listeners)?;
     logging::register_globals(lua, globals)?;
     nochatreports::register_globals(lua, globals)?;
-    system::register_globals(lua, globals)
+    system::register_globals(lua, globals)?;
+    thread::register_globals(lua, globals)
 }
 
 pub fn reload(lua: &Lua, sender: Option<String>) -> Result<(), Error> {

src/lua/nochatreports/crypt.rs

@@ -3,9 +3,8 @@ macro_rules! crypt {
     ($op:ident, $options:expr, $text:expr) => {{
         macro_rules! crypt_with {
             ($algo:ident) => {{
-                let encoding = $options.get("encoding").unwrap_or_default();
                 let key = &$options.get::<UserDataRef<AesKey>>("key")?.0;
-                match encoding {
+                match $options.get("encoding").unwrap_or_default() {
                     1 => $algo::<Base64Encoding>::$op($text, &key),
                     2 => $algo::<Base64rEncoding>::$op($text, &key),
                     _ => $algo::<NewBase64rEncoding>::$op($text, &key),

src/lua/nochatreports/key.rs

@@ -1,9 +1,9 @@
-use mlua::UserData;
+use mlua::{UserData, UserDataFields};
 
 pub struct AesKey(pub ncr::AesKey);
 
 impl UserData for AesKey {
-    fn add_fields<F: mlua::UserDataFields<Self>>(f: &mut F) {
+    fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
         f.add_field_method_get("base64", |_, this| Ok(this.0.encode_base64()));
         f.add_field_method_get("bytes", |_, this| Ok(this.0.as_ref().to_vec()));
     }

src/lua/system.rs

@@ -1,11 +1,12 @@
-use log::error;
-use mlua::{Lua, Result, Table};
 use std::{
     ffi::OsString,
     process::{Command, Stdio},
     thread,
 };
 
+use log::error;
+use mlua::{Lua, Result, Table};
+
 pub fn register_globals(lua: &Lua, globals: &Table) -> Result<()> {
     globals.set(
         "system",

src/lua/thread.rs

@@ -0,0 +1,28 @@
+use std::time::Duration;
+
+use mlua::{Error, Function, Lua, Result, Table};
+use tokio::time::{sleep, timeout};
+
+pub fn register_globals(lua: &Lua, globals: &Table) -> Result<()> {
+    globals.set(
+        "sleep",
+        lua.create_async_function(async |_, duration: u64| {
+            sleep(Duration::from_millis(duration)).await;
+            Ok(())
+        })?,
+    )?;
+
+    globals.set(
+        "timeout",
+        lua.create_async_function(async |_, (duration, function): (u64, Function)| {
+            timeout(
+                Duration::from_millis(duration),
+                function.call_async::<()>(()),
+            )
+            .await
+            .map_err(Error::external)
+        })?,
+    )?;
+
+    Ok(())
+}

src/lua/vec3.rs

@@ -1,5 +1,5 @@
 use azalea::{BlockPos, entity::Position};
-use mlua::{FromLua, IntoLua, Lua, Result, Value};
+use mlua::{Error, FromLua, IntoLua, Lua, Result, Value};
 
 #[derive(Clone)]
 pub struct Vec3 {
@@ -40,7 +40,7 @@ impl From<&Position> for Vec3 {
 
 impl From<BlockPos> for Vec3 {
     fn from(p: BlockPos) -> Self {
-        Vec3 {
+        Self {
             x: f64::from(p.x),
             y: f64::from(p.y),
             z: f64::from(p.z),
@@ -63,7 +63,7 @@ impl FromLua for Vec3 {
                 },
             )
         } else {
-            Err(mlua::Error::FromLuaConversionError {
+            Err(Error::FromLuaConversionError {
                 from: value.type_name(),
                 to: "Vec3".to_string(),
                 message: None,

src/main.rs

@@ -1,14 +1,27 @@
-#![feature(let_chains)]
+#![feature(if_let_guard, let_chains)]
+#![warn(clippy::pedantic, clippy::nursery)]
+#![allow(clippy::significant_drop_tightening)]
 
 mod arguments;
 mod build_info;
 mod commands;
 mod events;
+mod hacks;
 mod http;
 mod lua;
 mod particle;
 mod replay;
 
+#[cfg(feature = "matrix")]
+mod matrix;
+
+use std::{
+    collections::HashMap,
+    env,
+    fs::{OpenOptions, read_to_string},
+    sync::Arc,
+};
+
 use anyhow::Context;
 use arguments::Arguments;
 use azalea::{
@@ -23,14 +36,10 @@ use clap::Parser;
 use commands::{CommandSource, register};
 use futures::lock::Mutex;
 use futures_locks::RwLock;
+use hacks::HacksPlugin;
+use log::debug;
 use mlua::{Function, Lua, Table};
 use replay::{plugin::RecordPlugin, recorder::Recorder};
-use std::{
-    collections::HashMap,
-    env,
-    fs::{OpenOptions, read_to_string},
-    sync::Arc,
-};
 
 #[cfg(feature = "mimalloc")]
 #[global_allocator]
@@ -39,7 +48,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 type ListenerMap = Arc<RwLock<HashMap<String, Vec<(String, Function)>>>>;
 
 #[derive(Default, Clone, Component)]
-pub struct State {
+struct State {
     lua: Arc<Lua>,
     event_listeners: ListenerMap,
     commands: Arc<CommandDispatcher<Mutex<CommandSource>>>,
@@ -54,24 +63,28 @@ async fn main() -> anyhow::Result<()> {
     let event_listeners = Arc::new(RwLock::new(HashMap::new()));
     let lua = unsafe { Lua::unsafe_new() };
     let globals = lua.globals();
-
     lua::register_globals(&lua, &globals, event_listeners.clone())?;
-    globals.set("SCRIPT_PATH", &*args.script)?;
-    lua.load(
-        read_to_string(&args.script)
-            .with_context(|| format!("failed to read {}", args.script.display()))?,
-    )
-    .exec()?;
+
+    if let Some(path) = args.script {
+        globals.set("SCRIPT_PATH", &*path)?;
+        lua.load(read_to_string(path)?).exec()?;
+    } else if let Some(code) = ["main.lua", "errornowatcher.lua"].iter().find_map(|path| {
+        debug!("trying to load code from {path}");
+        globals.set("SCRIPT_PATH", *path).ok()?;
+        read_to_string(path).ok()
+    }) {
+        lua.load(code).exec()?;
+    }
     if let Some(code) = args.exec {
         lua.load(code).exec()?;
     }
 
     let server = globals
         .get::<String>("Server")
-        .expect("Server should be in lua globals");
+        .context("lua globals missing Server variable")?;
     let username = globals
         .get::<String>("Username")
-        .expect("Username should be in lua globals");
+        .context("lua globals missing Username variable")?;
 
     let mut commands = CommandDispatcher::new();
     register(&mut commands);
@@ -113,8 +126,15 @@ async fn main() -> anyhow::Result<()> {
             },
         )),
     };
+    let account = if username.contains('@') {
+        Account::microsoft(&username).await?
+    } else {
+        Account::offline(&username)
+    };
+
     let Err(error) = ClientBuilder::new_without_plugins()
         .add_plugins(DefaultBotPlugins)
+        .add_plugins(HacksPlugin)
         .add_plugins(default_plugins)
         .add_plugins(record_plugin)
         .set_handler(events::handle_event)
@@ -123,14 +143,7 @@ async fn main() -> anyhow::Result<()> {
             event_listeners,
             commands: Arc::new(commands),
         })
-        .start(
-            if username.contains('@') {
-                Account::microsoft(&username).await?
-            } else {
-                Account::offline(&username)
-            },
-            server,
-        )
+        .start(account, server)
         .await;
     eprintln!("{error}");
 

src/matrix/bot.rs

@@ -0,0 +1,117 @@
+use std::time::Duration;
+
+use anyhow::Result;
+use log::{debug, error};
+use matrix_sdk::{
+    Client, Room, RoomState,
+    event_handler::Ctx,
+    ruma::events::room::{
+        member::StrippedRoomMemberEvent,
+        message::{MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent},
+    },
+};
+use tokio::time::sleep;
+
+use super::Context;
+use crate::{
+    events::call_listeners,
+    lua::{eval, exec, matrix::room::Room as LuaRoom, reload},
+};
+
+pub async fn on_regular_room_message(
+    event: OriginalSyncRoomMessageEvent,
+    room: Room,
+    ctx: Ctx<Context>,
+) -> Result<()> {
+    if room.state() != RoomState::Joined {
+        return Ok(());
+    }
+    let MessageType::Text(text_content) = event.content.msgtype else {
+        return Ok(());
+    };
+
+    if text_content.body.starts_with(&ctx.name) && ctx.is_owner(&event.sender.to_string()) {
+        let body = text_content.body[ctx.name.len()..]
+            .trim_start_matches(':')
+            .trim();
+        let split = body.split_once(char::is_whitespace).unzip();
+        let code = split
+            .1
+            .map(|body| body.trim_start_matches("```lua").trim_matches(['`', '\n']));
+
+        let mut output = None;
+        match split.0.unwrap_or(body).to_lowercase().as_str() {
+            "reload" => {
+                output = Some(
+                    reload(&ctx.state.lua, None)
+                        .map_or_else(|error| error.to_string(), |()| String::from("ok")),
+                );
+            }
+            "eval" if let Some(code) = code => {
+                output = Some(
+                    eval(&ctx.state.lua, code, None)
+                        .await
+                        .unwrap_or_else(|error| error.to_string()),
+                );
+            }
+            "exec" if let Some(code) = code => {
+                output = Some(
+                    exec(&ctx.state.lua, code, None)
+                        .await
+                        .map_or_else(|error| error.to_string(), |()| String::from("ok")),
+                );
+            }
+            "ping" => {
+                room.send(RoomMessageEventContent::text_plain("pong!"))
+                    .await?;
+            }
+            _ => (),
+        }
+
+        if let Some(output) = output {
+            room.send(RoomMessageEventContent::text_html(
+                &output,
+                format!("<pre><code>{output}</code></pre>"),
+            ))
+            .await?;
+        }
+    }
+
+    call_listeners(&ctx.state, "matrix_chat", || {
+        let table = ctx.state.lua.create_table()?;
+        table.set("room", LuaRoom(room))?;
+        table.set("sender_id", event.sender.to_string())?;
+        table.set("body", text_content.body)?;
+        Ok(table)
+    })
+    .await
+}
+
+pub async fn on_stripped_state_member(
+    member: StrippedRoomMemberEvent,
+    client: Client,
+    room: Room,
+    ctx: Ctx<Context>,
+) -> Result<()> {
+    if let Some(user_id) = client.user_id()
+        && member.state_key == user_id
+        && ctx.is_owner(&member.sender.to_string())
+    {
+        debug!("joining room {}", room.room_id());
+        while let Err(error) = room.join().await {
+            error!("failed to join room {}: {error:?}", room.room_id());
+            sleep(Duration::from_secs(10)).await;
+        }
+        debug!("successfully joined room {}", room.room_id());
+
+        call_listeners(&ctx.state, "matrix_join_room", || {
+            let table = ctx.state.lua.create_table()?;
+            table.set("room", LuaRoom(room))?;
+            table.set("sender", member.sender.to_string())?;
+            Ok(table)
+        })
+        .await?;
+    }
+
+    Ok(())
+}

src/matrix/mod.rs

@@ -0,0 +1,149 @@
+mod bot;
+mod verification;
+
+use std::{path::Path, sync::Arc, time::Duration};
+
+use anyhow::{Context as _, Result};
+use bot::{on_regular_room_message, on_stripped_state_member};
+use log::{error, warn};
+use matrix_sdk::{
+    Client, Error, LoopCtrl, authentication::matrix::MatrixSession, config::SyncSettings,
+};
+use mlua::Table;
+use serde::{Deserialize, Serialize};
+use tokio::fs;
+use verification::{on_device_key_verification_request, on_room_message_verification_request};
+
+use crate::{State, events::call_listeners, lua::matrix::client::Client as LuaClient};
+
+#[derive(Clone)]
+struct Context {
+    state: State,
+    name: String,
+}
+
+impl Context {
+    fn is_owner(&self, name: &String) -> bool {
+        self.state
+            .lua
+            .globals()
+            .get::<Table>("MatrixOptions")
+            .ok()
+            .and_then(|options| {
+                options
+                    .get::<Vec<String>>("owners")
+                    .ok()
+                    .and_then(|owners| owners.contains(name).then_some(()))
+            })
+            .is_some()
+    }
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+struct Session {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    sync_token: Option<String>,
+    user_session: MatrixSession,
+}
+
+async fn persist_sync_token(
+    session_file: &Path,
+    session: &mut Session,
+    sync_token: String,
+) -> Result<()> {
+    session.sync_token = Some(sync_token);
+    fs::write(session_file, serde_json::to_string(&session)?).await?;
+    Ok(())
+}
+
+pub async fn login(state: &State, options: &Table, globals: &Table, name: String) -> Result<()> {
+    let (homeserver_url, username, password, sync_timeout) = (
+        options.get::<String>("homeserver_url")?,
+        options.get::<String>("username")?,
+        &options.get::<String>("password")?,
+        options.get::<u64>("sync_timeout"),
+    );
+    let root_dir = dirs::data_dir()
+        .context("no data directory")?
+        .join("errornowatcher")
+        .join(&name)
+        .join("matrix");
+
+    let mut builder = Client::builder().homeserver_url(homeserver_url);
+    if !fs::try_exists(&root_dir).await.unwrap_or_default()
+        && let Err(error) = fs::create_dir_all(&root_dir).await
+    {
+        warn!("failed to create directory for matrix sqlite store: {error:?}");
+    } else {
+        builder = builder.sqlite_store(&root_dir, None);
+    }
+    let client = builder.build().await?;
+
+    let mut sync_settings = SyncSettings::new();
+    if let Ok(seconds) = sync_timeout {
+        sync_settings = sync_settings.timeout(Duration::from_secs(seconds));
+    }
+
+    let mut new_session;
+    let session_file = root_dir.join("session.json");
+    if let Some(session) = fs::read_to_string(&session_file)
+        .await
+        .ok()
+        .and_then(|data| serde_json::from_str::<Session>(&data).ok())
+    {
+        new_session = session.clone();
+        if let Some(sync_token) = session.sync_token {
+            sync_settings = sync_settings.token(sync_token);
+        }
+        client.restore_session(session.user_session).await?;
+    } else {
+        let matrix_auth = client.matrix_auth();
+        matrix_auth
+            .login_username(username, password)
+            .initial_device_display_name(&name)
+            .await?;
+
+        new_session = Session {
+            user_session: matrix_auth.session().context("should have session")?,
+            sync_token: None,
+        };
+        fs::write(&session_file, serde_json::to_string(&new_session)?).await?;
+    }
+
+    client.add_event_handler_context(Context {
+        state: state.to_owned(),
+        name,
+    });
+    client.add_event_handler(on_stripped_state_member);
+    loop {
+        match client.sync_once(sync_settings.clone()).await {
+            Ok(response) => {
+                sync_settings = sync_settings.token(response.next_batch.clone());
+                persist_sync_token(&session_file, &mut new_session, response.next_batch).await?;
+                break;
+            }
+            Err(error) => {
+                error!("failed to do initial sync: {error:?}");
+            }
+        }
+    }
+
+    client.add_event_handler(on_device_key_verification_request);
+    client.add_event_handler(on_room_message_verification_request);
+    client.add_event_handler(on_regular_room_message);
+
+    let client = Arc::new(client);
+    globals.set("matrix", LuaClient(client.clone()))?;
+    call_listeners(state, "matrix_init", || Ok(())).await?;
+
+    client
+        .sync_with_result_callback(sync_settings, |sync_result| async {
+            let mut new_session = new_session.clone();
+            persist_sync_token(&session_file, &mut new_session, sync_result?.next_batch)
+                .await
+                .map_err(|err| Error::UnknownError(err.into()))?;
+            Ok(LoopCtrl::Continue)
+        })
+        .await?;
+    Ok(())
+}

src/matrix/verification.rs

@@ -0,0 +1,156 @@
+use std::time::Duration;
+
+use anyhow::{Context, Result};
+use futures::StreamExt;
+use log::{error, info, warn};
+use matrix_sdk::{
+    Client,
+    crypto::{Emoji, SasState, format_emojis},
+    encryption::verification::{
+        SasVerification, Verification, VerificationRequest, VerificationRequestState,
+    },
+    ruma::{
+        UserId,
+        events::{
+            key::verification::request::ToDeviceKeyVerificationRequestEvent,
+            room::message::{MessageType, OriginalSyncRoomMessageEvent},
+        },
+    },
+};
+use tokio::time::sleep;
+
+async fn confirm_emojis(sas: SasVerification, emoji: [Emoji; 7]) {
+    info!("\n{}", format_emojis(emoji));
+    warn!("automatically confirming emojis in 10 seconds");
+    sleep(Duration::from_secs(10)).await;
+    if let Err(error) = sas.confirm().await {
+        error!("failed to confirm emojis: {error:?}");
+    }
+}
+
+async fn print_devices(user_id: &UserId, client: &Client) -> Result<()> {
+    info!("devices of user {user_id}");
+
+    let own_id = client.device_id().context("missing own device id")?;
+    for device in client
+        .encryption()
+        .get_user_devices(user_id)
+        .await?
+        .devices()
+        .filter(|device| device.device_id() != own_id)
+    {
+        info!(
+            "\t{:<10} {:<30} {:<}",
+            device.device_id(),
+            device.display_name().unwrap_or("-"),
+            if device.is_verified() { "✅" } else { "❌" }
+        );
+    }
+
+    Ok(())
+}
+
+async fn sas_verification_handler(client: Client, sas: SasVerification) -> Result<()> {
+    info!(
+        "starting verification with {} {}",
+        &sas.other_device().user_id(),
+        &sas.other_device().device_id()
+    );
+    print_devices(sas.other_device().user_id(), &client).await?;
+    sas.accept().await?;
+
+    while let Some(state) = sas.changes().next().await {
+        match state {
+            SasState::KeysExchanged {
+                emojis,
+                decimals: _,
+            } => {
+                tokio::spawn(confirm_emojis(
+                    sas.clone(),
+                    emojis.context("only emoji verification supported")?.emojis,
+                ));
+            }
+            SasState::Done { .. } => {
+                let device = sas.other_device();
+                info!(
+                    "successfully verified device {} {} with trust {:?}",
+                    device.user_id(),
+                    device.device_id(),
+                    device.local_trust_state()
+                );
+                print_devices(sas.other_device().user_id(), &client).await?;
+                break;
+            }
+            SasState::Cancelled(info) => {
+                warn!("verification cancelled: {}", info.reason());
+                break;
+            }
+            SasState::Created { .. }
+            | SasState::Started { .. }
+            | SasState::Accepted { .. }
+            | SasState::Confirmed => (),
+        }
+    }
+
+    Ok(())
+}
+
+async fn request_verification_handler(client: Client, request: VerificationRequest) {
+    info!(
+        "accepting verification request from {}",
+        request.other_user_id()
+    );
+    if let Err(error) = request.accept().await {
+        error!("failed to accept verification request: {error:?}");
+        return;
+    }
+
+    while let Some(state) = request.changes().next().await {
+        match state {
+            VerificationRequestState::Created { .. }
+            | VerificationRequestState::Requested { .. }
+            | VerificationRequestState::Ready { .. } => (),
+            VerificationRequestState::Transitioned { verification } => {
+                if let Verification::SasV1(sas) = verification {
+                    tokio::spawn(async move {
+                        if let Err(error) = sas_verification_handler(client, sas).await {
+                            error!("failed to handle sas verification request: {error:?}");
+                        }
+                    });
+                    break;
+                }
+            }
+            VerificationRequestState::Done | VerificationRequestState::Cancelled(_) => break,
+        }
+    }
+}
+
+pub async fn on_device_key_verification_request(
+    event: ToDeviceKeyVerificationRequestEvent,
+    client: Client,
+) -> Result<()> {
+    let request = client
+        .encryption()
+        .get_verification_request(&event.sender, &event.content.transaction_id)
+        .await
+        .context("request object wasn't created")?;
+    tokio::spawn(request_verification_handler(client, request));
+
+    Ok(())
+}
+
+pub async fn on_room_message_verification_request(
+    event: OriginalSyncRoomMessageEvent,
+    client: Client,
+) -> Result<()> {
+    if let MessageType::VerificationRequest(_) = &event.content.msgtype {
+        let request = client
+            .encryption()
+            .get_verification_request(&event.sender, &event.event_id)
+            .await
+            .context("request object wasn't created")?;
+        tokio::spawn(request_verification_handler(client, request));
+    }
+
+    Ok(())
+}

src/particle.rs

@@ -1,7 +1,7 @@
 use azalea::{entity::particle::Particle, registry::ParticleKind};
 
 #[allow(clippy::too_many_lines)]
-pub fn to_kind(particle: &Particle) -> ParticleKind {
+pub const fn to_kind(particle: &Particle) -> ParticleKind {
     match particle {
         Particle::AngryVillager => ParticleKind::AngryVillager,
         Particle::Block(_) => ParticleKind::Block,
@@ -34,6 +34,7 @@ pub fn to_kind(particle: &Particle) -> ParticleKind {
         Particle::Flame => ParticleKind::Flame,
         Particle::CherryLeaves => ParticleKind::CherryLeaves,
         Particle::PaleOakLeaves => ParticleKind::PaleOakLeaves,
+        Particle::TintedLeaves => ParticleKind::TintedLeaves,
         Particle::SculkSoul => ParticleKind::SculkSoul,
         Particle::SculkCharge(_) => ParticleKind::SculkCharge,
         Particle::SculkChargePop => ParticleKind::SculkChargePop,
@@ -115,5 +116,6 @@ pub fn to_kind(particle: &Particle) -> ParticleKind {
         Particle::TrialOmen => ParticleKind::TrialOmen,
         Particle::Trail => ParticleKind::Trail,
         Particle::BlockCrumble => ParticleKind::BlockCrumble,
+        Particle::Firefly => ParticleKind::Firefly,
     }
 }

src/replay/plugin.rs

@@ -1,33 +1,39 @@
 #![allow(clippy::needless_pass_by_value)]
 
-use super::recorder::Recorder;
+use std::sync::Arc;
+
 use azalea::{
     ecs::{event::EventReader, system::Query},
-    packet_handling::{
-        configuration::ConfigurationEvent,
-        game::send_packet_events,
+    packet::{
+        config::ReceiveConfigPacketEvent,
+        game::emit_receive_packet_events,
         login::{LoginPacketEvent, process_packet_events},
     },
     protocol::packets::login::ClientboundLoginPacket,
     raw_connection::RawConnection,
 };
-use bevy_app::{First, Plugin};
+use bevy_app::{App, First, Plugin};
 use bevy_ecs::{schedule::IntoSystemConfigs, system::ResMut};
 use log::error;
 use parking_lot::Mutex;
-use std::sync::Arc;
+
+use super::recorder::Recorder;
 
 pub struct RecordPlugin {
     pub recorder: Arc<Mutex<Option<Recorder>>>,
 }
 
 impl Plugin for RecordPlugin {
-    fn build(&self, app: &mut bevy_app::App) {
-        if let Some(recorder) = self.recorder.lock().take() {
+    fn build(&self, app: &mut App) {
+        let recorder = self.recorder.lock().take();
+        if let Some(recorder) = recorder {
             app.insert_resource(recorder)
                 .add_systems(First, record_login_packets.before(process_packet_events))
                 .add_systems(First, record_configuration_packets)
-                .add_systems(First, record_game_packets.before(send_packet_events));
+                .add_systems(
+                    First,
+                    record_game_packets.before(emit_receive_packet_events),
+                );
         }
     }
 }
@@ -53,7 +59,7 @@ fn record_login_packets(
 
 fn record_configuration_packets(
     recorder: Option<ResMut<Recorder>>,
-    mut events: EventReader<ConfigurationEvent>,
+    mut events: EventReader<ReceiveConfigPacketEvent>,
 ) {
     if let Some(mut recorder) = recorder {
         for event in events.read() {

src/replay/recorder.rs

@@ -1,4 +1,9 @@
-use crate::build_info;
+use std::{
+    fs::File,
+    io::{BufWriter, Write},
+    time::{Instant, SystemTime, UNIX_EPOCH},
+};
+
 use anyhow::Result;
 use azalea::{
     buf::AzaleaWriteVar,
@@ -7,13 +12,10 @@ use azalea::{
 };
 use log::debug;
 use serde_json::json;
-use std::{
-    fs::File,
-    io::{BufWriter, Write},
-    time::{Instant, SystemTime, UNIX_EPOCH},
-};
 use zip::{ZipWriter, write::SimpleFileOptions};
 
+use crate::build_info;
+
 #[derive(Resource)]
 pub struct Recorder {
     zip_writer: BufWriter<ZipWriter<File>>,
@@ -56,7 +58,7 @@ impl Recorder {
                 "fileFormat": "MCPR",
                 "fileFormatVersion": 14,
                 "protocol": PROTOCOL_VERSION,
-                "generator": format!("errornowatcher {}", build_info::version_formatted()),
+                "generator": format!("ErrorNoWatcher {}", build_info::version_formatted()),
             })
             .to_string()
             .as_bytes(),
@@ -68,11 +70,12 @@ impl Recorder {
     }
 
     pub fn save_raw_packet(&mut self, raw_packet: &[u8]) -> Result<()> {
-        let mut data = Vec::with_capacity(raw_packet.len() + 8);
-        data.extend(TryInto::<u32>::try_into(self.start.elapsed().as_millis())?.to_be_bytes());
-        data.extend(TryInto::<u32>::try_into(raw_packet.len())?.to_be_bytes());
-        data.extend(raw_packet);
-        self.zip_writer.write_all(&data)?;
+        self.zip_writer.write_all(
+            &TryInto::<u32>::try_into(self.start.elapsed().as_millis())?.to_be_bytes(),
+        )?;
+        self.zip_writer
+            .write_all(&TryInto::<u32>::try_into(raw_packet.len())?.to_be_bytes())?;
+        self.zip_writer.write_all(raw_packet)?;
         Ok(())
     }