diff --git a/Cargo.lock b/Cargo.lock index 7f01874..4174305 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "aeronet_io" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7bb8c8b6d0843602f22cae4be6671d868b284ea2887e91b80f1ad2d87721fb" +checksum = "e134b14c8fa623e55c24e047abf185f180dc076c89499235a57e9f1d75600b76" dependencies = [ "anyhow", "bevy_app", @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "aeronet_steam" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd10fca3cb706c3f54605ce860f9485b2d6cd98501dddbd49dd12f91888bdff" +checksum = "19982a08403545f4f8f462e2ff12cf2aeaf0c10980a96e82704cefae938df280" dependencies = [ "aeronet_io", "anyhow", @@ -137,16 +137,43 @@ dependencies = [ "bytes", "derive_more 2.0.1", "oneshot", - "steamworks", + "steamworks 0.12.2", "sync_wrapper", "tracing", ] [[package]] -name = "aeronet_webtransport" -version = "0.14.0" +name = "aeronet_websocket" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb24041bf1fc54387d5e7699e35f5476245761e0ca0f32e84ad80af2ba2b36cf" +checksum = "8f370349279eafa2fcd1e195918dba2f65934f2107ac7eb9fab4d503b1e53544" +dependencies = [ + "aeronet_io", + "bevy_app", + "bevy_ecs", + "bevy_platform", + "bytes", + "cfg-if", + "derive_more 2.0.1", + "futures", + "js-sys", + "rcgen", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", + "tokio-tungstenite", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "aeronet_webtransport" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c9f0dd0b75f47b0d8ba48eb2dd5b9d44d88e4e6a2a5d6afa305f8bef2169d5" dependencies = [ "aeronet_io", "anyhow", @@ -628,6 +655,30 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "aws-lc-rs" +version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee74396bee4da70c2e27cf94762714c911725efe69d9e2672f998512a67a4ce4" +dependencies = [ + "bindgen 0.72.0", + "cc", + "cmake", + "dunce", + "fs_extra", + "libloading", +] + [[package]] name = "backtrace" version = "0.3.75" @@ -724,7 +775,7 @@ dependencies = [ "bevy_ecs", "bevy_log", "bevy_utils", - "steamworks", + "steamworks 0.11.0", ] [[package]] @@ -1100,25 +1151,25 @@ dependencies = [ [[package]] name = "bevy_enhanced_input" -version = "0.14.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a363bb40bfcf499006ea25a24a2bd751f5b036506f69abfbc3803ecdcc6ab0" +checksum = "ce252225d74b43f7f1e6cef76258ca9c5619bde8eeb40f8355d0728c962f2fea" dependencies = [ "bevy", "bevy_enhanced_input_macros", "bitflags 2.9.1", "log", "serde", + "smallvec", "variadics_please", ] [[package]] name = "bevy_enhanced_input_macros" -version = "0.14.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc822dee1e63af3229e07fdd21a8525072a51b8861329c07d7f2896016f1bc1" +checksum = "e0ed8306506ca9c22517b5ff8ae75167fe5efad42374da47837179165091e368" dependencies = [ - "darling", "proc-macro2", "quote", "syn", @@ -2004,6 +2055,8 @@ dependencies = [ "cexpr", "clang-sys", "itertools 0.13.0", + "log", + "prettyplease", "proc-macro2", "quote", "regex", @@ -2356,6 +2409,15 @@ dependencies = [ "error-code", ] +[[package]] +name = "cmake" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] + [[package]] name = "codespan-reporting" version = "0.11.1" @@ -2962,6 +3024,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dyn-clone" version = "1.0.19" @@ -3346,6 +3414,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "futures" version = "0.3.31" @@ -3799,6 +3873,12 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + [[package]] name = "heapless" version = "0.8.0" @@ -3838,7 +3918,7 @@ dependencies = [ "ron", "serde", "shared", - "steamworks", + "steamworks 0.11.0", "vergen-gitcl", ] @@ -3871,6 +3951,23 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a9fcbcc408c5526c3ab80d534e5c86e7967c1fb7aa0a8c76abd1edc27deb877" +[[package]] +name = "http" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + [[package]] name = "iana-time-zone" version = "0.1.63" @@ -4213,9 +4310,9 @@ checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07" [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -4359,9 +4456,8 @@ dependencies = [ [[package]] name = "lightyear" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193fba471971c447248028b533e73e85346b7dee2adea9f61cbdf777b7b935bc" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "aeronet_io", "bevy_app", @@ -4371,26 +4467,27 @@ dependencies = [ "document-features", "lightyear_aeronet", "lightyear_avian2d", - "lightyear_avian3d 0.22.4", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_frame_interpolation 0.22.4", + "lightyear_avian3d", + "lightyear_connection", + "lightyear_core", + "lightyear_frame_interpolation", "lightyear_inputs", "lightyear_inputs_bei", "lightyear_inputs_leafwing", "lightyear_inputs_native", - "lightyear_interpolation 0.22.4", - "lightyear_link 0.22.4", - "lightyear_messages 0.22.4", + "lightyear_interpolation", + "lightyear_link", + "lightyear_messages", "lightyear_netcode", - "lightyear_prediction 0.22.4", - "lightyear_replication 0.22.4", - "lightyear_serde 0.22.5", + "lightyear_prediction", + "lightyear_replication", + "lightyear_serde", "lightyear_steam", - "lightyear_sync 0.22.4", - "lightyear_transport 0.22.4", + "lightyear_sync", + "lightyear_transport", "lightyear_udp", - "lightyear_utils 0.22.4", + "lightyear_utils", + "lightyear_websocket", "lightyear_webtransport", "serde", "thiserror 2.0.12", @@ -4399,23 +4496,22 @@ dependencies = [ [[package]] name = "lightyear_aeronet" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b1dd9c873a9afed0301929b7e8087f13d003889bcbeca08661c545cd70e049" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "aeronet_io", "bevy_app", "bevy_ecs", "bevy_reflect", - "lightyear_link 0.22.4", + "lightyear_core", + "lightyear_link", "tracing", ] [[package]] name = "lightyear_avian2d" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b625185ef67da5b51934edc85676a17822a408984852dbfcdc8d7f5f618e042" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "avian2d", "bevy_app", @@ -4424,19 +4520,19 @@ dependencies = [ "bevy_time", "bevy_transform", "bevy_utils", - "lightyear_core 0.22.4", - "lightyear_frame_interpolation 0.22.4", - "lightyear_interpolation 0.22.4", - "lightyear_link 0.22.4", - "lightyear_prediction 0.22.4", - "lightyear_replication 0.22.4", + "lightyear_core", + "lightyear_frame_interpolation", + "lightyear_interpolation", + "lightyear_link", + "lightyear_prediction", + "lightyear_replication", "tracing", ] [[package]] name = "lightyear_avian3d" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "avian3d", "bevy_app", @@ -4444,69 +4540,28 @@ dependencies = [ "bevy_math", "bevy_transform", "bevy_utils", - "lightyear_core 0.21.1", - "lightyear_frame_interpolation 0.21.1", - "lightyear_interpolation 0.21.1", - "lightyear_link 0.21.1", - "lightyear_prediction 0.21.1", - "lightyear_replication 0.21.1", - "tracing", -] - -[[package]] -name = "lightyear_avian3d" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acfbf0539383ab92373bcb7060443f34ea9b690bc950d0d9d8b38daab914e53" -dependencies = [ - "avian3d", - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_transform", - "bevy_utils", - "lightyear_core 0.22.4", - "lightyear_frame_interpolation 0.22.4", - "lightyear_interpolation 0.22.4", - "lightyear_link 0.22.4", - "lightyear_prediction 0.22.4", - "lightyear_replication 0.22.4", + "lightyear_core", + "lightyear_frame_interpolation", + "lightyear_interpolation", + "lightyear_link", + "lightyear_prediction", + "lightyear_replication", "tracing", ] [[package]] name = "lightyear_connection" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_platform", "bevy_reflect", "bytes", - "lightyear_core 0.21.1", - "lightyear_link 0.21.1", - "lightyear_serde 0.21.1", - "serde", - "smallvec", - "thiserror 2.0.12", - "tracing", -] - -[[package]] -name = "lightyear_connection" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69332e92b5faf89c62b960d29572e375d211cb4a8f4ac066ad2c14d4a333b788" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_platform", - "bevy_reflect", - "bytes", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", - "lightyear_serde 0.22.5", + "lightyear_core", + "lightyear_link", + "lightyear_serde", "serde", "smallvec", "thiserror 2.0.12", @@ -4515,8 +4570,8 @@ dependencies = [ [[package]] name = "lightyear_core" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_derive", @@ -4525,102 +4580,68 @@ dependencies = [ "bevy_reflect", "bevy_time", "chrono", - "lightyear_serde 0.21.1", - "lightyear_utils 0.21.1", - "serde", - "tracing", -] - -[[package]] -name = "lightyear_core" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d7cf398fcc3a4188a38209b66aff462aa7c57474aafc650ef896e0cc24725b" -dependencies = [ - "bevy_app", - "bevy_derive", - "bevy_ecs", - "bevy_platform", - "bevy_reflect", - "bevy_time", - "chrono", - "lightyear_serde 0.22.5", - "lightyear_utils 0.22.4", + "lightyear_serde", + "lightyear_utils", "serde", "tracing", ] [[package]] name = "lightyear_frame_interpolation" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_time", "bevy_transform", - "lightyear_connection 0.21.1", - "lightyear_core 0.21.1", - "lightyear_interpolation 0.21.1", - "lightyear_replication 0.21.1", - "tracing", -] - -[[package]] -name = "lightyear_frame_interpolation" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c81fcfc4b65ac5cef9a038a25d755fcc4c9e728f6ed9eb89c53b72a307e2966" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_time", - "bevy_transform", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_interpolation 0.22.4", - "lightyear_replication 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_interpolation", + "lightyear_replication", "tracing", ] [[package]] name = "lightyear_inputs" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847b6d9c16fda40f267d7f7405ac970efec6ff9080a842bd7724471cfe3e722a" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_platform", "bevy_reflect", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_interpolation 0.22.4", - "lightyear_link 0.22.4", - "lightyear_messages 0.22.4", - "lightyear_prediction 0.22.4", - "lightyear_replication 0.22.4", - "lightyear_sync 0.22.4", - "lightyear_transport 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_interpolation", + "lightyear_link", + "lightyear_messages", + "lightyear_prediction", + "lightyear_replication", + "lightyear_sync", + "lightyear_transport", "serde", "tracing", ] [[package]] name = "lightyear_inputs_bei" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c85f95c0924841cd6b057acdd297a7bb9b9dd8c675eab454cc84ba5f475762" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_enhanced_input", "bevy_platform", "bevy_reflect", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", + "lightyear_connection", + "lightyear_core", "lightyear_inputs", - "lightyear_utils 0.22.4", + "lightyear_link", + "lightyear_prediction", + "lightyear_replication", + "lightyear_serde", + "lightyear_utils", "serde", "thiserror 2.0.12", "tracing", @@ -4628,18 +4649,18 @@ dependencies = [ [[package]] name = "lightyear_inputs_leafwing" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33435bd4692e28d00c615a6e1b35913acb8d1d46704b9f9d87599ee5dd734055" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", + "bevy_derive", "bevy_ecs", "bevy_input", "bevy_math", "bevy_platform", "bevy_reflect", "leafwing-input-manager", - "lightyear_core 0.22.4", + "lightyear_core", "lightyear_inputs", "serde", "tracing", @@ -4647,15 +4668,14 @@ dependencies = [ [[package]] name = "lightyear_inputs_native" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1074d9f7d85797ce2b05d462d0c7b4091665664f0aaa1234b2c89a847d6b8dfc" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_derive", "bevy_ecs", "bevy_reflect", - "lightyear_core 0.22.4", + "lightyear_core", "lightyear_inputs", "serde", "tracing", @@ -4663,8 +4683,8 @@ dependencies = [ [[package]] name = "lightyear_interpolation" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_derive", @@ -4674,108 +4694,47 @@ dependencies = [ "bevy_reflect", "bevy_time", "bevy_utils", - "lightyear_connection 0.21.1", - "lightyear_core 0.21.1", - "lightyear_messages 0.21.1", - "lightyear_replication 0.21.1", - "lightyear_serde 0.21.1", - "lightyear_sync 0.21.1", - "lightyear_utils 0.21.1", - "serde", - "tracing", -] - -[[package]] -name = "lightyear_interpolation" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81e1871f21da4e7b966186fa1e1abdb33dbd4c9cfde43a23c8a14b533ae4759" -dependencies = [ - "bevy_app", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_platform", - "bevy_reflect", - "bevy_time", - "bevy_utils", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_messages 0.22.4", - "lightyear_replication 0.22.4", - "lightyear_serde 0.22.5", - "lightyear_sync 0.22.4", - "lightyear_utils 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_messages", + "lightyear_replication", + "lightyear_serde", + "lightyear_sync", + "lightyear_utils", "serde", "tracing", ] [[package]] name = "lightyear_link" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_reflect", "bytes", - "lightyear_core 0.21.1", - "lightyear_utils 0.21.1", - "rand 0.9.1", - "tracing", -] - -[[package]] -name = "lightyear_link" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5856b9910ac9214c04ad0b20da4fc16ccbfd6c09355353ec6bb622b27d934b" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bytes", - "lightyear_core 0.22.4", - "lightyear_utils 0.22.4", + "lightyear_core", + "lightyear_utils", "rand 0.9.1", "tracing", ] [[package]] name = "lightyear_messages" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_reflect", "bytes", - "lightyear_connection 0.21.1", - "lightyear_core 0.21.1", - "lightyear_serde 0.21.1", - "lightyear_transport 0.21.1", - "lightyear_utils 0.21.1", - "serde", - "thiserror 2.0.12", - "tracing", -] - -[[package]] -name = "lightyear_messages" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169eea15e685ebff31d9263d1b4513408313897a008c763a1b0b91a0fb1e552a" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bytes", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", - "lightyear_serde 0.22.5", - "lightyear_transport 0.22.4", - "lightyear_utils 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_link", + "lightyear_serde", + "lightyear_transport", + "lightyear_utils", "serde", "thiserror 2.0.12", "tracing", @@ -4783,9 +4742,8 @@ dependencies = [ [[package]] name = "lightyear_netcode" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49426dec872253d4ab6e6871ef935802549bb31374036257fd0e47e75cec6f33" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "aeronet_io", "bevy_app", @@ -4794,12 +4752,12 @@ dependencies = [ "bevy_time", "bytes", "chacha20poly1305", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", - "lightyear_serde 0.22.5", - "lightyear_transport 0.22.4", - "lightyear_utils 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_link", + "lightyear_serde", + "lightyear_transport", + "lightyear_utils", "no_std_io2", "rand 0.9.1", "thiserror 2.0.12", @@ -4809,8 +4767,8 @@ dependencies = [ [[package]] name = "lightyear_prediction" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_derive", @@ -4820,45 +4778,16 @@ dependencies = [ "bevy_platform", "bevy_reflect", "bevy_time", - "lightyear_connection 0.21.1", - "lightyear_core 0.21.1", - "lightyear_frame_interpolation 0.21.1", - "lightyear_interpolation 0.21.1", - "lightyear_link 0.21.1", - "lightyear_replication 0.21.1", - "lightyear_serde 0.21.1", - "lightyear_sync 0.21.1", - "lightyear_utils 0.21.1", - "parking_lot", - "seahash", - "serde", - "tracing", -] - -[[package]] -name = "lightyear_prediction" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f256d99bb82370509cb34d2b56447c4ae4db9e7d3519d501cef256d3d7de587" -dependencies = [ - "bevy_app", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", - "bevy_math", - "bevy_platform", - "bevy_reflect", - "bevy_time", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_frame_interpolation 0.22.4", - "lightyear_interpolation 0.22.4", - "lightyear_link 0.22.4", - "lightyear_messages 0.22.4", - "lightyear_replication 0.22.4", - "lightyear_serde 0.22.5", - "lightyear_sync 0.22.4", - "lightyear_utils 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_frame_interpolation", + "lightyear_interpolation", + "lightyear_link", + "lightyear_messages", + "lightyear_replication", + "lightyear_serde", + "lightyear_sync", + "lightyear_utils", "parking_lot", "seahash", "serde", @@ -4867,37 +4796,8 @@ dependencies = [ [[package]] name = "lightyear_replication" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" -dependencies = [ - "avian3d", - "bevy_app", - "bevy_ecs", - "bevy_platform", - "bevy_ptr", - "bevy_reflect", - "bevy_time", - "bevy_transform", - "bytes", - "dashmap", - "lightyear_connection 0.21.1", - "lightyear_core 0.21.1", - "lightyear_link 0.21.1", - "lightyear_messages 0.21.1", - "lightyear_serde 0.21.1", - "lightyear_transport 0.21.1", - "lightyear_utils 0.21.1", - "serde", - "smallvec", - "thiserror 2.0.12", - "tracing", -] - -[[package]] -name = "lightyear_replication" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91650857e0aaef9403ddbd589b94e9df54651d5e046215b09c9581517afd4e9" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "avian2d", "avian3d", @@ -4910,13 +4810,13 @@ dependencies = [ "bevy_transform", "bytes", "dashmap", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", - "lightyear_messages 0.22.4", - "lightyear_serde 0.22.5", - "lightyear_transport 0.22.4", - "lightyear_utils 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_link", + "lightyear_messages", + "lightyear_serde", + "lightyear_transport", + "lightyear_utils", "serde", "smallvec", "thiserror 2.0.12", @@ -4925,28 +4825,8 @@ dependencies = [ [[package]] name = "lightyear_serde" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" -dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_platform", - "bevy_ptr", - "bevy_reflect", - "bincode", - "bytes", - "no_std_io2", - "serde", - "thiserror 2.0.12", - "tracing", - "variadics_please", -] - -[[package]] -name = "lightyear_serde" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a45bd23d5f45b25ff53361f148dac09872c38ee184baf2ef9615250b4a9e09a" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_derive", "bevy_ecs", @@ -4964,26 +4844,25 @@ dependencies = [ [[package]] name = "lightyear_steam" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f19ee16713f70eb8b03f95d00533b497ebdb63bded9cdc85864e9998e14f48" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "aeronet_io", "aeronet_steam", "bevy_app", "bevy_ecs", "lightyear_aeronet", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_link", "thiserror 2.0.12", "tracing", ] [[package]] name = "lightyear_sync" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_derive", @@ -4992,45 +4871,21 @@ dependencies = [ "bevy_reflect", "bevy_time", "bevy_utils", - "lightyear_connection 0.21.1", - "lightyear_core 0.21.1", - "lightyear_link 0.21.1", - "lightyear_messages 0.21.1", - "lightyear_serde 0.21.1", - "lightyear_transport 0.21.1", - "lightyear_utils 0.21.1", - "serde", - "tracing", -] - -[[package]] -name = "lightyear_sync" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf0cc472ae1a69f31fb044522be52d54ed0fb21ac87ae4e9cc81177b6222491" -dependencies = [ - "bevy_app", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", - "bevy_reflect", - "bevy_time", - "bevy_utils", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", - "lightyear_messages 0.22.4", - "lightyear_serde 0.22.5", - "lightyear_transport 0.22.4", - "lightyear_utils 0.22.4", + "lightyear_connection", + "lightyear_core", + "lightyear_link", + "lightyear_messages", + "lightyear_serde", + "lightyear_transport", + "lightyear_utils", "serde", "tracing", ] [[package]] name = "lightyear_transport" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_app", "bevy_ecs", @@ -5043,42 +4898,13 @@ dependencies = [ "enum_dispatch", "governor", "indexmap", - "lightyear_connection 0.21.1", - "lightyear_core 0.21.1", - "lightyear_link 0.21.1", - "lightyear_serde 0.21.1", - "lightyear_utils 0.21.1", + "lightyear_connection", + "lightyear_core", + "lightyear_link", + "lightyear_serde", + "lightyear_utils", "nonzero_ext", - "ringbuffer 0.15.0", - "serde", - "thiserror 2.0.12", - "tracing", -] - -[[package]] -name = "lightyear_transport" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "596415739d85219669af6e12c08590f79880422643ce0b1c9df9f220badb3237" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_platform", - "bevy_reflect", - "bevy_time", - "bevy_utils", - "bytes", - "crossbeam-channel", - "enum_dispatch", - "governor", - "indexmap", - "lightyear_connection 0.22.4", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", - "lightyear_serde 0.22.5", - "lightyear_utils 0.22.4", - "nonzero_ext", - "ringbuffer 0.16.0", + "ringbuffer", "serde", "thiserror 2.0.12", "tracing", @@ -5086,54 +4912,53 @@ dependencies = [ [[package]] name = "lightyear_udp" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f150d0153bcb576db14754a0c1d1cc210e078e65ca6b335333dbb8ef5a8703f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "aeronet_io", "bevy_app", "bevy_ecs", "bevy_platform", "bytes", - "lightyear_core 0.22.4", - "lightyear_link 0.22.4", + "lightyear_core", + "lightyear_link", "thiserror 2.0.12", "tracing", ] [[package]] name = "lightyear_utils" -version = "0.21.1" -source = "git+https://github.com/cBournhonesque/lightyear.git?rev=03cbf419a2c0595261b64420bc0332fc3fe1cc3f#03cbf419a2c0595261b64420bc0332fc3fe1cc3f" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "bevy_ecs", "bevy_platform", "bevy_reflect", - "hashbrown 0.15.4", - "lightyear_serde 0.21.1", + "hashbrown 0.16.0", "paste", "seahash", ] [[package]] -name = "lightyear_utils" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260feac85385f1698c712711480dd2f359bb5e9b04247ddca1801d0a9fd90633" +name = "lightyear_websocket" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ + "aeronet_io", + "aeronet_websocket", + "bevy_app", "bevy_ecs", - "bevy_platform", "bevy_reflect", - "hashbrown 0.15.4", - "paste", - "seahash", + "lightyear_aeronet", + "lightyear_link", + "thiserror 2.0.12", + "tracing", ] [[package]] name = "lightyear_webtransport" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900ba027710e1df8c9624d336280e7809beedfe50b249cef7a3add4ce67a1bbc" +version = "0.24.2" +source = "git+https://github.com/cBournhonesque/lightyear?rev=69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d#69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" dependencies = [ "aeronet_io", "aeronet_webtransport", @@ -5141,7 +4966,7 @@ dependencies = [ "bevy_ecs", "bevy_reflect", "lightyear_aeronet", - "lightyear_link 0.22.4", + "lightyear_link", "thiserror 2.0.12", "tracing", ] @@ -6842,12 +6667,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ringbuffer" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53" - [[package]] name = "ringbuffer" version = "0.16.0" @@ -6958,6 +6777,8 @@ version = "0.23.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" dependencies = [ + "aws-lc-rs", + "log", "once_cell", "ring", "rustls-pki-types", @@ -7003,6 +6824,7 @@ version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -7204,11 +7026,22 @@ dependencies = [ "clap", "happy_feet", "lightyear", - "lightyear_avian3d 0.21.1", + "lightyear_avian3d", "ron", "serde", "shared", - "steamworks", + "steamworks 0.11.0", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", ] [[package]] @@ -7248,12 +7081,12 @@ dependencies = [ "bevy_trenchbroom", "happy_feet", "lightyear", - "lightyear_serde 0.22.5", + "lightyear_serde", "nil 0.14.0", "rand 0.8.5", "ron", "serde", - "steamworks", + "steamworks 0.11.0", ] [[package]] @@ -7455,16 +7288,34 @@ checksum = "a79d6f059322f73a4586cc2d0ca595ce1583104b2b1574ae1bb87f2c05bf4c67" dependencies = [ "bitflags 1.3.2", "lazy_static", - "steamworks-sys", + "steamworks-sys 0.11.0", "thiserror 1.0.69", ] +[[package]] +name = "steamworks" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "722f54c70818b8debdc25b18618b77a0a69fa280012c29e7904d32f9136299fc" +dependencies = [ + "bitflags 2.9.1", + "paste", + "steamworks-sys 0.12.2", + "thiserror 2.0.12", +] + [[package]] name = "steamworks-sys" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef6b00f8fe8eaaaff22cb9b70822a48c1a5d772bc682c202a57c0b438175845" +[[package]] +name = "steamworks-sys" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42862065c9e685d08cc3d9f6c609d4b46bd9684ec7e9420688eb979213469582" + [[package]] name = "strict-num" version = "0.1.1" @@ -7828,6 +7679,32 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-rustls" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" +dependencies = [ + "futures-util", + "log", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tungstenite", +] + [[package]] name = "toml" version = "0.8.23" @@ -7974,6 +7851,25 @@ version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" +[[package]] +name = "tungstenite" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" +dependencies = [ + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand 0.9.1", + "rustls", + "rustls-pki-types", + "sha1", + "thiserror 2.0.12", + "utf-8", +] + [[package]] name = "twox-hash" version = "2.1.1" @@ -8085,6 +7981,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8_iter" version = "1.0.4" @@ -8219,21 +8121,22 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -8245,9 +8148,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ "cfg-if", "js-sys", @@ -8258,9 +8161,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8268,9 +8171,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -8281,9 +8184,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] @@ -8399,9 +8302,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 316a074..7af6516 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ bevy_trenchbroom = { version = "0.8.1", default-features = false, features = [ happy_feet = { git = "https://github.com/atornity/happy_feet.git", rev = "1b24ed95f166e63af35e7b6f9f0053d6d28e1f1a", features = [ "serde", ] } -lightyear = { version = "0.22.4", default-features = false, features = [ +lightyear = { version = "0.24", git = "https://github.com/cBournhonesque/lightyear", rev = "69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d", default-features = false, features = [ "input_native", "interpolation", "netcode", @@ -73,8 +73,8 @@ lightyear = { version = "0.22.4", default-features = false, features = [ "std", "udp", ] } -lightyear_avian3d = { git = "https://github.com/cBournhonesque/lightyear.git", rev = "03cbf419a2c0595261b64420bc0332fc3fe1cc3f" } -lightyear_serde = "0.22.4" +lightyear_avian3d = { git = "https://github.com/cBournhonesque/lightyear", rev = "69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" } +lightyear_serde = { git = "https://github.com/cBournhonesque/lightyear", rev = "69675e5f7b305ae02c3c2c3cd320bbc3e442ee4d" } nil = "0.14.0" rand = "=0.8.5" ron = "0.8" diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs index 58ab52a..0720800 100644 --- a/crates/client/src/client.rs +++ b/crates/client/src/client.rs @@ -7,8 +7,13 @@ use bevy::{ }; use bevy_trenchbroom::geometry::Brushes; use lightyear::{ + link::{LinkConditioner, prelude::*}, netcode::Key, - prelude::{client::NetcodeConfig, input::native::InputMarker, *}, + prelude::{ + client::{Input, InputDelayConfig, NetcodeConfig}, + input::native::InputMarker, + *, + }, }; use nil::prelude::Mutex; use shared::{ @@ -25,6 +30,7 @@ use std::{ net::{IpAddr, Ipv4Addr, SocketAddr}, process::Stdio, sync::{LazyLock, mpsc}, + time::Duration, }; /// Cache of server processes to be cleared at process exit @@ -78,11 +84,21 @@ fn attempt_connection(mut commands: Commands) -> Result { private_key: Key::default(), protocol_id: 0, }; + let sync_config = SyncConfig { + jitter_multiple: 5, + jitter_margin: Duration::from_millis(15), + ..default() + }; + let conditioner = LinkConditioner::new(LinkConditionerConfig { + incoming_latency: Duration::from_millis(10), + incoming_jitter: Duration::from_millis(0), + incoming_loss: 0.0, + }); commands .spawn(( Name::from("Client"), Client::default(), - Link::new(None), + Link::new(Some(conditioner)), LocalAddr(client_addr), PeerAddr(server_addr), ReplicationReceiver::default(), @@ -94,6 +110,10 @@ fn attempt_connection(mut commands: Commands) -> Result { }, )?, UdpIo::default(), + InputTimeline(Timeline::from(Input::new( + sync_config, + InputDelayConfig::balanced(), + ))), )) .trigger(Connect); diff --git a/crates/server/src/server.rs b/crates/server/src/server.rs index a139d1e..570c63c 100644 --- a/crates/server/src/server.rs +++ b/crates/server/src/server.rs @@ -1,11 +1,17 @@ use crate::config::ServerConfig; use bevy::prelude::*; -use lightyear::prelude::{ - server::{NetcodeConfig, NetcodeServer, ServerUdpIo, Started}, - *, +use lightyear::{ + link::LinkConditioner, + prelude::{ + server::{NetcodeConfig, NetcodeServer, ServerUdpIo, Started}, + *, + }, }; use shared::{GameState, global_observer, heads_database::HeadsDatabase, tb_entities::SpawnPoint}; -use std::net::{IpAddr, Ipv4Addr, SocketAddr}; +use std::{ + net::{IpAddr, Ipv4Addr, SocketAddr}, + time::Duration, +}; pub fn plugin(app: &mut App) { app.add_systems(Startup, (start_server, setup_timeout_timer)); @@ -34,9 +40,15 @@ fn handle_new_client( info!("Client connected on IP: {}", id.ip()); + let conditioner = LinkConditioner::new(LinkConditionerConfig { + incoming_latency: Duration::from_millis(10), + incoming_jitter: Duration::from_millis(0), + incoming_loss: 0.0, + }); + commands .entity(trigger.target()) - .insert(ReplicationSender::default()); + .insert((ReplicationSender::default(), Link::new(Some(conditioner)))); crate::player::spawn(commands, trigger.target(), query, asset_server, heads_db); @@ -56,11 +68,17 @@ fn close_on_disconnect( fn start_server(mut commands: Commands) -> Result { let server_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 25565); + let conditioner = LinkConditioner::new(LinkConditionerConfig { + incoming_latency: Duration::from_millis(10), + incoming_jitter: Duration::from_millis(0), + incoming_loss: 0.0, + }); let mut commands = commands.spawn(( Name::from("Server"), LocalAddr(server_addr), ServerUdpIo::default(), NetcodeServer::new(NetcodeConfig::default()), + Link::new(Some(conditioner)), )); commands.trigger(server::Start);