Merge branch 'main' into 1.19.1

2 files changed, 31 insertions, 0 deletions

diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml
index 192d3405..5b85f6c2 100755
--- a/azalea-chat/Cargo.toml
+++ b/azalea-chat/Cargo.toml
@@ -6,6 +6,7 @@ version = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+azalea-buf = {path = "../azalea-buf"}
 azalea-language = {path = "../azalea-language"}
 lazy_static = "1.4.0"
 serde = "^1.0.130"
diff --git a/azalea-chat/src/component.rs b/azalea-chat/src/component.rs
index 36709cc0..d2f687d4 100755
--- a/azalea-chat/src/component.rs
+++ b/azalea-chat/src/component.rs
@@ -1,3 +1,6 @@
+use std::io::{Read, Write};
+
+use azalea_buf::{McBufReadable, McBufWritable};
 use serde::{de, Deserialize, Deserializer};
 
 use crate::{
@@ -264,3 +267,30 @@ impl<'de> Deserialize<'de> for Component {
         Ok(component)
     }
 }
+
+impl McBufReadable for Component {
+    fn read_from(buf: &mut impl Read) -> Result<Self, String> {
+        let string = String::read_from(buf)?;
+        let json: serde_json::Value = serde_json::from_str(string.as_str())
+            .map_err(|_| "Component isn't valid JSON".to_string())?;
+        let component = Component::deserialize(json).map_err(|e| e.to_string())?;
+        Ok(component)
+    }
+}
+
+impl McBufWritable for Component {
+    // async fn read_from(buf: &mut impl Read) -> Result<Self, String>
+    // where
+    //     R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    // {
+    //     let string = buf.read_utf().await?;
+    //     let json: serde_json::Value = serde_json::from_str(string.as_str())
+    //         .map_err(|e| "Component isn't valid JSON".to_string())?;
+    //     let component = Component::deserialize(json).map_err(|e| e.to_string())?;
+    //     Ok(component)
+    // }
+    fn write_into(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
+        // component doesn't have serialize implemented yet
+        todo!()
+    }
+}