mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 06:16:04 +00:00
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
This commit is contained in:
Shayne Hartford
GitHub
parent
e443c5d76e
commit
dfdc3144b6
35 changed files with 791 additions and 506 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -1,6 +1,7 @@
|
|||
/target
|
||||
/doc
|
||||
.vscode
|
||||
.idea/
|
||||
.vscode/
|
||||
doc/
|
||||
target/
|
||||
|
||||
.cargo/config
|
||||
.cargo/config.toml
|
||||
|
|
|
|||
782
Cargo.lock
generated
782
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
88
Cargo.toml
88
Cargo.toml
|
|
@ -1,24 +1,80 @@
|
|||
[workspace]
|
||||
members = [
|
||||
"azalea",
|
||||
"azalea-client",
|
||||
"azalea-protocol",
|
||||
"azalea-chat",
|
||||
"azalea-core",
|
||||
"azalea-auth",
|
||||
"azalea-brigadier",
|
||||
"azalea-crypto",
|
||||
"azalea-world",
|
||||
"azalea-language",
|
||||
"azalea-block",
|
||||
"azalea-buf",
|
||||
"azalea-physics",
|
||||
"azalea-registry",
|
||||
"azalea-inventory",
|
||||
"azalea-entity",
|
||||
"azalea",
|
||||
"azalea-client",
|
||||
"azalea-protocol",
|
||||
"azalea-chat",
|
||||
"azalea-core",
|
||||
"azalea-auth",
|
||||
"azalea-brigadier",
|
||||
"azalea-crypto",
|
||||
"azalea-world",
|
||||
"azalea-language",
|
||||
"azalea-block",
|
||||
"azalea-buf",
|
||||
"azalea-physics",
|
||||
"azalea-registry",
|
||||
"azalea-inventory",
|
||||
"azalea-entity",
|
||||
]
|
||||
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]
|
||||
debug = true
|
||||
|
||||
|
|
|
|||
|
|
@ -11,23 +11,20 @@ version = "0.10.3+mc1.21.1"
|
|||
[dependencies]
|
||||
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
|
||||
azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" }
|
||||
base64 = "0.22.1"
|
||||
chrono = { version = "0.4.38", default-features = false, features = ["serde"] }
|
||||
tracing = "0.1.40"
|
||||
num-bigint = "0.4.6"
|
||||
once_cell = "1.19.0"
|
||||
reqwest = { version = "0.12.5", default-features = false, features = [
|
||||
"json",
|
||||
"rustls-tls",
|
||||
] }
|
||||
rsa = "0.9.6"
|
||||
serde = { version = "1.0.203", features = ["derive"] }
|
||||
serde_json = "1.0.120"
|
||||
thiserror = "1.0.61"
|
||||
tokio = { version = "1.38.0", features = ["fs"] }
|
||||
uuid = { version = "1.9.1", features = ["serde", "v3"] }
|
||||
md-5 = "0.10.6"
|
||||
base64 = { workspace = true }
|
||||
chrono = { workspace = true, features = ["serde"] }
|
||||
md-5 = { workspace = true }
|
||||
#num-bigint = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
reqwest = { workspace = true, features = ["json", "rustls-tls"] }
|
||||
rsa = { workspace = true }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
tokio = { workspace = true, features = ["fs"] }
|
||||
tracing = { workspace = true }
|
||||
uuid = { workspace = true, features = ["serde", "v3"] }
|
||||
|
||||
[dev-dependencies]
|
||||
env_logger = "0.11.3"
|
||||
tokio = { version = "1.38.0", features = ["full"] }
|
||||
env_logger = { workspace = true }
|
||||
tokio = { workspace = true, features = ["full"] }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
/// in a different way, use [`get_ms_link_code`], [`get_ms_auth_token`],
|
||||
/// [`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 {
|
||||
cache::get_account_in_cache(cache_file, email).await
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ proc-macro = true
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "1.0.86"
|
||||
quote = "1.0.36"
|
||||
syn = "2.0.68"
|
||||
proc-macro2 = { workspace = true }
|
||||
quote = { workspace = true }
|
||||
syn = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dev-dependencies]
|
||||
bevy_app = "0.13.0"
|
||||
bevy_ecs = "0.13.0"
|
||||
bevy_app = { workspace = true }
|
||||
bevy_ecs = { workspace = true }
|
||||
|
||||
[dependencies]
|
||||
azalea-buf = { path = "../azalea-buf", 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]
|
||||
azalea-buf = ["dep:azalea-buf", "dep:azalea-chat", "azalea-chat/azalea-buf"]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
simdnbt = "0.6"
|
||||
azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.10.0" }
|
||||
byteorder = "^1.5.0"
|
||||
tracing = "0.1.40"
|
||||
serde_json = { version = "^1.0", optional = true }
|
||||
thiserror = "1.0.61"
|
||||
uuid = "^1.9.1"
|
||||
byteorder = { workspace = true }
|
||||
serde_json = { workspace = true, optional = true }
|
||||
simdnbt = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
uuid = { workspace = true }
|
||||
|
||||
[features]
|
||||
serde_json = ["dep:serde_json"]
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@ proc-macro = true
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "^1.0.86"
|
||||
quote = "^1.0.36"
|
||||
syn = { version = "^2.0.68", features = ["extra-traits"] }
|
||||
proc-macro2 = { workspace = true }
|
||||
quote = { workspace = true }
|
||||
syn = { workspace = true, features = ["extra-traits"] }
|
||||
|
|
|
|||
|
|
@ -15,13 +15,11 @@ azalea-buf = ["dep:azalea-buf", "simdnbt"]
|
|||
numbers = ["dep:azalea-registry", "dep:simdnbt"]
|
||||
|
||||
[dependencies]
|
||||
azalea-buf = { path = "../azalea-buf", features = [
|
||||
"serde_json",
|
||||
], version = "0.10.0", optional = true }
|
||||
azalea-buf = { path = "../azalea-buf", features = ["serde_json"], version = "0.10.0", optional = true }
|
||||
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 }
|
||||
once_cell = { workspace = true }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
simdnbt = { workspace = true, optional = true }
|
||||
tracing = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -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"]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ use std::{
|
|||
fmt::Debug,
|
||||
io,
|
||||
net::SocketAddr,
|
||||
ops::Deref,
|
||||
sync::Arc,
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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}")]
|
||||
|
|
|
|||
|
|
@ -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<()>,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
simdnbt = "0.6"
|
||||
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
|
||||
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
|
||||
bevy_ecs = { version = "0.13.0", default-features = false, optional = true }
|
||||
nohash-hasher = "0.2.0"
|
||||
num-traits = "0.2.19"
|
||||
serde = { version = "^1.0", optional = true }
|
||||
uuid = "^1.9.1"
|
||||
serde_json = "^1.0.120"
|
||||
tracing = "0.1.40"
|
||||
bevy_ecs = { workspace = true, optional = true }
|
||||
nohash-hasher = { workspace = true }
|
||||
num-traits = { workspace = true }
|
||||
serde = { workspace = true, optional = true }
|
||||
#serde_json = { workspace = true }
|
||||
simdnbt = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
#uuid = { workspace = true }
|
||||
|
||||
[features]
|
||||
bevy_ecs = ["dep:bevy_ecs"]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
aes = "0.8.4"
|
||||
aes = { workspace = true }
|
||||
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
|
||||
cfb8 = "0.8.1"
|
||||
num-bigint = "^0.4.6"
|
||||
rand = { version = "^0.8.5", features = ["getrandom"] }
|
||||
rsa = { version = "0.9.6", features = ["sha2"] }
|
||||
rsa_public_encrypt_pkcs1 = "0.4.0"
|
||||
sha-1 = "^0.10.1"
|
||||
sha2 = "0.10.8"
|
||||
uuid = "^1.9.1"
|
||||
cfb8 = { workspace = true }
|
||||
num-bigint = { workspace = true }
|
||||
rand = { workspace = true, features = ["getrandom"] }
|
||||
rsa = { workspace = true, features = ["sha2"] }
|
||||
rsa_public_encrypt_pkcs1 = { workspace = true }
|
||||
sha-1 = { workspace = true }
|
||||
sha2 = { workspace = true }
|
||||
uuid = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
criterion = { version = "^0.5.1", features = ["html_reports"] }
|
||||
criterion = { workspace = true, features = ["html_reports"] }
|
||||
|
||||
[[bench]]
|
||||
harness = false
|
||||
|
|
|
|||
|
|
@ -9,22 +9,20 @@ license = "MIT"
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
simdnbt = "0.6"
|
||||
azalea-block = { version = "0.10.0", path = "../azalea-block" }
|
||||
azalea-buf = { version = "0.10.0", path = "../azalea-buf" }
|
||||
azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [
|
||||
"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 = { version = "0.10.0", path = "../azalea-inventory" }
|
||||
azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
|
||||
azalea-world = { version = "0.10.0", path = "../azalea-world" }
|
||||
bevy_app = "0.13.0"
|
||||
bevy_ecs = "0.13.0"
|
||||
derive_more = "0.99.18"
|
||||
enum-as-inner = "0.6.0"
|
||||
tracing = "0.1.40"
|
||||
nohash-hasher = "0.2.0"
|
||||
parking_lot = "0.12.3"
|
||||
thiserror = "1.0.61"
|
||||
uuid = "1.9.1"
|
||||
bevy_app = { workspace = true }
|
||||
bevy_ecs = { workspace = true }
|
||||
derive_more = { workspace = true }
|
||||
enum-as-inner = { workspace = true }
|
||||
nohash-hasher = { workspace = true }
|
||||
parking_lot = { workspace = true }
|
||||
simdnbt = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
uuid = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
simdnbt = "0.6"
|
||||
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-registry = { version = "0.10.0", path = "../azalea-registry" }
|
||||
azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [
|
||||
"azalea-buf",
|
||||
] }
|
||||
azalea-core = { version = "0.10.0", path = "../azalea-core" }
|
||||
uuid = "1.9.1"
|
||||
simdnbt = { workspace = true }
|
||||
uuid = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ proc-macro = true
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "1.0.86"
|
||||
quote = "1.0.36"
|
||||
syn = "2.0.68"
|
||||
proc-macro2 = { workspace = true }
|
||||
quote = { workspace = true }
|
||||
syn = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
once_cell = "1.19.0"
|
||||
serde = "^1.0"
|
||||
serde_json = "^1.0.120"
|
||||
# tokio = {version = "^1.21.2", features = ["fs"]}
|
||||
once_cell = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
#tokio = { workspace = true, features = ["fs"] }
|
||||
|
|
|
|||
|
|
@ -11,18 +11,18 @@ version = "0.10.3+mc1.21.1"
|
|||
[dependencies]
|
||||
azalea-block = { path = "../azalea-block", 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-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]
|
||||
bevy_time = "0.13.0"
|
||||
uuid = "^1.9.1"
|
||||
#bevy_time = { workspace = true }
|
||||
uuid = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
simdnbt = "0.6"
|
||||
async-recursion = "1.1.1"
|
||||
async-recursion = { workspace = true }
|
||||
azalea-auth = { path = "../azalea-auth", 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-buf",
|
||||
] }
|
||||
azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = ["azalea-buf"] }
|
||||
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
|
||||
azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = [
|
||||
"numbers",
|
||||
"azalea-buf",
|
||||
] }
|
||||
azalea-core = { path = "../azalea-core", optional = true, version = "0.10.0", features = [
|
||||
"serde",
|
||||
] }
|
||||
azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = ["numbers", "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-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-registry = { path = "../azalea-registry", version = "0.10.0" }
|
||||
azalea-world = { path = "../azalea-world", version = "0.10.0" }
|
||||
bevy_ecs = { version = "0.13.0", default-features = false }
|
||||
byteorder = "^1.5.0"
|
||||
bytes = "^1.6.0"
|
||||
flate2 = "1.0.30"
|
||||
futures = "0.3.30"
|
||||
futures-lite = "2.3.0"
|
||||
futures-util = "0.3.30"
|
||||
tracing = "0.1.40"
|
||||
serde = { version = "^1.0", features = ["serde_derive"] }
|
||||
serde_json = "^1.0.120"
|
||||
thiserror = "1.0.61"
|
||||
tokio = { version = "^1.38.0", features = ["io-util", "net", "macros"] }
|
||||
tokio-util = { version = "0.7.11", features = ["codec"] }
|
||||
trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [
|
||||
"tokio-runtime",
|
||||
] }
|
||||
uuid = "1.9.1"
|
||||
log = "0.4.22"
|
||||
azalea-entity = { version = "0.10.0", path = "../azalea-entity" }
|
||||
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
|
||||
socks5-impl = "0.5.14"
|
||||
bevy_ecs = { workspace = true }
|
||||
#byteorder = { workspace = true }
|
||||
bytes = { workspace = true }
|
||||
flate2 = { workspace = true }
|
||||
futures = { workspace = true }
|
||||
futures-lite = { workspace = true }
|
||||
#futures-util = { workspace = true }
|
||||
log = { workspace = true }
|
||||
serde = { workspace = true, features = ["serde_derive"] }
|
||||
serde_json = { workspace = true }
|
||||
simdnbt = { workspace = true }
|
||||
socks5-impl = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
tokio = { workspace = true, features = ["io-util", "net", "macros"] }
|
||||
tokio-util = { workspace = true, features = ["codec"] }
|
||||
tracing = { workspace = true }
|
||||
trust-dns-resolver = { workspace = true, features = ["tokio-runtime"] }
|
||||
uuid = { workspace = true }
|
||||
|
||||
[features]
|
||||
connecting = []
|
||||
|
|
@ -56,7 +47,7 @@ default = ["packets"]
|
|||
packets = ["connecting", "dep:azalea-core"]
|
||||
|
||||
[dev-dependencies]
|
||||
anyhow = "^1.0.86"
|
||||
tracing = "^0.1.40"
|
||||
tracing-subscriber = "^0.3.18"
|
||||
once_cell = "1.19.0"
|
||||
anyhow = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
tracing-subscriber = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@ proc-macro = true
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "^1.0.86"
|
||||
quote = "^1.0.36"
|
||||
syn = "^2.0.68"
|
||||
proc-macro2 = { workspace = true }
|
||||
quote = { workspace = true }
|
||||
syn = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ pub struct ServerAddress {
|
|||
pub port: u16,
|
||||
}
|
||||
|
||||
impl<'a> TryFrom<&'a str> for ServerAddress {
|
||||
impl TryFrom<&'_ str> for ServerAddress {
|
||||
type Error = String;
|
||||
|
||||
/// Convert a Minecraft server address (host:port, the port is optional) to
|
||||
|
|
|
|||
|
|
@ -209,8 +209,8 @@ pub fn compression_decoder(
|
|||
/// The current protocol state must be passed as a generic.
|
||||
///
|
||||
/// For the non-waiting version, see [`try_read_packet`].
|
||||
pub async fn read_packet<'a, P: ProtocolPacket + Debug, R>(
|
||||
stream: &'a mut R,
|
||||
pub async fn read_packet<P: ProtocolPacket + Debug, R>(
|
||||
stream: &mut R,
|
||||
buffer: &mut BytesMut,
|
||||
compression_threshold: Option<u32>,
|
||||
cipher: &mut Option<Aes128CfbDec>,
|
||||
|
|
@ -242,8 +242,8 @@ where
|
|||
Ok(Some(packet))
|
||||
}
|
||||
|
||||
pub async fn read_raw_packet<'a, R>(
|
||||
stream: &'a mut R,
|
||||
pub async fn read_raw_packet<R>(
|
||||
stream: &mut R,
|
||||
buffer: &mut BytesMut,
|
||||
compression_threshold: Option<u32>,
|
||||
// this has to be a &mut Option<T> instead of an Option<&mut T> because
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
simdnbt = "0.6"
|
||||
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
|
||||
azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.10.0" }
|
||||
once_cell = "1.19.0"
|
||||
serde = { version = "^1.0", optional = true }
|
||||
once_cell = { workspace = true }
|
||||
serde = { workspace = true, optional = true }
|
||||
simdnbt = { workspace = true }
|
||||
|
||||
[features]
|
||||
serde = ["azalea-registry-macros/serde", "dep:serde"]
|
||||
default = ["serde"]
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ proc-macro = true
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "1.0.86"
|
||||
quote = "1.0.36"
|
||||
syn = "2.0.68"
|
||||
#proc-macro2 = { workspace = true }
|
||||
quote = { workspace = true }
|
||||
syn = { workspace = true }
|
||||
|
||||
[features]
|
||||
serde = []
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
[dependencies]
|
||||
simdnbt = "0.6"
|
||||
azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" }
|
||||
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
|
||||
azalea-core = { path = "../azalea-core", version = "0.10.0", features = [
|
||||
"bevy_ecs",
|
||||
] }
|
||||
azalea-core = { path = "../azalea-core", version = "0.10.0", features = ["bevy_ecs"] }
|
||||
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
|
||||
bevy_ecs = "0.13.0"
|
||||
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
|
||||
tracing = "0.1.40"
|
||||
nohash-hasher = "0.2.0"
|
||||
once_cell = "1.19.0"
|
||||
parking_lot = "^0.12.3"
|
||||
thiserror = "1.0.61"
|
||||
uuid = "1.9.1"
|
||||
serde_json = "1.0.120"
|
||||
serde = "1.0.203"
|
||||
rustc-hash = "2.0.0"
|
||||
bevy_ecs = { workspace = true }
|
||||
derive_more = { workspace = true, features = ["deref", "deref_mut"] }
|
||||
nohash-hasher = { workspace = true }
|
||||
#once_cell = { workspace = true }
|
||||
parking_lot = { workspace = true }
|
||||
rustc-hash = { workspace = true }
|
||||
#serde = { workspace = true }
|
||||
#serde_json = { workspace = true }
|
||||
simdnbt = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
#uuid = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
azalea-client = { path = "../azalea-client" }
|
||||
criterion = "0.5.1"
|
||||
criterion = { workspace = true }
|
||||
|
||||
[[bench]]
|
||||
name = "chunks"
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ impl BitStorage {
|
|||
let values_per_long = 64 / bits;
|
||||
let magic_index = values_per_long - 1;
|
||||
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;
|
||||
|
||||
|
|
@ -228,7 +228,7 @@ pub struct BitStorageIter<'a> {
|
|||
index: usize,
|
||||
}
|
||||
|
||||
impl<'a> Iterator for BitStorageIter<'a> {
|
||||
impl Iterator for BitStorageIter<'_> {
|
||||
type Item = u64;
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ impl<'a> FindBlocks<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
impl<'a> Iterator for FindBlocks<'a> {
|
||||
impl Iterator for FindBlocks<'_> {
|
||||
type Item = BlockPos;
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ pre-release-replacements = [
|
|||
]
|
||||
|
||||
[dependencies]
|
||||
anyhow = "^1.0.86"
|
||||
async-trait = "0.1.80"
|
||||
anyhow = { workspace = true }
|
||||
#async-trait = { workspace = true }
|
||||
azalea-auth = { version = "0.10.0", path = "../azalea-auth" }
|
||||
azalea-block = { version = "0.10.0", path = "../azalea-block" }
|
||||
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-registry = { version = "0.10.0", path = "../azalea-registry" }
|
||||
azalea-world = { version = "0.10.0", path = "../azalea-world" }
|
||||
bevy_app = "0.13.0"
|
||||
bevy_ecs = "0.13.0"
|
||||
bevy_log = "0.13.0"
|
||||
bevy_tasks = { version = "0.13.0", features = ["multi-threaded"] }
|
||||
bevy_time = "0.13.0"
|
||||
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
|
||||
futures = "0.3.30"
|
||||
futures-lite = "2.3.0"
|
||||
nohash-hasher = "0.2.0"
|
||||
num-traits = "0.2.19"
|
||||
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] }
|
||||
priority-queue = "2.0.3"
|
||||
rustc-hash = "2.0.0"
|
||||
serde = { version = "1", optional = true }
|
||||
thiserror = "^1.0.61"
|
||||
tokio = "^1.38.0"
|
||||
tracing = "0.1.40"
|
||||
uuid = "1.9.1"
|
||||
bevy_app = { workspace = true }
|
||||
bevy_ecs = { workspace = true }
|
||||
bevy_log = { workspace = true }
|
||||
bevy_tasks = { workspace = true, features = ["multi-threaded"] }
|
||||
#bevy_time = { workspace = true }
|
||||
derive_more = { workspace = true, features = ["deref", "deref_mut"] }
|
||||
futures = { workspace = true }
|
||||
futures-lite = { workspace = true }
|
||||
nohash-hasher = { workspace = true }
|
||||
num-traits = { workspace = true }
|
||||
parking_lot = { workspace = true, features = ["deadlock_detection"] }
|
||||
priority-queue = { workspace = true }
|
||||
rustc-hash = { workspace = true }
|
||||
serde = { workspace = true, optional = true }
|
||||
thiserror = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
uuid = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
criterion = "0.5.1"
|
||||
rand = "0.8.5"
|
||||
criterion = { workspace = true }
|
||||
rand = { workspace = true }
|
||||
|
||||
[features]
|
||||
default = ["log", "serde"]
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ where
|
|||
>,
|
||||
}
|
||||
|
||||
impl<'w, 's, 'a, F> EntityFinder<'w, 's, F>
|
||||
impl<'a, F> EntityFinder<'_, '_, F>
|
||||
where
|
||||
F: QueryFilter + 'static,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -154,8 +154,7 @@ impl Simulation {
|
|||
pub fn is_mining(&self) -> bool {
|
||||
// return true if the component is present and Some
|
||||
self.get_component::<azalea_client::mining::MineBlockPos>()
|
||||
.map(|c| *c)
|
||||
.flatten()
|
||||
.and_then(|c| *c)
|
||||
.is_some()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -562,7 +562,6 @@ pub type BoxSwarmHandleFn<SS> =
|
|||
/// }
|
||||
/// Ok(())
|
||||
/// }
|
||||
|
||||
impl Swarm {
|
||||
/// Add a new account to the swarm. You can remove it later by calling
|
||||
/// [`Client::disconnect`].
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
nightly
|
||||
nightly-2024-11-11
|
||||
Loading…
Add table
Reference in a new issue