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-core/src/direction.rs |  8 +++-----
 azalea-core/src/lib.rs       | 10 ----------
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'azalea-core/src')

diff --git a/azalea-core/src/direction.rs b/azalea-core/src/direction.rs
index 5a7f601a..95dacc69 100755
--- a/azalea-core/src/direction.rs
+++ b/azalea-core/src/direction.rs
@@ -1,7 +1,5 @@
 use azalea_buf::McBuf;
 
-use crate::floor_mod;
-
 #[derive(Clone, Copy, Debug, McBuf, Default)]
 pub enum Direction {
     #[default]
@@ -116,7 +114,7 @@ impl AxisCycle {
         }
     }
     pub fn between(axis0: Axis, axis1: Axis) -> Self {
-        Self::from_ordinal(floor_mod(axis1 as i32 - axis0 as i32, 3))
+        Self::from_ordinal(i32::rem_euclid(axis1 as i32 - axis0 as i32, 3) as u32)
     }
     pub fn inverse(self) -> Self {
         match self {
@@ -128,8 +126,8 @@ impl AxisCycle {
     pub fn cycle(self, axis: Axis) -> Axis {
         match self {
             Self::None => axis,
-            Self::Forward => Axis::from_ordinal(floor_mod(axis as i32 + 1, 3)),
-            Self::Backward => Axis::from_ordinal(floor_mod(axis as i32 - 1, 3)),
+            Self::Forward => Axis::from_ordinal(i32::rem_euclid(axis as i32 + 1, 3) as u32),
+            Self::Backward => Axis::from_ordinal(i32::rem_euclid(axis as i32 - 1, 3) as u32),
         }
     }
     pub fn cycle_xyz(self, x: i32, y: i32, z: i32, axis: Axis) -> i32 {
diff --git a/azalea-core/src/lib.rs b/azalea-core/src/lib.rs
index f7726a38..7c74bdcb 100755
--- a/azalea-core/src/lib.rs
+++ b/azalea-core/src/lib.rs
@@ -38,16 +38,6 @@ pub use aabb::*;
 mod block_hit_result;
 pub use block_hit_result::*;
 
-// java moment
-// TODO: add tests and optimize/simplify this
-pub fn floor_mod(x: i32, y: u32) -> u32 {
-    if x < 0 {
-        y - ((-x) as u32 % y)
-    } else {
-        x as u32 % y
-    }
-}
-
 // TODO: make this generic
 pub fn binary_search(mut min: i32, max: i32, predicate: &dyn Fn(i32) -> bool) -> i32 {
     let mut diff = max - min;
-- 
cgit v1.2.3