upgrade deps, bevy 0.13

azalea-rs · Feb 17, 2024 · be4f13c · be4f13c
1 parent 64d4889
commit be4f13c
Show file tree

Hide file tree

Showing 25 changed files with 253 additions and 267 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml
@@ -12,22 +12,22 @@ version = "0.9.0"
 azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
 azalea-crypto = { path = "../azalea-crypto", version = "0.9.0" }
 base64 = "0.21.7"
-chrono = { version = "0.4.32", default-features = false, features = ["serde"] }
+chrono = { version = "0.4.34", default-features = false, features = ["serde"] }
 tracing = "0.1.40"
 num-bigint = "0.4.4"
 once_cell = "1.19.0"
-reqwest = { version = "0.11.23", default-features = false, features = [
+reqwest = { version = "0.11.24", default-features = false, features = [
     "json",
     "rustls-tls",
 ] }
 rsa = "0.9.6"
-serde = { version = "1.0.195", features = ["derive"] }
-serde_json = "1.0.111"
-thiserror = "1.0.56"
-tokio = { version = "1.35.1", features = ["fs"] }
+serde = { version = "1.0.196", features = ["derive"] }
+serde_json = "1.0.113"
+thiserror = "1.0.57"
+tokio = { version = "1.36.0", features = ["fs"] }
 uuid = { version = "1.7.0", features = ["serde", "v3"] }
 md-5 = "0.10.6"
 
 [dev-dependencies]
-env_logger = "0.11.0"
-tokio = { version = "1.35.1", features = ["full"] }
+env_logger = "0.11.2"
+tokio = { version = "1.36.0", features = ["full"] }
diff --git a/azalea-block/azalea-block-macros/Cargo.toml b/azalea-block/azalea-block-macros/Cargo.toml
@@ -14,4 +14,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.78"
 quote = "1.0.35"
-syn = "2.0.48"
+syn = "2.0.49"
diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml
@@ -14,7 +14,7 @@ azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.9.0" }
 byteorder = "^1.5.0"
 tracing = "0.1.40"
 serde_json = { version = "^1.0", optional = true }
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 uuid = "^1.7.0"
 
 [features]

diff --git a/azalea-buf/azalea-buf-macros/Cargo.toml b/azalea-buf/azalea-buf-macros/Cargo.toml
@@ -13,4 +13,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "^1.0.78"
 quote = "^1.0.35"
-syn = { version = "^2.0.48", features = ["extra-traits"] }
+syn = { version = "^2.0.49", features = ["extra-traits"] }
diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml
@@ -23,5 +23,5 @@ simdnbt = { version = "0.4", optional = true, git = "https://github.com/azalea-r
 tracing = "0.1.40"
 once_cell = "1.19.0"
 serde = { version = "^1.0", features = ["derive"] }
-serde_json = "^1.0.111"
+serde_json = "^1.0.113"
 azalea-registry = { path = "../azalea-registry", version = "0.9.0", optional = true }
diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
@@ -10,7 +10,7 @@ version = "0.9.0"
 
 [dependencies]
 simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
-reqwest = { version = "0.11.23", default-features = false }
+reqwest = { version = "0.11.24", default-features = false }
 anyhow = "1.0.79"
 async-trait = "0.1.77"
 azalea-auth = { path = "../azalea-auth", version = "0.9.0" }
@@ -23,11 +23,11 @@ azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
 azalea-protocol = { path = "../azalea-protocol", version = "0.9.0" }
 azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
 azalea-world = { path = "../azalea-world", version = "0.9.0" }
-bevy_app = "0.12.1"
-bevy_ecs = "0.12.1"
-bevy_log = { version = "0.12.1", optional = true }
-bevy_tasks = "0.12.1"
-bevy_time = "0.12.1"
+bevy_app = "0.13.0"
+bevy_ecs = "0.13.0"
+bevy_log = { version = "0.13.0", optional = true }
+bevy_tasks = "0.13.0"
+bevy_time = "0.13.0"
 azalea-inventory = { path = "../azalea-inventory", version = "0.9.0" }
 derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
 futures = "0.3.30"
@@ -36,12 +36,12 @@ nohash-hasher = "0.2.0"
 once_cell = "1.19.0"
 parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
 regex = "1.10.3"
-thiserror = "^1.0.56"
-tokio = { version = "^1.35.1", features = ["sync"] }
+thiserror = "^1.0.57"
+tokio = { version = "^1.36.0", features = ["sync"] }
 uuid = "^1.7.0"
 azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
-serde_json = "1.0.111"
-serde = "1.0.195"
+serde_json = "1.0.113"
+serde = "1.0.196"
 minecraft_folder_path = "0.1.2"
 
 [features]

diff --git a/azalea-client/src/entity_query.rs b/azalea-client/src/entity_query.rs
@@ -3,7 +3,8 @@ use std::sync::Arc;
 use bevy_ecs::{
     component::Component,
     entity::Entity,
-    query::{ROQueryItem, ReadOnlyWorldQuery, WorldQuery},
+    query::QueryData,
+    query::{QueryFilter, ROQueryItem},
     world::World,
 };
 use parking_lot::Mutex;
@@ -22,13 +23,13 @@ impl Client {
     ///     .is_some();
     /// # }
     /// ```
-    pub fn query<'w, Q: WorldQuery>(&self, ecs: &'w mut World) -> <Q as WorldQuery>::Item<'w> {
-        ecs.query::<Q>()
+    pub fn query<'w, D: QueryData>(&self, ecs: &'w mut World) -> D::Item<'w> {
+        ecs.query::<D>()
             .get_mut(ecs, self.entity)
             .unwrap_or_else(|_| {
                 panic!(
                     "Our client is missing a required component {:?}",
-                    std::any::type_name::<Q>()
+                    std::any::type_name::<D>()
                 )
             })
     }
@@ -58,7 +59,7 @@ impl Client {
     /// ```
     ///
     /// [`Entity`]: bevy_ecs::entity::Entity
-    pub fn entity_by<F: ReadOnlyWorldQuery, Q: ReadOnlyWorldQuery>(
+    pub fn entity_by<F: QueryFilter, Q: QueryData>(
         &mut self,
         predicate: impl EntityPredicate<Q, F>,
     ) -> Option<Entity> {
@@ -93,14 +94,14 @@ impl Client {
     }
 }
 
-pub trait EntityPredicate<Q: ReadOnlyWorldQuery, Filter: ReadOnlyWorldQuery> {
+pub trait EntityPredicate<Q: QueryData, Filter: QueryFilter> {
     fn find(&self, ecs_lock: Arc<Mutex<World>>) -> Option<Entity>;
 }
 impl<F, Q, Filter> EntityPredicate<Q, Filter> for F
 where
     F: Fn(&ROQueryItem<Q>) -> bool,
-    Q: ReadOnlyWorldQuery,
-    Filter: ReadOnlyWorldQuery,
+    Q: QueryData,
+    Filter: QueryFilter,
 {
     fn find(&self, ecs_lock: Arc<Mutex<World>>) -> Option<Entity> {
         let mut ecs = ecs_lock.lock();
@@ -114,8 +115,8 @@ where
 // impl<'a, F, Q1, Q2> EntityPredicate<'a, (Q1, Q2)> for F
 // where
 //     F: Fn(&<Q1 as WorldQuery>::Item<'_>, &<Q2 as WorldQuery>::Item<'_>) ->
-// bool,     Q1: ReadOnlyWorldQuery,
-//     Q2: ReadOnlyWorldQuery,
+// bool,     Q1: QueryFilter,
+//     Q2: QueryFilter,
 // {
 //     fn find(&self, ecs: &mut Ecs) -> Option<Entity> {
 //         // (self)(query)

diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs
@@ -156,7 +156,7 @@ pub fn handle_block_interact_event(
                 sequence: sequence_number.0,
             }
             .get(),
-        })
+        });
     }
 }
 

