diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2022-11-27 16:25:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 16:25:07 -0600 |
| commit | 631ed63dbdc7167df4de02a55b5c2ef1cea909e9 (patch) | |
| tree | 104e567c332f2aeb30ea6acefef8c73f9b2f158b /azalea-world/src/lib.rs | |
| parent | 962b9fcaae917c7e5bef718469fba31f6ff7c3cb (diff) | |
| download | azalea-drasl-631ed63dbdc7167df4de02a55b5c2ef1cea909e9.tar.xz | |
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
Diffstat (limited to 'azalea-world/src/lib.rs')
| -rw-r--r--[-rwxr-xr-x] | azalea-world/src/lib.rs | 170 |
1 files changed, 11 insertions, 159 deletions
diff --git a/azalea-world/src/lib.rs b/azalea-world/src/lib.rs index 26cae205..05cc7d85 100755..100644 --- a/azalea-world/src/lib.rs +++ b/azalea-world/src/lib.rs @@ -1,174 +1,26 @@ #![feature(int_roundings)] +#![feature(error_generic_member_access)] +#![feature(provide_any)] mod bit_storage; mod chunk_storage; +mod container; pub mod entity; mod entity_storage; mod palette; +mod world; + +use std::backtrace::Backtrace; -use azalea_block::BlockState; -use azalea_buf::BufReadError; -use azalea_core::{BlockPos, ChunkPos, PositionDelta8, Vec3}; pub use bit_storage::BitStorage; -pub use chunk_storage::{Chunk, ChunkStorage}; -use entity::{Entity, EntityData}; -pub use entity_storage::EntityStorage; -use parking_lot::Mutex; -use std::{ - io::Cursor, - ops::{Index, IndexMut}, - sync::Arc, -}; +pub use chunk_storage::{Chunk, ChunkStorage, PartialChunkStorage, WeakChunkStorage}; +pub use container::*; +pub use entity_storage::{PartialEntityStorage, WeakEntityStorage}; use thiserror::Error; -use uuid::Uuid; - -/// A world is a collection of chunks and entities. They're called "levels" in Minecraft's source code. -#[derive(Debug, Default)] -pub struct World { - pub chunk_storage: ChunkStorage, - pub entity_storage: EntityStorage, -} +pub use world::*; #[derive(Error, Debug)] pub enum MoveEntityError { #[error("Entity doesn't exist")] - EntityDoesNotExist, -} - -impl World { - pub fn new(chunk_radius: u32, height: u32, min_y: i32) -> Self { - World { - chunk_storage: ChunkStorage::new(chunk_radius, height, min_y), - entity_storage: EntityStorage::new(), - } - } - - pub fn replace_with_packet_data( - &mut self, - pos: &ChunkPos, - data: &mut Cursor<&[u8]>, - ) -> Result<(), BufReadError> { - self.chunk_storage.replace_with_packet_data(pos, data) - } - - pub fn set_chunk(&mut self, pos: &ChunkPos, chunk: Option<Chunk>) -> Result<(), BufReadError> { - self[pos] = chunk.map(|c| Arc::new(Mutex::new(c))); - Ok(()) - } - - pub fn update_view_center(&mut self, pos: &ChunkPos) { - self.chunk_storage.view_center = *pos; - } - - pub fn get_block_state(&self, pos: &BlockPos) -> Option<BlockState> { - self.chunk_storage.get_block_state(pos) - } - - pub fn set_block_state(&mut self, pos: &BlockPos, state: BlockState) -> Option<BlockState> { - self.chunk_storage.set_block_state(pos, state) - } - - pub fn set_entity_pos(&mut self, entity_id: u32, new_pos: Vec3) -> Result<(), MoveEntityError> { - let mut entity = self - .entity_mut(entity_id) - .ok_or(MoveEntityError::EntityDoesNotExist)?; - - let old_chunk = ChunkPos::from(entity.pos()); - let new_chunk = ChunkPos::from(&new_pos); - // this is fine because we update the chunk below - unsafe { entity.move_unchecked(new_pos) }; - if old_chunk != new_chunk { - self.entity_storage - .update_entity_chunk(entity_id, &old_chunk, &new_chunk); - } - Ok(()) - } - - pub fn move_entity_with_delta( - &mut self, - entity_id: u32, - delta: &PositionDelta8, - ) -> Result<(), MoveEntityError> { - let mut entity = self - .entity_mut(entity_id) - .ok_or(MoveEntityError::EntityDoesNotExist)?; - let new_pos = entity.pos().with_delta(delta); - - let old_chunk = ChunkPos::from(entity.pos()); - let new_chunk = ChunkPos::from(&new_pos); - // this is fine because we update the chunk below - - unsafe { entity.move_unchecked(new_pos) }; - if old_chunk != new_chunk { - self.entity_storage - .update_entity_chunk(entity_id, &old_chunk, &new_chunk); - } - Ok(()) - } - - pub fn add_entity(&mut self, id: u32, entity: EntityData) { - self.entity_storage.insert(id, entity); - } - - pub fn height(&self) -> u32 { - self.chunk_storage.height - } - - pub fn min_y(&self) -> i32 { - self.chunk_storage.min_y - } - - pub fn entity_data_by_id(&self, id: u32) -> Option<&EntityData> { - self.entity_storage.get_by_id(id) - } - - pub fn entity_data_mut_by_id(&mut self, id: u32) -> Option<&mut EntityData> { - self.entity_storage.get_mut_by_id(id) - } - - pub fn entity(&self, id: u32) -> Option<Entity<&World>> { - let entity_data = self.entity_storage.get_by_id(id)?; - let entity_ptr = unsafe { entity_data.as_const_ptr() }; - Some(Entity::new(self, id, entity_ptr)) - } - - pub fn entity_mut(&mut self, id: u32) -> Option<Entity<'_, &mut World>> { - let entity_data = self.entity_storage.get_mut_by_id(id)?; - let entity_ptr = unsafe { entity_data.as_ptr() }; - Some(Entity::new(self, id, entity_ptr)) - } - - pub fn entity_by_uuid(&self, uuid: &Uuid) -> Option<&EntityData> { - self.entity_storage.get_by_uuid(uuid) - } - - pub fn entity_mut_by_uuid(&mut self, uuid: &Uuid) -> Option<&mut EntityData> { - self.entity_storage.get_mut_by_uuid(uuid) - } - - /// Get an iterator over all entities. - #[inline] - pub fn entities(&self) -> std::collections::hash_map::Values<'_, u32, EntityData> { - self.entity_storage.entities() - } - - pub fn find_one_entity<F>(&self, mut f: F) -> Option<&EntityData> - where - F: FnMut(&EntityData) -> bool, - { - self.entity_storage.find_one_entity(|entity| f(entity)) - } -} - -impl Index<&ChunkPos> for World { - type Output = Option<Arc<Mutex<Chunk>>>; - - fn index(&self, pos: &ChunkPos) -> &Self::Output { - &self.chunk_storage[pos] - } -} -impl IndexMut<&ChunkPos> for World { - fn index_mut<'a>(&'a mut self, pos: &ChunkPos) -> &'a mut Self::Output { - &mut self.chunk_storage[pos] - } + EntityDoesNotExist(Backtrace), } |
