Bot API (#27)

Basically make the `azalea` crate have stuff

1 files changed, 47 insertions, 26 deletions

diff --git a/azalea/examples/craft_dig_straight_down.rs b/azalea/examples/craft_dig_straight_down.rs
index 53e5cae8..3b7267ef 100644
--- a/azalea/examples/craft_dig_straight_down.rs
+++ b/azalea/examples/craft_dig_straight_down.rs
@@ -1,45 +1,66 @@
-use azalea::{Bot, Event};
+use azalea::{pathfinder, Account};
+use azalea::{Bot, Client, Event};
+use parking_lot::Mutex;
+use std::sync::Arc;
 
-struct Context {
-    pub started: bool
+#[derive(Default)]
+struct State {
+    pub started: bool,
 }
 
 #[tokio::main]
 async fn main() {
-    let bot = Bot::offline("bot");
+    let account = Account::offline("bot");
     // or let bot = azalea::Bot::microsoft("access token").await;
 
-    bot.join("localhost".try_into().unwrap()).await.unwrap();
-
-    let ctx = Arc::new(Mutex::new(Context { started: false }));
-
-    loop {
-       tokio::spawn(handle_event(bot.next().await, bot, ctx.clone()));
-    }
+    azalea::start(azalea::Options {
+        account,
+        address: "localhost",
+        state: Arc::new(Mutex::new(State::default())),
+        plugins: vec![],
+        handle,
+    })
+    .await
+    .unwrap();
 }
 
-
-async fn handle_event(event: &Event, bot: &Bot, ctx: Arc<Context>) {
+async fn handle(bot: Client, event: Arc<Event>, state: Arc<Mutex<State>>) {
     match event {
-        Event::Message(m) {
-            if m.username == bot.player.username { return };
+        Event::Message(m) => {
+            if m.username == bot.player.username {
+                return;
+            };
             if m.message = "go" {
                 // make sure we only start once
                 let ctx_lock = ctx.lock().unwrap();
-                if ctx_lock.started { return };
+                if ctx_lock.started {
+                    return;
+                };
                 ctx_lock.started = true;
                 drop(ctx_lock);
 
-                bot.goto(
-                    pathfinder::Goals::NearXZ(5, azalea::BlockXZ(0, 0))
-                ).await;
-                let chest = bot.open_container(&bot.world.find_one_block(|b| b.id == "minecraft:chest")).await.unwrap();
-                bot.take_amount(&chest, 5, |i| i.id == "#minecraft:planks").await;
+                bot.goto(pathfinder::Goals::NearXZ(5, azalea::BlockXZ(0, 0)))
+                    .await;
+                let chest = bot
+                    .open_container(&bot.world.find_one_block(|b| b.id == "minecraft:chest"))
+                    .await
+                    .unwrap();
+                bot.take_amount(&chest, 5, |i| i.id == "#minecraft:planks")
+                    .await;
                 chest.close().await;
 
-                let crafting_table = bot.open_crafting_table(&bot.world.find_one_block(|b| b.id == "minecraft:crafting_table")).await.unwrap();
-                bot.craft(&crafting_table, &bot.recipe_for("minecraft:sticks")).await?;
-                let pickaxe = bot.craft(&crafting_table, &bot.recipe_for("minecraft:wooden_pickaxe")).await?;
+                let crafting_table = bot
+                    .open_crafting_table(
+                        &bot.world
+                            .find_one_block(|b| b.id == "minecraft:crafting_table"),
+                    )
+                    .await
+                    .unwrap();
+                bot.craft(&crafting_table, &bot.recipe_for("minecraft:sticks"))
+                    .await?;
+                let pickaxe = bot
+                    .craft(&crafting_table, &bot.recipe_for("minecraft:wooden_pickaxe"))
+                    .await?;
                 crafting_table.close().await;
 
                 bot.hold(&pickaxe);
@@ -50,7 +71,7 @@ async fn handle_event(event: &Event, bot: &Bot, ctx: Arc<Context>) {
                     }
                 }
             }
-        },
+        }
         _ => {}
     }
-}
\ No newline at end of file
+}