diff --git a/azalea-client/src/inventory.rs b/azalea-client/src/inventory.rs
@@ -708,7 +708,7 @@ pub fn handle_container_click_event(
                 carried_item: inventory.carried.clone(),
             }
             .get(),
-        })
+        });
     }
 }
 

diff --git a/azalea-client/src/mining.rs b/azalea-client/src/mining.rs
@@ -253,7 +253,7 @@ fn handle_start_mining_block_with_direction_event(
                     entity: event.entity,
                     position: event.position,
                     destroy_stage: mine_progress.destroy_stage(),
-                })
+                });
             }
 
             send_packet_events.send(SendPacketEvent {
@@ -572,7 +572,7 @@ fn continue_mining_block(
                 entity,
                 position: mining.pos,
                 direction: mining.dir,
-            })
+            });
         }
 
         swing_arm_events.send(SwingArmEvent { entity });

diff --git a/azalea-client/src/packet_handling/game.rs b/azalea-client/src/packet_handling/game.rs
@@ -1176,7 +1176,7 @@ pub fn process_packet_events(ecs: &mut World) {
                 let mut client_side_close_container_events = system_state.get_mut(ecs);
                 client_side_close_container_events.send(ClientSideCloseContainerEvent {
                     entity: player_entity,
-                })
+                });
             }
             ClientboundGamePacket::Cooldown(_) => {}
             ClientboundGamePacket::CustomChatCompletions(_) => {}
