progress, ?

3 files changed, 26 insertions, 42 deletions

diff --git a/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs b/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs
index 30b1403c..f19ab024 100644
--- a/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs
+++ b/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs
@@ -4,10 +4,7 @@ use serde::{Deserialize, Deserializer};
 use serde_json::Value;
 use tokio::io::BufReader;
 
-use crate::{
-    mc_buf,
-    packets::{Packet, PacketTrait},
-};
+use crate::{mc_buf, packets::Packet};
 
 use super::StatusPacket;
 
@@ -39,23 +36,24 @@ pub struct ClientboundStatusResponsePacket {
     pub version: Version,
 }
 
-#[async_trait]
-impl PacketTrait for ClientboundStatusResponsePacket {
-    fn get(self) -> StatusPacket {
+impl ClientboundStatusResponsePacket {
+    pub fn get(self) -> StatusPacket {
         StatusPacket::ClientboundStatusResponsePacket(self)
     }
 
-    fn write(&self, _buf: &mut Vec<u8>) {}
+    pub fn write(&self, _buf: &mut Vec<u8>) {}
 
-    async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
+    pub async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
         buf: &mut BufReader<T>,
-    ) -> Result<Packet, String> {
+    ) -> Result<StatusPacket, String> {
         let status_string = mc_buf::read_utf(buf).await?;
         let status_json: Value =
             serde_json::from_str(status_string.as_str()).expect("Server status isn't valid JSON");
 
-        Ok(ClientboundStatusResponsePacket::deserialize(status_json)
+        let packet = ClientboundStatusResponsePacket::deserialize(status_json)
             .map_err(|e| e.to_string())?
-            .get())
+            .get();
+
+        Ok(packet)
     }
 }
diff --git a/minecraft-protocol/src/packets/status/mod.rs b/minecraft-protocol/src/packets/status/mod.rs
index 7e327ca7..aa302e58 100644
--- a/minecraft-protocol/src/packets/status/mod.rs
+++ b/minecraft-protocol/src/packets/status/mod.rs
@@ -6,10 +6,13 @@ use tokio::io::BufReader;
 
 use crate::connect::PacketFlow;
 
-use super::{ConnectionProtocol, PacketTrait, ProtocolPacket};
+use super::{ProtocolPacket};
 
 #[derive(Clone, Debug)]
-pub enum StatusPacket {
+pub enum StatusPacket
+where
+    Self: Sized,
+{
     ServerboundStatusRequestPacket(
         serverbound_status_request_packet::ServerboundStatusRequestPacket,
     ),
@@ -18,22 +21,8 @@ pub enum StatusPacket {
     ),
 }
 
-// #[async_trait]
-// impl ProtocolPacket for StatusPacket {
-impl StatusPacket {
-    fn get_inner(self) -> impl PacketTrait {
-        match self {
-            StatusPacket::ServerboundStatusRequestPacket(packet) => packet,
-            StatusPacket::ClientboundStatusResponsePacket(packet) => packet,
-        }
-    }
-    // fn get_inner(&self) -> StatusPacket {
-    //     match self {
-    //         StatusPacket::ServerboundStatusRequestPacket(packet) => packet,
-    //         StatusPacket::ClientboundStatusResponsePacket(packet) => packet,
-    //     }
-    // }
-
+#[async_trait]
+impl ProtocolPacket for StatusPacket {
     fn id(&self) -> u32 {
         match self {
             StatusPacket::ServerboundStatusRequestPacket(_packet) => 0x00,
@@ -49,14 +38,11 @@ impl StatusPacket {
     }
 
     /// Read a packet by its id, ConnectionProtocol, and flow
-    async fn read<
-        T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send,
-        P: ProtocolPacket,
-    >(
+    async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
         id: u32,
         flow: &PacketFlow,
         buf: &mut BufReader<T>,
-    ) -> Result<P, String>
+    ) -> Result<StatusPacket, String>
     where
         Self: Sized,
     {
diff --git a/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs b/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs
index 066131cc..8b29391a 100644
--- a/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs
+++ b/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs
@@ -2,25 +2,25 @@ use async_trait::async_trait;
 use std::hash::Hash;
 use tokio::io::BufReader;
 
-use crate::packets::{Packet, PacketTrait, ProtocolPacket};
+use crate::packets::{Packet, ProtocolPacket};
 
 use super::StatusPacket;
 
 #[derive(Hash, Clone, Debug)]
 pub struct ServerboundStatusRequestPacket {}
 
-#[async_trait]
-impl PacketTrait for ServerboundStatusRequestPacket {
-    fn get(self) -> StatusPacket {
+impl ServerboundStatusRequestPacket {
+    pub fn get(self) -> StatusPacket {
         StatusPacket::ServerboundStatusRequestPacket(self)
     }
-    fn write(&self, _buf: &mut Vec<u8>) {
+
+    pub fn write(&self, _buf: &mut Vec<u8>) {
         panic!("ServerboundStatusRequestPacket::write not implemented")
     }
 
-    async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
+    pub async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
         _buf: &mut BufReader<T>,
-    ) -> Result<Packet, String> {
+    ) -> Result<StatusPacket, String> {
         Err("ServerboundStatusRequestPacket::read not implemented".to_string())
     }
 }