write_to Serializable trait for FmlHs

Author: iceiix

src/server/plugin_messages.rs

@@ -1,10 +1,11 @@
 
 use std::collections::HashMap;
 use std::io;
+use byteorder::WriteBytesExt;
 
 use crate::protocol::packet::play::serverbound::PluginMessageServerbound;
 use crate::protocol::packet::play::serverbound::PluginMessageServerbound_i16;
-use crate::protocol::{Serializable, VarInt, Error};
+use crate::protocol::{Serializable, Error};
 
 #[derive(Debug)]
 pub enum FmlHs<'a> {
@@ -70,29 +71,33 @@ impl<'a> Serializable for FmlHs<'a> {
 
 
     fn write_to<W: io::Write>(&self, buf: &mut W) -> Result<(), Error> {
-        unimplemented!()
-    }
-}
-
-impl<'a> FmlHs<'a> {
-    pub fn as_message(&'a self) -> Vec<u8> {
         match self {
             FmlHs::ClientHello { fml_protocol_version } => {
-                vec![1, *fml_protocol_version as u8]
+                buf.write_u8(1)?;
+                fml_protocol_version.write_to(buf)
             },
             FmlHs::ModList { mods } => {
-                let mut buf = vec![2];
-                let number_of_mods = VarInt(mods.len() as i32);
-                number_of_mods.write_to(&mut buf).unwrap();
-                // TODO: write mods
+                buf.write_u8(2)?;
+                Ok(())
 
-                buf
+                //let number_of_mods = VarInt(mods.len() as i32);
+                //number_of_mods.write_to(&mut buf).unwrap();
+                // TODO: write mods
             },
             _ => unimplemented!()
         }
     }
 }
 
+impl<'a> FmlHs<'a> {
+    // TODO: remove this wrapper and call write_to directly
+    pub fn as_message(&'a self) -> Vec<u8> {
+        let mut buf: Vec<u8> = vec![];
+        self.write_to(&mut buf).unwrap();
+        buf
+    }
+}
+
 pub struct Brand {
     pub brand: String,
 }