Add from_message FML|HS parsing in plugin_messages::FmlHs

Author: iceiix

src/server/mod.rs

@@ -684,29 +684,8 @@ impl Server {
             // TODO: "REGISTER" => 
             // TODO: "UNREGISTER" =>
             "FML|HS" => {
-                // https://wiki.vg/Minecraft_Forge_Handshake
-                let discriminator = data[0];
-
-                match discriminator {
-                    0 => {
-                        // ServerHello
-                        let fml_protocol_version = data[1];
-                        let dimension = if fml_protocol_version > 1 {
-                            use byteorder::{BigEndian, ReadBytesExt};
-                            let dimension = (&data[2..2 + 4]).read_u32::<BigEndian>().unwrap();
-                            Some(dimension)
-                        } else {
-                            None
-                        };
-
-                        println!("FML|HS ServerHello: fml_protocol_version={}, dimension={:?}", fml_protocol_version, dimension);
-
-                        // TODO: send reply
-                    },
-                    _ => {
-                        println!("Unhandled FML|HS packet: discriminator={}", discriminator);
-                    }
-                }
+                let msg = plugin_messages::FmlHs::from_message(&data);
+                println!("FML|HS msg={:?}", msg);
             }
             _ => ()
         }

src/server/plugin_messages.rs

@@ -5,10 +5,11 @@ use crate::protocol::Serializable;
 use crate::protocol::packet::play::serverbound::PluginMessageServerbound;
 use crate::protocol::packet::play::serverbound::PluginMessageServerbound_i16;
 
+#[derive(Debug)]
 pub enum FmlHs<'a> {
     ServerHello {
         fml_protocol_version: i8,
-        override_dimension: i32,
+        override_dimension: Option<i32>,
     },
     ClientHello {
         fml_protocol_version: i8,
@@ -29,6 +30,39 @@ pub enum FmlHs<'a> {
     HandshakeReset,
 }
 
+impl<'a> FmlHs<'a> {
+    pub fn from_message(data: &[u8]) -> FmlHs<'a> {
+        // https://wiki.vg/Minecraft_Forge_Handshake
+        let discriminator = data[0];
+
+        match discriminator {
+            0 => {
+                // ServerHello
+                let fml_protocol_version = data[1] as i8;
+                let override_dimension = if fml_protocol_version > 1 {
+                    use byteorder::{BigEndian, ReadBytesExt};
+                    let dimension = (&data[2..2 + 4]).read_i32::<BigEndian>().unwrap();
+                    Some(dimension)
+                } else {
+                    None
+                };
+
+                println!("FML|HS ServerHello: fml_protocol_version={}, override_dimension={:?}", fml_protocol_version, override_dimension);
+
+                FmlHs::ServerHello {
+                    fml_protocol_version,
+                    override_dimension,
+                }
+
+                // TODO: send reply
+            },
+            _ => {
+                panic!("Unhandled FML|HS packet: discriminator={}", discriminator);
+            }
+        }
+    }
+}
+
 pub struct Brand {
     pub brand: String,
 }