aboutsummaryrefslogtreecommitdiff
path: root/azalea-world/src/container.rs
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2022-11-27 16:25:07 -0600
committerGitHub <noreply@github.com>2022-11-27 16:25:07 -0600
commit631ed63dbdc7167df4de02a55b5c2ef1cea909e9 (patch)
tree104e567c332f2aeb30ea6acefef8c73f9b2f158b /azalea-world/src/container.rs
parent962b9fcaae917c7e5bef718469fba31f6ff7c3cb (diff)
downloadazalea-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/container.rs')
-rw-r--r--azalea-world/src/container.rs54
1 files changed, 54 insertions, 0 deletions
diff --git a/azalea-world/src/container.rs b/azalea-world/src/container.rs
new file mode 100644
index 00000000..acdc9b05
--- /dev/null
+++ b/azalea-world/src/container.rs
@@ -0,0 +1,54 @@
+use crate::WeakWorld;
+use azalea_core::ResourceLocation;
+use log::error;
+use std::{
+ collections::HashMap,
+ sync::{Arc, Weak},
+};
+
+/// A container of [`WeakWorld`]s. Worlds are stored as a Weak pointer here, so
+/// if no clients are using a world it will be forgotten.
+#[derive(Default)]
+pub struct WeakWorldContainer {
+ pub worlds: HashMap<ResourceLocation, Weak<WeakWorld>>,
+}
+
+impl WeakWorldContainer {
+ pub fn new() -> Self {
+ WeakWorldContainer {
+ worlds: HashMap::new(),
+ }
+ }
+
+ /// Get a world from the container.
+ pub fn get(&self, name: &ResourceLocation) -> Option<Arc<WeakWorld>> {
+ self.worlds.get(name).and_then(|world| world.upgrade())
+ }
+
+ /// Add an empty world to the container (or not if it already exists) and
+ /// returns a strong reference to the world.
+ #[must_use = "the world will be immediately forgotten if unused"]
+ pub fn insert(&mut self, name: ResourceLocation, height: u32, min_y: i32) -> Arc<WeakWorld> {
+ if let Some(existing) = self.worlds.get(&name).and_then(|world| world.upgrade()) {
+ if existing.height() != height {
+ error!(
+ "Shared dimension height mismatch: {} != {}",
+ existing.height(),
+ height,
+ );
+ }
+ if existing.min_y() != min_y {
+ error!(
+ "Shared world min_y mismatch: {} != {}",
+ existing.min_y(),
+ min_y,
+ );
+ }
+ existing
+ } else {
+ let world = Arc::new(WeakWorld::new(height, min_y));
+ self.worlds.insert(name, Arc::downgrade(&world));
+ world
+ }
+ }
+}