refactor: minor changes
This commit is contained in:
parent
3400541a79
commit
a957aaeaec
@ -6,7 +6,7 @@ use azalea::{
|
|||||||
protocol::packets::game::ServerboundSetCarriedItem,
|
protocol::packets::game::ServerboundSetCarriedItem,
|
||||||
};
|
};
|
||||||
use log::error;
|
use log::error;
|
||||||
use mlua::{Lua, Result, Table, UserDataRef};
|
use mlua::{Lua, Result, UserDataRef, Value};
|
||||||
|
|
||||||
pub fn container(_lua: &Lua, client: &Client) -> Result<Option<ContainerRef>> {
|
pub fn container(_lua: &Lua, client: &Client) -> Result<Option<ContainerRef>> {
|
||||||
Ok(client.get_open_container().map(ContainerRef))
|
Ok(client.get_open_container().map(ContainerRef))
|
||||||
@ -21,7 +21,7 @@ pub fn held_slot(_lua: &Lua, client: &Client) -> Result<u8> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[allow(clippy::too_many_lines)]
|
#[allow(clippy::too_many_lines)]
|
||||||
pub fn menu(lua: &Lua, client: &Client) -> Result<Table> {
|
pub fn menu(lua: &Lua, client: &Client) -> Result<Value> {
|
||||||
fn from_slot_list<const N: usize>(s: SlotList<N>) -> Vec<ItemStack> {
|
fn from_slot_list<const N: usize>(s: SlotList<N>) -> Vec<ItemStack> {
|
||||||
s.iter()
|
s.iter()
|
||||||
.map(|i| ItemStack(i.to_owned()))
|
.map(|i| ItemStack(i.to_owned()))
|
||||||
@ -84,9 +84,9 @@ pub fn menu(lua: &Lua, client: &Client) -> Result<Table> {
|
|||||||
table.set("contents", from_slot_list(contents))?;
|
table.set("contents", from_slot_list(contents))?;
|
||||||
table.set("player", from_slot_list(player))?;
|
table.set("player", from_slot_list(player))?;
|
||||||
}
|
}
|
||||||
_ => (),
|
_ => return Ok(Value::Nil),
|
||||||
}
|
}
|
||||||
Ok(table)
|
Ok(Value::Table(table))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn open_container_at(
|
pub async fn open_container_at(
|
||||||
|
@ -55,15 +55,15 @@ pub fn start_mining(_lua: &Lua, client: &mut Client, position: Vec3) -> Result<(
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn use_item(_lua: &Lua, client: &Client, hand: Option<u8>) -> Result<()> {
|
pub fn use_item(_lua: &Lua, client: &Client, hand: Option<u8>) -> Result<()> {
|
||||||
let d = client.direction();
|
let direction = client.direction();
|
||||||
if let Err(error) = client.write_packet(ServerboundUseItem {
|
if let Err(error) = client.write_packet(ServerboundUseItem {
|
||||||
hand: match hand {
|
hand: match hand {
|
||||||
Some(1) => InteractionHand::OffHand,
|
Some(1) => InteractionHand::OffHand,
|
||||||
_ => InteractionHand::MainHand,
|
_ => InteractionHand::MainHand,
|
||||||
},
|
},
|
||||||
sequence: 0,
|
sequence: 0,
|
||||||
yaw: d.0,
|
yaw: direction.0,
|
||||||
pitch: d.1,
|
pitch: direction.1,
|
||||||
}) {
|
}) {
|
||||||
error!("failed to send UseItem packet: {error:?}");
|
error!("failed to send UseItem packet: {error:?}");
|
||||||
}
|
}
|
||||||
|
@ -14,8 +14,11 @@ use log::error;
|
|||||||
use mlua::{FromLua, Lua, Result, Table, UserDataRef, Value};
|
use mlua::{FromLua, Lua, Result, Table, UserDataRef, Value};
|
||||||
|
|
||||||
pub fn direction(_lua: &Lua, client: &Client) -> Result<Direction> {
|
pub fn direction(_lua: &Lua, client: &Client) -> Result<Direction> {
|
||||||
let d = client.direction();
|
let direction = client.direction();
|
||||||
Ok(Direction { y: d.0, x: d.1 })
|
Ok(Direction {
|
||||||
|
y: direction.0,
|
||||||
|
x: direction.1,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn eye_position(_lua: &Lua, client: &Client) -> Result<Vec3> {
|
pub fn eye_position(_lua: &Lua, client: &Client) -> Result<Vec3> {
|
||||||
|
@ -19,7 +19,6 @@ pub fn health(_lua: &Lua, client: &Client) -> Result<f32> {
|
|||||||
|
|
||||||
pub fn hunger(lua: &Lua, client: &Client) -> Result<Table> {
|
pub fn hunger(lua: &Lua, client: &Client) -> Result<Table> {
|
||||||
let hunger = client.hunger();
|
let hunger = client.hunger();
|
||||||
|
|
||||||
let table = lua.create_table()?;
|
let table = lua.create_table()?;
|
||||||
table.set("food", hunger.food)?;
|
table.set("food", hunger.food)?;
|
||||||
table.set("saturation", hunger.saturation)?;
|
table.set("saturation", hunger.saturation)?;
|
||||||
|
@ -114,9 +114,9 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
)),
|
)),
|
||||||
};
|
};
|
||||||
let Err(error) = ClientBuilder::new_without_plugins()
|
let Err(error) = ClientBuilder::new_without_plugins()
|
||||||
|
.add_plugins(DefaultBotPlugins)
|
||||||
.add_plugins(default_plugins)
|
.add_plugins(default_plugins)
|
||||||
.add_plugins(record_plugin)
|
.add_plugins(record_plugin)
|
||||||
.add_plugins(DefaultBotPlugins)
|
|
||||||
.set_handler(events::handle_event)
|
.set_handler(events::handle_event)
|
||||||
.set_state(State {
|
.set_state(State {
|
||||||
lua: Arc::new(lua),
|
lua: Arc::new(lua),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user