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

Fix 1.20.4 branch (#193)

Browse source 
* Add rust rover to .gitignore

* Downgrade to last working nightly version

* Update dependencies and set the simdnbt revision because version doesn't work with git, only path.

* Disable cursor_remaining stabilized feature
This commit is contained in:
Shayne Hartford 2024-12-04 19:09:28 -05:00 • committed by GitHub
parent a485977f3f
commit 5a460f3871
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 969 additions and 679 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
/doc
.vscode
.idea/
.vscode/
doc/
target/
.cargo/config
.cargo/config.toml

1401
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

26
azalea-auth/Cargo.toml
View file

@ -11,23 +11,23 @@ version = "0.9.1"
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
azalea-crypto = { path = "../azalea-crypto", version = "0.9.0" }
base64 = "0.22.0"
base64 = "0.22.1"
chrono = { version = "0.4.38", default-features = false, features = ["serde"] }
tracing = "0.1.40"
num-bigint = "0.4.4"
once_cell = "1.19.0"
reqwest = { version = "0.12.4", default-features = false, features = [
tracing = "0.1.41"
num-bigint = "0.4.6"
once_cell = "1.20.2"
reqwest = { version = "0.12.9", default-features = false, features = [
"json",
"rustls-tls",
] }
rsa = "0.9.6"
serde = { version = "1.0.198", features = ["derive"] }
serde_json = "1.0.116"
thiserror = "1.0.58"
tokio = { version = "1.37.0", features = ["fs"] }
uuid = { version = "1.8.0", features = ["serde", "v3"] }
rsa = "0.9.7"
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
thiserror = "1.0.69"
tokio = { version = "1.42.0", features = ["fs"] }
uuid = { version = "1.11.0", features = ["serde", "v3"] }
md-5 = "0.10.6"
[dev-dependencies]
env_logger = "0.11.3"
tokio = { version = "1.37.0", features = ["full"] }
env_logger = "0.11.5"
tokio = { version = "1.42.0", features = ["full"] }

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
[dependencies]
proc-macro2 = "1.0.81"
quote = "1.0.36"
syn = "2.0.60"
proc-macro2 = "1.0.92"
quote = "1.0.37"
syn = "2.0.90"

2
azalea-brigadier/Cargo.toml
View file

@ -11,7 +11,7 @@ version = "0.9.1"
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.9.0", optional = true }
azalea-chat = { path = "../azalea-chat", version = "0.9.0", optional = true }
parking_lot = "0.12.1"
parking_lot = "0.12.3"
[features]
azalea-buf = ["dep:azalea-buf", "dep:azalea-chat"]

8
azalea-buf/Cargo.toml
View file

@ -9,13 +9,13 @@ version = "0.9.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.9.0" }
byteorder = "^1.5.0"
tracing = "0.1.40"
tracing = "0.1.41"
serde_json = { version = "^1.0", optional = true }
thiserror = "1.0.58"
uuid = "^1.8.0"
thiserror = "1.0.69"
uuid = "^1.11.0"
[features]
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
[dependencies]
proc-macro2 = "^1.0.81"
quote = "^1.0.36"
syn = { version = "^2.0.60", features = ["extra-traits"] }
proc-macro2 = "^1.0.92"
quote = "^1.0.37"
syn = { version = "^2.0.90", features = ["extra-traits"] }

8
azalea-chat/Cargo.toml
View file

@ -19,9 +19,9 @@ azalea-buf = { path = "../azalea-buf", features = [
"serde_json",
], version = "0.9.0", optional = true }
azalea-language = { path = "../azalea-language", version = "0.9.0" }
simdnbt = { version = "0.4", optional = true, git = "https://github.com/azalea-rs/simdnbt" }
tracing = "0.1.40"
once_cell = "1.19.0"
simdnbt = { version = "0.4", optional = true, git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
tracing = "0.1.41"
once_cell = "1.20.2"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0.116"
serde_json = "^1.0.133"
azalea-registry = { path = "../azalea-registry", version = "0.9.0", optional = true }

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

@ -1,4 +1,4 @@
#![feature(cursor_remaining)]
// #![feature(cursor_remaining)]
#![doc = include_str!("../README.md")]
pub mod base_component;

32
azalea-client/Cargo.toml
View file

@ -9,10 +9,10 @@ version = "0.9.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
reqwest = { version = "0.12.4", default-features = false }
anyhow = "1.0.82"
async-trait = "0.1.80"
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
reqwest = { version = "0.12.9", default-features = false }
anyhow = "1.0.94"
async-trait = "0.1.83"
azalea-auth = { path = "../azalea-auth", version = "0.9.0" }
azalea-block = { path = "../azalea-block", version = "0.9.0" }
azalea-chat = { path = "../azalea-chat", version = "0.9.0" }
@ -29,21 +29,21 @@ bevy_log = { version = "0.13.2", optional = true }
bevy_tasks = "0.13.2"
bevy_time = "0.13.2"
azalea-inventory = { path = "../azalea-inventory", version = "0.9.0" }
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
futures = "0.3.30"
tracing = "0.1.40"
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
futures = "0.3.31"
tracing = "0.1.41"
nohash-hasher = "0.2.0"
once_cell = "1.19.0"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
regex = "1.10.4"
thiserror = "^1.0.58"
tokio = { version = "^1.37.0", features = ["sync"] }
uuid = "^1.8.0"
once_cell = "1.20.2"
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] }
regex = "1.11.1"
thiserror = "^1.0.69"
tokio = { version = "^1.42.0", features = ["sync"] }
uuid = "^1.11.0"
azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
serde_json = "1.0.116"
serde = "1.0.198"
serde_json = "1.0.133"
serde = "1.0.215"
minecraft_folder_path = "0.1.2"
socks5-impl = "0.5.12"
socks5-impl = "0.5.17"
[features]
default = ["log"]

10
azalea-core/Cargo.toml
View file

@ -9,17 +9,17 @@ version = "0.9.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
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.13.2", default-features = false, optional = true }
nohash-hasher = "0.2.0"
num-traits = "0.2.18"
num-traits = "0.2.19"
serde = { version = "^1.0", optional = true }
uuid = "^1.8.0"
serde_json = "^1.0.116"
tracing = "0.1.40"
uuid = "^1.11.0"
serde_json = "^1.0.133"
tracing = "0.1.41"
[features]
bevy_ecs = ["dep:bevy_ecs"]

6
azalea-crypto/Cargo.toml
View file

@ -12,13 +12,13 @@ repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-crypto"
aes = "0.8.4"
azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
cfb8 = "0.8.1"
num-bigint = "^0.4.4"
num-bigint = "^0.4.6"
rand = { version = "^0.8.5", features = ["getrandom"] }
rsa = { version = "0.9.6", features = ["sha2"] }
rsa = { version = "0.9.7", features = ["sha2"] }
rsa_public_encrypt_pkcs1 = "0.4.0"
sha-1 = "^0.10.1"
sha2 = "0.10.8"
uuid = "^1.8.0"
uuid = "^1.11.0"
[dev-dependencies]
criterion = { version = "^0.5.1", features = ["html_reports"] }

14
azalea-entity/Cargo.toml
View file

@ -9,7 +9,7 @@ license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
azalea-block = { version = "0.9.0", path = "../azalea-block" }
azalea-buf = { version = "0.9.0", path = "../azalea-buf" }
azalea-chat = { version = "0.9.0", path = "../azalea-chat", features = [
@ -21,10 +21,10 @@ azalea-registry = { version = "0.9.0", path = "../azalea-registry" }
azalea-world = { version = "0.9.0", path = "../azalea-world" }
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
derive_more = "0.99.17"
enum-as-inner = "0.6.0"
tracing = "0.1.40"
derive_more = "0.99.18"
enum-as-inner = "0.6.1"
tracing = "0.1.41"
nohash-hasher = "0.2.0"
parking_lot = "0.12.1"
thiserror = "1.0.58"
uuid = "1.8.0"
parking_lot = "0.12.3"
thiserror = "1.0.69"
uuid = "1.11.0"

2
azalea-inventory/Cargo.toml
View file

@ -9,7 +9,7 @@ version = "0.9.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
azalea-buf = { version = "0.9.0", path = "../azalea-buf" }
azalea-inventory-macros = { version = "0.9.0", path = "./azalea-inventory-macros" }
azalea-registry = { version = "0.9.0", path = "../azalea-registry" }

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
[dependencies]
proc-macro2 = "1.0.81"
quote = "1.0.36"
syn = "2.0.60"
proc-macro2 = "1.0.92"
quote = "1.0.37"
syn = "2.0.90"

4
azalea-language/Cargo.toml
View file

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

8
azalea-physics/Cargo.toml
View file

@ -17,12 +17,12 @@ azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
azalea-world = { path = "../azalea-world", version = "0.9.0" }
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
tracing = "0.1.40"
once_cell = "1.19.0"
parking_lot = "^0.12.1"
tracing = "0.1.41"
once_cell = "1.20.2"
parking_lot = "^0.12.3"
nohash-hasher = "0.2.0"
smallvec = "1.13.2"
[dev-dependencies]
bevy_time = "0.13.2"
uuid = "^1.8.0"
uuid = "^1.11.0"

38
azalea-protocol/Cargo.toml
View file

@ -9,8 +9,8 @@ version = "0.9.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
async-recursion = "1.1.0"
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
async-recursion = "1.1.1"
azalea-auth = { path = "../azalea-auth", version = "0.9.0" }
azalea-block = { path = "../azalea-block", default-features = false, version = "0.9.0" }
azalea-brigadier = { path = "../azalea-brigadier", version = "0.9.0", features = [
@ -31,24 +31,24 @@ azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
azalea-world = { path = "../azalea-world", version = "0.9.0" }
bevy_ecs = { version = "0.13.2", default-features = false }
byteorder = "^1.5.0"
bytes = "^1.6.0"
flate2 = "1.0.28"
futures = "0.3.30"
futures-lite = "2.3.0"
futures-util = "0.3.30"
tracing = "0.1.40"
bytes = "^1.9.0"
flate2 = "1.0.35"
futures = "0.3.31"
futures-lite = "2.5.0"
futures-util = "0.3.31"
tracing = "0.1.41"
serde = { version = "^1.0", features = ["serde_derive"] }
serde_json = "^1.0.116"
thiserror = "1.0.58"
tokio = { version = "^1.37.0", features = ["io-util", "net", "macros"] }
tokio-util = { version = "0.7.10", features = ["codec"] }
serde_json = "^1.0.133"
thiserror = "1.0.69"
tokio = { version = "^1.42.0", features = ["io-util", "net", "macros"] }
tokio-util = { version = "0.7.13", features = ["codec"] }
trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [
"tokio-runtime",
] }
uuid = "1.8.0"
log = "0.4.21"
uuid = "1.11.0"
log = "0.4.22"
socks5-impl = "0.5.12"
socks5-impl = "0.5.17"
[features]
connecting = []
@ -57,7 +57,7 @@ packets = ["connecting", "dep:azalea-core"]
strict_registry = ["packets"]
[dev-dependencies]
anyhow = "^1.0.82"
tracing = "^0.1.40"
tracing-subscriber = "^0.3.18"
once_cell = "1.19.0"
anyhow = "^1.0.94"
tracing = "^0.1.41"
tracing-subscriber = "^0.3.19"
once_cell = "1.20.2"

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
[dependencies]
proc-macro2 = "^1.0.81"
quote = "^1.0.36"
syn = "^2.0.60"
proc-macro2 = "^1.0.92"
quote = "^1.0.37"
syn = "^2.0.90"

4
azalea-registry/Cargo.toml
View file

@ -9,10 +9,10 @@ version = "0.9.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.9.0" }
once_cell = "1.19.0"
once_cell = "1.20.2"
[features]
serde = ["azalea-registry-macros/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
[dependencies]
proc-macro2 = "1.0.81"
quote = "1.0.36"
syn = "2.0.60"
proc-macro2 = "1.0.92"
quote = "1.0.37"
syn = "2.0.90"
[features]
serde = []

20
azalea-world/Cargo.toml
View file

@ -9,24 +9,24 @@ version = "0.9.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt" }
simdnbt = { version = "0.4", git = "https://github.com/azalea-rs/simdnbt", rev = "860d6e1" }
azalea-block = { path = "../azalea-block", default-features = false, version = "0.9.0" }
azalea-buf = { path = "../azalea-buf", version = "0.9.0" }
azalea-core = { path = "../azalea-core", version = "0.9.0", features = [
"bevy_ecs",
"bevy_ecs",
] }
azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
azalea-registry = { path = "../azalea-registry", version = "0.9.0" }
bevy_ecs = "0.13.2"
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
tracing = "0.1.40"
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
tracing = "0.1.41"
nohash-hasher = "0.2.0"
once_cell = "1.19.0"
parking_lot = "^0.12.1"
thiserror = "1.0.58"
uuid = "1.8.0"
serde_json = "1.0.116"
serde = "1.0.198"
once_cell = "1.20.2"
parking_lot = "^0.12.3"
thiserror = "1.0.69"
uuid = "1.11.0"
serde_json = "1.0.133"
serde = "1.0.215"
rustc-hash = "1.1.0"
[dev-dependencies]

24
azalea/Cargo.toml
View file

@ -12,8 +12,8 @@ pre-release-replacements = [
]
[dependencies]
anyhow = "^1.0.82"
async-trait = "0.1.80"
anyhow = "^1.0.94"
async-trait = "0.1.83"
azalea-block = { version = "0.9.0", path = "../azalea-block" }
azalea-chat = { version = "0.9.0", path = "../azalea-chat" }
azalea-client = { version = "0.9.0", path = "../azalea-client", default-features = false }
@ -29,17 +29,17 @@ azalea-buf = { version = "0.9.0", path = "../azalea-buf" }
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
bevy_tasks = { version = "0.13.2", features = ["multi-threaded"] }
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
futures = "0.3.30"
futures-lite = "2.3.0"
tracing = "0.1.40"
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
futures = "0.3.31"
futures-lite = "2.5.0"
tracing = "0.1.41"
nohash-hasher = "0.2.0"
num-traits = "0.2.18"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
priority-queue = "2.0.2"
thiserror = "^1.0.58"
tokio = "^1.37.0"
uuid = "1.8.0"
num-traits = "0.2.19"
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] }
priority-queue = "2.1.1"
thiserror = "^1.0.69"
tokio = "^1.42.0"
uuid = "1.11.0"
bevy_log = "0.13.2"
azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
bevy_time = "0.13.2"

2
rust-toolchain
View file

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