move handshake into separate module

kubi-shared/src/networking/client.rs

@@ -1,7 +1,6 @@
 use shipyard::Component;
 
 pub type ClientId = u16;
-pub type ClientKey = u16;
 
 #[derive(Component, Clone, Copy, Debug)]
 pub struct Client(pub ClientId);

kubi/src/networking.rs

@@ -1,23 +1,27 @@
-use glam::Vec3;
 use shipyard::{Unique, AllStoragesView, UniqueView, UniqueViewMut, Workload, IntoWorkload, EntitiesViewMut, Component, ViewMut, SystemModificator, View, IntoIter, WorkloadModificator};
 use glium::glutin::event_loop::ControlFlow;
 use std::net::SocketAddr;
-use uflow::{client::{Client, Config as ClientConfig, Event as ClientEvent}, EndpointConfig, SendMode};
+use uflow::{client::{Client, Config as ClientConfig, Event as ClientEvent}, EndpointConfig};
 use kubi_shared::networking::{
-  messages::{ClientToServerMessage, ServerToClientMessage, S_SERVER_HELLO},
+  messages::ServerToClientMessage,
-  state::ClientJoinState, 
+  state::ClientJoinState,
-  channels::{CHANNEL_AUTH, CHANNEL_MOVE},
 };
 use crate::{
-  events::{EventComponent, player_actions::PlayerActionEvent}, 
+  events::EventComponent, 
   control_flow::SetControlFlow, 
   world::tasks::ChunkTaskManager, 
   state::is_ingame_or_loading
 };
 
+mod handshake;
 mod world;
 mod player;
 
+use handshake::{
+  set_client_join_state_to_connected,
+  say_hello,
+  check_server_hello_response
+};
 use world::{
   inject_network_responses_into_manager_queue,
   send_block_place_events,
@@ -89,53 +93,6 @@ fn flush_client(
   client.0.flush();
 }
 
-fn set_client_join_state_to_connected(
-  mut join_state: UniqueViewMut<ClientJoinState>
-) {
-  log::info!("Setting ClientJoinState");
-  *join_state = ClientJoinState::Connected;
-}
-
-fn say_hello(
-  mut client: UniqueViewMut<UdpClient>,
-) {
-  log::info!("Authenticating");
-  client.0.send(
-    postcard::to_allocvec(
-      &ClientToServerMessage::ClientHello {
-        username: "Sbeve".into(),
-        password: None
-      }
-    ).unwrap().into_boxed_slice(),
-    CHANNEL_AUTH,
-    uflow::SendMode::Reliable
-  );
-}
-
-fn check_server_hello_response(
-  network_events: View<NetworkEvent>,
-  mut join_state: UniqueViewMut<ClientJoinState>
-) {
-  for event in network_events.iter() {
-    let ClientEvent::Receive(data) = &event.0 else {
-      continue
-    };
-    if !event.is_message_of_type::<S_SERVER_HELLO>() {
-      continue
-    }
-    let Ok(parsed_message) = postcard::from_bytes(data) else {
-      log::error!("Malformed message");
-      continue
-    };
-    let ServerToClientMessage::ServerHello { init: _ } = parsed_message else {
-      unreachable!()
-    };
-    //TODO handle init data
-    *join_state = ClientJoinState::Joined;
-    log::info!("Joined the server!");
-    return;
-  }
-}
 
 fn handle_disconnect(
   network_events: View<NetworkEvent>,

kubi/src/networking/handshake.rs

@@ -0,0 +1,56 @@
+use shipyard::{UniqueViewMut, View, IntoIter};
+use uflow::{client::Event as ClientEvent, SendMode};
+use kubi_shared::networking::{
+  messages::{ClientToServerMessage, ServerToClientMessage, S_SERVER_HELLO},
+  state::ClientJoinState, 
+  channels::CHANNEL_AUTH,
+};
+use super::{UdpClient, NetworkEvent};
+
+pub fn set_client_join_state_to_connected(
+  mut join_state: UniqueViewMut<ClientJoinState>
+) {
+  log::info!("Setting ClientJoinState");
+  *join_state = ClientJoinState::Connected;
+}
+
+pub fn say_hello(
+  mut client: UniqueViewMut<UdpClient>,
+) {
+  log::info!("Authenticating");
+  client.0.send(
+    postcard::to_allocvec(
+      &ClientToServerMessage::ClientHello {
+        username: "Sbeve".into(),
+        password: None
+      }
+    ).unwrap().into_boxed_slice(),
+    CHANNEL_AUTH,
+    SendMode::Reliable
+  );
+}
+
+pub fn check_server_hello_response(
+  network_events: View<NetworkEvent>,
+  mut join_state: UniqueViewMut<ClientJoinState>
+) {
+  for event in network_events.iter() {
+    let ClientEvent::Receive(data) = &event.0 else {
+      continue
+    };
+    if !event.is_message_of_type::<S_SERVER_HELLO>() {
+      continue
+    }
+    let Ok(parsed_message) = postcard::from_bytes(data) else {
+      log::error!("Malformed message");
+      continue
+    };
+    let ServerToClientMessage::ServerHello { init: _ } = parsed_message else {
+      unreachable!()
+    };
+    //TODO handle init data
+    *join_state = ClientJoinState::Joined;
+    log::info!("Joined the server!");
+    return;
+  }
+}

kubi/src/networking/player.rs

@@ -8,6 +8,10 @@ use kubi_shared::networking::{
 use crate::events::player_actions::PlayerActionEvent;
 use super::{UdpClient, NetworkEvent};
 
+pub fn add_net_player() {
+  //TODO
+}
+
 pub fn send_player_movement_events(
   actions: View<PlayerActionEvent>,
   mut client: UniqueViewMut<UdpClient>,
@@ -48,3 +52,10 @@ pub fn receive_player_movement_events(
     //TODO apply position to local player
   }
 }
+
+
+pub fn receive_connected_players(
+  network_events: View<NetworkEvent>,
+) {
+
+}