mat/azalea
1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 14:26:04 +00:00
Code Issues Projects Releases Packages Activity

Update and merge the dependencies (#187)

Browse source 
* 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
This commit is contained in:
Shayne Hartford 2024-11-23 03:29:30 -05:00 • committed by GitHub
parent e443c5d76e
commit dfdc3144b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 791 additions and 506 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -1,6 +1,7 @@
/target .idea/
/doc .vscode/
.vscode doc/
target/
.cargo/config .cargo/config
.cargo/config.toml .cargo/config.toml

782
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

88
Cargo.toml
View file

@ -1,24 +1,80 @@
[workspace] [workspace]
members = [ members = [
"azalea", "azalea",
"azalea-client", "azalea-client",
"azalea-protocol", "azalea-protocol",
"azalea-chat", "azalea-chat",
"azalea-core", "azalea-core",
"azalea-auth", "azalea-auth",
"azalea-brigadier", "azalea-brigadier",
"azalea-crypto", "azalea-crypto",
"azalea-world", "azalea-world",
"azalea-language", "azalea-language",
"azalea-block", "azalea-block",
"azalea-buf", "azalea-buf",
"azalea-physics", "azalea-physics",
"azalea-registry", "azalea-registry",
"azalea-inventory", "azalea-inventory",
"azalea-entity", "azalea-entity",
] ]
resolver = "2" resolver = "2"
[workspace.dependencies]
aes = "0.8.4"
anyhow = "1.0.93"
async-recursion = "1.1.1"
async-trait = "0.1.83"
base64 = "0.22.1"
bevy_app = "0.13.2"
bevy_ecs = { version = "0.13.2", default-features = false }
bevy_log = "0.13.2"
bevy_tasks = "0.13.2"
bevy_time = "0.13.2"
byteorder = "1.5.0"
bytes = "1.8.0"
cfb8 = "0.8.1"
chrono = { version = "0.4.38", default-features = false }
criterion = "0.5.1"
derive_more = "1.0.0"
enum-as-inner = "0.6.1"
env_logger = "0.11.5"
flate2 = "1.0.35"
futures = "0.3.31"
futures-lite = "2.5.0"
#futures-util = "0.3.31"
log = "0.4.22"
md-5 = "0.10.6"
minecraft_folder_path = "0.1.2"
nohash-hasher = "0.2.0"
num-bigint = "0.4.6"
num-traits = "0.2.19"
once_cell = "1.20.2"
parking_lot = "0.12.3"
priority-queue = "2.1.1"
proc-macro2 = "1.0.92"
quote = "1.0.37"
rand = "0.8.5"
regex = "1.11.1"
reqwest = { version = "0.12.9", default-features = false }
rsa = "0.9.6"
rsa_public_encrypt_pkcs1 = "0.4.0"
rustc-hash = "2.0.0"
serde = "1.0.215"
serde_json = "1.0.133"
sha-1 = "0.10.1"
sha2 = "0.10.8"
simdnbt = "0.6"
#smallvec = "1.13.2"
socks5-impl = "0.5.17"
syn = "2.0.89"
thiserror = "2.0.3"
tokio = "1.41.1"
tokio-util = "0.7.12"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
trust-dns-resolver = { version = "0.23.2", default-features = false }
uuid = "1.11.0"
[profile.release] [profile.release]
debug = true debug = true

33
azalea-auth/Cargo.toml
View file

@ -11,23 +11,20 @@ version = "0.10.3+mc1.21.1"
[dependencies] [dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" } azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" }
base64 = "0.22.1" base64 = { workspace = true }
chrono = { version = "0.4.38", default-features = false, features = ["serde"] } chrono = { workspace = true, features = ["serde"] }
tracing = "0.1.40" md-5 = { workspace = true }
num-bigint = "0.4.6" #num-bigint = { workspace = true }
once_cell = "1.19.0" once_cell = { workspace = true }
reqwest = { version = "0.12.5", default-features = false, features = [ reqwest = { workspace = true, features = ["json", "rustls-tls"] }
"json", rsa = { workspace = true }
"rustls-tls", serde = { workspace = true, features = ["derive"] }
] } serde_json = { workspace = true }
rsa = "0.9.6" thiserror = { workspace = true }
serde = { version = "1.0.203", features = ["derive"] } tokio = { workspace = true, features = ["fs"] }
serde_json = "1.0.120" tracing = { workspace = true }
thiserror = "1.0.61" uuid = { workspace = true, features = ["serde", "v3"] }
tokio = { version = "1.38.0", features = ["fs"] }
uuid = { version = "1.9.1", features = ["serde", "v3"] }
md-5 = "0.10.6"
[dev-dependencies] [dev-dependencies]
env_logger = "0.11.3" env_logger = { workspace = true }
tokio = { version = "1.38.0", features = ["full"] } tokio = { workspace = true, features = ["full"] }

2
azalea-auth/src/auth.rs
View file

@ -68,7 +68,7 @@ pub enum AuthError {
/// If you want to use your own code to cache or show the auth code to the user /// If you want to use your own code to cache or show the auth code to the user
/// in a different way, use [`get_ms_link_code`], [`get_ms_auth_token`], /// in a different way, use [`get_ms_link_code`], [`get_ms_auth_token`],
/// [`get_minecraft_token`] and [`get_profile`] instead. /// [`get_minecraft_token`] and [`get_profile`] instead.
pub async fn auth<'a>(email: &str, opts: AuthOpts<'a>) -> Result<AuthResult, AuthError> { pub async fn auth(email: &str, opts: AuthOpts<'_>) -> Result<AuthResult, AuthError> {
let cached_account = if let Some(cache_file) = &opts.cache_file { let cached_account = if let Some(cache_file) = &opts.cache_file {
cache::get_account_in_cache(cache_file, email).await cache::get_account_in_cache(cache_file, email).await
} else { } else {

6
azalea-block/azalea-block-macros/Cargo.toml
View file

@ -12,6 +12,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
proc-macro2 = "1.0.86" proc-macro2 = { workspace = true }
quote = "1.0.36" quote = { workspace = true }
syn = "2.0.68" syn = { workspace = true }

6
azalea-brigadier/Cargo.toml
View file

@ -9,13 +9,13 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dev-dependencies] [dev-dependencies]
bevy_app = "0.13.0" bevy_app = { workspace = true }
bevy_ecs = "0.13.0" bevy_ecs = { workspace = true }
[dependencies] [dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.10.0", optional = true } azalea-buf = { path = "../azalea-buf", version = "0.10.0", optional = true }
azalea-chat = { path = "../azalea-chat", version = "0.10.0", optional = true } azalea-chat = { path = "../azalea-chat", version = "0.10.0", optional = true }
parking_lot = "0.12.3" parking_lot = { workspace = true }
[features] [features]
azalea-buf = ["dep:azalea-buf", "dep:azalea-chat", "azalea-chat/azalea-buf"] azalea-buf = ["dep:azalea-buf", "dep:azalea-chat", "azalea-chat/azalea-buf"]

12
azalea-buf/Cargo.toml
View file

@ -9,13 +9,13 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6"
azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.10.0" } azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.10.0" }
byteorder = "^1.5.0" byteorder = { workspace = true }
tracing = "0.1.40" serde_json = { workspace = true, optional = true }
serde_json = { version = "^1.0", optional = true } simdnbt = { workspace = true }
thiserror = "1.0.61" thiserror = { workspace = true }
uuid = "^1.9.1" tracing = { workspace = true }
uuid = { workspace = true }
[features] [features]
serde_json = ["dep:serde_json"] serde_json = ["dep:serde_json"]

6
azalea-buf/azalea-buf-macros/Cargo.toml
View file

@ -11,6 +11,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
proc-macro2 = "^1.0.86" proc-macro2 = { workspace = true }
quote = "^1.0.36" quote = { workspace = true }
syn = { version = "^2.0.68", features = ["extra-traits"] } syn = { workspace = true, features = ["extra-traits"] }

14
azalea-chat/Cargo.toml
View file

@ -15,13 +15,11 @@ azalea-buf = ["dep:azalea-buf", "simdnbt"]
numbers = ["dep:azalea-registry", "dep:simdnbt"] numbers = ["dep:azalea-registry", "dep:simdnbt"]
[dependencies] [dependencies]
azalea-buf = { path = "../azalea-buf", features = [ azalea-buf = { path = "../azalea-buf", features = ["serde_json"], version = "0.10.0", optional = true }
"serde_json",
], version = "0.10.0", optional = true }
azalea-language = { path = "../azalea-language", version = "0.10.0" } azalea-language = { path = "../azalea-language", version = "0.10.0" }
simdnbt = { version = "0.6", optional = true }
tracing = "0.1.40"
once_cell = "1.19.0"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0.120"
azalea-registry = { path = "../azalea-registry", version = "0.10.0", optional = true } azalea-registry = { path = "../azalea-registry", version = "0.10.0", optional = true }
once_cell = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
simdnbt = { workspace = true, optional = true }
tracing = { workspace = true }

50
azalea-client/Cargo.toml
View file

@ -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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6" anyhow = { workspace = true }
reqwest = { version = "0.12.5", default-features = false } #async-trait = { workspace = true }
anyhow = "1.0.86"
async-trait = "0.1.80"
azalea-auth = { path = "../azalea-auth", version = "0.10.0" } azalea-auth = { path = "../azalea-auth", version = "0.10.0" }
azalea-block = { path = "../azalea-block", 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-chat = { path = "../azalea-chat", version = "0.10.0" }
azalea-core = { path = "../azalea-core", version = "0.10.0" } azalea-core = { path = "../azalea-core", version = "0.10.0" }
azalea-crypto = { path = "../azalea-crypto", 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-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-protocol = { path = "../azalea-protocol", version = "0.10.0" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
azalea-world = { path = "../azalea-world", version = "0.10.0" } azalea-world = { path = "../azalea-world", version = "0.10.0" }
bevy_app = "0.13.0" bevy_app = { workspace = true }
bevy_ecs = "0.13.0" bevy_ecs = { workspace = true }
bevy_log = { version = "0.13.0", optional = true } bevy_log = { workspace = true, optional = true }
bevy_tasks = "0.13.0" bevy_tasks = { workspace = true }
bevy_time = "0.13.0" bevy_time = { workspace = true }
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] } derive_more = { workspace = true, features = ["deref", "deref_mut"] }
futures = "0.3.30" #futures = { workspace = true }
tracing = "0.1.40" minecraft_folder_path = { workspace = true }
nohash-hasher = "0.2.0" #nohash-hasher = { workspace = true }
once_cell = "1.19.0" once_cell = { workspace = true }
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] } parking_lot = { workspace = true, features = ["deadlock_detection"] }
regex = "1.10.5" regex = { workspace = true }
thiserror = "^1.0.61" reqwest = { workspace = true }
tokio = { version = "^1.38.0", features = ["sync"] } #serde = { workspace = true }
uuid = "^1.9.1" #serde_json = { workspace = true }
serde_json = "1.0.120" simdnbt = { workspace = true }
serde = "1.0.203" thiserror = { workspace = true }
minecraft_folder_path = "0.1.2" tokio = { workspace = true, features = ["sync"] }
azalea-entity = { version = "0.10.0", path = "../azalea-entity" } tracing = { workspace = true }
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } uuid = { workspace = true }
[features] [features]
default = ["log"] default = ["log"]

1
azalea-client/src/client.rs
View file

@ -3,7 +3,6 @@ use std::{
fmt::Debug, fmt::Debug,
io, io,
net::SocketAddr, net::SocketAddr,
ops::Deref,
sync::Arc, sync::Arc,
time::{Duration, Instant}, time::{Duration, Instant},
}; };

1
azalea-client/src/local_player.rs
View file

@ -137,6 +137,7 @@ pub fn death_event(query: Query<&LocalPlayerEvents, Added<Dead>>) {
} }
} }
#[allow(clippy::large_enum_variant)]
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum HandlePacketError { pub enum HandlePacketError {
#[error("{0}")] #[error("{0}")]

1
azalea-client/src/raw_connection.rs
View file

@ -22,7 +22,6 @@ pub struct RawConnection {
writer: RawConnectionWriter, writer: RawConnectionWriter,
/// Packets sent to this will be sent to the server. /// Packets sent to this will be sent to the server.
/// A task that reads packets from the server. The client is disconnected /// A task that reads packets from the server. The client is disconnected
/// when this task ends. /// when this task ends.
read_packets_task: tokio::task::JoinHandle<()>, read_packets_task: tokio::task::JoinHandle<()>,

16
azalea-core/Cargo.toml
View file

@ -9,16 +9,16 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6"
azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
bevy_ecs = { version = "0.13.0", default-features = false, optional = true } bevy_ecs = { workspace = true, optional = true }
nohash-hasher = "0.2.0" nohash-hasher = { workspace = true }
num-traits = "0.2.19" num-traits = { workspace = true }
serde = { version = "^1.0", optional = true } serde = { workspace = true, optional = true }
uuid = "^1.9.1" #serde_json = { workspace = true }
serde_json = "^1.0.120" simdnbt = { workspace = true }
tracing = "0.1.40" tracing = { workspace = true }
#uuid = { workspace = true }
[features] [features]
bevy_ecs = ["dep:bevy_ecs"] bevy_ecs = ["dep:bevy_ecs"]

20
azalea-crypto/Cargo.toml
View file

@ -9,19 +9,19 @@ 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
aes = "0.8.4" aes = { workspace = true }
azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
cfb8 = "0.8.1" cfb8 = { workspace = true }
num-bigint = "^0.4.6" num-bigint = { workspace = true }
rand = { version = "^0.8.5", features = ["getrandom"] } rand = { workspace = true, features = ["getrandom"] }
rsa = { version = "0.9.6", features = ["sha2"] } rsa = { workspace = true, features = ["sha2"] }
rsa_public_encrypt_pkcs1 = "0.4.0" rsa_public_encrypt_pkcs1 = { workspace = true }
sha-1 = "^0.10.1" sha-1 = { workspace = true }
sha2 = "0.10.8" sha2 = { workspace = true }
uuid = "^1.9.1" uuid = { workspace = true }
[dev-dependencies] [dev-dependencies]
criterion = { version = "^0.5.1", features = ["html_reports"] } criterion = { workspace = true, features = ["html_reports"] }
[[bench]] [[bench]]
harness = false harness = false

24
azalea-entity/Cargo.toml
View file

@ -9,22 +9,20 @@ license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6"
azalea-block = { version = "0.10.0", path = "../azalea-block" } azalea-block = { version = "0.10.0", path = "../azalea-block" }
azalea-buf = { version = "0.10.0", path = "../azalea-buf" } azalea-buf = { version = "0.10.0", path = "../azalea-buf" }
azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [ azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = ["azalea-buf"] }
"azalea-buf",
] }
azalea-core = { version = "0.10.0", path = "../azalea-core" } azalea-core = { version = "0.10.0", path = "../azalea-core" }
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
azalea-registry = { version = "0.10.0", path = "../azalea-registry" } azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
azalea-world = { version = "0.10.0", path = "../azalea-world" } azalea-world = { version = "0.10.0", path = "../azalea-world" }
bevy_app = "0.13.0" bevy_app = { workspace = true }
bevy_ecs = "0.13.0" bevy_ecs = { workspace = true }
derive_more = "0.99.18" derive_more = { workspace = true }
enum-as-inner = "0.6.0" enum-as-inner = { workspace = true }
tracing = "0.1.40" nohash-hasher = { workspace = true }
nohash-hasher = "0.2.0" parking_lot = { workspace = true }
parking_lot = "0.12.3" simdnbt = { workspace = true }
thiserror = "1.0.61" thiserror = { workspace = true }
uuid = "1.9.1" tracing = { workspace = true }
uuid = { workspace = true }

10
azalea-inventory/Cargo.toml
View file

@ -9,12 +9,10 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6"
azalea-buf = { version = "0.10.0", path = "../azalea-buf" } azalea-buf = { version = "0.10.0", path = "../azalea-buf" }
azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = ["azalea-buf"] }
azalea-core = { version = "0.10.0", path = "../azalea-core" }
azalea-inventory-macros = { version = "0.10.0", path = "./azalea-inventory-macros" } azalea-inventory-macros = { version = "0.10.0", path = "./azalea-inventory-macros" }
azalea-registry = { version = "0.10.0", path = "../azalea-registry" } azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [ simdnbt = { workspace = true }
"azalea-buf", uuid = { workspace = true }
] }
azalea-core = { version = "0.10.0", path = "../azalea-core" }
uuid = "1.9.1"

