aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock154
-rw-r--r--Cargo.toml38
-rw-r--r--azalea-crypto/Cargo.toml2
-rw-r--r--azalea-crypto/src/lib.rs4
-rw-r--r--azalea-entity/src/metadata.rs2
-rw-r--r--codegen/lib/code/entity.py2
6 files changed, 114 insertions, 88 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 10ea58df..d62e74d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -265,7 +265,7 @@ dependencies = [
"num-traits",
"parking_lot",
"radix-heap",
- "rand 0.10.0-rc.5",
+ "rand 0.10.0-rc.6",
"rustc-hash",
"serde",
"tokio",
@@ -430,8 +430,8 @@ dependencies = [
"criterion",
"md-5",
"num-bigint",
- "rand 0.10.0-rc.5",
- "rand_core 0.10.0-rc-2",
+ "rand 0.10.0-rc.6",
+ "rand_core 0.10.0-rc-3",
"rsa",
"rsa_public_encrypt_pkcs1",
"sha1",
@@ -637,9 +637,9 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
[[package]]
name = "bevy_app"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e4fc5dfe9d1d9b8233e1878353b5e66a3f5910c2131d3abf68f9a4116b2d433"
+checksum = "2271a0123a7cc355c3fe98754360c75aa84b29f2a6b1a9f8c00aac427570d174"
dependencies = [
"bevy_derive",
"bevy_ecs",
@@ -660,9 +660,9 @@ dependencies = [
[[package]]
name = "bevy_derive"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9396b256b366a43d7f61d1f230cdab0a512fb4712cbf7d688f3d6fce4c5ea8a"
+checksum = "70b6a05c31f54c83d681f1b8699bbaf581f06b25a40c9a6bb815625f731f5ba9"
dependencies = [
"bevy_macro_utils",
"quote",
@@ -671,9 +671,9 @@ dependencies = [
[[package]]
name = "bevy_ecs"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7dd5229dd00d00e70ac6b2fc0a139961252f6ce07d3d268cfcac0da86d5bde4"
+checksum = "24637a7c8643cab493f4085cda6bde4895f0e0816699c59006f18819da2ca0b8"
dependencies = [
"arrayvec",
"bevy_ecs_macros",
@@ -699,9 +699,9 @@ dependencies = [
[[package]]
name = "bevy_ecs_macros"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d83bdd2285af4867e76c691406e0a4b55611b583d0c45b6ac7bcec1b45fd48"
+checksum = "6eb14c18ca71e11c69fbae873c2db129064efac6d52e48d0127d37bfba1acfa8"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -711,9 +711,9 @@ dependencies = [
[[package]]
name = "bevy_log"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a2d4ea086ac4663ab9dfb056c7b85eee39e18f7e3e9a4ae6e39897eaa155c5"
+checksum = "406304a9b867a2de98c3edf0cc9e5a608fad1a1ddc567e15e72c186a8273ef51"
dependencies = [
"android_log-sys",
"bevy_app",
@@ -729,11 +729,10 @@ dependencies = [
[[package]]
name = "bevy_macro_utils"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d984f9f8bd0f0d9fb020492a955e641e30e7a425f3588bf346cb3e61fec3c3"
+checksum = "0b7272fca0bf30d8ca2571a803598856104b63e5c596d52850f811ed37c5e1e3"
dependencies = [
- "parking_lot",
"proc-macro2",
"quote",
"syn",
@@ -742,14 +741,13 @@ dependencies = [
[[package]]
name = "bevy_platform"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4691af6d7cfd1b5deb2fc926a43a180a546cdc3fe1e5a013fcee60db9bb2c81f"
+checksum = "9b29ea749a8e85f98186ab662f607b885b97c804bb14cdb0cdf838164496d474"
dependencies = [
"critical-section",
"foldhash",
"futures-channel",
- "getrandom 0.3.4",
"hashbrown",
"js-sys",
"portable-atomic",
@@ -763,15 +761,15 @@ dependencies = [
[[package]]
name = "bevy_ptr"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d24d7906c7de556033168b3485de36c59049fbaef0c2c44c715a23e0329b10"
+checksum = "4f98cbc6d34bbdb58240b72ed1731931b4991a893b3a3238bb7c42ae054aa676"
[[package]]
name = "bevy_reflect"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5472b91928c0f3e4e3988c0d036b00719f19520f53a0c3f8c2af72f00e693c5"
+checksum = "2b2a977e2b8dba65b6e9c11039c5f9ef108be428f036b3d1cac13ad86ec59f9c"
dependencies = [
"assert_type_match",
"bevy_platform",
@@ -784,6 +782,7 @@ dependencies = [
"erased-serde",
"foldhash",
"glam",
+ "indexmap",
"serde",
"smallvec",
"smol_str",
@@ -795,9 +794,9 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "083784255162fa39960aa3cf3c23af0e515db2daa7f2e796ae34df993f4d3f6c"
+checksum = "067af30072b1611fda1a577f1cb678b8ea2c9226133068be808dd49aac30cef0"
dependencies = [
"bevy_macro_utils",
"indexmap",
@@ -809,9 +808,9 @@ dependencies = [
[[package]]
name = "bevy_tasks"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcbbfa5a58a16c4228434d3018c23fde3d78dcd76ec5f5b2b482a21f4b158dd3"
+checksum = "990ffedd374dd2c4fe8f0fd4bcefd5617d1ee59164b6c3fcc356a69b48e26e8e"
dependencies = [
"async-channel",
"async-executor",
@@ -828,9 +827,9 @@ dependencies = [
[[package]]
name = "bevy_time"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32835c3dbe082fbbe7d4f2f37f655073421f2882d4320ac2d59f922474260de4"
+checksum = "e4c68b78e7ca1cc10c811cd1ded8350f53f2be11eb46946879a74c684026bff7"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -843,9 +842,9 @@ dependencies = [
[[package]]
name = "bevy_utils"
-version = "0.17.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "789d04f88c764877a4552e07745b402dbc45f5d0545e6d102558f2f1752a1d89"
+checksum = "e258c44d869f9c41ac0f88a16815c67f2569eb9fff4716828a40273d127b6f84"
dependencies = [
"bevy_platform",
"disqualified",
@@ -982,13 +981,13 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "chacha20"
-version = "0.10.0-rc.5"
+version = "0.10.0-rc.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cbf41c6ec3c4b9eaf7f8f5c11a72cd7d3aa0428125c20d5ef4d09907a0f019"
+checksum = "f895fb33c1ad22da4bc79d37c0bddff8aee2ba4575705345eb73b8ffbc386074"
dependencies = [
"cfg-if",
"cpufeatures",
- "rand_core 0.10.0-rc-2",
+ "rand_core 0.10.0-rc-3",
]
[[package]]
@@ -1059,9 +1058,9 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.7.6"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
[[package]]
name = "cmake"
@@ -1073,6 +1072,12 @@ dependencies = [
]
[[package]]
+name = "cmov"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c11ed919bd3bae4af5ab56372b627dfc32622aba6cec36906e8ab46746037c9d"
+
+[[package]]
name = "colorchoice"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1273,14 +1278,14 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
[[package]]
name = "crypto-bigint"
-version = "0.7.0-rc.10"
+version = "0.7.0-rc.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6715836b4946e8585016e80b79c7561476aff3b22f7b756778e7b109d86086c6"
+checksum = "cfc44c334576a43ddece6194e3bf6f177b402728fde319648e36aaf617a473c7"
dependencies = [
+ "ctutils",
"num-traits",
- "rand_core 0.10.0-rc-2",
+ "rand_core 0.10.0-rc-3",
"serdect",
- "subtle",
"zeroize",
]
@@ -1305,13 +1310,13 @@ dependencies = [
[[package]]
name = "crypto-primes"
-version = "0.7.0-pre.4"
+version = "0.7.0-pre.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd9b2855017318a49714c07ee8895b89d3510d54fa6d86be5835de74c389609"
+checksum = "e79c98a281f9441200b24e3151407a629bfbe720399186e50516da939195e482"
dependencies = [
"crypto-bigint",
"libm",
- "rand_core 0.10.0-rc-2",
+ "rand_core 0.10.0-rc-3",
]
[[package]]
@@ -1326,6 +1331,15 @@ dependencies = [
]
[[package]]
+name = "ctutils"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c67c81499f542d1dd38c6a2a2fe825f4dd4bca5162965dd2eea0c8119873d3c"
+dependencies = [
+ "cmov",
+]
+
+[[package]]
name = "data-encoding"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1712,6 +1726,19 @@ dependencies = [
]
[[package]]
+name = "getrandom"
+version = "0.4.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b99f0d993a2b9b97b9a201193aa8ad21305cde06a3be9a7e1f8f4201e5cc27e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "rand_core 0.10.0-rc-3",
+ "wasip2",
+]
+
+[[package]]
name = "gimli"
version = "0.32.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1759,9 +1786,9 @@ dependencies = [
[[package]]
name = "heapless"
-version = "0.8.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
+checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed"
dependencies = [
"hash32",
"portable-atomic",
@@ -2746,18 +2773,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
dependencies = [
"rand_chacha 0.9.0",
- "rand_core 0.9.4",
+ "rand_core 0.9.5",
]
[[package]]
name = "rand"
-version = "0.10.0-rc.5"
+version = "0.10.0-rc.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be866deebbade98028b705499827ad6967c8bb1e21f96a2609913c8c076e9307"
+checksum = "bccc05ac8fad6ee391f3cc6725171817eed960345e2fb42ad229d486c1ca2d98"
dependencies = [
"chacha20",
- "getrandom 0.3.4",
- "rand_core 0.10.0-rc-2",
+ "getrandom 0.4.0-rc.0",
+ "rand_core 0.10.0-rc-3",
]
[[package]]
@@ -2777,7 +2804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
- "rand_core 0.9.4",
+ "rand_core 0.9.5",
]
[[package]]
@@ -2791,18 +2818,18 @@ dependencies = [
[[package]]
name = "rand_core"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1b3bc831f92381018fd9c6350b917c7b21f1eed35a65a51900e0e55a3d7afa"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
dependencies = [
"getrandom 0.3.4",
]
[[package]]
name = "rand_core"
-version = "0.10.0-rc-2"
+version = "0.10.0-rc-3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "104a23e4e8b77312a823b6b5613edbac78397e2f34320bc7ac4277013ec4478e"
+checksum = "f66ee92bc15280519ef199a274fe0cafff4245d31bc39aaa31c011ad56cb1f05"
[[package]]
name = "rayon"
@@ -2922,9 +2949,9 @@ dependencies = [
[[package]]
name = "rsa"
-version = "0.10.0-rc.10"
+version = "0.10.0-rc.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e499c52862d75a86c0024cc99dcb6d7127d15af3beae7b03573d62fab7ade08a"
+checksum = "c9a2b1eacbc34fbaf77f6f1db1385518446008d49b9f9f59dc9d1340fce4ca9e"
dependencies = [
"const-oid",
"crypto-bigint",
@@ -2932,11 +2959,10 @@ dependencies = [
"digest 0.11.0-rc.5",
"pkcs1",
"pkcs8",
- "rand_core 0.10.0-rc-2",
+ "rand_core 0.10.0-rc-3",
"sha2",
"signature",
"spki",
- "subtle",
"zeroize",
]
@@ -3231,7 +3257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a0251c9d6468f4ba853b6352b190fb7c1e405087779917c238445eb03993826"
dependencies = [
"digest 0.11.0-rc.5",
- "rand_core 0.10.0-rc-2",
+ "rand_core 0.10.0-rc-3",
]
[[package]]
@@ -3947,9 +3973,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "26.0.0"
+version = "27.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2"
+checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
dependencies = [
"bitflags",
"bytemuck",
@@ -4433,6 +4459,6 @@ checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3"
[[package]]
name = "zmij"
-version = "1.0.13"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac93432f5b761b22864c774aac244fa5c0fd877678a4c37ebf6cf42208f9c9ec"
+checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea"
diff --git a/Cargo.toml b/Cargo.toml
index be37529d..cf07aa93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,12 +34,12 @@ aes = "0.8.4"
anyhow = "1.0.100"
async-compat = "0.2.5"
base64 = "0.22.1"
-bevy_app = "0.17.3"
-bevy_ecs = { version = "0.17.3", default-features = false }
-bevy_utils = { version = "0.17.3", default-features = false }
-bevy_log = "0.17.3"
-bevy_tasks = "0.17.3"
-bevy_time = "0.17.3"
+bevy_app = "0.18.0"
+bevy_ecs = { version = "0.18.0", default-features = false }
+bevy_utils = { version = "0.18.0", default-features = false }
+bevy_log = "0.18.0"
+bevy_tasks = "0.18.0"
+bevy_time = "0.18.0"
byteorder = "1.5.0"
cfb8 = "0.8.1"
chrono = { version = "0.4.42", default-features = false }
@@ -47,17 +47,17 @@ compact_str = "0.9.0"
crc32c = "0.6.8"
criterion = "0.8.1"
# TODO: Remove when rsa is fixed.
-crypto-bigint = "=0.7.0-rc.10"
+crypto-bigint = "=0.7.0-rc.17"
# TODO: Remove when rsa is fixed.
-crypto-primes = "=0.7.0-pre.4"
+crypto-primes = "=0.7.0-pre.6"
derive_more = "2.1.1"
enum-as-inner = "0.6.1"
env_logger = "0.11.8"
-flate2 = { version = "1.1.5", features = ["zlib-rs"] }
+flate2 = { version = "1.1.8", features = ["zlib-rs"] }
futures = "0.3.31"
futures-lite = "2.6.1"
hickory-resolver = "0.25.2"
-indexmap = "2.12.1"
+indexmap = "2.13.0"
md-5 = "0.10.6"
minecraft_folder_path = "0.1.2"
nohash-hasher = "0.2.0"
@@ -66,18 +66,18 @@ num-format = "0.4.4"
num-traits = "0.2.19"
parking_lot = "0.12.5"
pastey = "0.2.1"
-proc-macro2 = "1.0.104"
-quote = "1.0.42"
-rand = "0.10.0-rc.5"
+proc-macro2 = "1.0.105"
+quote = "1.0.43"
+rand = "0.10.0-rc.6"
# TODO: Remove when rand is fixed.
-rand_core = "=0.10.0-rc-2"
+rand_core = "=0.10.0-rc-3"
regex = "1.12.2"
reqwest = { version = "0.13.1", default-features = false }
-rsa = "0.10.0-rc.10"
+rsa = "0.10.0-rc.12"
rsa_public_encrypt_pkcs1 = "0.4.0"
rustc-hash = "2.1.1"
serde = "1.0.228"
-serde_json = "1.0.148"
+serde_json = "1.0.149"
sha1 = "0.11.0-rc.3"
sha2 = "0.11.0-rc.3"
# TODO: Remove when rsa is fixed.
@@ -85,10 +85,10 @@ signature = "=3.0.0-rc.5"
# simdnbt = "0.9.0"
simdnbt = { git = "https://github.com/azalea-rs/simdnbt" }
socks5-impl = "0.8.0"
-syn = "2.0.112"
+syn = "2.0.114"
thiserror = "2.0.17"
-tokio = "1.48.0"
-tokio-util = "0.7.17"
+tokio = "1.49.0"
+tokio-util = "0.7.18"
tracing = "0.1.44"
tracing-subscriber = "0.3.22"
uuid = "1.19.0"
diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml
index 04f6217a..49b56a7d 100644
--- a/azalea-crypto/Cargo.toml
+++ b/azalea-crypto/Cargo.toml
@@ -14,7 +14,7 @@ aes.workspace = true
azalea-buf = { workspace = true, optional = true }
cfb8.workspace = true
num-bigint.workspace = true
-rand = { workspace = true, features = ["os_rng"] }
+rand = { workspace = true, features = ["sys_rng"] }
# TODO: Remove when rand is fixed.
rand_core.workspace = true
rsa = { workspace = true, features = ["sha2"] }
diff --git a/azalea-crypto/src/lib.rs b/azalea-crypto/src/lib.rs
index 948b3715..abedaee8 100644
--- a/azalea-crypto/src/lib.rs
+++ b/azalea-crypto/src/lib.rs
@@ -8,7 +8,7 @@ use aes::{
Aes128,
cipher::{BlockDecryptMut, BlockEncryptMut, KeyIvInit, inout::InOutBuf},
};
-use rand::{TryRngCore, rngs::OsRng};
+use rand::{TryRngCore, rngs::SysRng};
use sha1::{Digest, Sha1};
#[cfg(feature = "signing")]
@@ -30,7 +30,7 @@ pub fn make_salt() -> u64 {
fn generate_secret_key() -> [u8; 16] {
let mut key = [0u8; 16];
- OsRng.try_fill_bytes(&mut key).unwrap();
+ SysRng.try_fill_bytes(&mut key).unwrap();
key
}
diff --git a/azalea-entity/src/metadata.rs b/azalea-entity/src/metadata.rs
index d076e403..3c49bf53 100644
--- a/azalea-entity/src/metadata.rs
+++ b/azalea-entity/src/metadata.rs
@@ -193,7 +193,7 @@
//! - [SpawnerMinecart]
//! - [TntMinecart]
-#![allow(clippy::single_match)]
+#![allow(clippy::single_match, non_snake_case)]
use azalea_chat::FormattedText;
use azalea_core::{
diff --git a/codegen/lib/code/entity.py b/codegen/lib/code/entity.py
index 1297b9f6..d10a159f 100644
--- a/codegen/lib/code/entity.py
+++ b/codegen/lib/code/entity.py
@@ -712,7 +712,7 @@ impl From<EntityDataValue> for UpdateMetadataError {
code.append("")
code_header.append("")
- code_header.append("#![allow(clippy::single_match)]")
+ code_header.append("#![allow(clippy::single_match, non_snake_case)]")
with open(METADATA_RS_DIR, "w") as f:
f.write("\n".join(code_header) + "\n\n")