From 0d6e4179e6cc16594a4be3ecd62d89411115f319 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Tue, 14 Dec 2021 23:03:26 -0600
Subject: progress, ?

---
 minecraft-protocol/src/packets/status/mod.rs | 32 ++++++++--------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'minecraft-protocol/src/packets/status/mod.rs')

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,
     {
-- 
cgit v1.2.3