Parse modinfo.modList from server ping packet

Author: iceiix

src/protocol/mod.rs

@@ -996,6 +996,29 @@ impl Conn {
         let version = val.get("version").ok_or(invalid_status())?;
         let players = val.get("players").ok_or(invalid_status())?;
 
+        // TODO: Option<> to distinguish non-modded, vs no mods?
+        let mut forge_mods: std::vec::Vec<crate::server::plugin_messages::ForgeMod> = vec![];
+        if let Some(modinfo) = val.get("modinfo") {
+            if let Some(modinfo_type) = modinfo.get("type") {
+                if modinfo_type == "FML" {
+                    if let Some(modlist) = modinfo.get("modList") {
+                        if let Value::Array(items) = modlist {
+                            for item in items {
+                                if let Value::Object(obj) = item {
+                                    let modid = obj.get("modid").unwrap().as_str().unwrap().to_string();
+                                    let version = obj.get("version").unwrap().as_str().unwrap().to_string();
+
+                                    forge_mods.push(crate::server::plugin_messages::ForgeMod { modid, version });
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    panic!("Unrecognized modinfo type in server ping response: {} in {}", modinfo_type, modinfo);
+                }
+            }
+        }
+
         Ok((Status {
             version: StatusVersion {
                 name: version.get("name").and_then(Value::as_str).ok_or(invalid_status())?
@@ -1016,6 +1039,7 @@ impl Conn {
             description: format::Component::from_value(val.get("description")
                                                                .ok_or(invalid_status())?),
             favicon: val.get("favicon").and_then(Value::as_str).map(|v| v.to_owned()),
+            forge_mods,
         },
             ping))
     }
@@ -1027,6 +1051,7 @@ pub struct Status {
     pub players: StatusPlayers,
     pub description: format::Component,
     pub favicon: Option<String>,
+    pub forge_mods: Vec<crate::server::plugin_messages::ForgeMod>,
 }
 
 #[derive(Debug)]

src/screen/server_list.rs

@@ -78,6 +78,7 @@ struct PingInfo {
     max: i32,
     protocol_version: i32,
     protocol_name: String,
+    forge_mods: Vec<crate::server::plugin_messages::ForgeMod>,
     favicon: Option<image::DynamicImage>,
 }
 
@@ -283,6 +284,7 @@ impl ServerList {
                             max: res.0.players.max,
                             protocol_version: res.0.version.protocol,
                             protocol_name: res.0.version.name,
+                            forge_mods: res.0.forge_mods,
                             favicon,
                         }));
                     }
@@ -299,6 +301,7 @@ impl ServerList {
                             max: 0,
                             protocol_version: 0,
                             protocol_name: "".to_owned(),
+                            forge_mods: vec![],
                             favicon: None,
                         });
                     }
@@ -497,6 +500,9 @@ impl super::Screen for ServerList {
 
                                 // TODO: store in memory instead of disk? but where?
                                 self.server_protocol_versions.insert(res.address, res.protocol_version);
+                                if res.forge_mods.len() > 0 {
+                                    println!("Forge mods installed on server: {:?}", res.forge_mods);
+                                }
                                 let mut out = fs::File::create("server_versions.json").unwrap();
                                 serde_json::to_writer_pretty(&mut out, &self.server_protocol_versions).unwrap();
                             }