diff --git a/errornowatcher.lua b/errornowatcher.lua index 95ef5c5..fc641ba 100644 --- a/errornowatcher.lua +++ b/errornowatcher.lua @@ -9,7 +9,7 @@ for _, module in "utils", } do - module = "lua/" .. module + module = "lib/" .. module package.loaded[module] = nil require(module) end diff --git a/lua/enum.lua b/lib/enum.lua similarity index 100% rename from lua/enum.lua rename to lib/enum.lua diff --git a/lua/events.lua b/lib/events.lua similarity index 100% rename from lua/events.lua rename to lib/events.lua diff --git a/lua/utils.lua b/lib/utils.lua similarity index 100% rename from lua/utils.lua rename to lib/utils.lua diff --git a/src/commands.rs b/src/commands.rs index d6c68c5..cb38b18 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1,6 +1,6 @@ use crate::{ State, - scripting::{eval, exec, reload}, + lua::{eval, exec, reload}, }; use azalea::{ GameProfileComponent, brigadier::prelude::*, chat::ChatPacket, entity::metadata::Player, diff --git a/src/events.rs b/src/events.rs index a0a31d2..9569634 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,4 +1,4 @@ -use crate::{State, commands::CommandSource, http::serve, scripting}; +use crate::{State, commands::CommandSource, http::serve, lua}; use azalea::prelude::*; use hyper::{server::conn::http1, service::service_fn}; use hyper_util::rt::TokioIo; @@ -53,7 +53,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow: globals.set( "client", - scripting::client::Client { + lua::client::Client { inner: Some(client), }, )?; diff --git a/src/http.rs b/src/http.rs index 67953b6..acd8d97 100644 --- a/src/http.rs +++ b/src/http.rs @@ -1,6 +1,6 @@ use crate::{ State, - scripting::{eval, exec, reload}, + lua::{eval, exec, reload}, }; use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody}; use hyper::{Method, Request, Response, StatusCode, body::Bytes}; diff --git a/src/scripting/block.rs b/src/lua/block.rs similarity index 100% rename from src/scripting/block.rs rename to src/lua/block.rs diff --git a/src/scripting/client/interaction.rs b/src/lua/client/interaction.rs similarity index 100% rename from src/scripting/client/interaction.rs rename to src/lua/client/interaction.rs diff --git a/src/scripting/client/mod.rs b/src/lua/client/mod.rs similarity index 100% rename from src/scripting/client/mod.rs rename to src/lua/client/mod.rs diff --git a/src/scripting/client/movement.rs b/src/lua/client/movement.rs similarity index 100% rename from src/scripting/client/movement.rs rename to src/lua/client/movement.rs diff --git a/src/scripting/client/state.rs b/src/lua/client/state.rs similarity index 100% rename from src/scripting/client/state.rs rename to src/lua/client/state.rs diff --git a/src/scripting/client/world.rs b/src/lua/client/world.rs similarity index 100% rename from src/scripting/client/world.rs rename to src/lua/client/world.rs diff --git a/src/scripting/direction.rs b/src/lua/direction.rs similarity index 100% rename from src/scripting/direction.rs rename to src/lua/direction.rs diff --git a/src/scripting/entity.rs b/src/lua/entity.rs similarity index 100% rename from src/scripting/entity.rs rename to src/lua/entity.rs diff --git a/src/scripting/fluid_state.rs b/src/lua/fluid_state.rs similarity index 100% rename from src/scripting/fluid_state.rs rename to src/lua/fluid_state.rs diff --git a/src/scripting/hunger.rs b/src/lua/hunger.rs similarity index 100% rename from src/scripting/hunger.rs rename to src/lua/hunger.rs diff --git a/src/scripting/logging.rs b/src/lua/logging.rs similarity index 100% rename from src/scripting/logging.rs rename to src/lua/logging.rs diff --git a/src/scripting/mod.rs b/src/lua/mod.rs similarity index 100% rename from src/scripting/mod.rs rename to src/lua/mod.rs diff --git a/src/scripting/vec3.rs b/src/lua/vec3.rs similarity index 100% rename from src/scripting/vec3.rs rename to src/lua/vec3.rs diff --git a/src/main.rs b/src/main.rs index b882784..c91d9ce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ mod arguments; mod commands; mod events; mod http; -mod scripting; +mod lua; use azalea::{brigadier::prelude::CommandDispatcher, prelude::*}; use clap::Parser; @@ -34,7 +34,7 @@ async fn main() -> anyhow::Result<()> { let username = globals.get::("USERNAME")?; globals.set("script_path", script_path)?; - scripting::register_functions(&lua, &globals)?; + lua::register_functions(&lua, &globals)?; let mut commands = CommandDispatcher::new(); register(&mut commands);