6
azalea-inventory/azalea-inventory-macros/Cargo.toml
View file

@ -12,6 +12,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
proc-macro2 = "1.0.86" proc-macro2 = { workspace = true }
quote = "1.0.36" quote = { workspace = true }
syn = "2.0.68" syn = { workspace = true }

8
azalea-language/Cargo.toml
View file

@ -9,7 +9,7 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
once_cell = "1.19.0" once_cell = { workspace = true }
serde = "^1.0" serde = { workspace = true }
serde_json = "^1.0.120" serde_json = { workspace = true }
# tokio = {version = "^1.21.2", features = ["fs"]} #tokio = { workspace = true, features = ["fs"] }

22
azalea-physics/Cargo.toml
View file

@ -11,18 +11,18 @@ version = "0.10.3+mc1.21.1"
[dependencies] [dependencies]
azalea-block = { path = "../azalea-block", version = "0.10.0" } azalea-block = { path = "../azalea-block", version = "0.10.0" }
azalea-core = { path = "../azalea-core", version = "0.10.0" } azalea-core = { path = "../azalea-core", 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"
tracing = "0.1.40"
once_cell = "1.19.0"
parking_lot = "^0.12.3"
nohash-hasher = "0.2.0"
smallvec = "1.13.2"
azalea-entity = { version = "0.10.0", path = "../azalea-entity" } azalea-entity = { version = "0.10.0", path = "../azalea-entity" }
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
azalea-world = { path = "../azalea-world", version = "0.10.0" }
bevy_app = { workspace = true }
bevy_ecs = { workspace = true }
#nohash-hasher = { workspace = true }
once_cell = { workspace = true }
parking_lot = { workspace = true }
#smallvec = { workspace = true }
#tracing = { workspace = true }
[dev-dependencies] [dev-dependencies]
bevy_time = "0.13.0" #bevy_time = { workspace = true }
uuid = "^1.9.1" uuid = { workspace = true }

65
azalea-protocol/Cargo.toml
View file

@ -9,46 +9,37 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6" async-recursion = { workspace = true }
async-recursion = "1.1.1"
azalea-auth = { path = "../azalea-auth", version = "0.10.0" } azalea-auth = { path = "../azalea-auth", version = "0.10.0" }
azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" } azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" }
azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = [ azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = ["azalea-buf"] }
"azalea-buf",
] }
azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = [ azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = ["numbers", "azalea-buf"] }
"numbers", azalea-core = { path = "../azalea-core", optional = true, version = "0.10.0", features = ["serde"] }
"azalea-buf",
] }
azalea-core = { path = "../azalea-core", optional = true, version = "0.10.0", features = [
"serde",
] }
azalea-crypto = { path = "../azalea-crypto", 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-protocol-macros = { path = "./azalea-protocol-macros", version = "0.10.0" } azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.10.0" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
azalea-world = { path = "../azalea-world", version = "0.10.0" } azalea-world = { path = "../azalea-world", version = "0.10.0" }
bevy_ecs = { version = "0.13.0", default-features = false } bevy_ecs = { workspace = true }
byteorder = "^1.5.0" #byteorder = { workspace = true }
bytes = "^1.6.0" bytes = { workspace = true }
flate2 = "1.0.30" flate2 = { workspace = true }
futures = "0.3.30" futures = { workspace = true }
futures-lite = "2.3.0" futures-lite = { workspace = true }
futures-util = "0.3.30" #futures-util = { workspace = true }
tracing = "0.1.40" log = { workspace = true }
serde = { version = "^1.0", features = ["serde_derive"] } serde = { workspace = true, features = ["serde_derive"] }
serde_json = "^1.0.120" serde_json = { workspace = true }
thiserror = "1.0.61" simdnbt = { workspace = true }
tokio = { version = "^1.38.0", features = ["io-util", "net", "macros"] } socks5-impl = { workspace = true }
tokio-util = { version = "0.7.11", features = ["codec"] } thiserror = { workspace = true }
trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [ tokio = { workspace = true, features = ["io-util", "net", "macros"] }
"tokio-runtime", tokio-util = { workspace = true, features = ["codec"] }
] } tracing = { workspace = true }
uuid = "1.9.1" trust-dns-resolver = { workspace = true, features = ["tokio-runtime"] }
log = "0.4.22" uuid = { workspace = true }
azalea-entity = { version = "0.10.0", path = "../azalea-entity" }
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
socks5-impl = "0.5.14"
[features] [features]
connecting = [] connecting = []
@ -56,7 +47,7 @@ default = ["packets"]
packets = ["connecting", "dep:azalea-core"] packets = ["connecting", "dep:azalea-core"]
[dev-dependencies] [dev-dependencies]
anyhow = "^1.0.86" anyhow = { workspace = true }
tracing = "^0.1.40" once_cell = { workspace = true }
tracing-subscriber = "^0.3.18" tracing = { workspace = true }
once_cell = "1.19.0" tracing-subscriber = { workspace = true }

