From 7cd43d489471c49c9c7ccad20f40fe53130055c5 Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Thu, 2 Mar 2023 17:45:10 +0200 Subject: [PATCH] chore(client, server, shared): update naia deps --- Cargo.lock | 36 +++++++++++++++++------------------ client/Cargo.toml | 2 +- server/Cargo.toml | 2 +- server/src/main.rs | 4 ++-- shared/Cargo.toml | 2 +- shared/src/server/protocol.rs | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7f4bc2..06f178b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3992,9 +3992,9 @@ dependencies = [ [[package]] name = "naia-bevy-client" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd2f0e28ef56852c5fdb1a88627f9ab20f30aef0b1553c96ef4ee3e6ae7e73" +checksum = "dbbe53341075dbb982cac8242afd4161838f1de9555a72bc2b9e2b3d9b1c4253" dependencies = [ "bevy_app", "bevy_ecs", @@ -4004,9 +4004,9 @@ dependencies = [ [[package]] name = "naia-bevy-server" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4abb4cd2969e61cbc6e9a1ca1c4b5148c26b997bdb367b86ed264b95d0ee7f0" +checksum = "545144fb126ee9c1f5b29aa460fe8728e6af7b26bba340772f4c0d8245bd326e" dependencies = [ "bevy_app", "bevy_ecs", @@ -4016,9 +4016,9 @@ dependencies = [ [[package]] name = "naia-bevy-shared" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb525671ecd40aae0360d04e8c31ad4b62377476a68a9b1d8db4a2ca076d072" +checksum = "a6060bae2cc3619f7264886021a6a141e1d0f1ef3a84d10bee8e182dd99d8e3e" dependencies = [ "bevy_ecs", "naia-shared", @@ -4026,9 +4026,9 @@ dependencies = [ [[package]] name = "naia-client" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02bb6a98678f7012f874f1f34e759b8d6264f1fee5517fbebeb80d72334118e" +checksum = "8974bcdb4b978e91dc0af9c4e3656f13b4e17c7385d8ebfd7d897e175259b545" dependencies = [ "bevy_ecs", "cfg-if", @@ -4058,9 +4058,9 @@ dependencies = [ [[package]] name = "naia-derive" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b46e6f562306297268da2d2ed755738b000e593fc46e7110d022b915488d2c" +checksum = "bdf68538eef6ac46820636a8d83d140caf55bf9bda9f078e3a8aece3d7f73f79" dependencies = [ "naia-serde-derive", "proc-macro2", @@ -4070,9 +4070,9 @@ dependencies = [ [[package]] name = "naia-serde" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3527cc6892dbaa0e48886643d4a533bcb311230f675ff276d6e4c2e766f613" +checksum = "6422cbb88a0a983d620c3cf64248a6dfba94c513be74096d936015b79cd136f7" dependencies = [ "cfg-if", "log", @@ -4081,9 +4081,9 @@ dependencies = [ [[package]] name = "naia-serde-derive" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b845831b6bcb607a0e66ab10b2eade0e030e55eb0376fcb8062e38cd8da59b6f" +checksum = "f9c02c29b86deb78790c6bc29ebc87aa2eb62639df442131bee852f398e91039" dependencies = [ "cfg-if", "log", @@ -4094,9 +4094,9 @@ dependencies = [ [[package]] name = "naia-server" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6c83aecce45e8940e6ced5c2be89b4608a20f5ec51cbe532da7eb0692beda7" +checksum = "3ba24ff5fd25dfe6b765adee3208e1cf0486c07a72b5568bbc4977cff3380ea0" dependencies = [ "bevy_ecs", "fastrand", @@ -4126,9 +4126,9 @@ dependencies = [ [[package]] name = "naia-shared" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3aff5c4336ee61035159787ff444883f24af8c94ae504629d42ea1d7b115a9" +checksum = "54803e35fc27b8bc5b7b9a8c541403422e2a654a719a22be93d196188f9974d5" dependencies = [ "bevy_ecs", "cfg-if", diff --git a/client/Cargo.toml b/client/Cargo.toml index 39bf863..e1974b5 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -14,7 +14,7 @@ publish = false [dependencies] laurelin_shared = { package = "shared", path = "../shared" } -naia-bevy-client = "0.16.0" +naia-bevy-client = "0.18.0" # one dep needs ^0.5.9, and another one needs ^0.5.10 # and for some reason cargo can't figure this out, so we're forcing it for now. diff --git a/server/Cargo.toml b/server/Cargo.toml index 212604d..dd7c945 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] laurelin_shared = { package = "shared", path = "../shared" } -naia-bevy-server = "0.16.0" +naia-bevy-server = "0.18.0" bevy_app = { version = "0.9.1", default-features=false } bevy_core = { version = "0.9.1", default-features=false } diff --git a/server/src/main.rs b/server/src/main.rs index b217c6f..992a4f2 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -6,11 +6,11 @@ * See LICENSE for licensing information. */ -use bevy_app::{App, CoreStage, ScheduleRunnerPlugin}; +use bevy_app::{App, ScheduleRunnerPlugin}; use bevy_core::CorePlugin; use bevy_log::{info, LogPlugin}; -use naia_bevy_server::{Plugin as ServerPlugin, ServerConfig, Stage}; +use naia_bevy_server::{Plugin as ServerPlugin, ServerConfig}; use laurelin_shared::server::protocol::protocol; diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 9eb0cc4..1315ce4 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -10,7 +10,7 @@ license = "GPL-3.0-only" publish = false [dependencies] -naia-bevy-shared = "0.16.0" +naia-bevy-shared = "0.18.0" thiserror = "1.0.38" diff --git a/shared/src/server/protocol.rs b/shared/src/server/protocol.rs index 8723ada..7cd08c6 100644 --- a/shared/src/server/protocol.rs +++ b/shared/src/server/protocol.rs @@ -15,8 +15,8 @@ use super::{channels::ChannelsPlugin, messages::MessagesPlugin}; pub fn protocol() -> Protocol { Protocol::builder() // configuration - .tick_interval(Duration::from_millis(25)) - .link_condition(LinkConditionerConfig::average_condition()) + .tick_interval(Duration::from_millis(16)) + .link_condition(LinkConditionerConfig::good_condition()) // channels .add_plugin(ChannelsPlugin) // messages -- 2.44.1