bevy 0.17 + lib upgrades

Author: aggyomfg

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_slinet"
-version = "0.14.0"
+version = "0.15.0"
 authors = [
     "Sliman4 <4sliman4@gmail.com>",
     "aggyomfg <aggyomfg@yandex.com>"
@@ -25,12 +25,11 @@ features = [
 ]
 
 [dependencies]
-bevy = { version = "0.16", default-features = false, features = ["bevy_log"]}
+bevy = { version = "0.17", default-features = false, features = ["bevy_log"]}
 serde = { version = "1", features = ["derive"] }
 byteorder = "1"
 bincode = { version = "1", optional = true }
 dashmap = { version = "6", optional = true }
-log = "0.4"
 tokio = { version = "1", features = [
     "io-util",
     "rt-multi-thread",

Cargo.toml

@@ -61,11 +61,11 @@ fn main() {
         .run()
 }
 
-fn connection_establish_system(event: Trigger<ConnectionEstablishEvent<Config>>) {
+fn connection_establish_system(event: On<ConnectionEstablishEvent<Config>>) {
     println!("Connected!");
 }
 
-fn packet_receive_system(event: Trigger<PacketReceiveEvent<Config>>) {
+fn packet_receive_system(event: On<PacketReceiveEvent<Config>>) {
     match &event.event().packet {
         ServerPacket::String(s) => println!("Got a message: {}", s),
     }
@@ -124,15 +124,15 @@ fn main() {
         .run()
 }
 
-fn new_connection_system(event: Trigger<NewConnectionEvent<Config>>) {
+fn new_connection_system(event: On<NewConnectionEvent<Config>>) {
     event
         .event()
         .connection
         .send(ServerPacket::String("Hello, Client!".to_string()))
         .unwrap();
 }
 
-fn packet_receive_system(event: Trigger<PacketReceiveEvent<Config>>) {
+fn packet_receive_system(event: On<PacketReceiveEvent<Config>>) {
     match &event.event().packet {
         ClientPacket::String(s) => println!("Got a message from a client: {}", s),
     }
@@ -148,7 +148,7 @@ Note: you should implement keep-alive and disconnection systems yourself, or loo
 
 ## More examples
 
-[Here](https://github.com/aggyomfg/bevy_slinet/tree/main/examples).
+[Examples](https://github.com/aggyomfg/bevy_slinet/tree/main/examples).
 
 ### Compatibility table
 
@@ -168,4 +168,5 @@ Note: you should implement keep-alive and disconnection systems yourself, or loo
 | `0.12`         | `0.14`       |
 | `0.13`         | `0.15`       |
 | `0.14`         | `0.16`       |
-| `main`         | `0.16`       |
+| `0.15`         | `0.17`       |
+| `main`         | `0.17`       |

README.md

@@ -39,12 +39,12 @@ impl ClientConfig for Config {
     type LengthSerializer = LittleEndian<u32>;
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Debug, Deserialize, Serialize)]
 enum ClientPacket {
     String(String),
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Debug, Deserialize, Serialize)]
 enum ServerPacket {
     String(String),
 }
@@ -71,7 +71,7 @@ fn main() {
     client.join().unwrap();
 }
 
-fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Config>>) {
+fn server_new_connection_system(new_connection: On<NewConnectionEvent<Config>>) {
     new_connection
         .event()
         .connection
@@ -83,7 +83,7 @@ fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Confi
     );
 }
 
-fn client_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<Config>>) {
+fn client_packet_receive_system(new_packet: On<client::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         ServerPacket::String(s) => println!("Server -> Client: {s}"),
     }
@@ -94,7 +94,7 @@ fn client_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<C
         .unwrap();
 }
 
-fn server_packet_receive_system(new_packet: Trigger<server::PacketReceiveEvent<Config>>) {
+fn server_packet_receive_system(new_packet: On<server::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         ClientPacket::String(s) => println!("Server <- Client: {s}"),
     }

examples/hello_world_tcp.rs

@@ -83,7 +83,7 @@ fn main() {
     client2.join().unwrap();
 }
 
-fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Config>>) {
+fn server_new_connection_system(new_connection: On<NewConnectionEvent<Config>>) {
     new_connection
         .event()
         .connection
@@ -95,7 +95,7 @@ fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Confi
     );
 }
 
-fn client_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<Config>>) {
+fn client_packet_receive_system(new_packet: On<client::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         CustomCryptServerPacket::String(s) => println!("Server -> Client: {s}"),
     }
@@ -108,7 +108,7 @@ fn client_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<C
         .unwrap();
 }
 
-fn client2_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<Config>>) {
+fn client2_packet_receive_system(new_packet: On<client::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         CustomCryptServerPacket::String(s) => println!("Server -> Client2: {s}"),
     }
@@ -121,7 +121,7 @@ fn client2_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<
         .unwrap();
 }
 
-fn server_packet_receive_system(new_packet: Trigger<server::PacketReceiveEvent<Config>>) {
+fn server_packet_receive_system(new_packet: On<server::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         CustomCryptClientPacket::String(s) => println!("Server <- Client: {s}"),
     }

examples/hello_world_tcp_encrypted.rs

@@ -39,12 +39,12 @@ impl ClientConfig for Config {
     type LengthSerializer = BigEndian<u8>;
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Debug, Deserialize, Serialize)]
 enum ClientPacket {
     String(String),
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Debug, Deserialize, Serialize)]
 enum ServerPacket {
     String(String),
 }
@@ -71,7 +71,7 @@ fn main() {
     client.join().unwrap();
 }
 
-fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Config>>) {
+fn server_new_connection_system(new_connection: On<NewConnectionEvent<Config>>) {
     new_connection
         .event()
         .connection
@@ -83,7 +83,7 @@ fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Confi
     );
 }
 
-fn client_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<Config>>) {
+fn client_packet_receive_system(new_packet: On<client::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         ServerPacket::String(s) => println!("Server -> Client: {s}"),
     }
@@ -94,7 +94,7 @@ fn client_packet_receive_system(new_packet: Trigger<client::PacketReceiveEvent<C
         .unwrap();
 }
 
-fn server_packet_receive_system(new_packet: Trigger<server::PacketReceiveEvent<Config>>) {
+fn server_packet_receive_system(new_packet: On<server::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         ClientPacket::String(s) => println!("Server <- Client: {s}"),
     }

examples/hello_world_udp.rs

@@ -38,7 +38,7 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
 
-use bevy::log::LogPlugin;
+use bevy::log::{self, LogPlugin};
 use bevy::prelude::*;
 use bevy::time::common_conditions::on_timer;
 use bevy_slinet::serializer::SerializerAdapter;
@@ -112,27 +112,27 @@ impl ClientConfig for BattleConfig {
     type LengthSerializer = LittleEndian<u16>;
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 enum LobbyClientPacket {
     Hello,
     Battle,
     KeepAlive,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 enum LobbyServerPacket {
     Hello,
     BattleServer(SocketAddr),
     KeepAlive,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 enum BattleClientPacket {
     Play,
     KeepAlive,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 enum BattleServerPacket {
     BroadcastPlayerJoin,
     BattleStart,
@@ -206,7 +206,7 @@ fn main() {
         .run();
 }
 
-fn lobby_server_packet_handler(lobby_packet: Trigger<server::PacketReceiveEvent<LobbyConfig>>) {
+fn lobby_server_packet_handler(lobby_packet: On<server::PacketReceiveEvent<LobbyConfig>>) {
     let event = lobby_packet.event();
     log::info!("Client -> Lobby: {:?}", event.packet);
     match event.packet {
@@ -226,7 +226,7 @@ fn lobby_server_packet_handler(lobby_packet: Trigger<server::PacketReceiveEvent<
 }
 
 fn lobby_server_accept_new_connections(
-    new_connection: Trigger<NewConnectionEvent<LobbyConfig>>,
+    new_connection: On<NewConnectionEvent<LobbyConfig>>,
     mut keep_alive_map: ResMut<ServerKeepAliveMap<LobbyConfig>>,
 ) {
     keep_alive_map.map.insert(
@@ -236,7 +236,7 @@ fn lobby_server_accept_new_connections(
 }
 
 fn battle_server_accept_new_connections(
-    new_connection: Trigger<NewConnectionEvent<BattleConfig>>,
+    new_connection: On<NewConnectionEvent<BattleConfig>>,
     mut keep_alive_map: ResMut<ServerKeepAliveMap<BattleConfig>>,
     connections: Res<ServerConnections<BattleConfig>>,
 ) {
@@ -258,7 +258,7 @@ fn battle_server_accept_new_connections(
         .unwrap();
 }
 
-fn battle_server_packet_handler(packet: Trigger<server::PacketReceiveEvent<BattleConfig>>) {
+fn battle_server_packet_handler(packet: On<server::PacketReceiveEvent<BattleConfig>>) {
     let event = packet.event();
     log::info!("Client -> Battle: {:?}", event.packet);
     #[allow(clippy::single_match)]
@@ -272,7 +272,7 @@ fn battle_server_packet_handler(packet: Trigger<server::PacketReceiveEvent<Battl
 }
 
 fn lobby_client_packet_handler(
-    packet: Trigger<client::PacketReceiveEvent<LobbyConfig>>,
+    packet: On<client::PacketReceiveEvent<LobbyConfig>>,
     mut commands: Commands,
 ) {
     let event = packet.event();
@@ -296,7 +296,7 @@ fn lobby_client_packet_handler(
 }
 
 fn battle_client_packet_handler(
-    packet: Trigger<client::PacketReceiveEvent<BattleConfig>>,
+    packet: On<client::PacketReceiveEvent<BattleConfig>>,
     mut commands: Commands,
 ) {
     let event = packet.event();
@@ -342,7 +342,7 @@ fn battle_client_packet_handler(
 }
 
 fn lobby_client_connect_handler(
-    connection: Trigger<ConnectionEstablishEvent<LobbyConfig>>,
+    connection: On<ConnectionEstablishEvent<LobbyConfig>>,
     mut timeout: ResMut<ClientKeepAliveTimeout>,
 ) {
     connection
@@ -354,14 +354,14 @@ fn lobby_client_connect_handler(
 }
 
 fn battle_client_connect_handler(
-    _connection: Trigger<ConnectionEstablishEvent<BattleConfig>>,
+    _connection: On<ConnectionEstablishEvent<BattleConfig>>,
     mut timeout: ResMut<ClientKeepAliveTimeout>,
 ) {
     timeout.0.reset();
 }
 
 fn lobby_client_keepalive_handler(
-    packet: Trigger<client::PacketReceiveEvent<LobbyConfig>>,
+    packet: On<client::PacketReceiveEvent<LobbyConfig>>,
     mut timeout: ResMut<ClientKeepAliveTimeout>,
 ) {
     if packet.event().packet == LobbyServerPacket::KeepAlive {
@@ -370,7 +370,7 @@ fn lobby_client_keepalive_handler(
 }
 
 fn battle_client_keepalive_handler(
-    packet: Trigger<client::PacketReceiveEvent<BattleConfig>>,
+    packet: On<client::PacketReceiveEvent<BattleConfig>>,
     mut timeout: ResMut<ClientKeepAliveTimeout>,
 ) {
     if packet.event().packet == BattleServerPacket::KeepAlive {
@@ -405,7 +405,7 @@ fn client_check_timeout(
 }
 
 fn lobby_client_reconnect_if_error(
-    disconnect: Trigger<client::DisconnectionEvent<LobbyConfig>>,
+    disconnect: On<client::DisconnectionEvent<LobbyConfig>>,
     mut commands: Commands,
 ) {
     let event = disconnect.event();
@@ -416,7 +416,7 @@ fn lobby_client_reconnect_if_error(
 }
 
 fn battle_client_reconnect_if_error(
-    disconnect: Trigger<client::DisconnectionEvent<BattleConfig>>,
+    disconnect: On<client::DisconnectionEvent<BattleConfig>>,
     mut commands: Commands,
 ) {
     let event = disconnect.event();
@@ -451,7 +451,7 @@ fn server_send_keepalive(
 }
 
 fn lobby_server_keepalive_handler(
-    packet: Trigger<server::PacketReceiveEvent<LobbyConfig>>,
+    packet: On<server::PacketReceiveEvent<LobbyConfig>>,
     mut lobby_map: ResMut<ServerKeepAliveMap<LobbyConfig>>,
 ) {
     let event = packet.event();
@@ -464,7 +464,7 @@ fn lobby_server_keepalive_handler(
 }
 
 fn battle_server_keepalive_handler(
-    packet: Trigger<server::PacketReceiveEvent<BattleConfig>>,
+    packet: On<server::PacketReceiveEvent<BattleConfig>>,
     mut battle_map: ResMut<ServerKeepAliveMap<BattleConfig>>,
 ) {
     let event = packet.event();

examples/lobby_and_battle_servers.rs

@@ -38,13 +38,13 @@ impl ClientConfig for Config {
     }
     type LengthSerializer = LittleEndian<u32>;
 }
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Debug, Deserialize, Serialize)]
 enum ServerPacket {
     Hello,
     Message(usize),
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Debug, Deserialize, Serialize)]
 enum ClientPacket {
     Hello,
     Reply(usize),
@@ -81,7 +81,7 @@ fn main() {
     server.join().unwrap();
 }
 
-fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Config>>) {
+fn server_new_connection_system(new_connection: On<NewConnectionEvent<Config>>) {
     new_connection
         .event()
         .connection
@@ -94,7 +94,7 @@ fn server_new_connection_system(new_connection: Trigger<NewConnectionEvent<Confi
 }
 
 fn client_packet_receive_system(
-    new_packet: Trigger<client::PacketReceiveEvent<Config>>,
+    new_packet: On<client::PacketReceiveEvent<Config>>,
     client_number: Res<ClientId>,
 ) {
     match &new_packet.event().packet {
@@ -117,7 +117,7 @@ fn client_packet_receive_system(
     }
 }
 
-fn server_packet_receive_system(new_packet: Trigger<server::PacketReceiveEvent<Config>>) {
+fn server_packet_receive_system(new_packet: On<server::PacketReceiveEvent<Config>>) {
     match &new_packet.event().packet {
         ClientPacket::Hello => {
             println!(