From 88834d4d2c9708ecec0c7f2997ca52b2b4d56641 Mon Sep 17 00:00:00 2001
From: Lucas Poffo <ltkpoffo@gmail.com>
Date: Sun, 12 Mar 2023 01:52:54 -0300
Subject: [PATCH] Renet, Renetcode: add client.is_connecting()

Rename in renetcode client.connected() to client.is_connected() for consistency.
---
 bevy_renet/src/lib.rs      | 2 +-
 renet/src/client.rs        | 8 ++++++--
 renetcode/examples/echo.rs | 2 +-
 renetcode/src/client.rs    | 9 ++++++++-
 renetcode/src/server.rs    | 8 ++++----
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/bevy_renet/src/lib.rs b/bevy_renet/src/lib.rs
index 52134f0e..85eddb93 100644
--- a/bevy_renet/src/lib.rs
+++ b/bevy_renet/src/lib.rs
@@ -129,7 +129,7 @@ impl RenetClientPlugin {
 
 pub fn client_connecting(client: Option<Res<RenetClient>>) -> bool {
     match client {
-        Some(client) => !client.is_connected(),
+        Some(client) => client.is_connecting(),
         None => false,
     }
 }
diff --git a/renet/src/client.rs b/renet/src/client.rs
index 0ca3e88d..c17dda27 100644
--- a/renet/src/client.rs
+++ b/renet/src/client.rs
@@ -106,8 +106,12 @@ impl RenetClient {
         self.netcode_client.client_id()
     }
 
+    pub fn is_connecting(&self) -> bool {
+        self.netcode_client.is_connecting()
+    }
+
     pub fn is_connected(&self) -> bool {
-        self.netcode_client.connected()
+        self.netcode_client.is_connected()
     }
 
     /// If the client is disconnected, returns the reason.
@@ -161,7 +165,7 @@ impl RenetClient {
 
     /// Send packets to the server.
     pub fn send_packets(&mut self) -> Result<(), RenetError> {
-        if self.netcode_client.connected() {
+        if self.netcode_client.is_connected() {
             let packets = self.reliable_connection.get_packets_to_send()?;
             for packet in packets.into_iter() {
                 let (addr, payload) = self.netcode_client.generate_payload_packet(&packet)?;
diff --git a/renetcode/examples/echo.rs b/renetcode/examples/echo.rs
index c3bd1126..9c2a1d96 100644
--- a/renetcode/examples/echo.rs
+++ b/renetcode/examples/echo.rs
@@ -174,7 +174,7 @@ fn client(connect_token: ConnectToken) {
 
         match stdin_channel.try_recv() {
             Ok(text) => {
-                if client.connected() {
+                if client.is_connected() {
                     let (addr, payload) = client.generate_payload_packet(text.as_bytes()).unwrap();
                     udp_socket.send_to(payload, addr).unwrap();
                 } else {
diff --git a/renetcode/src/client.rs b/renetcode/src/client.rs
index 01cc01b2..ae7ab626 100644
--- a/renetcode/src/client.rs
+++ b/renetcode/src/client.rs
@@ -91,7 +91,14 @@ impl NetcodeClient {
         }
     }
 
-    pub fn connected(&self) -> bool {
+    pub fn is_connecting(&self) -> bool {
+        matches!(
+            self.state,
+            ClientState::SendingConnectionRequest | ClientState::SendingConnectionResponse
+        )
+    }
+
+    pub fn is_connected(&self) -> bool {
         self.state == ClientState::Connected
     }
 
diff --git a/renetcode/src/server.rs b/renetcode/src/server.rs
index 04d2cad0..cf7f2af1 100644
--- a/renetcode/src/server.rs
+++ b/renetcode/src/server.rs
@@ -706,7 +706,7 @@ mod tests {
             _ => unreachable!(),
         };
 
-        assert!(!client.connected());
+        assert!(!client.is_connected());
         let (client_packet, _) = client.update(Duration::ZERO).unwrap();
         let result = server.process_packet(client_addr, client_packet);
 
@@ -724,7 +724,7 @@ mod tests {
             _ => unreachable!(),
         };
 
-        assert!(client.connected());
+        assert!(client.is_connected());
 
         for _ in 0..3 {
             let payload = [7u8; 300];
@@ -762,9 +762,9 @@ mod tests {
             ServerResult::ClientDisconnected {
                 payload: Some(payload), ..
             } => {
-                assert!(client.connected());
+                assert!(client.is_connected());
                 assert!(client.process_packet(payload).is_none());
-                assert!(!client.connected());
+                assert!(!client.is_connected());
             }
             _ => unreachable!(),
         }