ErrorNoInternet/ErrorNoWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: clean up locking and convert to async

Browse Source
This commit is contained in:
Ryan
2025-02-16 14:21:29 -05:00
parent 1c7a6fde09
commit 2e1736af25
7 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/commands.rs
View File

@@ -7,7 +7,7 @@ use azalea::{
prelude::*,
};
use bevy_ecs::{entity::Entity, query::With};
use parking_lot::Mutex;
use futures::lock::Mutex;
pub type Ctx<'a> = CommandContext<Mutex<CommandSource>>;
@@ -40,35 +40,43 @@ impl CommandSource {
pub fn register(commands: &mut CommandDispatcher<Mutex<CommandSource>>) {
commands.register(literal("reload").executes(|ctx: &Ctx| {
let source = ctx.source.lock();
source.reply(&format!("{:?}", reload(&source.state.lua.lock())));
let source = ctx.source.clone();
tokio::spawn(async move {
let source = source.lock().await;
source.reply(&format!("{:?}", reload(&source.state.lua)));
});
1
}));
commands.register(
literal("eval").then(argument("code", string()).executes(|ctx: &Ctx| {
let source = ctx.source.lock();
source.reply(&format!(
"{:?}",
eval(&source.state.lua.lock(), &get_string(ctx, "code").unwrap())
));
let source = ctx.source.clone();
let code = get_string(ctx, "code").unwrap();
tokio::spawn(async move {
let source = source.lock().await;
source.reply(&format!("{:?}", eval(&source.state.lua, &code).await));
});
1
})),
);
commands.register(
literal("exec").then(argument("code", string()).executes(|ctx: &Ctx| {
let source = ctx.source.lock();
source.reply(&format!(
"{:?}",
exec(&source.state.lua.lock(), &get_string(ctx, "code").unwrap())
));
let source = ctx.source.clone();
let code = get_string(ctx, "code").unwrap();
tokio::spawn(async move {
let source = source.lock().await;
source.reply(&format!("{:?}", exec(&source.state.lua, &code).await));
});
1
})),
);
commands.register(literal("ping").executes(|ctx: &Ctx| {
ctx.source.lock().reply("pong!");
let source = ctx.source.clone();
tokio::spawn(async move {
source.lock().await.reply("pong!");
});
1
}));
}