6
azalea-protocol/azalea-protocol-macros/Cargo.toml
View file

@ -11,6 +11,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
proc-macro2 = "^1.0.86" proc-macro2 = { workspace = true }
quote = "^1.0.36" quote = { workspace = true }
syn = "^2.0.68" syn = { workspace = true }

2
azalea-protocol/src/lib.rs
View file

@ -40,7 +40,7 @@ pub struct ServerAddress {
pub port: u16, pub port: u16,
} }
impl<'a> TryFrom<&'a str> for ServerAddress { impl TryFrom<&'_ str> for ServerAddress {
type Error = String; type Error = String;
/// Convert a Minecraft server address (host:port, the port is optional) to /// Convert a Minecraft server address (host:port, the port is optional) to

8
azalea-protocol/src/read.rs
View file

@ -209,8 +209,8 @@ pub fn compression_decoder(
/// The current protocol state must be passed as a generic. /// The current protocol state must be passed as a generic.
/// ///
/// For the non-waiting version, see [`try_read_packet`]. /// For the non-waiting version, see [`try_read_packet`].
pub async fn read_packet<'a, P: ProtocolPacket + Debug, R>( pub async fn read_packet<P: ProtocolPacket + Debug, R>(
stream: &'a mut R, stream: &mut R,
buffer: &mut BytesMut, buffer: &mut BytesMut,
compression_threshold: Option<u32>, compression_threshold: Option<u32>,
cipher: &mut Option<Aes128CfbDec>, cipher: &mut Option<Aes128CfbDec>,
@ -242,8 +242,8 @@ where
Ok(Some(packet)) Ok(Some(packet))
} }
pub async fn read_raw_packet<'a, R>( pub async fn read_raw_packet<R>(
stream: &'a mut R, stream: &mut R,
buffer: &mut BytesMut, buffer: &mut BytesMut,
compression_threshold: Option<u32>, compression_threshold: Option<u32>,
// this has to be a &mut Option<T> instead of an Option<&mut T> because // this has to be a &mut Option<T> instead of an Option<&mut T> because

