BevyRenet: update bevy to 0.11 (#93)

lucaspoffo · Jul 14, 2023 · e763da5 · e763da5
1 parent ddfdf1b
commit e763da5
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 28 deletions.
diff --git a/bevy_renet/Cargo.toml b/bevy_renet/Cargo.toml
@@ -15,11 +15,11 @@ default = ["transport"]
 transport = ["renet/transport"]
 
 [dependencies]
-bevy = {version = "0.10.1", default-features = false}
+bevy = {version = "0.11.0", default-features = false}
 renet = {path = "../renet", version = "0.0.12", features = ["bevy"]}
 
 [dev-dependencies]
-bevy = {version = "0.10.1", default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11"]}
+bevy = {version = "0.11.0", default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11"]}
 bincode = "1.3.1"
 env_logger = "0.10.0"
 serde = {version = "1.0", features = ["derive"]}
diff --git a/bevy_renet/src/lib.rs b/bevy_renet/src/lib.rs
@@ -24,9 +24,9 @@ impl Plugin for RenetServerPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<Events<ServerEvent>>();
 
-        app.configure_set(RenetSet::Server.run_if(resource_exists::<RenetServer>()));
+        app.configure_set(Update, RenetSet::Server.run_if(resource_exists::<RenetServer>()));
 
-        app.add_system(Self::update_system.in_base_set(CoreSet::PreUpdate).in_set(RenetSet::Server));
+        app.add_systems(PreUpdate, Self::update_system.in_set(RenetSet::Server));
     }
 }
 
@@ -42,9 +42,9 @@ impl RenetServerPlugin {
 
 impl Plugin for RenetClientPlugin {
     fn build(&self, app: &mut App) {
-        app.configure_set(RenetSet::Client.run_if(resource_exists::<RenetClient>()));
+        app.configure_set(Update, RenetSet::Client.run_if(resource_exists::<RenetClient>()));
 
-        app.add_system(Self::update_system.in_base_set(CoreSet::PreUpdate).in_set(RenetSet::Client));
+        app.add_systems(PreUpdate, Self::update_system.in_set(RenetSet::Client));
     }
 }
 

diff --git a/bevy_renet/src/transport.rs b/bevy_renet/src/transport.rs
@@ -21,18 +21,20 @@ pub struct NetcodeClientPlugin;
 impl Plugin for NetcodeServerPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<NetcodeTransportError>();
-        app.configure_set(
-            TransportSet::Server
-                .run_if(resource_exists::<NetcodeServerTransport>().and_then(resource_exists::<RenetServer>()))
+
+        app.add_systems(
+            PreUpdate,
+            Self::update_system
+                .run_if(resource_exists::<NetcodeServerTransport>())
+                .run_if(resource_exists::<RenetServer>())
                 .after(RenetSet::Server),
         );
-
-        app.add_system(Self::update_system.in_base_set(CoreSet::PreUpdate).in_set(TransportSet::Server));
-        app.add_system(Self::send_packets.in_base_set(CoreSet::PostUpdate).in_set(TransportSet::Server));
-        app.add_system(
-            Self::disconnect_on_exit
-                .in_base_set(CoreSet::PostUpdate)
-                .in_set(TransportSet::Server),
+        app.add_systems(
+            PostUpdate,
+            (Self::send_packets, Self::disconnect_on_exit)
+                .run_if(resource_exists::<NetcodeServerTransport>())
+                .run_if(resource_exists::<RenetServer>())
+                .after(RenetSet::Server),
         );
     }
 }
@@ -64,18 +66,19 @@ impl Plugin for NetcodeClientPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<NetcodeTransportError>();
 
-        app.configure_set(
-            TransportSet::Client
-                .run_if(resource_exists::<NetcodeClientTransport>().and_then(resource_exists::<RenetClient>()))
+        app.add_systems(
+            PreUpdate,
+            Self::update_system
+                .run_if(resource_exists::<NetcodeClientTransport>())
+                .run_if(resource_exists::<RenetClient>())
                 .after(RenetSet::Client),
         );
-
-        app.add_system(Self::update_system.in_base_set(CoreSet::PreUpdate).in_set(TransportSet::Client));
-        app.add_system(Self::send_packets.in_base_set(CoreSet::PostUpdate).in_set(TransportSet::Client));
-        app.add_system(
-            Self::disconnect_on_exit
-                .in_base_set(CoreSet::PostUpdate)
-                .in_set(TransportSet::Client),
+        app.add_systems(
+            PostUpdate,
+            (Self::send_packets, Self::disconnect_on_exit)
+                .run_if(resource_exists::<NetcodeClientTransport>())
+                .run_if(resource_exists::<RenetClient>())
+                .after(RenetSet::Client),
         );
     }
 }

diff --git a/renet/Cargo.toml b/renet/Cargo.toml
@@ -16,7 +16,7 @@ default = ["transport"]
 transport = ["dep:renetcode"]
 
 [dependencies]
-bevy_ecs = { version = "0.10.1", optional = true }
+bevy_ecs = { version = "0.11.0", optional = true }
 bytes = "1.1"
 log = "0.4.17"
 octets = "0.2"

diff --git a/renet/src/server.rs b/renet/src/server.rs
@@ -8,6 +8,7 @@ use bytes::Bytes;
 
 /// Connection and disconnection events in the server.
 #[derive(Debug)]
+#[cfg_attr(feature = "bevy", derive(bevy_ecs::prelude::Event))]
 pub enum ServerEvent {
     ClientConnected { client_id: u64 },
     ClientDisconnected { client_id: u64, reason: DisconnectReason },

diff --git a/renet/src/transport/mod.rs b/renet/src/transport/mod.rs
@@ -12,6 +12,7 @@ pub use renetcode::{
 };
 
 #[derive(Debug)]
+#[cfg_attr(feature = "bevy", derive(bevy_ecs::prelude::Event))]
 pub enum NetcodeTransportError {
     Netcode(NetcodeError),
     Renet(crate::DisconnectReason),

diff --git a/renet_visualizer/Cargo.toml b/renet_visualizer/Cargo.toml
@@ -15,4 +15,4 @@ bevy = ["dep:bevy_ecs"]
 [dependencies]
 renet = { path = "../renet", version = "0.0.12" }
 egui = "0.22"
-bevy_ecs = { version = "0.10.0", optional = true }
+bevy_ecs = { version = "0.11.0", optional = true }