aboutsummaryrefslogtreecommitdiff
path: root/azalea
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2024-02-17 14:43:42 -0600
committermat <git@matdoes.dev>2024-02-17 14:43:42 -0600
commitbe4f13c36c281f086602092098522b3f25fc0680 (patch)
tree599d2de84d06d7d1c31a908a2e89499c62e0a5ca /azalea
parent64d48897afe5bcb40931f8ef8b3594fe275751e8 (diff)
downloadazalea-drasl-be4f13c36c281f086602092098522b3f25fc0680.tar.xz
upgrade deps, bevy 0.13
Diffstat (limited to 'azalea')
-rw-r--r--azalea/Cargo.toml18
-rw-r--r--azalea/src/nearest_entity.rs6
-rw-r--r--azalea/src/pathfinder/world.rs4
3 files changed, 13 insertions, 15 deletions
diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml
index 41803928..8a11fc46 100644
--- a/azalea/Cargo.toml
+++ b/azalea/Cargo.toml
@@ -26,23 +26,23 @@ azalea-world = { version = "0.9.0", path = "../azalea-world" }
azalea-auth = { version = "0.9.0", path = "../azalea-auth" }
azalea-brigadier = { version = "0.9.0", path = "../azalea-brigadier" }
azalea-buf = { version = "0.9.0", path = "../azalea-buf" }
-bevy_app = "0.12.1"
-bevy_ecs = "0.12.1"
-bevy_tasks = { version = "0.12.1", features = ["multi-threaded"] }
+bevy_app = "0.13.0"
+bevy_ecs = "0.13.0"
+bevy_tasks = { version = "0.13.0", features = ["multi-threaded"] }
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
futures = "0.3.30"
futures-lite = "2.2.0"
tracing = "0.1.40"
nohash-hasher = "0.2.0"
-num-traits = "0.2.17"
+num-traits = "0.2.18"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
-priority-queue = "1.3.2"
-thiserror = "^1.0.56"
-tokio = "^1.35.1"
+priority-queue = "1.4.0"
+thiserror = "^1.0.57"
+tokio = "^1.36.0"
uuid = "1.7.0"
-bevy_log = "0.12.1"
+bevy_log = "0.13.0"
azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
-bevy_time = "0.12.1"
+bevy_time = "0.13.0"
rustc-hash = "1.1.0"
[dev-dependencies]
diff --git a/azalea/src/nearest_entity.rs b/azalea/src/nearest_entity.rs
index 38c9886e..363c8fb0 100644
--- a/azalea/src/nearest_entity.rs
+++ b/azalea/src/nearest_entity.rs
@@ -2,7 +2,7 @@ use azalea_entity::Position;
use azalea_world::{InstanceName, MinecraftEntityId};
use bevy_ecs::{
prelude::Entity,
- query::{ReadOnlyWorldQuery, With},
+ query::{QueryFilter, With},
system::{Query, SystemParam},
};
@@ -44,7 +44,7 @@ use bevy_ecs::{
#[derive(SystemParam)]
pub struct EntityFinder<'w, 's, F = ()>
where
- F: ReadOnlyWorldQuery + 'static,
+ F: QueryFilter + 'static,
{
all_entities:
Query<'w, 's, (&'static Position, &'static InstanceName), With<MinecraftEntityId>>,
@@ -59,7 +59,7 @@ where
impl<'w, 's, 'a, F> EntityFinder<'w, 's, F>
where
- F: ReadOnlyWorldQuery + 'static,
+ F: QueryFilter + 'static,
{
/// Gets the nearest entity to the given position and world instance name.
/// This method will return `None` if there are no entities within range. If
diff --git a/azalea/src/pathfinder/world.rs b/azalea/src/pathfinder/world.rs
index a5a273fb..d3c94a52 100644
--- a/azalea/src/pathfinder/world.rs
+++ b/azalea/src/pathfinder/world.rs
@@ -157,9 +157,7 @@ impl CachedWorld {
}
let world = self.world_lock.read();
- let Some(chunk) = world.chunks.get(&chunk_pos) else {
- return None;
- };
+ let chunk = world.chunks.get(&chunk_pos)?;
let chunk = chunk.read();
let sections: Vec<azalea_world::palette::PalettedContainer> = chunk