From ee55453fbf9a799e23cbca60e384f6adf3d11acf Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 6 Nov 2023 18:04:48 -0600 Subject: [PATCH] bevy 0.12 --- Cargo.lock | 414 +++++++++--------- azalea-auth/Cargo.toml | 18 +- azalea-block/azalea-block-macros/Cargo.toml | 4 +- azalea-buf/Cargo.toml | 6 +- azalea-buf/azalea-buf-macros/Cargo.toml | 4 +- azalea-chat/Cargo.toml | 2 +- azalea-client/Cargo.toml | 28 +- azalea-client/src/attack.rs | 2 +- azalea-client/src/chat.rs | 4 +- azalea-client/src/chunk_batching.rs | 4 +- azalea-client/src/client.rs | 10 +- azalea-client/src/disconnect.rs | 2 +- azalea-client/src/events.rs | 14 +- azalea-client/src/interact.rs | 4 +- azalea-client/src/inventory.rs | 10 +- azalea-client/src/local_player.rs | 2 +- azalea-client/src/mining.rs | 8 +- azalea-client/src/movement.rs | 6 +- .../src/packet_handling/configuration.rs | 2 +- azalea-client/src/packet_handling/game.rs | 4 +- azalea-client/src/player.rs | 2 +- azalea-client/src/respawn.rs | 2 +- azalea-client/src/task_pool.rs | 6 +- azalea-core/Cargo.toml | 6 +- azalea-crypto/Cargo.toml | 4 +- azalea-entity/Cargo.toml | 8 +- azalea-entity/src/plugin/relative_updates.rs | 4 +- .../azalea-inventory-macros/Cargo.toml | 4 +- azalea-language/Cargo.toml | 2 +- azalea-nbt/Cargo.toml | 8 +- azalea-physics/Cargo.toml | 8 +- azalea-protocol/Cargo.toml | 28 +- .../azalea-protocol-macros/Cargo.toml | 4 +- .../azalea-registry-macros/Cargo.toml | 4 +- azalea-world/Cargo.toml | 6 +- azalea/Cargo.toml | 24 +- azalea/src/accept_resource_packs.rs | 2 +- azalea/src/auto_respawn.rs | 2 +- azalea/src/bot.rs | 4 +- azalea/src/container.rs | 4 +- azalea/src/pathfinder/mod.rs | 6 +- azalea/src/pathfinder/simulation.rs | 4 +- azalea/src/swarm/chat.rs | 4 +- 43 files changed, 354 insertions(+), 340 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bea5504f..1a8cbd425 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,21 +30,22 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -92,9 +93,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "flate2", "futures-core", @@ -105,15 +106,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.0.1", + "futures-lite 1.13.0", "slab", ] @@ -134,24 +135,24 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -186,7 +187,7 @@ dependencies = [ "criterion", "derive_more", "futures", - "futures-lite", + "futures-lite 2.0.1", "log", "nohash-hasher", "num-traits", @@ -235,7 +236,7 @@ version = "0.8.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -265,7 +266,7 @@ version = "0.8.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -390,7 +391,7 @@ version = "0.8.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -464,7 +465,7 @@ dependencies = [ "bytes", "flate2", "futures", - "futures-lite", + "futures-lite 2.0.1", "futures-util", "log", "once_cell", @@ -485,7 +486,7 @@ version = "0.8.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -504,7 +505,7 @@ version = "0.8.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -547,9 +548,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -559,9 +560,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bevy_app" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" +checksum = "172d532ea812e5954fa814dae003c207f2a0b20c6e50431787c94a7159677ece" dependencies = [ "bevy_derive", "bevy_ecs", @@ -575,20 +576,20 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" +checksum = "24bf40259be12a1a24d9fd536f5ff18d31eeb5665b77e2732899783be6edc5d6" dependencies = [ "bevy_macro_utils", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "bevy_ecs" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" +checksum = "ae11a1f467c372b50e9d4b55e78370f5420c9db7416200cc441cc84f08174dd3" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -607,21 +608,21 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" +checksum = "f642c2b67c4d0daf8edf15074f6351457eb487a34b3de1290c760d8f3ac9ec16" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "bevy_log" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" +checksum = "011417debf7868b45932bb97fc0d5bfdeaf9304e324aa94840e2f1e6deeed69d" dependencies = [ "android_log-sys", "bevy_app", @@ -635,21 +636,22 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981" +checksum = "cf6fba87c6d069fcbcd8a48625ca8ab4392ad40d2b260863ce7d641a0f42986d" dependencies = [ + "proc-macro2", "quote", "rustc-hash", - "syn 2.0.37", + "syn 2.0.39", "toml_edit", ] [[package]] name = "bevy_math" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" +checksum = "752764558a1f429c20704c3b836a019fa308961c43fdfef4f08e339d456c96be" dependencies = [ "glam", "serde", @@ -657,15 +659,15 @@ dependencies = [ [[package]] name = "bevy_ptr" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" +checksum = "308a02679f6ce21ef71de20fae6d6a2016c07baa21d8e8d0558e6b7851e8adf2" [[package]] name = "bevy_reflect" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" +checksum = "cdd56914a8ad57621d7a1a099f7e6b1f7482c9c76cedc9c3d4c175a203939c5d" dependencies = [ "bevy_math", "bevy_ptr", @@ -674,8 +676,6 @@ dependencies = [ "downcast-rs", "erased-serde", "glam", - "once_cell", - "parking_lot", "serde", "smallvec", "smol_str", @@ -684,37 +684,36 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" +checksum = "25f627907c40ac552f798423447fc331fc1ddacd94c5f7a2a70942eb06bc8447" dependencies = [ "bevy_macro_utils", - "bit-set", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", "uuid", ] [[package]] name = "bevy_tasks" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" +checksum = "3a45be906618192515bc613e46546150089adbb4a82178dc462045acd1e89e92" dependencies = [ "async-channel", "async-executor", "async-task", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "wasm-bindgen-futures", ] [[package]] name = "bevy_time" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" +checksum = "b29709cadf22d318a0b7c79f763e9c5ac414292bd0e850066fa935959021b276" dependencies = [ "bevy_app", "bevy_ecs", @@ -726,15 +725,16 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" +checksum = "c8e75d4a34ef0b15dffd1ee9079ef1f0f5139527e192b9d5708b3e158777c753" dependencies = [ "ahash", "bevy_utils_proc_macros", "getrandom", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "instant", + "nonmax", "petgraph", "thiserror", "tracing", @@ -743,30 +743,15 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57" +checksum = "f7dfd3735a61a1b681ed1e176afe4eae731bbb03e51ad871e9eb39e76a2d170e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -802,9 +787,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -945,9 +930,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1168,7 +1153,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -1247,6 +1232,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1255,9 +1246,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1280,9 +1271,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1295,9 +1286,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1305,15 +1296,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1322,9 +1313,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1332,7 +1323,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1341,34 +1332,48 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1413,9 +1418,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glam" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" dependencies = [ "bytemuck", "serde", @@ -1479,9 +1484,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ "ahash", "allocator-api2", @@ -1600,12 +1605,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -1681,15 +1686,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "linked-hash-map" @@ -1705,9 +1710,9 @@ checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1739,9 +1744,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1769,9 +1774,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", @@ -1784,6 +1789,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "nonmax" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99756f5493e135528f0cd660ac67b4c3a542bb65a3565efe92bb2c2317eb3669" + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1880,9 +1891,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -1927,9 +1938,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1943,15 +1954,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "backtrace", "cfg-if", "libc", "petgraph", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "thread-id", "windows-targets", @@ -1979,7 +1990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -2061,9 +2072,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2140,23 +2151,23 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -2170,13 +2181,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -2187,15 +2198,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.21" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64", "bytes", @@ -2248,16 +2259,14 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1", "pkcs8", @@ -2390,9 +2399,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -2408,20 +2417,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2464,9 +2473,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -2541,9 +2550,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", @@ -2590,9 +2599,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -2631,22 +2640,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -2697,9 +2706,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -2709,7 +2718,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys", ] @@ -2722,7 +2731,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -2737,9 +2746,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2751,17 +2760,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "toml_datetime", "winnow", ] @@ -2774,11 +2783,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2786,20 +2794,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -2847,9 +2855,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc775440033cb114085f6f2437682b194fa7546466024b1037e82a48a052a69" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" dependencies = [ "async-trait", "cfg-if", @@ -2872,9 +2880,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff7aed33ef3e8bf2c9966fccdfed93f93d46f432282ea875cd66faabc6ef2f" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" dependencies = [ "cfg-if", "futures-util", @@ -2941,9 +2949,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", "serde", @@ -2951,9 +2959,9 @@ dependencies = [ [[package]] name = "valence_nbt" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a438b23122288a8db833fb960b1858aba873bef2c14687a172b39464c7b8b2a1" +checksum = "c3cddc3222ed5ead4fa446881b3deeeee0dba60b0088b2bf12fedbac7eda2312" [[package]] name = "valuable" @@ -2969,9 +2977,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" @@ -3019,7 +3027,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", "wasm-bindgen-shared", ] @@ -3053,7 +3061,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3179,9 +3187,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] @@ -3196,6 +3204,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "zerocopy" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df56f6afc7151a3a7c037f711788ecf8d0c1554787f4c292d6756b46d243ed9" + [[package]] name = "zeroize" version = "1.6.0" diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml index 4af4e419b..8f2acc274 100644 --- a/azalea-auth/Cargo.toml +++ b/azalea-auth/Cargo.toml @@ -11,22 +11,22 @@ version = "0.8.0" [dependencies] azalea-buf = { path = "../azalea-buf", version = "0.8.0" } azalea-crypto = { path = "../azalea-crypto", version = "0.8.0" } -base64 = "0.21.4" +base64 = "0.21.5" chrono = { version = "0.4.31", default-features = false, features = ["serde"] } log = "0.4.20" num-bigint = "0.4.4" once_cell = "1.18.0" -reqwest = { version = "0.11.21", default-features = false, features = [ +reqwest = { version = "0.11.22", default-features = false, features = [ "json", "rustls-tls", ] } -rsa = "0.9.2" -serde = { version = "1.0.188", features = ["derive"] } -serde_json = "1.0.107" -thiserror = "1.0.49" -tokio = { version = "1.32.0", features = ["fs"] } -uuid = { version = "1.4.1", features = ["serde"] } +rsa = "0.9.3" +serde = { version = "1.0.190", features = ["derive"] } +serde_json = "1.0.108" +thiserror = "1.0.50" +tokio = { version = "1.33.0", features = ["fs"] } +uuid = { version = "1.5.0", features = ["serde"] } [dev-dependencies] env_logger = "0.10.0" -tokio = { version = "1.32.0", features = ["full"] } +tokio = { version = "1.33.0", features = ["full"] } diff --git a/azalea-block/azalea-block-macros/Cargo.toml b/azalea-block/azalea-block-macros/Cargo.toml index 82337071a..b77b541e0 100644 --- a/azalea-block/azalea-block-macros/Cargo.toml +++ b/azalea-block/azalea-block-macros/Cargo.toml @@ -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.67" +proc-macro2 = "1.0.69" quote = "1.0.33" -syn = "2.0.37" +syn = "2.0.39" diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml index 183c38a7f..22b6701d5 100644 --- a/azalea-buf/Cargo.toml +++ b/azalea-buf/Cargo.toml @@ -10,11 +10,11 @@ version = "0.8.0" [dependencies] azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.8.0" } -byteorder = "^1.4.3" +byteorder = "^1.5.0" log = "0.4.20" serde_json = { version = "^1.0", optional = true } -thiserror = "1.0.49" -uuid = "^1.4.1" +thiserror = "1.0.50" +uuid = "^1.5.0" [features] serde_json = ["dep:serde_json"] diff --git a/azalea-buf/azalea-buf-macros/Cargo.toml b/azalea-buf/azalea-buf-macros/Cargo.toml index d0151c701..1cb410647 100644 --- a/azalea-buf/azalea-buf-macros/Cargo.toml +++ b/azalea-buf/azalea-buf-macros/Cargo.toml @@ -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.67" +proc-macro2 = "^1.0.69" quote = "^1.0.33" -syn = { version = "^2.0.37", features = ["extra-traits"] } +syn = { version = "^2.0.39", features = ["extra-traits"] } diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index aff0158dc..da2741256 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -19,4 +19,4 @@ azalea-language = { path = "../azalea-language", version = "0.8.0" } log = "0.4.20" once_cell = "1.18.0" serde = { version = "^1.0", features = ["derive"] } -serde_json = "^1.0.107" +serde_json = "^1.0.108" diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index 98cf924b5..655cd1a57 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -9,9 +9,9 @@ version = "0.8.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -reqwest = { version = "0.11.21", default-features = false } +reqwest = { version = "0.11.22", default-features = false } anyhow = "1.0.75" -async-trait = "0.1.73" +async-trait = "0.1.74" azalea-auth = { path = "../azalea-auth", version = "0.8.0" } azalea-block = { path = "../azalea-block", version = "0.8.0" } azalea-nbt = { path = "../azalea-nbt", version = "0.8.0" } @@ -23,25 +23,25 @@ azalea-buf = { path = "../azalea-buf", version = "0.8.0" } azalea-protocol = { path = "../azalea-protocol", version = "0.8.0" } azalea-registry = { path = "../azalea-registry", version = "0.8.0" } azalea-world = { path = "../azalea-world", version = "0.8.0" } -bevy_app = "0.11.3" -bevy_ecs = "0.11.3" -bevy_log = { version = "0.11.3", optional = true } -bevy_tasks = "0.11.3" -bevy_time = "0.11.3" +bevy_app = "0.12.0" +bevy_ecs = "0.12.0" +bevy_log = { version = "0.12.0", optional = true } +bevy_tasks = "0.12.0" +bevy_time = "0.12.0" azalea-inventory = { path = "../azalea-inventory", version = "0.8.0" } derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] } -futures = "0.3.28" +futures = "0.3.29" log = "0.4.20" nohash-hasher = "0.2.0" once_cell = "1.18.0" parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] } -regex = "1.9.6" -thiserror = "^1.0.49" -tokio = { version = "^1.32.0", features = ["sync"] } -uuid = "^1.4.1" +regex = "1.10.2" +thiserror = "^1.0.50" +tokio = { version = "^1.33.0", features = ["sync"] } +uuid = "^1.5.0" azalea-entity = { version = "0.8.0", path = "../azalea-entity" } -serde_json = "1.0.107" -serde = "1.0.188" +serde_json = "1.0.108" +serde = "1.0.190" [features] default = ["log"] diff --git a/azalea-client/src/attack.rs b/azalea-client/src/attack.rs index 56f3b1d0c..287a2ddef 100644 --- a/azalea-client/src/attack.rs +++ b/azalea-client/src/attack.rs @@ -81,7 +81,7 @@ pub fn handle_attack_event( mut send_packet_events: EventWriter, mut swing_arm_event: EventWriter, ) { - for event in events.iter() { + for event in events.read() { let (game_mode, mut ticks_since_last_attack, mut physics, mut sprinting, sneaking) = query.get_mut(event.entity).unwrap(); diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs index 337bce51f..f238dd471 100755 --- a/azalea-client/src/chat.rs +++ b/azalea-client/src/chat.rs @@ -199,7 +199,7 @@ fn handle_send_chat_event( mut events: EventReader, mut send_chat_kind_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { if event.content.starts_with('/') { send_chat_kind_events.send(SendChatKindEvent { entity: event.entity, @@ -242,7 +242,7 @@ fn handle_send_chat_kind_event( mut events: EventReader, mut send_packet_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { let content = event .content .chars() diff --git a/azalea-client/src/chunk_batching.rs b/azalea-client/src/chunk_batching.rs index 81fb7550e..eda16442f 100644 --- a/azalea-client/src/chunk_batching.rs +++ b/azalea-client/src/chunk_batching.rs @@ -79,7 +79,7 @@ pub fn handle_chunk_batch_start_event( mut query: Query<&mut ChunkBatchInfo>, mut events: EventReader, ) { - for event in events.iter() { + for event in events.read() { if let Ok(mut chunk_batch_info) = query.get_mut(event.entity) { chunk_batch_info.start_time = Instant::now(); } @@ -91,7 +91,7 @@ pub fn handle_chunk_batch_finished_event( mut events: EventReader, mut send_packets: EventWriter, ) { - for event in events.iter() { + for event in events.read() { if let Ok(mut chunk_batch_info) = query.get_mut(event.entity) { chunk_batch_info.batch_finished(event.batch_size); let desired_chunks_per_tick = chunk_batch_info.desired_chunks_per_tick(); diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs index 7c5cb82a2..f4622eed1 100644 --- a/azalea-client/src/client.rs +++ b/azalea-client/src/client.rs @@ -59,11 +59,11 @@ use bevy_ecs::{ bundle::Bundle, component::Component, entity::Entity, - schedule::{IntoSystemConfigs, LogLevel, ScheduleBuildSettings, ScheduleLabel}, + schedule::{InternedScheduleLabel, IntoSystemConfigs, LogLevel, ScheduleBuildSettings}, system::{ResMut, Resource}, world::World, }; -use bevy_time::{prelude::FixedTime, TimePlugin}; +use bevy_time::{Fixed, Time, TimePlugin}; use derive_more::Deref; use log::{debug, error}; use parking_lot::{Mutex, RwLock}; @@ -631,7 +631,7 @@ pub struct AzaleaPlugin; impl Plugin for AzaleaPlugin { fn build(&self, app: &mut App) { // Minecraft ticks happen every 50ms - app.insert_resource(FixedTime::new(Duration::from_millis(50))) + app.insert_resource(Time::::from_duration(Duration::from_millis(50))) .add_systems( Update, ( @@ -674,14 +674,14 @@ pub fn start_ecs_runner( async fn run_schedule_loop( ecs: Arc>, - outer_schedule_label: Box, + outer_schedule_label: InternedScheduleLabel, mut run_schedule_receiver: mpsc::UnboundedReceiver<()>, ) { loop { // whenever we get an event from run_schedule_receiver, run the schedule run_schedule_receiver.recv().await; let mut ecs = ecs.lock(); - ecs.run_schedule(&outer_schedule_label); + ecs.run_schedule(outer_schedule_label); ecs.clear_trackers(); } } diff --git a/azalea-client/src/disconnect.rs b/azalea-client/src/disconnect.rs index 966e5bb7f..916ef1fb4 100644 --- a/azalea-client/src/disconnect.rs +++ b/azalea-client/src/disconnect.rs @@ -41,7 +41,7 @@ pub fn remove_components_from_disconnected_players( mut commands: Commands, mut events: EventReader, ) { - for DisconnectEvent { entity } in events.iter() { + for DisconnectEvent { entity } in events.read() { commands.entity(*entity).remove::(); } } diff --git a/azalea-client/src/events.rs b/azalea-client/src/events.rs index 17ebd4e8c..46c0189a0 100644 --- a/azalea-client/src/events.rs +++ b/azalea-client/src/events.rs @@ -142,7 +142,7 @@ fn login_listener(query: Query<&LocalPlayerEvents, Added>) { } fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { - for event in events.iter() { + for event in events.read() { let local_player_events = query .get(event.entity) .expect("Non-local entities shouldn't be able to receive chat events"); @@ -160,7 +160,7 @@ fn tick_listener(query: Query<&LocalPlayerEvents, With>) { } fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { - for event in events.iter() { + for event in events.read() { let local_player_events = query .get(event.entity) .expect("Non-local entities shouldn't be able to receive add player events"); @@ -171,7 +171,7 @@ fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader, mut events: EventReader) { - for event in events.iter() { + for event in events.read() { let local_player_events = query .get(event.entity) .expect("Non-local entities shouldn't be able to receive add player events"); @@ -185,7 +185,7 @@ fn update_player_listener( query: Query<&LocalPlayerEvents>, mut events: EventReader, ) { - for event in events.iter() { + for event in events.read() { let local_player_events = query .get(event.entity) .expect("Non-local entities shouldn't be able to receive update player events"); @@ -199,7 +199,7 @@ fn remove_player_listener( query: Query<&LocalPlayerEvents>, mut events: EventReader, ) { - for event in events.iter() { + for event in events.read() { let local_player_events = query .get(event.entity) .expect("Non-local entities shouldn't be able to receive remove player events"); @@ -210,7 +210,7 @@ fn remove_player_listener( } pub fn death_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { - for event in events.iter() { + for event in events.read() { if let Ok(local_player_events) = query.get(event.entity) { local_player_events .send(Event::Death(event.packet.clone().map(|p| p.into()))) @@ -220,7 +220,7 @@ pub fn death_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader< } fn keepalive_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { - for event in events.iter() { + for event in events.read() { let local_player_events = query .get(event.entity) .expect("Non-local entities shouldn't be able to receive keepalive events"); diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs index 32b68925c..eaced255b 100644 --- a/azalea-client/src/interact.rs +++ b/azalea-client/src/interact.rs @@ -115,7 +115,7 @@ pub fn handle_block_interact_event( mut query: Query<(Entity, &mut CurrentSequenceNumber, &HitResultComponent)>, mut send_packet_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { let Ok((entity, mut sequence_number, hit_result)) = query.get_mut(event.entity) else { warn!("Sent BlockInteractEvent for entity that doesn't have the required components"); continue; @@ -312,7 +312,7 @@ pub fn handle_swing_arm_event( mut events: EventReader, mut send_packet_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { send_packet_events.send(SendPacketEvent { entity: event.entity, packet: ServerboundSwingPacket { diff --git a/azalea-client/src/inventory.rs b/azalea-client/src/inventory.rs index 0e4b9da39..356e0c0ba 100644 --- a/azalea-client/src/inventory.rs +++ b/azalea-client/src/inventory.rs @@ -585,7 +585,7 @@ fn handle_menu_opened_event( mut events: EventReader, mut query: Query<&mut InventoryComponent>, ) { - for event in events.iter() { + for event in events.read() { let mut inventory = query.get_mut(event.entity).unwrap(); inventory.id = event.window_id as u8; inventory.container_menu = Some(Menu::from_kind(event.menu_type)); @@ -609,7 +609,7 @@ fn handle_container_close_event( mut client_side_events: EventWriter, mut send_packet_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { let (entity, inventory) = query.get(event.entity).unwrap(); if event.id != inventory.id { warn!( @@ -643,7 +643,7 @@ pub fn handle_client_side_close_container_event( mut events: EventReader, mut query: Query<&mut InventoryComponent>, ) { - for event in events.iter() { + for event in events.read() { let mut inventory = query.get_mut(event.entity).unwrap(); inventory.container_menu = None; inventory.id = 0; @@ -661,7 +661,7 @@ pub fn handle_container_click_event( mut events: EventReader, mut send_packet_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { let (entity, mut inventory) = query.get_mut(event.entity).unwrap(); if inventory.id != event.window_id { warn!( @@ -714,7 +714,7 @@ fn handle_set_container_content_event( mut events: EventReader, mut query: Query<&mut InventoryComponent>, ) { - for event in events.iter() { + for event in events.read() { let mut inventory = query.get_mut(event.entity).unwrap(); if event.container_id != inventory.id { diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs index c2b16434c..e49a81fea 100644 --- a/azalea-client/src/local_player.rs +++ b/azalea-client/src/local_player.rs @@ -172,7 +172,7 @@ pub fn handle_send_packet_event( mut send_packet_events: EventReader, mut query: Query<&mut RawConnection>, ) { - for event in send_packet_events.iter() { + for event in send_packet_events.read() { if let Ok(raw_connection) = query.get_mut(event.entity) { // debug!("Sending packet: {:?}", event.packet); if let Err(e) = raw_connection.write_packet(event.packet.clone()) { diff --git a/azalea-client/src/mining.rs b/azalea-client/src/mining.rs index e1193f734..840351432 100644 --- a/azalea-client/src/mining.rs +++ b/azalea-client/src/mining.rs @@ -89,7 +89,7 @@ fn handle_start_mining_block_event( mut start_mining_events: EventWriter, mut query: Query<&HitResultComponent>, ) { - for event in events.iter() { + for event in events.read() { let hit_result = query.get_mut(event.entity).unwrap(); let direction = if hit_result.block_pos == event.position { // we're looking at the block @@ -136,7 +136,7 @@ fn handle_start_mining_block_with_direction_event( instances: Res, mut commands: Commands, ) { - for event in events.iter() { + for event in events.read() { let ( instance_name, game_mode, @@ -346,7 +346,7 @@ fn handle_finish_mining_block_event( )>, instances: Res, ) { - for event in events.iter() { + for event in events.read() { let (instance_name, game_mode, inventory, abilities, permission_level, _sequence_number) = query.get_mut(event.entity).unwrap(); let instance_lock = instances.get(instance_name).unwrap(); @@ -407,7 +407,7 @@ fn handle_stop_mining_block_event( mut query: Query<(&mut Mining, &MineBlockPos, &mut MineProgress)>, mut commands: Commands, ) { - for event in events.iter() { + for event in events.read() { let (mut _mining, mine_block_pos, mut mine_progress) = query.get_mut(event.entity).unwrap(); let mine_block_pos = diff --git a/azalea-client/src/movement.rs b/azalea-client/src/movement.rs index 945f0c0cb..b636fbcb7 100644 --- a/azalea-client/src/movement.rs +++ b/azalea-client/src/movement.rs @@ -408,7 +408,7 @@ pub fn handle_walk( mut events: EventReader, mut query: Query<(&mut PhysicsState, &mut Sprinting, &mut Attributes)>, ) { - for event in events.iter() { + for event in events.read() { if let Ok((mut physics_state, mut sprinting, mut attributes)) = query.get_mut(event.entity) { physics_state.move_direction = event.direction; @@ -431,7 +431,7 @@ pub fn handle_sprint( mut query: Query<&mut PhysicsState>, mut events: EventReader, ) { - for event in events.iter() { + for event in events.read() { if let Ok(mut physics_state) = query.get_mut(event.entity) { physics_state.move_direction = WalkDirection::from(event.direction); physics_state.trying_to_sprint = true; @@ -486,7 +486,7 @@ pub enum KnockbackType { } pub fn handle_knockback(mut query: Query<&mut Physics>, mut events: EventReader) { - for event in events.iter() { + for event in events.read() { if let Ok(mut physics) = query.get_mut(event.entity) { match event.knockback { KnockbackType::Set(velocity) => { diff --git a/azalea-client/src/packet_handling/configuration.rs b/azalea-client/src/packet_handling/configuration.rs index 7c295bdb7..e26e3f3b0 100644 --- a/azalea-client/src/packet_handling/configuration.rs +++ b/azalea-client/src/packet_handling/configuration.rs @@ -70,7 +70,7 @@ pub fn process_packet_events(ecs: &mut World) { for PacketEvent { entity: player_entity, packet, - } in events.iter() + } in events.read() { // we do this so `ecs` isn't borrowed for the whole loop events_owned.push((*player_entity, packet.clone())); diff --git a/azalea-client/src/packet_handling/game.rs b/azalea-client/src/packet_handling/game.rs index a81852a6e..a17dd13f5 100644 --- a/azalea-client/src/packet_handling/game.rs +++ b/azalea-client/src/packet_handling/game.rs @@ -59,7 +59,7 @@ use crate::{ /// for PacketEvent { /// entity, /// packet, -/// } in events.iter() { +/// } in events.read() { /// match packet { /// ClientboundGamePacket::LevelParticles(p) => { /// // ... @@ -181,7 +181,7 @@ pub fn process_packet_events(ecs: &mut World) { for PacketEvent { entity: player_entity, packet, - } in events.iter() + } in events.read() { // we do this so `ecs` isn't borrowed for the whole loop events_owned.push((*player_entity, packet.clone())); diff --git a/azalea-client/src/player.rs b/azalea-client/src/player.rs index 0a3f204f9..9289d2606 100755 --- a/azalea-client/src/player.rs +++ b/azalea-client/src/player.rs @@ -37,7 +37,7 @@ pub fn retroactively_add_game_profile_component( mut events: EventReader, entity_uuid_index: Res, ) { - for event in events.iter() { + for event in events.read() { if let Some(entity) = entity_uuid_index.get(&event.info.uuid) { commands .entity(entity) diff --git a/azalea-client/src/respawn.rs b/azalea-client/src/respawn.rs index d0ef1ccac..cd9b434e8 100644 --- a/azalea-client/src/respawn.rs +++ b/azalea-client/src/respawn.rs @@ -25,7 +25,7 @@ pub fn perform_respawn( mut events: EventReader, mut send_packets: EventWriter, ) { - for event in events.iter() { + for event in events.read() { send_packets.send(SendPacketEvent { entity: event.entity, packet: ServerboundClientCommandPacket { diff --git a/azalea-client/src/task_pool.rs b/azalea-client/src/task_pool.rs index 32c74c6f5..da1de6079 100644 --- a/azalea-client/src/task_pool.rs +++ b/azalea-client/src/task_pool.rs @@ -110,7 +110,7 @@ impl TaskPoolOptions { remaining_threads = remaining_threads.saturating_sub(io_threads); - IoTaskPool::init(|| { + IoTaskPool::get_or_init(|| { TaskPoolBuilder::default() .num_threads(io_threads) .thread_name("IO Task Pool".to_string()) @@ -126,7 +126,7 @@ impl TaskPoolOptions { remaining_threads = remaining_threads.saturating_sub(async_compute_threads); - AsyncComputeTaskPool::init(|| { + AsyncComputeTaskPool::get_or_init(|| { TaskPoolBuilder::default() .num_threads(async_compute_threads) .thread_name("Async Compute Task Pool".to_string()) @@ -141,7 +141,7 @@ impl TaskPoolOptions { .compute .get_number_of_threads(remaining_threads, total_threads); - ComputeTaskPool::init(|| { + ComputeTaskPool::get_or_init(|| { TaskPoolBuilder::default() .num_threads(compute_threads) .thread_name("Compute Task Pool".to_string()) diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml index ef7554723..eb04ed01d 100644 --- a/azalea-core/Cargo.toml +++ b/azalea-core/Cargo.toml @@ -13,11 +13,11 @@ azalea-buf = { path = "../azalea-buf", version = "0.8.0" } azalea-inventory = { version = "0.8.0", path = "../azalea-inventory" } azalea-nbt = { path = "../azalea-nbt", version = "0.8.0" } azalea-registry = { path = "../azalea-registry", version = "0.8.0" } -bevy_ecs = { version = "0.11.3", default-features = false, optional = true } +bevy_ecs = { version = "0.12.0", default-features = false, optional = true } nohash-hasher = "0.2.0" -num-traits = "0.2.16" +num-traits = "0.2.17" serde = { version = "^1.0", optional = true } -uuid = "^1.4.1" +uuid = "^1.5.0" [features] bevy_ecs = ["dep:bevy_ecs"] diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml index e692f36b6..65a18920d 100644 --- a/azalea-crypto/Cargo.toml +++ b/azalea-crypto/Cargo.toml @@ -14,11 +14,11 @@ azalea-buf = { path = "../azalea-buf", version = "0.8.0" } cfb8 = "0.8.1" num-bigint = "^0.4.4" rand = { version = "^0.8.5", features = ["getrandom"] } -rsa = { version = "0.9.2", features = ["sha2"] } +rsa = { version = "0.9.3", features = ["sha2"] } rsa_public_encrypt_pkcs1 = "0.4.0" sha-1 = "^0.10.1" sha2 = "0.10.8" -uuid = "^1.4.1" +uuid = "^1.5.0" [dev-dependencies] criterion = { version = "^0.5.1", features = ["html_reports"] } diff --git a/azalea-entity/Cargo.toml b/azalea-entity/Cargo.toml index 3cb85f77d..7cde8c71d 100644 --- a/azalea-entity/Cargo.toml +++ b/azalea-entity/Cargo.toml @@ -17,12 +17,12 @@ azalea-inventory = { version = "0.8.0", path = "../azalea-inventory" } azalea-nbt = { version = "0.8.0", path = "../azalea-nbt" } azalea-registry = { version = "0.8.0", path = "../azalea-registry" } azalea-world = { version = "0.8.0", path = "../azalea-world" } -bevy_app = "0.11.3" -bevy_ecs = "0.11.3" +bevy_app = "0.12.0" +bevy_ecs = "0.12.0" derive_more = "0.99.17" enum-as-inner = "0.6.0" log = "0.4.20" nohash-hasher = "0.2.0" parking_lot = "0.12.1" -thiserror = "1.0.49" -uuid = "1.4.1" +thiserror = "1.0.50" +uuid = "1.5.0" diff --git a/azalea-entity/src/plugin/relative_updates.rs b/azalea-entity/src/plugin/relative_updates.rs index 4f7e478a0..140c54e92 100644 --- a/azalea-entity/src/plugin/relative_updates.rs +++ b/azalea-entity/src/plugin/relative_updates.rs @@ -22,7 +22,7 @@ use bevy_ecs::{ prelude::{Component, Entity}, query::With, system::{EntityCommand, Query}, - world::{EntityMut, World}, + world::{EntityWorldMut, World}, }; use derive_more::{Deref, DerefMut}; use log::warn; @@ -44,7 +44,7 @@ use crate::LocalEntity; pub struct RelativeEntityUpdate { pub partial_world: Arc>, // a function that takes the entity and updates it - pub update: Box, + pub update: Box, } /// A component that counts the number of times this entity has been modified. diff --git a/azalea-inventory/azalea-inventory-macros/Cargo.toml b/azalea-inventory/azalea-inventory-macros/Cargo.toml index af0a3ff98..0e8190789 100644 --- a/azalea-inventory/azalea-inventory-macros/Cargo.toml +++ b/azalea-inventory/azalea-inventory-macros/Cargo.toml @@ -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.67" +proc-macro2 = "1.0.69" quote = "1.0.33" -syn = "2.0.37" +syn = "2.0.39" diff --git a/azalea-language/Cargo.toml b/azalea-language/Cargo.toml index fdb934244..b4102ed43 100644 --- a/azalea-language/Cargo.toml +++ b/azalea-language/Cargo.toml @@ -11,5 +11,5 @@ version = "0.8.0" [dependencies] once_cell = "1.18.0" serde = "^1.0" -serde_json = "^1.0.107" +serde_json = "^1.0.108" # tokio = {version = "^1.21.2", features = ["fs"]} diff --git a/azalea-nbt/Cargo.toml b/azalea-nbt/Cargo.toml index 0199c5352..4f78adb96 100644 --- a/azalea-nbt/Cargo.toml +++ b/azalea-nbt/Cargo.toml @@ -10,18 +10,18 @@ repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-nbt" [dependencies] azalea-buf = { path = "../azalea-buf", version = "0.8.0" } -byteorder = "^1.4.3" +byteorder = "^1.5.0" compact_str = { version = "0.7.1", features = ["serde"] } enum-as-inner = "0.6.0" -flate2 = "^1.0.27" +flate2 = "^1.0.28" log = "0.4.20" serde = { version = "^1.0", features = ["derive"], optional = true } -thiserror = "1.0.49" +thiserror = "1.0.50" [dev-dependencies] criterion = { version = "^0.5.1", features = ["html_reports"] } graphite_binary = "0.1.0" -valence_nbt = "0.7.0" +valence_nbt = "0.8.0" fastnbt = "2.4.4" [features] diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml index a5e6deafb..97751f231 100644 --- a/azalea-physics/Cargo.toml +++ b/azalea-physics/Cargo.toml @@ -15,12 +15,12 @@ azalea-entity = { version = "0.8.0", path = "../azalea-entity" } azalea-inventory = { version = "0.8.0", path = "../azalea-inventory" } azalea-registry = { path = "../azalea-registry", version = "0.8.0" } azalea-world = { path = "../azalea-world", version = "0.8.0" } -bevy_app = "0.11.3" -bevy_ecs = "0.11.3" +bevy_app = "0.12.0" +bevy_ecs = "0.12.0" log = "0.4.20" once_cell = "1.18.0" parking_lot = "^0.12.1" [dev-dependencies] -bevy_time = "0.11.3" -uuid = "^1.4.1" +bevy_time = "0.12.0" +uuid = "^1.5.0" diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index 10f28913f..4c849573c 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -9,7 +9,7 @@ version = "0.8.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-compression = { version = "^0.4.3", features = [ +async-compression = { version = "^0.4.4", features = [ "tokio", "zlib", ], optional = true } @@ -33,23 +33,23 @@ azalea-nbt = { path = "../azalea-nbt", version = "^0.8.0", features = [ azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.8.0" } azalea-registry = { path = "../azalea-registry", version = "0.8.0" } azalea-world = { path = "../azalea-world", version = "0.8.0" } -bevy_ecs = { version = "0.11.3", default-features = false } -byteorder = "^1.4.3" +bevy_ecs = { version = "0.12.0", default-features = false } +byteorder = "^1.5.0" bytes = "^1.5.0" -flate2 = "1.0.27" -futures = "0.3.28" -futures-lite = "1.13.0" -futures-util = "0.3.28" +flate2 = "1.0.28" +futures = "0.3.29" +futures-lite = "2.0.1" +futures-util = "0.3.29" log = "0.4.20" serde = { version = "^1.0", features = ["serde_derive"] } -serde_json = "^1.0.107" -thiserror = "1.0.49" -tokio = { version = "^1.32.0", features = ["io-util", "net", "macros"] } -tokio-util = { version = "0.7.9", features = ["codec"] } -trust-dns-resolver = { version = "^0.23.0", default-features = false, features = [ +serde_json = "^1.0.108" +thiserror = "1.0.50" +tokio = { version = "^1.33.0", features = ["io-util", "net", "macros"] } +tokio-util = { version = "0.7.10", features = ["codec"] } +trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [ "tokio-runtime", ] } -uuid = "1.4.1" +uuid = "1.5.0" [features] connecting = [] @@ -59,6 +59,6 @@ strict_registry = ["packets"] [dev-dependencies] anyhow = "^1.0.75" -tracing = "^0.1.37" +tracing = "^0.1.40" tracing-subscriber = "^0.3.17" once_cell = "1.18.0" diff --git a/azalea-protocol/azalea-protocol-macros/Cargo.toml b/azalea-protocol/azalea-protocol-macros/Cargo.toml index acef483ec..f463e0662 100644 --- a/azalea-protocol/azalea-protocol-macros/Cargo.toml +++ b/azalea-protocol/azalea-protocol-macros/Cargo.toml @@ -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.67" +proc-macro2 = "^1.0.69" quote = "^1.0.33" -syn = "^2.0.37" +syn = "^2.0.39" diff --git a/azalea-registry/azalea-registry-macros/Cargo.toml b/azalea-registry/azalea-registry-macros/Cargo.toml index c92ea7e28..f8a8d8fce 100644 --- a/azalea-registry/azalea-registry-macros/Cargo.toml +++ b/azalea-registry/azalea-registry-macros/Cargo.toml @@ -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.67" +proc-macro2 = "1.0.69" quote = "1.0.33" -syn = "2.0.37" +syn = "2.0.39" [features] serde = [] diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index e0b32968f..02f4d3edd 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -17,15 +17,15 @@ azalea-core = { path = "../azalea-core", version = "^0.8.0", features = [ azalea-inventory = { version = "0.8.0", path = "../azalea-inventory" } azalea-nbt = { path = "../azalea-nbt", version = "0.8.0" } azalea-registry = { path = "../azalea-registry", version = "0.8.0" } -bevy_ecs = "0.11.3" +bevy_ecs = "0.12.0" derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] } enum-as-inner = "0.6.0" log = "0.4.20" nohash-hasher = "0.2.0" once_cell = "1.18.0" parking_lot = "^0.12.1" -thiserror = "1.0.49" -uuid = "1.4.1" +thiserror = "1.0.50" +uuid = "1.5.0" [dev-dependencies] azalea-client = { path = "../azalea-client" } diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index bdab1233b..c3133d135 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -13,7 +13,7 @@ pre-release-replacements = [ [dependencies] anyhow = "^1.0.75" -async-trait = "0.1.73" +async-trait = "0.1.74" azalea-block = { version = "0.8.0", path = "../azalea-block" } azalea-chat = { version = "0.8.0", path = "../azalea-chat" } azalea-client = { version = "0.8.0", path = "../azalea-client", default-features = false } @@ -25,23 +25,23 @@ azalea-registry = { version = "0.8.0", path = "../azalea-registry" } azalea-world = { version = "0.8.0", path = "../azalea-world" } azalea-auth = { version = "0.8.0", path = "../azalea-auth" } azalea-brigadier = { version = "0.8.0", path = "../azalea-brigadier" } -bevy_app = "0.11.3" -bevy_ecs = "0.11.3" -bevy_tasks = "0.11.3" +bevy_app = "0.12.0" +bevy_ecs = "0.12.0" +bevy_tasks = { version = "0.12.0", features = ["multi-threaded"] } derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] } -futures = "0.3.28" -futures-lite = "1.13.0" +futures = "0.3.29" +futures-lite = "2.0.1" log = "0.4.20" nohash-hasher = "0.2.0" -num-traits = "0.2.16" +num-traits = "0.2.17" parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] } priority-queue = "1.3.2" -thiserror = "^1.0.49" -tokio = "^1.32.0" -uuid = "1.4.1" -bevy_log = "0.11.3" +thiserror = "^1.0.50" +tokio = "^1.33.0" +uuid = "1.5.0" +bevy_log = "0.12.0" azalea-entity = { version = "0.8.0", path = "../azalea-entity" } -bevy_time = "0.11.3" +bevy_time = "0.12.0" rustc-hash = "1.1.0" [dev-dependencies] diff --git a/azalea/src/accept_resource_packs.rs b/azalea/src/accept_resource_packs.rs index c7891f928..281af420f 100644 --- a/azalea/src/accept_resource_packs.rs +++ b/azalea/src/accept_resource_packs.rs @@ -30,7 +30,7 @@ fn accept_resource_pack( mut events: EventReader, mut send_packet_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { send_packet_events.send(SendPacketEvent { entity: event.entity, packet: ServerboundResourcePackPacket { diff --git a/azalea/src/auto_respawn.rs b/azalea/src/auto_respawn.rs index 67e28b51f..07b3e0f5b 100644 --- a/azalea/src/auto_respawn.rs +++ b/azalea/src/auto_respawn.rs @@ -24,7 +24,7 @@ fn auto_respawn( mut events: EventReader, mut perform_respawn_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { perform_respawn_events.send(PerformRespawnEvent { entity: event.entity, }); diff --git a/azalea/src/bot.rs b/azalea/src/bot.rs index 509d0e2d7..4fe10e74b 100644 --- a/azalea/src/bot.rs +++ b/azalea/src/bot.rs @@ -148,7 +148,7 @@ pub fn jump_listener( mut query: Query<(&mut Jumping, &mut Bot)>, mut events: EventReader, ) { - for event in events.iter() { + for event in events.read() { if let Ok((mut jumping, mut bot)) = query.get_mut(event.entity) { **jumping = true; bot.jumping_once = true; @@ -167,7 +167,7 @@ fn look_at_listener( mut events: EventReader, mut query: Query<(&Position, &EyeHeight, &mut LookDirection)>, ) { - for event in events.iter() { + for event in events.read() { if let Ok((position, eye_height, mut look_direction)) = query.get_mut(event.entity) { let (y_rot, x_rot) = direction_looking_at(&position.up(eye_height.into()), &event.position); diff --git a/azalea/src/container.rs b/azalea/src/container.rs index f5ac710eb..08c60dd92 100644 --- a/azalea/src/container.rs +++ b/azalea/src/container.rs @@ -140,7 +140,7 @@ impl ContainerHandle { /// /// Note that any modifications you make to the `Menu` you're given will not /// actually cause any packets to be sent. If you're trying to modify your - /// inventory, use [`Self::open_inventory`] instead + /// inventory, use [`Client::open_inventory`] instead pub fn menu(&self) -> Option { let ecs = self.client.ecs.lock(); let inventory = ecs @@ -179,7 +179,7 @@ impl ContainerHandle { pub struct WaitingForInventoryOpen; fn handle_menu_opened_event(mut commands: Commands, mut events: EventReader) { - for event in events.iter() { + for event in events.read() { if let ClientboundGamePacket::ContainerSetContent { .. } = event.packet { commands .entity(event.entity) diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index e82b01790..bb10fa8ef 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -185,7 +185,7 @@ fn goto_listener( ) { let thread_pool = AsyncComputeTaskPool::get(); - for event in events.iter() { + for event in events.read() { let (mut pathfinder, executing_path, position, instance_name, inventory) = query .get_mut(event.entity) .expect("Called goto on an entity that's not in the world"); @@ -328,7 +328,7 @@ fn path_found_listener( instance_container: Res, mut commands: Commands, ) { - for event in events.iter() { + for event in events.read() { let (mut pathfinder, executing_path, instance_name, inventory) = query .get_mut(event.entity) .expect("Path found for an entity that doesn't have a pathfinder"); @@ -676,7 +676,7 @@ fn handle_stop_pathfinding_event( mut walk_events: EventWriter, mut commands: Commands, ) { - for event in events.iter() { + for event in events.read() { let Ok((mut pathfinder, mut executing_path)) = query.get_mut(event.entity) else { continue; }; diff --git a/azalea/src/pathfinder/simulation.rs b/azalea/src/pathfinder/simulation.rs index cc0779858..0cffb4161 100644 --- a/azalea/src/pathfinder/simulation.rs +++ b/azalea/src/pathfinder/simulation.rs @@ -11,7 +11,7 @@ use azalea_entity::{ use azalea_world::{ChunkStorage, Instance, InstanceContainer, InstanceName, MinecraftEntityId}; use bevy_app::{App, FixedUpdate}; use bevy_ecs::prelude::*; -use bevy_time::fixed_timestep::FixedTime; +use bevy_time::{Fixed, Time}; use parking_lot::RwLock; #[derive(Bundle, Clone)] @@ -70,7 +70,7 @@ impl Simulation { azalea_client::task_pool::TaskPoolPlugin::default(), )) // make sure it doesn't do fixed ticks without us telling it to - .insert_resource(FixedTime::new(Duration::MAX)) + .insert_resource(Time::::from_duration(Duration::MAX)) .insert_resource(InstanceContainer { instances: [(instance_name.clone(), Arc::downgrade(&instance.clone()))] .iter() diff --git a/azalea/src/swarm/chat.rs b/azalea/src/swarm/chat.rs index 6cf4d6b6d..8ed5d7f5e 100644 --- a/azalea/src/swarm/chat.rs +++ b/azalea/src/swarm/chat.rs @@ -64,7 +64,7 @@ fn chat_listener( mut global_chat_state: ResMut, mut new_chat_messages_events: EventWriter, ) { - for event in events.iter() { + for event in events.read() { let mut client_chat_state = query.get_mut(event.entity); let mut client_chat_index = if let Ok(ref client_chat_state) = client_chat_state { client_chat_state.chat_index @@ -119,7 +119,7 @@ fn update_min_index_and_shrink_queue( mut events: EventReader, swarm: Option>, ) { - for event in events.iter() { + for event in events.read() { if let Some(swarm) = &swarm { // it should also work if Swarm isn't present (so the tests don't need it) swarm