diff options
| author | Shayne Hartford <shaybox@shaybox.com> | 2024-11-23 03:29:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-23 02:29:30 -0600 |
| commit | dfdc3144b61b6750ad62fb493b7c00c6c820c90b (patch) | |
| tree | 0cca5bcea62b3562152944b278c494401531d4d7 /azalea-client | |
| parent | e443c5d76e706132ab554e97513d2b159f4ab0a1 (diff) | |
| download | azalea-drasl-dfdc3144b61b6750ad62fb493b7c00c6c820c90b.tar.xz | |
Update and merge the dependencies (#187)
* Add rust rover to .gitignore
* Fold dependency feature lists
* Sort dependencies alphabetically
* Update dependencies
* Upgrade dependencies
* Comment out unused dependencies
* Nightly is broken right now :)
* Fix conflict with derive_more
* cargo autoinherit to merge dependencies
* Fix clippy lints
Diffstat (limited to 'azalea-client')
| -rw-r--r-- | azalea-client/Cargo.toml | 50 | ||||
| -rw-r--r-- | azalea-client/src/client.rs | 1 | ||||
| -rw-r--r-- | azalea-client/src/local_player.rs | 1 | ||||
| -rw-r--r-- | azalea-client/src/raw_connection.rs | 1 |
4 files changed, 26 insertions, 27 deletions
diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index 089f48ed..371e2d3b 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -9,40 +9,40 @@ version = "0.10.3+mc1.21.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -simdnbt = "0.6" -reqwest = { version = "0.12.5", default-features = false } -anyhow = "1.0.86" -async-trait = "0.1.80" +anyhow = { workspace = true } +#async-trait = { workspace = true } azalea-auth = { path = "../azalea-auth", version = "0.10.0" } azalea-block = { path = "../azalea-block", version = "0.10.0" } +azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-chat = { path = "../azalea-chat", version = "0.10.0" } azalea-core = { path = "../azalea-core", version = "0.10.0" } azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" } +azalea-entity = { version = "0.10.0", path = "../azalea-entity" } +azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } azalea-physics = { path = "../azalea-physics", version = "0.10.0" } -azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-protocol = { path = "../azalea-protocol", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-world = { path = "../azalea-world", version = "0.10.0" } -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" -derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] } -futures = "0.3.30" -tracing = "0.1.40" -nohash-hasher = "0.2.0" -once_cell = "1.19.0" -parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] } -regex = "1.10.5" -thiserror = "^1.0.61" -tokio = { version = "^1.38.0", features = ["sync"] } -uuid = "^1.9.1" -serde_json = "1.0.120" -serde = "1.0.203" -minecraft_folder_path = "0.1.2" -azalea-entity = { version = "0.10.0", path = "../azalea-entity" } -azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } +bevy_app = { workspace = true } +bevy_ecs = { workspace = true } +bevy_log = { workspace = true, optional = true } +bevy_tasks = { workspace = true } +bevy_time = { workspace = true } +derive_more = { workspace = true, features = ["deref", "deref_mut"] } +#futures = { workspace = true } +minecraft_folder_path = { workspace = true } +#nohash-hasher = { workspace = true } +once_cell = { workspace = true } +parking_lot = { workspace = true, features = ["deadlock_detection"] } +regex = { workspace = true } +reqwest = { workspace = true } +#serde = { workspace = true } +#serde_json = { workspace = true } +simdnbt = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["sync"] } +tracing = { workspace = true } +uuid = { workspace = true } [features] default = ["log"] diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs index caeca7fe..9083a80b 100644 --- a/azalea-client/src/client.rs +++ b/azalea-client/src/client.rs @@ -3,7 +3,6 @@ use std::{ fmt::Debug, io, net::SocketAddr, - ops::Deref, sync::Arc, time::{Duration, Instant}, }; diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs index b0582d8b..3cc77f9d 100644 --- a/azalea-client/src/local_player.rs +++ b/azalea-client/src/local_player.rs @@ -137,6 +137,7 @@ pub fn death_event(query: Query<&LocalPlayerEvents, Added<Dead>>) { } } +#[allow(clippy::large_enum_variant)] #[derive(Error, Debug)] pub enum HandlePacketError { #[error("{0}")] diff --git a/azalea-client/src/raw_connection.rs b/azalea-client/src/raw_connection.rs index 9f7a85f1..8cbb15a4 100644 --- a/azalea-client/src/raw_connection.rs +++ b/azalea-client/src/raw_connection.rs @@ -22,7 +22,6 @@ pub struct RawConnection { writer: RawConnectionWriter, /// Packets sent to this will be sent to the server. - /// A task that reads packets from the server. The client is disconnected /// when this task ends. read_packets_task: tokio::task::JoinHandle<()>, |
