From f01d89b681577932f622e9aba3ec6092d9a1670d Mon Sep 17 00:00:00 2001 From: ErrorNoInternet Date: Fri, 18 Apr 2025 00:20:55 -0400 Subject: [PATCH] build(deps)!: update azalea and fix ecs changes --- Cargo.lock | 635 ++++++++++++++++++++-------------- src/events.rs | 16 +- src/hacks/mod.rs | 8 +- src/lua/block.rs | 2 +- src/lua/client/container.rs | 8 +- src/lua/client/interaction.rs | 7 +- src/lua/client/movement.rs | 21 +- src/lua/client/state.rs | 21 +- src/lua/client/world/find.rs | 5 +- src/lua/client/world/mod.rs | 13 +- src/main.rs | 9 +- src/replay/plugin.rs | 35 +- 12 files changed, 447 insertions(+), 333 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 005157a..9ca1d15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,20 +64,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "const-random", - "getrandom 0.2.15", - "once_cell", - "version_check", - "zerocopy 0.7.35", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -87,12 +73,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "allocator-api2" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" - [[package]] name = "android-tzdata" version = "0.1.1" @@ -262,10 +242,23 @@ dependencies = [ ] [[package]] -name = "async-compression" -version = "0.4.22" +name = "async-compat" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a194f9d963d8099596278594b3107448656ba73831c9d8c783e613ce86da64" +checksum = "7bab94bde396a3f7b4962e396fdad640e241ed797d4d8d77fc8c237d14c58fc0" +dependencies = [ + "futures-core", + "futures-io", + "once_cell", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-compression" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07" dependencies = [ "flate2", "futures-core", @@ -276,14 +269,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" +checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa" dependencies = [ "async-task", "concurrent-queue", "fastrand", "futures-lite", + "pin-project-lite", "slab", ] @@ -325,6 +319,9 @@ name = "async-task" version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" +dependencies = [ + "portable-atomic", +] [[package]] name = "async-trait" @@ -342,6 +339,9 @@ name = "atomic-waker" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +dependencies = [ + "portable-atomic", +] [[package]] name = "autocfg" @@ -399,7 +399,7 @@ dependencies = [ [[package]] name = "azalea" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-auth", "azalea-block", @@ -437,7 +437,7 @@ dependencies = [ [[package]] name = "azalea-auth" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-buf", "azalea-crypto", @@ -457,7 +457,7 @@ dependencies = [ [[package]] name = "azalea-block" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-block-macros", "azalea-buf", @@ -467,7 +467,7 @@ dependencies = [ [[package]] name = "azalea-block-macros" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "proc-macro2", "quote", @@ -477,7 +477,7 @@ dependencies = [ [[package]] name = "azalea-brigadier" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-buf", "azalea-chat", @@ -487,7 +487,7 @@ dependencies = [ [[package]] name = "azalea-buf" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-buf-macros", "byteorder", @@ -501,7 +501,7 @@ dependencies = [ [[package]] name = "azalea-buf-macros" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "proc-macro2", "quote", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "azalea-chat" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-buf", "azalea-language", @@ -525,8 +525,9 @@ dependencies = [ [[package]] name = "azalea-client" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ + "async-compat", "azalea-auth", "azalea-block", "azalea-buf", @@ -560,7 +561,7 @@ dependencies = [ [[package]] name = "azalea-core" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-buf", "azalea-chat", @@ -577,7 +578,7 @@ dependencies = [ [[package]] name = "azalea-crypto" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "aes", "azalea-buf", @@ -594,7 +595,7 @@ dependencies = [ [[package]] name = "azalea-entity" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-block", "azalea-buf", @@ -618,7 +619,7 @@ dependencies = [ [[package]] name = "azalea-inventory" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-buf", "azalea-chat", @@ -634,7 +635,7 @@ dependencies = [ [[package]] name = "azalea-inventory-macros" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "proc-macro2", "quote", @@ -644,7 +645,7 @@ dependencies = [ [[package]] name = "azalea-language" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "compact_str", "serde", @@ -654,7 +655,7 @@ dependencies = [ [[package]] name = "azalea-physics" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-block", "azalea-core", @@ -671,7 +672,7 @@ dependencies = [ [[package]] name = "azalea-protocol" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "async-recursion", "azalea-auth", @@ -706,7 +707,7 @@ dependencies = [ [[package]] name = "azalea-protocol-macros" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "proc-macro2", "quote", @@ -716,7 +717,7 @@ dependencies = [ [[package]] name = "azalea-registry" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-buf", "azalea-registry-macros", @@ -727,7 +728,7 @@ dependencies = [ [[package]] name = "azalea-registry-macros" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "quote", "syn", @@ -736,7 +737,7 @@ dependencies = [ [[package]] name = "azalea-world" version = "0.12.0+mc1.21.5" -source = "git+https://github.com/azalea-rs/azalea#6a83a6fa387170ae71fbe06791cf3afa20aac1df" +source = "git+https://github.com/azalea-rs/azalea#11a74f215e28d7c3971c9894351567edb68ef0f8" dependencies = [ "azalea-block", "azalea-buf", @@ -799,28 +800,32 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "bevy_app" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ac033a388b8699d241499a43783a09e6a3bab2430f1297c6bd4974095efb3f" +checksum = "a2b6267ac23a9947d5b2725ff047a1e1add70076d85fa9fb73d044ab9bea1f3c" dependencies = [ "bevy_derive", "bevy_ecs", + "bevy_platform", "bevy_reflect", "bevy_tasks", "bevy_utils", + "cfg-if", "console_error_panic_hook", "ctrlc", - "derive_more 1.0.0", "downcast-rs", + "log", + "thiserror 2.0.12", + "variadics_please", "wasm-bindgen", "web-sys", ] [[package]] name = "bevy_derive" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d94761ce947b0a2402fd949fe1e7a5b1535293130ba4cd9893be6295d4680a" +checksum = "f626531b9c05c25a758ede228727bd11c2c2c8498ecbed9925044386d525a2a3" dependencies = [ "bevy_macro_utils", "quote", @@ -829,30 +834,37 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1597106cc01e62e6217ccb662e0748b2ce330893f27c7dc17bac33e0bb99bca9" +checksum = "d9e807b5d9aab3bb8dfe47e7a44c9ff088bad2ceefe299b80ac77609a87fe9d4" dependencies = [ + "arrayvec", "bevy_ecs_macros", + "bevy_platform", "bevy_ptr", "bevy_reflect", "bevy_tasks", "bevy_utils", "bitflags", + "bumpalo", "concurrent-queue", "derive_more 1.0.0", "disqualified", - "fixedbitset 0.5.7", + "fixedbitset", + "indexmap 2.9.0", + "log", "nonmax", - "petgraph", + "serde", "smallvec", + "thiserror 2.0.12", + "variadics_please", ] [[package]] name = "bevy_ecs_macros" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f453adf07712b39826bc5845e5b0887ce03204ee8359bbe6b40a9afda60564a1" +checksum = "467d7bb98aeb8dd30f36e6a773000c12a891d4f1bee2adc3841ec89cc8eaf54e" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -862,14 +874,15 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381a22e01f24af51536ef1eace94298dd555d06ffcf368125d16317f5f179cb" +checksum = "7156df8d2f11135cf71c03eb4c11132b65201fd4f51648571e59e39c9c9ee2f6" dependencies = [ "android_log-sys", "bevy_app", "bevy_ecs", "bevy_utils", + "tracing", "tracing-log", "tracing-oslog", "tracing-subscriber", @@ -878,10 +891,11 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb6ded1ddc124ea214f6a2140e47a78d1fe79b0638dad39419cdeef2e1133f1" +checksum = "7a2473db70d8785b5c75d6dd951a2e51e9be2c2311122db9692c79c9d887517b" dependencies = [ + "parking_lot", "proc-macro2", "quote", "syn", @@ -889,18 +903,37 @@ dependencies = [ ] [[package]] -name = "bevy_ptr" -version = "0.15.3" +name = "bevy_platform" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89fe0b0b919146939481a3a7c38864face2c6d0fd2c73ab3d430dc693ecd9b11" +checksum = "704db2c11b7bc31093df4fbbdd3769f9606a6a5287149f4b51f2680f25834ebc" +dependencies = [ + "cfg-if", + "critical-section", + "foldhash", + "getrandom 0.2.16", + "hashbrown 0.15.3", + "portable-atomic", + "portable-atomic-util", + "serde", + "spin", + "web-time", +] + +[[package]] +name = "bevy_ptr" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f1275dfb4cfef4ffc90c3fa75408964864facf833acc932413d52aa5364ba4" [[package]] name = "bevy_reflect" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ddbca0a39e88eff2c301dc794ee9d73a53f4b08d47b2c9b5a6aac182fae6217" +checksum = "607ebacc31029cf2f39ac330eabf1d4bc411b159528ec08dbe6b0593eaccfd41" dependencies = [ "assert_type_match", + "bevy_platform", "bevy_ptr", "bevy_reflect_derive", "bevy_utils", @@ -908,16 +941,22 @@ dependencies = [ "disqualified", "downcast-rs", "erased-serde", + "foldhash", + "glam", "serde", "smallvec", "smol_str", + "thiserror 2.0.12", + "uuid", + "variadics_please", + "wgpu-types", ] [[package]] name = "bevy_reflect_derive" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d62affb769db17d34ad0b75ff27eca94867e2acc8ea350c5eca97d102bd98709" +checksum = "cf35e45e4eb239018369f63f2adc2107a54c329f9276d020e01eee1625b0238b" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -928,56 +967,49 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028630ddc355563bd567df1076db3515858aa26715ddf7467d2086f9b40e5ab1" +checksum = "444c450b65e108855f42ecb6db0c041a56ea7d7f10cc6222f0ca95e9536a7d19" dependencies = [ "async-channel", "async-executor", + "async-task", + "atomic-waker", + "bevy_platform", + "cfg-if", "concurrent-queue", + "crossbeam-queue", + "derive_more 1.0.0", "futures-channel", "futures-lite", + "heapless", "pin-project", "wasm-bindgen-futures", ] [[package]] name = "bevy_time" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2051ec56301b994f7c182a2a6eb1490038149ad46d95eee715e1a922acdfd9" +checksum = "456369ca10f8e039aaf273332744674844827854833ee29e28f9e161702f2f55" dependencies = [ "bevy_app", "bevy_ecs", + "bevy_platform", "bevy_reflect", - "bevy_utils", "crossbeam-channel", + "log", + "serde", ] [[package]] name = "bevy_utils" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63c2174d43a0de99f863c98a472370047a2bfa7d1e5cec8d9d647fb500905d9d" +checksum = "ac2da3b3c1f94dadefcbe837aaa4aa119fcea37f7bdc5307eb05b4ede1921e24" dependencies = [ - "ahash", - "bevy_utils_proc_macros", - "getrandom 0.2.15", - "hashbrown 0.14.5", + "bevy_platform", "thread_local", - "tracing", - "web-time", -] - -[[package]] -name = "bevy_utils_proc_macros" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94847541f6dd2e28f54a9c2b0e857da5f2631e2201ebc25ce68781cdcb721391" -dependencies = [ - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -1017,9 +1049,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "blake3" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389a099b34312839e16420d499a9cad9650541715937ffbdd40d36f49e77eeb3" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", @@ -1067,8 +1099,8 @@ dependencies = [ [[package]] name = "built" -version = "0.7.7" -source = "git+https://github.com/lukaslueg/built#9468c3a117265cc5976bb82631861aa133f32aec" +version = "0.8.0" +source = "git+https://github.com/lukaslueg/built#53719a12eeb1f4afb65411984f437b65d4799d71" dependencies = [ "git2", ] @@ -1117,9 +1149,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.19" +version = "1.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" dependencies = [ "jobserver", "libc", @@ -1182,9 +1214,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1219,9 +1251,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", "clap_derive", @@ -1229,9 +1261,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", @@ -1285,6 +1317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", + "portable-atomic", ] [[package]] @@ -1342,26 +1375,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom 0.2.15", - "once_cell", - "tiny-keccak", -] - [[package]] name = "const_panic" version = "0.2.12" @@ -1432,18 +1445,21 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crunchy" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" - [[package]] name = "crypto-common" version = "0.1.6" @@ -1579,9 +1595,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid", "pem-rfc7468", @@ -1701,9 +1717,9 @@ checksum = "c9c272297e804878a2a4b707cfcfc6d2328b5bb936944613b4fdf2b9269afdfd" [[package]] name = "downcast-rs" -version = "1.2.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf" [[package]] name = "ed25519" @@ -1889,12 +1905,6 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "fixedbitset" version = "0.5.7" @@ -2086,9 +2096,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", @@ -2140,6 +2150,15 @@ dependencies = [ "url", ] +[[package]] +name = "glam" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8babf46d4c1c9d92deac9f7be466f76dfc4482b6452fc5024b5e8daf6ffeb3ee" +dependencies = [ + "serde", +] + [[package]] name = "glob" version = "0.3.2" @@ -2202,6 +2221,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2210,22 +2238,13 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", - "serde", -] - -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ + "equivalent", "foldhash", + "serde", ] [[package]] @@ -2234,7 +2253,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.15.2", + "hashbrown 0.15.3", ] [[package]] @@ -2250,6 +2269,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32", + "portable-atomic", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.5.0" @@ -2265,13 +2295,10 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hickory-proto" version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d844af74f7b799e41c78221be863bade11c430d46042c3b49ca8ae0c6d27287" +source = "git+https://github.com/hickory-dns/hickory-dns#d442a94cc61fae5ae24a68d55cb722f379d4f031" dependencies = [ - "async-recursion", "async-trait", "cfg-if", - "critical-section", "data-encoding", "enum-as-inner", "futures-channel", @@ -2280,7 +2307,7 @@ dependencies = [ "idna", "ipnet", "once_cell", - "rand 0.9.0", + "rand 0.9.1", "ring", "thiserror 2.0.12", "tinyvec", @@ -2292,16 +2319,17 @@ dependencies = [ [[package]] name = "hickory-resolver" version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a128410b38d6f931fcc6ca5c107a3b02cabd6c05967841269a4ad65d23c44331" +source = "git+https://github.com/hickory-dns/hickory-dns#d442a94cc61fae5ae24a68d55cb722f379d4f031" dependencies = [ "cfg-if", "futures-util", "hickory-proto", + "ipconfig", "moka", "once_cell", "parking_lot", - "rand 0.9.0", + "rand 0.9.1", + "resolv-conf", "smallvec", "thiserror 2.0.12", "tokio", @@ -2706,7 +2734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.3", "serde", ] @@ -2720,6 +2748,18 @@ dependencies = [ "generic-array", ] +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -2868,9 +2908,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" [[package]] name = "libmimalloc-sys" @@ -3213,7 +3253,7 @@ dependencies = [ "anyhow", "async-trait", "base64 0.22.1", - "getrandom 0.2.15", + "getrandom 0.2.16", "gloo-utils", "hkdf", "indexed_db_futures", @@ -3595,7 +3635,7 @@ checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ "base64 0.22.1", "chrono", - "getrandom 0.2.15", + "getrandom 0.2.16", "http", "rand 0.8.5", "reqwest", @@ -3666,9 +3706,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.107" +version = "0.9.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" +checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" dependencies = [ "cc", "libc", @@ -3748,16 +3788,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset 0.4.2", - "indexmap 2.9.0", -] - [[package]] name = "phf" version = "0.11.3" @@ -3864,6 +3894,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3876,7 +3915,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.24", + "zerocopy", ] [[package]] @@ -3982,13 +4021,13 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc" +checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b" dependencies = [ "bytes", "getrandom 0.3.2", - "rand 0.9.0", + "rand 0.9.1", "ring", "rustc-hash 2.1.1", "rustls", @@ -4002,9 +4041,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5" +checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" dependencies = [ "cfg_aliases", "libc", @@ -4042,13 +4081,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy 0.8.24", ] [[package]] @@ -4077,7 +4115,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", ] [[package]] @@ -4128,7 +4166,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", "libredox", "thiserror 2.0.12", ] @@ -4227,6 +4265,12 @@ dependencies = [ "windows-registry", ] +[[package]] +name = "resolv-conf" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7c8f7f733062b66dc1c63f9db168ac0b97a9210e247fa90fdc9ad08f51b302" + [[package]] name = "ring" version = "0.17.14" @@ -4235,7 +4279,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys 0.52.0", @@ -4345,7 +4389,7 @@ dependencies = [ "base64 0.22.1", "bytes", "form_urlencoded", - "getrandom 0.2.15", + "getrandom 0.2.16", "http", "indexmap 2.9.0", "js-sys", @@ -4476,9 +4520,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags", "errno", @@ -4712,9 +4756,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -4738,9 +4782,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -4867,6 +4911,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "portable-atomic", +] [[package]] name = "spki" @@ -4904,9 +4951,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -4924,9 +4971,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", @@ -5033,15 +5080,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinystr" version = "0.7.6" @@ -5131,9 +5169,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -5144,9 +5182,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", "serde_spanned", @@ -5156,18 +5194,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.24" +version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap 2.9.0", "serde", @@ -5379,7 +5417,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "470dbf6591da1b39d43c14523b2b469c86879a53e8b758c8e090a470fe7b1fbe" dependencies = [ - "rand 0.9.0", + "rand 0.9.1", "web-time", ] @@ -5458,11 +5496,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.12.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.3.2", + "js-sys", "md-5", "serde", "wasm-bindgen", @@ -5474,6 +5513,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" +[[package]] +name = "variadics_please" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b6d82be61465f97d42bd1d15bf20f3b0a3a0905018f38f9d6f6962055b0b5c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -5500,7 +5550,7 @@ dependencies = [ "chacha20poly1305", "curve25519-dalek", "ed25519-dalek", - "getrandom 0.2.15", + "getrandom 0.2.16", "hkdf", "hmac", "matrix-pickle", @@ -5646,13 +5696,32 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.8" +version = "0.26.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93" dependencies = [ "rustls-pki-types", ] +[[package]] +name = "wgpu-types" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c" +dependencies = [ + "bitflags", + "js-sys", + "log", + "serde", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" + [[package]] name = "wildmatch" version = "2.4.0" @@ -5824,6 +5893,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -5842,6 +5920,21 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -5874,6 +5967,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -5886,6 +5985,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -5898,6 +6003,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -5922,6 +6033,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -5934,6 +6051,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -5946,6 +6069,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -5958,6 +6087,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -5972,13 +6107,23 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +checksum = "9e27d6ad3dac991091e4d35de9ba2d2d00647c5d0fc26c5496dee55984ae111b" dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wit-bindgen-rt" version = "0.39.0" @@ -6044,38 +6189,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" -dependencies = [ - "zerocopy-derive 0.8.24", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" dependencies = [ "proc-macro2", "quote", diff --git a/src/events.rs b/src/events.rs index 87775de..87227e7 100644 --- a/src/events.rs +++ b/src/events.rs @@ -23,7 +23,7 @@ use crate::{ replay::recorder::Recorder, }; -#[allow(clippy::too_many_lines)] +#[allow(clippy::cognitive_complexity, clippy::too_many_lines)] pub async fn handle_event(client: Client, event: Event, state: State) -> Result<()> { match event { Event::AddPlayer(player_info) => { @@ -35,6 +35,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result< let uuid = message.sender_uuid().map(|uuid| uuid.to_string()); let is_whisper = message.is_whisper(); let text = message.message(); + let html_text = text.to_html(); let ansi_text = text.to_ansi(); info!("{ansi_text}"); @@ -86,6 +87,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result< let table = state.lua.create_table()?; table.set("text", text.to_string())?; table.set("ansi_text", ansi_text)?; + table.set("html_text", html_text)?; table.set("sender", sender)?; table.set("content", content)?; table.set("uuid", uuid)?; @@ -101,6 +103,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result< let message_table = state.lua.create_table()?; message_table.set("text", packet.message.to_string())?; message_table.set("ansi_text", packet.message.to_ansi())?; + message_table.set("html_text", packet.message.to_html())?; let table = state.lua.create_table()?; table.set("message", message_table)?; table.set("player_id", packet.player_id.0)?; @@ -117,6 +120,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result< let table = state.lua.create_table()?; table.set("text", message.to_string())?; table.set("ansi_text", message.to_ansi())?; + table.set("html_text", message.to_html())?; Ok(table) }) .await @@ -125,7 +129,6 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result< } } Event::KeepAlive(id) => call_listeners(&state, "keep_alive", || Ok(id)).await, - Event::Login => call_listeners(&state, "login", || Ok(())).await, Event::RemovePlayer(player_info) => { call_listeners(&state, "remove_player", || Ok(Player::from(player_info))).await } @@ -201,6 +204,12 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result< } _ => Ok(()), }, + Event::Login => { + #[cfg(feature = "matrix")] + matrix_init(&client, state.clone()); + + call_listeners(&state, "login", || Ok(())).await + } Event::Init => { debug!("received init event"); @@ -212,9 +221,6 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result< exit(0); })?; - #[cfg(feature = "matrix")] - matrix_init(&client, state.clone()); - let globals = state.lua.globals(); lua_init(client, &state, &globals).await?; diff --git a/src/hacks/mod.rs b/src/hacks/mod.rs index 42d527c..34c0e74 100644 --- a/src/hacks/mod.rs +++ b/src/hacks/mod.rs @@ -3,9 +3,9 @@ pub mod anti_knockback; use anti_knockback::anti_knockback; -use azalea::{movement::handle_knockback, packet::game::process_packet_events}; +use azalea::{connection::read_packets, movement::handle_knockback}; use bevy_app::{App, Plugin, PreUpdate}; -use bevy_ecs::schedule::IntoSystemConfigs; +use bevy_ecs::schedule::IntoScheduleConfigs; pub struct HacksPlugin; @@ -13,9 +13,7 @@ impl Plugin for HacksPlugin { fn build(&self, app: &mut App) { app.add_systems( PreUpdate, - anti_knockback - .after(process_packet_events) - .before(handle_knockback), + anti_knockback.after(read_packets).before(handle_knockback), ); } } diff --git a/src/lua/block.rs b/src/lua/block.rs index 21d11f1..2a3d9fb 100644 --- a/src/lua/block.rs +++ b/src/lua/block.rs @@ -60,7 +60,7 @@ pub async fn get_block_states( true }) { - matched.push(block.id); + matched.push(block.id()); } } } diff --git a/src/lua/client/container.rs b/src/lua/client/container.rs index 6b1e64e..012b74e 100644 --- a/src/lua/client/container.rs +++ b/src/lua/client/container.rs @@ -4,7 +4,6 @@ use azalea::{ prelude::ContainerClientExt, protocol::packets::game::ServerboundSetCarriedItem, }; -use log::error; use mlua::{Lua, Result, UserDataRef, Value}; use super::{Client, Container, ContainerRef, ItemStack, Vec3}; @@ -126,11 +125,8 @@ pub fn set_held_slot(_lua: &Lua, client: &Client, slot: u8) -> Result<()> { inventory.selected_hotbar_slot = slot; }; - if let Err(error) = client.write_packet(ServerboundSetCarriedItem { + client.write_packet(ServerboundSetCarriedItem { slot: u16::from(slot), - }) { - error!("failed to send SetCarriedItem packet: {error:?}"); - } - + }); Ok(()) } diff --git a/src/lua/client/interaction.rs b/src/lua/client/interaction.rs index 9b509f8..1c2fb1f 100644 --- a/src/lua/client/interaction.rs +++ b/src/lua/client/interaction.rs @@ -3,7 +3,6 @@ use azalea::{ protocol::packets::game::{ServerboundUseItem, s_interact::InteractionHand}, world::MinecraftEntityId, }; -use log::error; use mlua::{Lua, Result, UserDataRef}; use super::{Client, Vec3}; @@ -57,7 +56,7 @@ pub fn start_mining(_lua: &Lua, client: &Client, position: Vec3) -> Result<()> { pub fn use_item(_lua: &Lua, client: &Client, hand: Option) -> Result<()> { let direction = client.direction(); - if let Err(error) = client.write_packet(ServerboundUseItem { + client.write_packet(ServerboundUseItem { hand: match hand { Some(1) => InteractionHand::OffHand, _ => InteractionHand::MainHand, @@ -65,8 +64,6 @@ pub fn use_item(_lua: &Lua, client: &Client, hand: Option) -> Result<()> { sequence: 0, yaw: direction.0, pitch: direction.1, - }) { - error!("failed to send UseItem packet: {error:?}"); - } + }); Ok(()) } diff --git a/src/lua/client/movement.rs b/src/lua/client/movement.rs index ded0b62..c3a42bb 100644 --- a/src/lua/client/movement.rs +++ b/src/lua/client/movement.rs @@ -3,13 +3,12 @@ use azalea::{ entity::Position, interact::HitResultComponent, pathfinder::{ - ExecutingPath, GotoEvent, Pathfinder, PathfinderClientExt, + ExecutingPath, Pathfinder, PathfinderClientExt, goals::{BlockPosGoal, Goal, InverseGoal, RadiusGoal, ReachBlockPosGoal, XZGoal, YGoal}, }, protocol::packets::game::{ServerboundPlayerCommand, s_player_command::Action}, world::MinecraftEntityId, }; -use log::error; use mlua::{FromLua, Lua, Result, Table, UserDataRef, Value}; use super::{Client, Direction, Vec3}; @@ -121,11 +120,7 @@ pub async fn start_go_to( } else { client.start_goto(goal); } - while client.get_tick_broadcaster().recv().await.is_ok() { - if client.ecs.lock().get::(client.entity).is_none() { - break; - } - } + let _ = client.get_tick_broadcaster().recv().await; Ok(()) } @@ -215,7 +210,7 @@ pub fn set_position(_lua: &Lua, client: &Client, new_position: Vec3) -> Result<( } pub fn set_sneaking(_lua: &Lua, client: &Client, sneaking: bool) -> Result<()> { - if let Err(error) = client.write_packet(ServerboundPlayerCommand { + client.write_packet(ServerboundPlayerCommand { id: client.component::(), action: if sneaking { Action::PressShiftKey @@ -223,9 +218,7 @@ pub fn set_sneaking(_lua: &Lua, client: &Client, sneaking: bool) -> Result<()> { Action::ReleaseShiftKey }, data: 0, - }) { - error!("failed to send PlayerCommand packet: {error:?}"); - } + }); Ok(()) } @@ -244,13 +237,11 @@ pub fn stop_pathfinding(_lua: &Lua, client: &Client, (): ()) -> Result<()> { } pub fn stop_sleeping(_lua: &Lua, client: &Client, (): ()) -> Result<()> { - if let Err(error) = client.write_packet(ServerboundPlayerCommand { + client.write_packet(ServerboundPlayerCommand { id: client.component::(), action: Action::StopSleeping, data: 0, - }) { - error!("failed to send PlayerCommand packet: {error:?}"); - } + }); Ok(()) } diff --git a/src/lua/client/state.rs b/src/lua/client/state.rs index 0b7eea1..34d79af 100644 --- a/src/lua/client/state.rs +++ b/src/lua/client/state.rs @@ -1,7 +1,7 @@ use azalea::{ ClientInformation, entity::metadata::{AirSupply, Score}, - pathfinder::PathfinderDebugParticles, + pathfinder::debug::PathfinderDebugParticles, protocol::common::client_information::ModelCustomization, }; use mlua::{Error, Lua, Result, Table, UserDataRef}; @@ -40,21 +40,22 @@ pub async fn set_client_information( allows_listing: info.get("allows_listing")?, model_customization: info .get::("model_customization") + .as_ref() .map(|t| ModelCustomization { - cape: get_bool(&t, "cape"), - jacket: get_bool(&t, "jacket"), - left_sleeve: get_bool(&t, "left_sleeve"), - right_sleeve: get_bool(&t, "right_sleeve"), - left_pants: get_bool(&t, "left_pants"), - right_pants: get_bool(&t, "right_pants"), - hat: get_bool(&t, "hat"), + cape: get_bool(t, "cape"), + jacket: get_bool(t, "jacket"), + left_sleeve: get_bool(t, "left_sleeve"), + right_sleeve: get_bool(t, "right_sleeve"), + left_pants: get_bool(t, "left_pants"), + right_pants: get_bool(t, "right_pants"), + hat: get_bool(t, "hat"), }) .unwrap_or_default(), view_distance: info.get("view_distance").unwrap_or(8), ..ClientInformation::default() }) - .await - .map_err(Error::external) + .await; + Ok(()) } pub fn set_component( diff --git a/src/lua/client/world/find.rs b/src/lua/client/world/find.rs index 60a73f4..48e8b68 100644 --- a/src/lua/client/world/find.rs +++ b/src/lua/client/world/find.rs @@ -28,7 +28,10 @@ pub fn blocks( nearest_to.z as i32, ), &BlockStates { - set: block_states.iter().map(|&id| BlockState { id }).collect(), + set: block_states + .into_iter() + .flat_map(BlockState::try_from) + .collect(), }, ) .map(Vec3::from) diff --git a/src/lua/client/world/mod.rs b/src/lua/client/world/mod.rs index 5355fc6..1f7f538 100644 --- a/src/lua/client/world/mod.rs +++ b/src/lua/client/world/mod.rs @@ -3,16 +3,19 @@ mod queries; pub mod find; use azalea::{BlockPos, auto_tool::AutoToolClientExt, blocks::BlockState, world::InstanceName}; -use mlua::{Lua, Result, Table}; +use mlua::{Lua, Result, Table, Value}; use super::{Client, Direction, Vec3}; -pub fn best_tool_for_block(lua: &Lua, client: &Client, block_state: u16) -> Result
{ - let result = client.best_tool_in_hotbar_for_block(BlockState { id: block_state }); +pub fn best_tool_for_block(lua: &Lua, client: &Client, block_state: u16) -> Result { + let Ok(block) = BlockState::try_from(block_state) else { + return Ok(Value::Nil); + }; + let result = client.best_tool_in_hotbar_for_block(block); let table = lua.create_table()?; table.set("index", result.index)?; table.set("percentage_per_tick", result.percentage_per_tick)?; - Ok(table) + Ok(Value::Table(table)) } pub fn dimension(_lua: &Lua, client: &Client) -> Result { @@ -29,7 +32,7 @@ pub fn get_block_state(_lua: &Lua, client: &Client, position: Vec3) -> Result anyhow::Result<()> { +async fn main() -> Result<()> { #[cfg(feature = "console-subscriber")] console_subscriber::init(); @@ -131,8 +131,7 @@ async fn main() -> anyhow::Result<()> { } else { Account::offline(&username) }; - - let Err(error) = ClientBuilder::new_without_plugins() + let Err(err) = ClientBuilder::new_without_plugins() .add_plugins(DefaultBotPlugins) .add_plugins(HacksPlugin) .add_plugins(default_plugins) @@ -145,7 +144,7 @@ async fn main() -> anyhow::Result<()> { }) .start(account, server) .await; - eprintln!("{error}"); + eprintln!("{err}"); Ok(()) } diff --git a/src/replay/plugin.rs b/src/replay/plugin.rs index e304565..7f2e8cd 100644 --- a/src/replay/plugin.rs +++ b/src/replay/plugin.rs @@ -3,17 +3,15 @@ use std::sync::Arc; use azalea::{ - ecs::{event::EventReader, system::Query}, + ecs::event::EventReader, packet::{ - config::ReceiveConfigPacketEvent, - game::emit_receive_packet_events, - login::{LoginPacketEvent, process_packet_events}, + config::ReceiveConfigPacketEvent, game::ReceiveGamePacketEvent, + login::ReceiveLoginPacketEvent, }, protocol::packets::login::ClientboundLoginPacket, - raw_connection::RawConnection, }; use bevy_app::{App, First, Plugin}; -use bevy_ecs::{schedule::IntoSystemConfigs, system::ResMut}; +use bevy_ecs::system::ResMut; use log::error; use parking_lot::Mutex; @@ -28,19 +26,16 @@ impl Plugin for RecordPlugin { let recorder = self.recorder.lock().take(); if let Some(recorder) = recorder { app.insert_resource(recorder) - .add_systems(First, record_login_packets.before(process_packet_events)) + .add_systems(First, record_login_packets) .add_systems(First, record_configuration_packets) - .add_systems( - First, - record_game_packets.before(emit_receive_packet_events), - ); + .add_systems(First, record_game_packets); } } } fn record_login_packets( recorder: Option>, - mut events: EventReader, + mut events: EventReader, ) { if let Some(mut recorder) = recorder { for event in events.read() { @@ -63,20 +58,20 @@ fn record_configuration_packets( ) { if let Some(mut recorder) = recorder { for event in events.read() { - if let Err(error) = recorder.save_packet(&event.packet) { + if let Err(error) = recorder.save_packet(event.packet.as_ref()) { error!("failed to record configuration packet: {error:?}"); } } } } -fn record_game_packets(recorder: Option>, query: Query<&RawConnection>) { - if let Some(mut recorder) = recorder - && let Ok(raw_conn) = query.get_single() - { - let queue = raw_conn.incoming_packet_queue(); - for raw_packet in queue.lock().iter() { - if let Err(error) = recorder.save_raw_packet(raw_packet) { +fn record_game_packets( + recorder: Option>, + mut events: EventReader, +) { + if let Some(mut recorder) = recorder { + for event in events.read() { + if let Err(error) = recorder.save_packet(event.packet.as_ref()) { error!("failed to record game packet: {error:?}"); } }