Remove as_message(), add write_fmlhs_plugin_message()

Author: iceiix

src/server/mod.rs

@@ -692,9 +692,9 @@ impl Server {
                         println!("Received FML|HS ServerHello {} {:?}", fml_protocol_version, override_dimension);
 
                         self.write_plugin_message("REGISTER", "FML|HS\0FML\0FML|MP\0FML\0FORGE".as_bytes());
-                        self.write_plugin_message("FML|HS", &plugin_messages::FmlHs::ClientHello { fml_protocol_version }.as_message());
+                        self.write_fmlhs_plugin_message(&plugin_messages::FmlHs::ClientHello { fml_protocol_version });
                         let mods: crate::protocol::LenPrefixed<crate::protocol::VarInt, plugin_messages::Mod> = Default::default();
-                        self.write_plugin_message("FML|HS", &plugin_messages::FmlHs::ModList { mods }.as_message());
+                        self.write_fmlhs_plugin_message(&plugin_messages::FmlHs::ModList { mods });
                     },
                     _ => (),
                 }
@@ -703,6 +703,15 @@ impl Server {
         }
     }
 
+    fn write_fmlhs_plugin_message(&mut self, msg: &plugin_messages::FmlHs) {
+        use crate::protocol::Serializable;
+
+        let mut buf: Vec<u8> = vec![];
+        msg.write_to(&mut buf).unwrap();
+
+        self.write_plugin_message("FML|HS", &buf);
+    }
+
     fn write_plugin_message(&mut self, channel: &str, data: &[u8]) {
         println!("Sending plugin message: channel={}, data={:?}", channel, data);
         if self.protocol_version >= 47 {

src/server/plugin_messages.rs

@@ -103,15 +103,6 @@ impl<'a> Serializable for FmlHs<'a> {
     }
 }
 
-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,
 }