7
azalea-registry/Cargo.toml
View file

@ -9,11 +9,12 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6"
azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.10.0" } azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.10.0" }
once_cell = "1.19.0" once_cell = { workspace = true }
serde = { version = "^1.0", optional = true } serde = { workspace = true, optional = true }
simdnbt = { workspace = true }
[features] [features]
serde = ["azalea-registry-macros/serde", "dep:serde"] serde = ["azalea-registry-macros/serde", "dep:serde"]
default = ["serde"] default = ["serde"]

6
azalea-registry/azalea-registry-macros/Cargo.toml
View file

@ -12,9 +12,9 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
proc-macro2 = "1.0.86" #proc-macro2 = { workspace = true }
quote = "1.0.36" quote = { workspace = true }
syn = "2.0.68" syn = { workspace = true }
[features] [features]
serde = [] serde = []

30
azalea-world/Cargo.toml
View file

@ -9,28 +9,26 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
simdnbt = "0.6"
azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" } azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" }
azalea-buf = { path = "../azalea-buf", version = "0.10.0" } azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-core = { path = "../azalea-core", version = "0.10.0", features = [ azalea-core = { path = "../azalea-core", version = "0.10.0", features = ["bevy_ecs"] }
"bevy_ecs",
] }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
bevy_ecs = "0.13.0" bevy_ecs = { workspace = true }
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] } derive_more = { workspace = true, features = ["deref", "deref_mut"] }
tracing = "0.1.40" nohash-hasher = { workspace = true }
nohash-hasher = "0.2.0" #once_cell = { workspace = true }
once_cell = "1.19.0" parking_lot = { workspace = true }
parking_lot = "^0.12.3" rustc-hash = { workspace = true }
thiserror = "1.0.61" #serde = { workspace = true }
uuid = "1.9.1" #serde_json = { workspace = true }
serde_json = "1.0.120" simdnbt = { workspace = true }
serde = "1.0.203" thiserror = { workspace = true }
rustc-hash = "2.0.0" tracing = { workspace = true }
#uuid = { workspace = true }
[dev-dependencies] [dev-dependencies]
azalea-client = { path = "../azalea-client" } azalea-client = { path = "../azalea-client" }
criterion = "0.5.1" criterion = { workspace = true }
[[bench]] [[bench]]
name = "chunks" name = "chunks"

