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

refactor(client): simplify usage with deref

Browse Source
This commit is contained in:
Ryan
2025-02-18 21:34:57 -05:00
parent 93a2dda8c6
commit 75d4a9c183
7 changed files with 68 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lua/client/interaction.rs
View File

@@ -3,17 +3,13 @@ use azalea::{BlockPos, BotClientExt, world::MinecraftEntityId};
use mlua::{Lua, Result, UserDataRef};
pub fn attack(_lua: &Lua, client: &mut Client, entity_id: u32) -> Result<()> {
client
.inner
.as_mut()
.unwrap()
.attack(MinecraftEntityId(entity_id));
client.attack(MinecraftEntityId(entity_id));
Ok(())
}
pub fn block_interact(_lua: &Lua, client: &mut Client, position: Vec3) -> Result<()> {
#[allow(clippy::cast_possible_truncation)]
client.inner.as_mut().unwrap().block_interact(BlockPos::new(
client.block_interact(BlockPos::new(
position.x as i32,
position.y as i32,
position.z as i32,
@@ -22,15 +18,13 @@ pub fn block_interact(_lua: &Lua, client: &mut Client, position: Vec3) -> Result
}
pub fn has_attack_cooldown(_lua: &Lua, client: &Client) -> Result<bool> {
Ok(client.inner.as_ref().unwrap().has_attack_cooldown())
Ok(client.has_attack_cooldown())
}
pub async fn mine(_lua: Lua, client: UserDataRef<Client>, position: Vec3) -> Result<()> {
#[allow(clippy::cast_possible_truncation)]
client
.inner
.clone()
.unwrap()
.mine(BlockPos::new(
position.x as i32,
position.y as i32,
@@ -41,13 +35,13 @@ pub async fn mine(_lua: Lua, client: UserDataRef<Client>, position: Vec3) -> Res
}
pub fn set_mining(_lua: &Lua, client: &Client, mining: bool) -> Result<()> {
client.inner.as_ref().unwrap().left_click_mine(mining);
client.left_click_mine(mining);
Ok(())
}
pub fn start_mining(_lua: &Lua, client: &mut Client, position: Vec3) -> Result<()> {
#[allow(clippy::cast_possible_truncation)]
client.inner.as_mut().unwrap().start_mining(BlockPos::new(
client.start_mining(BlockPos::new(
position.x as i32,
position.y as i32,
position.z as i32,