bump to bevy 0.14

Signed-off-by: Matthew Fisher <[email protected]>

Author: bacongobbler

Cargo.lock

@@ -12,5 +12,5 @@ license = "Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.8"
+bevy = "0.14"
 bytes = "1"

Cargo.toml

@@ -1,7 +1,7 @@
 use std::net::{SocketAddr, UdpSocket};
 
 use bevy::{log::LogPlugin, prelude::*};
-use bevy_simple_networking::{ClientPlugin, NetworkEvent, Transport};
+use bevy_simple_networking::{ClientPlugin, NetworkEvent, SocketAddrResource, Transport, UdpSocketResource};
 
 fn main() {
     let remote_addr: SocketAddr = "127.0.0.1:4567".parse().expect("could not parse addr");
@@ -14,18 +14,16 @@ fn main() {
         .expect("could not set socket to be nonblocking");
 
     App::new()
-        .insert_resource(remote_addr)
-        .insert_resource(socket)
-        .add_plugins(MinimalPlugins)
-        .add_plugin(LogPlugin)
-        .add_plugin(ClientPlugin)
-        .add_system(connection_handler)
-        .add_startup_system(hello_world)
+        .insert_resource(SocketAddrResource::new(remote_addr))
+        .insert_resource(UdpSocketResource::new(socket))
+        .add_plugins((MinimalPlugins, LogPlugin::default(), ClientPlugin))
+        .add_systems(Update, connection_handler)
+        .add_systems(Startup, hello_world)
         .run();
 }
 
 fn connection_handler(mut events: EventReader<NetworkEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         match event {
             NetworkEvent::Message(_, msg) => {
                 info!("{}", String::from_utf8_lossy(msg));
@@ -45,6 +43,6 @@ fn connection_handler(mut events: EventReader<NetworkEvent>) {
     }
 }
 
-fn hello_world(remote_addr: Res<SocketAddr>, mut transport: ResMut<Transport>) {
-    transport.send(*remote_addr, b"Hello world!");
+fn hello_world(remote_addr: Res<SocketAddrResource>, mut transport: ResMut<Transport>) {
+    transport.send(**remote_addr, b"Hello world!");
 }

examples/chat_client.rs

@@ -1,7 +1,7 @@
 use std::{net::UdpSocket, time::Duration};
 
-use bevy::{app::ScheduleRunnerSettings, log::LogPlugin, prelude::*};
-use bevy_simple_networking::{NetworkEvent, NetworkResource, ServerPlugin, Transport};
+use bevy::{app::{App, ScheduleRunnerPlugin, Update}, log::{info, LogPlugin}, prelude::*, MinimalPlugins};
+use bevy_simple_networking::{NetworkEvent, NetworkResource, ServerPlugin, Transport, UdpSocketResource};
 
 const LISTEN_ADDRESS: &str = "127.0.0.1:4567";
 
@@ -17,15 +17,12 @@ fn main() {
     info!("Server now listening on {}", LISTEN_ADDRESS);
 
     App::new()
+    .insert_resource(UdpSocketResource::new(socket))
         // run the server at a reduced tick rate (35 ticks per second)
-        .insert_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs_f32(
+        .add_plugins((MinimalPlugins, LogPlugin::default(), ServerPlugin, ScheduleRunnerPlugin::run_loop(Duration::from_secs_f32(
             1. / 35.,
-        )))
-        .insert_resource(socket)
-        .add_plugins(MinimalPlugins)
-        .add_plugin(LogPlugin)
-        .add_plugin(ServerPlugin)
-        .add_system(connection_handler)
+        ))))
+        .add_systems(Update, connection_handler)
         .run();
 }
 
@@ -34,7 +31,7 @@ fn connection_handler(
     mut events: EventReader<NetworkEvent>,
     mut transport: ResMut<Transport>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         match event {
             NetworkEvent::Connected(handle) => {
                 for (addr, _) in net.connections.iter() {

examples/chat_server.rs

@@ -1,7 +1,7 @@
 use std::net::{SocketAddr, UdpSocket};
 
 use bevy::{log::LogPlugin, prelude::*};
-use bevy_simple_networking::{ClientPlugin, NetworkEvent};
+use bevy_simple_networking::{ClientPlugin, NetworkEvent, SocketAddrResource, UdpSocketResource};
 
 fn main() {
     let remote_addr: SocketAddr = "127.0.0.1:4567".parse().expect("could not parse addr");
@@ -14,17 +14,15 @@ fn main() {
         .expect("could not set socket to be nonblocking");
 
     App::new()
-        .insert_resource(remote_addr)
-        .insert_resource(socket)
-        .add_plugins(MinimalPlugins)
-        .add_plugin(LogPlugin)
-        .add_plugin(ClientPlugin)
-        .add_system(connection_handler)
+        .insert_resource(SocketAddrResource::new(remote_addr))
+        .insert_resource(UdpSocketResource::new(socket))
+        .add_plugins((MinimalPlugins, LogPlugin::default(), ClientPlugin))
+        .add_systems(Update, connection_handler)
         .run();
 }
 
 fn connection_handler(mut events: EventReader<NetworkEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         match event {
             NetworkEvent::Message(_, msg) => {
                 info!("server sent a message: {:?}", msg);

examples/simple_client.rs

@@ -1,7 +1,7 @@
 use std::{net::UdpSocket, time::Duration};
 
-use bevy::{app::ScheduleRunnerSettings, log::LogPlugin, prelude::*};
-use bevy_simple_networking::{NetworkEvent, ServerPlugin, Transport};
+use bevy::{app::ScheduleRunnerPlugin, log::LogPlugin, prelude::*};
+use bevy_simple_networking::{NetworkEvent, ServerPlugin, Transport, UdpSocketResource};
 
 const LISTEN_ADDRESS: &str = "127.0.0.1:4567";
 
@@ -18,19 +18,16 @@ fn main() {
 
     App::new()
         // run the server at a reduced tick rate (100 ticks per minute)
-        .insert_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs_f32(
+        .insert_resource(UdpSocketResource::new(socket))
+        .add_plugins((MinimalPlugins, LogPlugin::default(), ServerPlugin, ScheduleRunnerPlugin::run_loop(Duration::from_secs_f32(
             60. / 100.,
-        )))
-        .insert_resource(socket)
-        .add_plugins(MinimalPlugins)
-        .add_plugin(LogPlugin)
-        .add_plugin(ServerPlugin)
-        .add_system(connection_handler)
+        ))))
+        .add_systems(Update, connection_handler)
         .run();
 }
 
 fn connection_handler(mut events: EventReader<NetworkEvent>, mut transport: ResMut<Transport>) {
-    for event in events.iter() {
+    for event in events.read() {
         match event {
             NetworkEvent::Connected(handle) => {
                 info!("{}: connected!", handle);

examples/simple_server.rs

@@ -1,9 +1,11 @@
 use std::{io, net::SocketAddr};
 
+use bevy::prelude::Event;
 use bytes::Bytes;
 
 use super::message::Message;
 
+#[derive(Event)]
 pub enum NetworkEvent {
     // A message was received from a client
     Message(SocketAddr, Bytes),

examples/using_label.rs

@@ -8,6 +8,7 @@ use std::net::SocketAddr;
 use std::time::Duration;
 
 pub use self::events::NetworkEvent;
+pub use self::systems::{SocketAddrResource, UdpSocketResource};
 pub use self::transport::Transport;
 
 use bevy::prelude::*;
@@ -19,6 +20,7 @@ const DEFAULT_HEARTBEAT_TICK_RATE_SECS: f32 = 2.;
 /// NetworkEvent::Disconnected
 const DEFAULT_IDLE_TIMEOUT_SECS: f32 = 5.;
 
+#[derive(Resource)]
 pub struct NetworkResource {
     // Hashmap of each live connection and their last known packet activity
     pub connections: HashMap<SocketAddr, Duration>,
@@ -35,20 +37,20 @@ impl Default for NetworkResource {
 }
 
 /// Label for network related systems.
-#[derive(Clone, Hash, Debug, PartialEq, Eq, SystemLabel)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, SystemSet)]
 pub enum NetworkSystem {
     Receive,
     Send,
 }
 
 /// Label for server specific systems.
-#[derive(Clone, Hash, Debug, PartialEq, Eq, SystemLabel)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, SystemSet)]
 pub enum ServerSystem {
     IdleTimeout,
 }
 
 /// Label for client specific systems.
-#[derive(Clone, Hash, Debug, PartialEq, Eq, SystemLabel)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, SystemSet)]
 pub enum ClientSystem {
     Heartbeat,
 }
@@ -60,12 +62,18 @@ impl Plugin for ServerPlugin {
         app.insert_resource(NetworkResource::default())
             .insert_resource(transport::Transport::new())
             .add_event::<events::NetworkEvent>()
-            .add_system(systems::server_recv_packet_system.label(NetworkSystem::Receive))
-            .add_system(systems::send_packet_system.label(NetworkSystem::Send))
-            .add_system(systems::idle_timeout_system.label(ServerSystem::IdleTimeout));
+            .add_systems(
+                Update,
+                (
+                    systems::server_recv_packet_system.in_set(NetworkSystem::Receive),
+                    systems::send_packet_system.in_set(NetworkSystem::Send),
+                    systems::idle_timeout_system.in_set(ServerSystem::IdleTimeout)
+                )
+            );
     }
 }
 
+#[derive(Resource)]
 pub struct HeartbeatTimer(Timer);
 
 pub struct ClientPlugin;
@@ -75,11 +83,16 @@ impl Plugin for ClientPlugin {
         app.insert_resource(transport::Transport::new())
             .insert_resource(HeartbeatTimer(Timer::from_seconds(
                 DEFAULT_HEARTBEAT_TICK_RATE_SECS,
-                true,
+                TimerMode::Repeating,
             )))
             .add_event::<events::NetworkEvent>()
-            .add_system(systems::client_recv_packet_system.label(NetworkSystem::Receive))
-            .add_system(systems::send_packet_system.label(NetworkSystem::Send))
-            .add_system(systems::auto_heartbeat_system.label(ClientSystem::Heartbeat));
+            .add_systems(
+                Update,
+                (
+                    systems::client_recv_packet_system.in_set(NetworkSystem::Receive),
+                    systems::send_packet_system.in_set(NetworkSystem::Send),
+                    systems::auto_heartbeat_system.in_set(ClientSystem::Heartbeat)
+                )
+            );
     }
 }