add configureable server info

.gitignore

@@ -31,5 +31,6 @@
 # Veloren
 *.rar
 *.log
+*.ron
 run.sh
 screenshots

server-cli/src/main.rs

@@ -39,6 +39,6 @@ fn main() {
         // Wait for the next tick.
         clock.tick(Duration::from_millis(1000 / TPS));
     }
-    
+
     //settings.save_to_file().expect("failed to save the settings!");
 }

server/src/lib.rs

@@ -100,12 +100,11 @@ impl Server {
             chunk_rx,
             pending_chunks: HashSet::new(),
 
-            server_settings: settings,
             server_info: ServerInfo {
-                // TODO: get from settings
+                name: settings.server_name.clone(),
-                name: "Server name".to_owned(),
+                description: settings.server_description.clone(),
-                description: "This is the best Veloren server.".to_owned(),
             },
+            server_settings: settings,
         };
 
         Ok(this)

server/src/settings.rs

@@ -1,5 +1,5 @@
 use serde_derive::{Deserialize, Serialize};
-use std::{fs, io::prelude::*, path::PathBuf, net::SocketAddr};
+use std::{fs, io::prelude::*, net::SocketAddr, path::PathBuf};
 
 /// `ControlSettings` contains keybindings.
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -9,7 +9,8 @@ pub struct ServerSettings {
     //pub max_players: u64,
     pub world_seed: u32,
     //pub pvp_enabled: bool,
-    //pub serverinfo: whatever
+    pub server_name: String,
+    pub server_description: String,
     //pub login_server: whatever
 }
 
@@ -18,9 +19,11 @@ impl Default for ServerSettings {
         Self {
             address: SocketAddr::from(([0; 4], 59003)),
             world_seed: 1337,
+            server_name: "Server name".to_owned(),
+            server_description: "This is the best Veloren server.".to_owned(),
         }
     }
-} 
+}
 
 impl ServerSettings {
     pub fn load() -> Self {
@@ -49,4 +52,4 @@ impl ServerSettings {
     fn get_settings_path() -> PathBuf {
         PathBuf::from(r"settings.ron")
     }
-}
+}

voxygen/src/singleplayer.rs

@@ -36,7 +36,8 @@ impl Singleplayer {
         ));
 
         // Create server
-        let server = Server::bind(sock.clone(), ServerSettings::default()).expect("Failed to create server instance!");
+        let server = Server::bind(sock.clone(), ServerSettings::default())
+            .expect("Failed to create server instance!");
 
         let server = match client {
             Some(client) => server.with_thread_pool(client.thread_pool().clone()),