@@ -1225,7 +1225,7 @@ pub fn process_packet_events(ecs: &mut World) {
                     window_id: p.container_id,
                     menu_type: p.menu_type,
                     title: p.title.to_owned(),
-                })
+                });
             }
             ClientboundGamePacket::OpenSignEditor(_) => {}
             ClientboundGamePacket::Ping(p) => {

diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml
@@ -13,12 +13,12 @@ simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
 azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
 azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
 azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
-bevy_ecs = { version = "0.12.1", default-features = false, optional = true }
+bevy_ecs = { version = "0.13.0", default-features = false, optional = true }
 nohash-hasher = "0.2.0"
-num-traits = "0.2.17"
+num-traits = "0.2.18"
 serde = { version = "^1.0", optional = true }
 uuid = "^1.7.0"
-serde_json = "^1.0.111"
+serde_json = "^1.0.113"
 tracing = "0.1.40"
 
 [features]

diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-crypto"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aes = "0.8.3"
+aes = "0.8.4"
 azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
 cfb8 = "0.8.1"
 num-bigint = "^0.4.4"

diff --git a/azalea-entity/Cargo.toml b/azalea-entity/Cargo.toml
@@ -19,12 +19,12 @@ azalea-core = { version = "0.9.0", path = "../azalea-core" }
 azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
 azalea-registry = { version = "0.9.0", path = "../azalea-registry" }
 azalea-world = { version = "0.9.0", path = "../azalea-world" }
-bevy_app = "0.12.1"
-bevy_ecs = "0.12.1"
+bevy_app = "0.13.0"
+bevy_ecs = "0.13.0"
 derive_more = "0.99.17"
 enum-as-inner = "0.6.0"
 tracing = "0.1.40"
 nohash-hasher = "0.2.0"
 parking_lot = "0.12.1"
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 uuid = "1.7.0"
diff --git a/azalea-inventory/azalea-inventory-macros/Cargo.toml b/azalea-inventory/azalea-inventory-macros/Cargo.toml
@@ -14,4 +14,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.78"
 quote = "1.0.35"
-syn = "2.0.48"
+syn = "2.0.49"
diff --git a/azalea-language/Cargo.toml b/azalea-language/Cargo.toml
@@ -11,5 +11,5 @@ version = "0.9.0"
 [dependencies]
 once_cell = "1.19.0"
 serde = "^1.0"
-serde_json = "^1.0.111"
+serde_json = "^1.0.113"
 # tokio = {version = "^1.21.2", features = ["fs"]}
diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml
@@ -15,12 +15,12 @@ azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
 azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
 azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
 azalea-world = { path = "../azalea-world", version = "0.9.0" }
-bevy_app = "0.12.1"
-bevy_ecs = "0.12.1"
+bevy_app = "0.13.0"
+bevy_ecs = "0.13.0"
 tracing = "0.1.40"
 once_cell = "1.19.0"
 parking_lot = "^0.12.1"
 
 [dev-dependencies]
-bevy_time = "0.12.1"
+bevy_time = "0.13.0"
 uuid = "^1.7.0"
diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml
@@ -29,7 +29,7 @@ azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
 azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.9.0" }
 azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
 azalea-world = { path = "../azalea-world", version = "0.9.0" }
-bevy_ecs = { version = "0.12.1", default-features = false }
+bevy_ecs = { version = "0.13.0", default-features = false }
 byteorder = "^1.5.0"
 bytes = "^1.5.0"
 flate2 = "1.0.28"
@@ -38,9 +38,9 @@ futures-lite = "2.2.0"
 futures-util = "0.3.30"
 tracing = "0.1.40"
 serde = { version = "^1.0", features = ["serde_derive"] }
-serde_json = "^1.0.111"
-thiserror = "1.0.56"
-tokio = { version = "^1.35.1", features = ["io-util", "net", "macros"] }
+serde_json = "^1.0.113"
+thiserror = "1.0.57"
+tokio = { version = "^1.36.0", features = ["io-util", "net", "macros"] }
 tokio-util = { version = "0.7.10", features = ["codec"] }
 trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [
     "tokio-runtime",

diff --git a/azalea-protocol/azalea-protocol-macros/Cargo.toml b/azalea-protocol/azalea-protocol-macros/Cargo.toml
@@ -13,4 +13,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "^1.0.78"
 quote = "^1.0.35"
-syn = "^2.0.48"
+syn = "^2.0.49"
diff --git a/azalea-registry/azalea-registry-macros/Cargo.toml b/azalea-registry/azalea-registry-macros/Cargo.toml
@@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.78"
 quote = "1.0.35"
-syn = "2.0.48"
+syn = "2.0.49"
 
 [features]
 serde = []
diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml
@@ -17,17 +17,17 @@ azalea-core = { path = "../azalea-core", version = "0.9.0", features = [
 ] }
 azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
 azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
-bevy_ecs = "0.12.1"
+bevy_ecs = "0.13.0"
 derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
 enum-as-inner = "0.6.0"
 tracing = "0.1.40"
 nohash-hasher = "0.2.0"
 once_cell = "1.19.0"
 parking_lot = "^0.12.1"
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 uuid = "1.7.0"
-serde_json = "1.0.111"
-serde = "1.0.195"
+serde_json = "1.0.113"
+serde = "1.0.196"
 
 [dev-dependencies]
 azalea-client = { path = "../azalea-client" }

diff --git 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]
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,7 @@ pub fn handle_block_interact_event( @@
                     sequence: sequence_number.0,
                 }
                 .get(),
-            })
+            });
         }
     }
@@ Expand Down @@