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-physics/src/collision/mod.rs | 0 azalea-physics/src/collision/world_collisions.rs | 4 ++-- azalea-physics/src/lib.rs | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) mode change 100755 => 100644 azalea-physics/src/collision/mod.rs mode change 100755 => 100644 azalea-physics/src/lib.rs (limited to 'azalea-physics/src') diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs old mode 100755 new mode 100644 diff --git a/azalea-physics/src/collision/world_collisions.rs b/azalea-physics/src/collision/world_collisions.rs index 65f7f5bb..a4062fcc 100644 --- a/azalea-physics/src/collision/world_collisions.rs +++ b/azalea-physics/src/collision/world_collisions.rs @@ -57,7 +57,7 @@ impl<'a> BlockCollisions<'a> { } } - fn get_chunk(&self, block_x: i32, block_z: i32) -> Option<&Arc>> { + fn get_chunk(&self, block_x: i32, block_z: i32) -> Option>> { let chunk_x = ChunkSectionPos::block_to_section_coord(block_x); let chunk_z = ChunkSectionPos::block_to_section_coord(block_z); let chunk_pos = ChunkPos::new(chunk_x, chunk_z); @@ -75,7 +75,7 @@ impl<'a> BlockCollisions<'a> { // return var7; // } - self.world[&chunk_pos].as_ref() + self.world.get_chunk(&chunk_pos) } } diff --git a/azalea-physics/src/lib.rs b/azalea-physics/src/lib.rs old mode 100755 new mode 100644 index 2295e6f2..34d31a0e --- a/azalea-physics/src/lib.rs +++ b/azalea-physics/src/lib.rs @@ -231,7 +231,10 @@ fn jump_boost_power>(_entity: &Entity) -> f64 { mod tests { use super::*; use azalea_core::ChunkPos; - use azalea_world::{Chunk, World}; + use azalea_world::{ + entity::{metadata, EntityMetadata}, + Chunk, World, + }; use uuid::Uuid; #[test] @@ -247,6 +250,7 @@ mod tests { y: 70., z: 0., }, + EntityMetadata::Player(metadata::Player::default()), ), ); let mut entity = world.entity_mut(0).unwrap(); @@ -279,6 +283,7 @@ mod tests { y: 70., z: 0.5, }, + EntityMetadata::Player(metadata::Player::default()), ), ); let block_state = world.set_block_state(&BlockPos { x: 0, y: 69, z: 0 }, BlockState::Stone); @@ -311,6 +316,7 @@ mod tests { y: 71., z: 0.5, }, + EntityMetadata::Player(metadata::Player::default()), ), ); let block_state = world.set_block_state( @@ -344,6 +350,7 @@ mod tests { y: 71., z: 0.5, }, + EntityMetadata::Player(metadata::Player::default()), ), ); let block_state = world.set_block_state( @@ -377,6 +384,7 @@ mod tests { y: 73., z: 0.5, }, + EntityMetadata::Player(metadata::Player::default()), ), ); let block_state = world.set_block_state( -- cgit v1.2.3