diff --git a/src/lua/block.rs b/src/lua/block.rs index 1e54bd9..32e978d 100644 --- a/src/lua/block.rs +++ b/src/lua/block.rs @@ -9,7 +9,10 @@ pub fn register_functions(lua: &Lua, globals: &Table) -> Result<()> { "get_block_from_state", lua.create_function(get_block_from_state)?, )?; - globals.set("get_block_states", lua.create_async_function(get_block_states)?)?; + globals.set( + "get_block_states", + lua.create_async_function(get_block_states)?, + )?; Ok(()) } @@ -18,20 +21,20 @@ pub fn get_block_from_state(lua: &Lua, state: u32) -> Result> { let Ok(state) = BlockState::try_from(state) else { return Ok(None); }; - let b: Box = state.into(); - let bh = b.behavior(); + let block: Box = state.into(); + let behavior = block.behavior(); - let block = lua.create_table()?; - block.set("id", b.id())?; - block.set("friction", bh.friction)?; - block.set("jump_factor", bh.jump_factor)?; - block.set("destroy_time", bh.destroy_time)?; - block.set("explosion_resistance", bh.explosion_resistance)?; - block.set( + let table = lua.create_table()?; + table.set("id", block.id())?; + table.set("friction", behavior.friction)?; + table.set("jump_factor", behavior.jump_factor)?; + table.set("destroy_time", behavior.destroy_time)?; + table.set("explosion_resistance", behavior.explosion_resistance)?; + table.set( "requires_correct_tool_for_drops", - bh.requires_correct_tool_for_drops, + behavior.requires_correct_tool_for_drops, )?; - Ok(Some(block)) + Ok(Some(table)) } pub async fn get_block_states( diff --git a/src/lua/client/movement.rs b/src/lua/client/movement.rs index 8198e0e..7a09502 100644 --- a/src/lua/client/movement.rs +++ b/src/lua/client/movement.rs @@ -117,15 +117,15 @@ pub fn jump(_lua: &Lua, client: &mut Client, _: ()) -> Result<()> { } pub fn looking_at(lua: &Lua, client: &Client) -> Result> { - let r = client.component::(); - Ok(if r.miss { + let result = client.component::(); + Ok(if result.miss { None } else { - let result = lua.create_table()?; - result.set("position", Vec3::from(r.block_pos))?; - result.set("inside", r.inside)?; - result.set("world_border", r.world_border)?; - Some(result) + let table = lua.create_table()?; + table.set("position", Vec3::from(result.block_pos))?; + table.set("inside", result.inside)?; + table.set("world_border", result.world_border)?; + Some(table) }) } @@ -149,26 +149,29 @@ pub async fn look_at(_lua: Lua, client: UserDataRef, position: Vec3) -> } pub fn pathfinder(lua: &Lua, client: &Client) -> Result { - let pathfinder = lua.create_table()?; - pathfinder.set( + let table = lua.create_table()?; + table.set( "is_calculating", client.component::().is_calculating, )?; - pathfinder.set( + table.set( "is_executing", - if let Some(p) = client.get_component::() { - pathfinder.set("last_reached_node", Vec3::from(p.last_reached_node))?; - pathfinder.set( - "last_node_reach_elapsed", - p.last_node_reached_at.elapsed().as_millis(), + if let Some(pathfinder) = client.get_component::() { + table.set( + "last_reached_node", + Vec3::from(pathfinder.last_reached_node), )?; - pathfinder.set("is_path_partial", p.is_path_partial)?; + table.set( + "last_node_reach_elapsed", + pathfinder.last_node_reached_at.elapsed().as_millis(), + )?; + table.set("is_path_partial", pathfinder.is_path_partial)?; true } else { false }, )?; - Ok(pathfinder) + Ok(table) } pub fn position(_lua: &Lua, client: &Client) -> Result { diff --git a/src/lua/client/state.rs b/src/lua/client/state.rs index 957770e..7c9a53a 100644 --- a/src/lua/client/state.rs +++ b/src/lua/client/state.rs @@ -16,12 +16,12 @@ pub fn health(_lua: &Lua, client: &Client) -> Result { } pub fn hunger(lua: &Lua, client: &Client) -> Result
{ - let h = client.hunger(); + let hunger = client.hunger(); - let hunger = lua.create_table()?; - hunger.set("food", h.food)?; - hunger.set("saturation", h.saturation)?; - Ok(hunger) + let table = lua.create_table()?; + table.set("food", hunger.food)?; + table.set("saturation", hunger.saturation)?; + Ok(table) } pub fn score(_lua: &Lua, client: &Client) -> Result { diff --git a/src/lua/client/world.rs b/src/lua/client/world.rs index bedb0c3..6f5942f 100644 --- a/src/lua/client/world.rs +++ b/src/lua/client/world.rs @@ -13,12 +13,12 @@ use azalea::{ use mlua::{Function, Lua, Result, Table, UserDataRef}; pub fn best_tool_for_block(lua: &Lua, client: &Client, block_state: u16) -> Result
{ - let tr = client.best_tool_in_hotbar_for_block(BlockState { id: block_state }); + let result = client.best_tool_in_hotbar_for_block(BlockState { id: block_state }); - let tool_result = lua.create_table()?; - tool_result.set("index", tr.index)?; - tool_result.set("percentage_per_tick", tr.percentage_per_tick)?; - Ok(tool_result) + let table = lua.create_table()?; + table.set("index", result.index)?; + table.set("percentage_per_tick", result.percentage_per_tick)?; + Ok(table) } pub fn dimension(_lua: &Lua, client: &Client) -> Result { @@ -105,16 +105,16 @@ pub fn get_block_state(_lua: &Lua, client: &Client, position: Vec3) -> Result Result> { #[allow(clippy::cast_possible_truncation)] Ok( - if let Some(fs) = client.world().read().get_fluid_state(&BlockPos::new( + 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 fluid_state = lua.create_table()?; - fluid_state.set("kind", fs.kind as u8)?; - fluid_state.set("amount", fs.amount)?; - fluid_state.set("falling", fs.falling)?; - Some(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 },