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, ?

---
 .../status/clientbound_status_response_packet.rs   | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

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

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)
     }
 }
-- 
cgit v1.2.3