4
azalea-world/src/bit_storage.rs
View file

@ -119,7 +119,7 @@ impl BitStorage {
let values_per_long = 64 / bits; let values_per_long = 64 / bits;
let magic_index = values_per_long - 1; let magic_index = values_per_long - 1;
let (divide_mul, divide_add, divide_shift) = MAGIC[magic_index]; let (divide_mul, divide_add, divide_shift) = MAGIC[magic_index];
let calculated_length = (size + values_per_long - 1) / values_per_long; let calculated_length = size.div_ceil(values_per_long);
let mask = (1 << bits) - 1; let mask = (1 << bits) - 1;
@ -228,7 +228,7 @@ pub struct BitStorageIter<'a> {
index: usize, index: usize,
} }
impl<'a> Iterator for BitStorageIter<'a> { impl Iterator for BitStorageIter<'_> {
type Item = u64; type Item = u64;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {

2
azalea-world/src/find_blocks.rs
View file

@ -155,7 +155,7 @@ impl<'a> FindBlocks<'a> {
} }
} }
impl<'a> Iterator for FindBlocks<'a> { impl Iterator for FindBlocks<'_> {
type Item = BlockPos; type Item = BlockPos;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {

44
azalea/Cargo.toml
View file

@ -12,8 +12,8 @@ pre-release-replacements = [
] ]
[dependencies] [dependencies]
anyhow = "^1.0.86" anyhow = { workspace = true }
async-trait = "0.1.80" #async-trait = { workspace = true }
azalea-auth = { version = "0.10.0", path = "../azalea-auth" } azalea-auth = { version = "0.10.0", path = "../azalea-auth" }
azalea-block = { version = "0.10.0", path = "../azalea-block" } azalea-block = { version = "0.10.0", path = "../azalea-block" }
azalea-brigadier = { version = "0.10.0", path = "../azalea-brigadier" } azalea-brigadier = { version = "0.10.0", path = "../azalea-brigadier" }
@ -27,28 +27,28 @@ azalea-physics = { version = "0.10.0", path = "../azalea-physics" }
azalea-protocol = { version = "0.10.0", path = "../azalea-protocol" } azalea-protocol = { version = "0.10.0", path = "../azalea-protocol" }
azalea-registry = { version = "0.10.0", path = "../azalea-registry" } azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
azalea-world = { version = "0.10.0", path = "../azalea-world" } azalea-world = { version = "0.10.0", path = "../azalea-world" }
bevy_app = "0.13.0" bevy_app = { workspace = true }
bevy_ecs = "0.13.0" bevy_ecs = { workspace = true }
bevy_log = "0.13.0" bevy_log = { workspace = true }
bevy_tasks = { version = "0.13.0", features = ["multi-threaded"] } bevy_tasks = { workspace = true, features = ["multi-threaded"] }
bevy_time = "0.13.0" #bevy_time = { workspace = true }
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] } derive_more = { workspace = true, features = ["deref", "deref_mut"] }
futures = "0.3.30" futures = { workspace = true }
futures-lite = "2.3.0" futures-lite = { workspace = true }
nohash-hasher = "0.2.0" nohash-hasher = { workspace = true }
num-traits = "0.2.19" num-traits = { workspace = true }
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] } parking_lot = { workspace = true, features = ["deadlock_detection"] }
priority-queue = "2.0.3" priority-queue = { workspace = true }
rustc-hash = "2.0.0" rustc-hash = { workspace = true }
serde = { version = "1", optional = true } serde = { workspace = true, optional = true }
thiserror = "^1.0.61" thiserror = { workspace = true }
tokio = "^1.38.0" tokio = { workspace = true }
tracing = "0.1.40" tracing = { workspace = true }
uuid = "1.9.1" uuid = { workspace = true }
[dev-dependencies] [dev-dependencies]
criterion = "0.5.1" criterion = { workspace = true }
rand = "0.8.5" rand = { workspace = true }
[features] [features]
default = ["log", "serde"] default = ["log", "serde"]

