new proto

1 files changed, 7 insertions, 3 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index cc55488..6b2911f 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -11,7 +11,11 @@ use std::{
     },
     thread::spawn,
 };
-use weareshared::{packets::Packet, store::ResourceStore, tree::SceneTree};
+use weareshared::{
+    packets::{Packet, ReadWrite},
+    store::ResourceStore,
+    tree::SceneTree,
+};
 
 #[derive(Parser, Debug)]
 struct Args {
@@ -59,7 +63,7 @@ fn main() -> Result<()> {
 fn handle_conn_read(conn: usize, sock: TcpStream, state: Arc<Mutex<State>>) -> Result<()> {
     let mut sock = BufReader::new(sock);
     loop {
-        let packet = Packet::deserialize(&mut sock)?;
+        let packet = Packet::read(&mut sock)?;
         debug!("{conn} <- {packet:?}");
         state.lock().unwrap().handle_packet(conn, packet)?;
     }
@@ -68,7 +72,7 @@ fn handle_conn_write(conn: usize, sock: TcpStream, rx: Receiver<Packet>) -> Resu
     let mut sock = BufWriter::new(sock);
     for packet in rx {
         debug!("{conn} -> {packet:?}");
-        packet.serialize(&mut sock)?;
+        packet.write(&mut sock)?;
         sock.flush()?;
     }
     Ok(())