Support custom (same) schedules

bevy_renet/Cargo.toml

@@ -25,6 +25,6 @@ renet = {path = "../renet", version = "0.0.16", default-features=false, features
 
 [dev-dependencies]
 bevy = {version = "0.14", default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11", "tonemapping_luts", "ktx2", "zstd"]}
-bincode = "1.3"
-env_logger = "0.11"
+bincode = "1.3.1"
+env_logger = "0.11.0"
 serde = {version = "1.0", features = ["derive"]}

bevy_renet/README.md

@@ -124,8 +124,6 @@ If you want a more complex example you can checkout the [demo_bevy](https://gith
 
 |bevy|bevy_renet|
 |---|---|
-|0.14|0.0.12|
-|0.13|0.0.11|
 |0.12|0.0.10|
 |0.11|0.0.9|
 |0.10|0.0.8|

bevy_renet/examples/simple.rs

@@ -98,8 +98,8 @@ fn main() {
     app.init_resource::<Lobby>();
 
     if is_host {
-        app.add_plugins(RenetServerPlugin);
-        app.add_plugins(NetcodeServerPlugin);
+        app.add_plugins(RenetServerPlugin::default());
+        app.add_plugins(NetcodeServerPlugin::default());
         let (server, transport) = new_renet_server();
         app.insert_resource(server);
         app.insert_resource(transport);
@@ -109,8 +109,8 @@ fn main() {
             (server_update_system, server_sync_players, move_players_system).run_if(resource_exists::<RenetServer>),
         );
     } else {
-        app.add_plugins(RenetClientPlugin);
-        app.add_plugins(NetcodeClientPlugin);
+        app.add_plugins(RenetClientPlugin::default());
+        app.add_plugins(NetcodeClientPlugin::default());
         app.init_resource::<PlayerInput>();
         let (client, transport) = new_renet_client();
         app.insert_resource(client);

bevy_renet/src/lib.rs

@@ -1,6 +1,9 @@
 pub use renet;
 
-use bevy::prelude::*;
+use bevy::{
+    ecs::{intern::Interned, schedule::ScheduleLabel},
+    prelude::*,
+};
 
 use renet::{RenetClient, RenetServer, ServerEvent};
 
@@ -25,19 +28,47 @@ pub struct RenetReceive;
 #[derive(Debug, SystemSet, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct RenetSend;
 
-pub struct RenetServerPlugin;
-
-pub struct RenetClientPlugin;
+#[derive(Debug, SystemSet, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum CoreSet {
+    Pre,
+    Post,
+}
+#[derive(Clone, Copy)]
+pub struct NetSchedules {
+    pub pre: Interned<dyn ScheduleLabel>,
+    pub post: Interned<dyn ScheduleLabel>,
+}
+impl Default for NetSchedules {
+    fn default() -> Self {
+        Self {
+            pre: PreUpdate.intern(),
+            post: PostUpdate.intern(),
+        }
+    }
+}
+#[derive(Default)]
+pub struct RenetServerPlugin {
+    pub schedules: NetSchedules,
+}
+#[derive(Default)]
+pub struct RenetClientPlugin {
+    pub schedules: NetSchedules,
+}
 
 impl Plugin for RenetServerPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<Events<ServerEvent>>();
-        app.add_systems(PreUpdate, Self::update_system.run_if(resource_exists::<RenetServer>));
         app.add_systems(
-            PreUpdate,
+            self.schedules.pre,
+            Self::update_system.in_set(CoreSet::Pre).run_if(resource_exists::<RenetServer>),
+        );
+        app.add_systems(
+            self.schedules.pre,
             Self::emit_server_events_system
                 .in_set(RenetReceive)
                 .run_if(resource_exists::<RenetServer>)
+                .in_set(CoreSet::Pre)
+                .run_if(resource_exists::<RenetServer>)
                 .after(Self::update_system),
         );
     }
@@ -57,7 +88,10 @@ impl RenetServerPlugin {
 
 impl Plugin for RenetClientPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(PreUpdate, Self::update_system.run_if(resource_exists::<RenetClient>));
+        app.add_systems(
+            self.schedules.pre,
+            Self::update_system.in_set(CoreSet::Pre).run_if(resource_exists::<RenetClient>),
+        );
     }
 }
 

bevy_renet/src/transport.rs

@@ -5,32 +5,41 @@ use renet::{
 
 use bevy::{app::AppExit, prelude::*};
 
-use crate::{RenetClientPlugin, RenetReceive, RenetSend, RenetServerPlugin};
+use crate::{CoreSet, NetSchedules, RenetClientPlugin, RenetReceive, RenetSend, RenetServerPlugin};
 
-pub struct NetcodeServerPlugin;
-
-pub struct NetcodeClientPlugin;
+#[derive(Default)]
+pub struct NetcodeServerPlugin {
+    pub schedules: NetSchedules,
+}
+#[derive(Default)]
+pub struct NetcodeClientPlugin {
+    pub schedules: NetSchedules,
+}
 
 impl Plugin for NetcodeServerPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<NetcodeTransportError>();
 
         app.add_systems(
-            PreUpdate,
+            self.schedules.pre,
             Self::update_system
                 .in_set(RenetReceive)
+                .in_set(CoreSet::Pre)
                 .run_if(resource_exists::<NetcodeServerTransport>)
                 .run_if(resource_exists::<RenetServer>)
                 .after(RenetServerPlugin::update_system)
                 .before(RenetServerPlugin::emit_server_events_system),
         );
 
         app.add_systems(
-            PostUpdate,
+            self.schedules.post,
             (Self::send_packets.in_set(RenetSend), Self::disconnect_on_exit)
                 .run_if(resource_exists::<NetcodeServerTransport>)
-                .run_if(resource_exists::<RenetServer>),
+                .run_if(resource_exists::<RenetServer>).in_set(CoreSet::Post),
         );
+        if self.schedules.post == self.schedules.pre {
+            app.configure_sets(self.schedules.post, (CoreSet::Pre, CoreSet::Post).chain());
+        }
     }
 }
 
@@ -62,18 +71,18 @@ impl Plugin for NetcodeClientPlugin {
         app.add_event::<NetcodeTransportError>();
 
         app.add_systems(
-            PreUpdate,
+            self.schedules.pre,
             Self::update_system
                 .in_set(RenetReceive)
                 .run_if(resource_exists::<NetcodeClientTransport>)
                 .run_if(resource_exists::<RenetClient>)
-                .after(RenetClientPlugin::update_system),
+                .after(RenetClientPlugin::update_system).in_set(CoreSet::Pre),
         );
         app.add_systems(
-            PostUpdate,
+            self.schedules.post,
             (Self::send_packets.in_set(RenetSend), Self::disconnect_on_exit)
                 .run_if(resource_exists::<NetcodeClientTransport>)
-                .run_if(resource_exists::<RenetClient>),
+                .run_if(resource_exists::<RenetClient>).in_set(CoreSet::Post),
         );
     }
 }

demo_bevy/src/bin/client.rs

@@ -124,7 +124,7 @@ fn add_steam_network(app: &mut App) {
 fn main() {
     let mut app = App::new();
     app.add_plugins(DefaultPlugins);
-    app.add_plugins(RenetClientPlugin);
+    app.add_plugins(RenetClientPlugin::default());
     app.add_plugins(LookTransformPlugin);
     app.add_plugins(FrameTimeDiagnosticsPlugin);
     app.add_plugins(LogDiagnosticsPlugin::default());

demo_bevy/src/bin/server.rs

@@ -90,7 +90,7 @@ fn main() {
     let mut app = App::new();
     app.add_plugins(DefaultPlugins);
 
-    app.add_plugins(RenetServerPlugin);
+    app.add_plugins(RenetServerPlugin::default());
     app.add_plugins(FrameTimeDiagnosticsPlugin);
     app.add_plugins(LogDiagnosticsPlugin::default());
     app.add_plugins(EguiPlugin);