2
azalea/src/nearest_entity.rs
View file

@ -57,7 +57,7 @@ where
>, >,
} }
impl<'w, 's, 'a, F> EntityFinder<'w, 's, F> impl<'a, F> EntityFinder<'_, '_, F>
where where
F: QueryFilter + 'static, F: QueryFilter + 'static,
{ {

3
azalea/src/pathfinder/simulation.rs
View file

@ -154,8 +154,7 @@ impl Simulation {
pub fn is_mining(&self) -> bool { pub fn is_mining(&self) -> bool {
// return true if the component is present and Some // return true if the component is present and Some
self.get_component::<azalea_client::mining::MineBlockPos>() self.get_component::<azalea_client::mining::MineBlockPos>()
.map(|c| *c) .and_then(|c| *c)
.flatten()
.is_some() .is_some()
} }
} }

1
azalea/src/swarm/mod.rs
View file

@ -562,7 +562,6 @@ pub type BoxSwarmHandleFn<SS> =
/// } /// }
/// Ok(()) /// Ok(())
/// } /// }
impl Swarm { impl Swarm {
/// Add a new account to the swarm. You can remove it later by calling /// Add a new account to the swarm. You can remove it later by calling
/// [`Client::disconnect`]. /// [`Client::disconnect`].

2
rust-toolchain
View file

@ -1 +1 @@
nightly nightly-2024-11-11