From 631ed63dbdc7167df4de02a55b5c2ef1cea909e9 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sun, 27 Nov 2022 16:25:07 -0600
Subject: Swarm (#36)

* make azalea-pathfinder dir

* start writing d* lite impl

* more work on d* lite

* work more on implementing d* lite

* full d* lite impl

* updated edges

* add next() function

* add NoPathError

* why does dstar lite not work

* fix d* lite implementation

* make the test actually check the coords

* replace while loop with if statement

* fix clippy complaints

* make W only have to be PartialOrd

* fix PartialOrd issues

* implement mtd* lite

* add a test to mtd* lite

* remove normal d* lite

* make heuristic only take in one arg

* add `success` function

* Update README.md

* evil black magic to make .entity not need dimension

* start adding moves

* slightly improve the vec3/position situation

new macro that implements all the useful functions

* moves stuff

* make it compile

* update deps in az-pathfinder

* make it compile again

* more pathfinding stuff

* add Bot::look_at

* replace EntityMut and EntityRef with just Entity

* block pos pathfinding stuff

* rename movedirection to walkdirection

* execute path every tick

* advance path

* change az-pf version

* make azalea_client keep plugin state

* fix Plugins::get

* why does it think there is air

* start debugging incorrect air

* update some From methods to use rem_euclid

* start adding swarm

* fix deadlock

i still don't understand why it was happening but the solution was to keep the Client::player lock for shorter so it didn't overlap with the Client::dimension lock

* make lookat actually work probably

* fix going too fast

* Update main.rs

* make a thing immutable

* direction_looking_at

* fix rotations

* import swarm in an example

* fix stuff from merge

* remove azalea_pathfinder import

* delete azalea-pathfinder crate

already in azalea::pathfinder module

* swarms

* start working on shared dimensions

* Shared worlds work

* start adding Swarm::add_account

* add_account works

* change "client" to "bot" in some places

* Fix issues from merge

* Update world.rs

* add SwarmEvent::Disconnect(Account)

* almost add SwarmEvent::Chat and new plugin system

it panics rn

* make plugins have to provide the State associated type

* improve comments

* make fn build slightly cleaner

* fix SwarmEvent::Chat

* change a println in bot/main.rs

* Client::shutdown -> disconnect

* polish

fix clippy warnings + improve some docs a bit

* fix shared worlds*

*there's a bug that entities and bots will have their positions exaggerated because the relative movement packet is applied for every entity once per bot

* i am being trolled by rust

for some reason some stuff is really slow for literally no reason and it makes no sense i am going insane

* make world an RwLock again

* remove debug messages

* fix skipping event ticks

unfortunately now sending events is `.send().await?` instead of just `.send()`

* fix deadlock + warnings

* turns out my floor_mod impl was wrong

and i32::rem_euclid has the correct behavior LOL

* still errors with lots of bots

* make swarm iter & fix new chunks not loading

* improve docs

* start fixing tests

* fix all the tests

except the examples i don't know how to exclude them from the tests

* improve docs some more
---
 azalea/src/bot.rs | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 azalea/src/bot.rs

(limited to 'azalea/src/bot.rs')

diff --git a/azalea/src/bot.rs b/azalea/src/bot.rs
old mode 100755
new mode 100644
index 0becaa62..0674c692
--- a/azalea/src/bot.rs
+++ b/azalea/src/bot.rs
@@ -4,9 +4,14 @@ use azalea_core::Vec3;
 use parking_lot::Mutex;
 use std::{f64::consts::PI, sync::Arc};
 
-#[derive(Default, Clone)]
-pub struct Plugin {
-    pub state: State,
+#[derive(Clone, Default)]
+pub struct Plugin;
+impl crate::Plugin for Plugin {
+    type State = State;
+
+    fn build(&self) -> State {
+        State::default()
+    }
 }
 
 #[derive(Default, Clone)]
@@ -14,6 +19,18 @@ pub struct State {
     jumping_once: Arc<Mutex<bool>>,
 }
 
+#[async_trait]
+impl crate::PluginState for State {
+    async fn handle(self: Box<Self>, event: Event, mut bot: Client) {
+        if let Event::Tick = event {
+            if *self.jumping_once.lock() && bot.jumping() {
+                *self.jumping_once.lock() = false;
+                bot.set_jumping(false);
+            }
+        }
+    }
+}
+
 pub trait BotTrait {
     fn jump(&mut self);
     fn look_at(&mut self, pos: &Vec3);
@@ -23,7 +40,7 @@ impl BotTrait for azalea_client::Client {
     /// Queue a jump for the next tick.
     fn jump(&mut self) {
         self.set_jumping(true);
-        let state = self.plugins.get::<Plugin>().unwrap().state.clone();
+        let state = self.plugins.get::<State>().unwrap().clone();
         *state.jumping_once.lock() = true;
     }
 
@@ -34,18 +51,6 @@ impl BotTrait for azalea_client::Client {
     }
 }
 
-#[async_trait]
-impl crate::Plugin for Plugin {
-    async fn handle(self: Box<Self>, event: Event, mut bot: Client) {
-        if let Event::Tick = event {
-            if *self.state.jumping_once.lock() && bot.jumping() {
-                *self.state.jumping_once.lock() = false;
-                bot.set_jumping(false);
-            }
-        }
-    }
-}
-
 fn direction_looking_at(current: &Vec3, target: &Vec3) -> (f32, f32) {
     // borrowed from mineflayer's Bot.lookAt because i didn't want to do math
     let delta = target - current;
-- 
cgit v1.2.3