Send world name to client. Show in title.

kylepaulsen · Apr 17, 2021 · 310aef9 · 310aef9
1 parent 45abc5c
commit 310aef9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/WebMap/Config.cs b/WebMap/Config.cs
@@ -19,6 +19,8 @@ static class WebMapConfig {
         public static double PLAYER_UPDATE_INTERVAL = 0.5;
         public static bool CACHE_SERVER_FILES = false;
 
+        public static string WORLD_NAME = "";
+
         public static TValue GetValueOrDefault<TKey, TValue>(
             this IDictionary<TKey, TValue> dictionary, TKey key, TValue defaultValue) {
 
@@ -97,11 +99,28 @@ public static void readConfigFile(string configFile) {
             }
         }
 
+        public static string getWorldName() {
+            if (WORLD_NAME != "") {
+                return WORLD_NAME;
+            }
+            string[] arguments = Environment.GetCommandLineArgs();
+            var worldName = "";
+            for (var t = 0; t < arguments.Length; t++) {
+                if (arguments[t] == "-world") {
+                    worldName = arguments[t + 1];
+                    break;
+                }
+            }
+            WORLD_NAME = worldName;
+            return worldName;
+        }
+
         public static string makeClientConfigJSON() {
             var sb = new StringBuilder();
             sb.Length = 0;
 
             sb.Append("{");
+            sb.Append($"\"world_name\":\"{getWorldName()}\",");
             sb.Append($"\"texture_size\":{TEXTURE_SIZE},");
             sb.Append($"\"pixel_size\":{PIXEL_SIZE},");
             sb.Append($"\"update_interval\":{PLAYER_UPDATE_INTERVAL},");

diff --git a/WebMap/WebMap.cs b/WebMap/WebMap.cs
@@ -35,18 +35,9 @@ public void Awake() {
             var pluginPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             WebMapConfig.readConfigFile(Path.Combine(pluginPath, "config.json"));
 
-            string[] arguments = Environment.GetCommandLineArgs();
-            var worldName = "";
-            for (var t = 0; t < arguments.Length; t++) {
-                if (arguments[t] == "-world") {
-                    worldName = arguments[t + 1];
-                    break;
-                }
-            }
-
             var mapDataPath = Path.Combine(pluginPath, "map_data");
             Directory.CreateDirectory(mapDataPath);
-            worldDataPath = Path.Combine(mapDataPath, worldName);
+            worldDataPath = Path.Combine(mapDataPath, WebMapConfig.getWorldName());
             Directory.CreateDirectory(worldDataPath);
 
             mapDataServer = new MapDataServer();

diff --git a/WebMap/web-src/index.js b/WebMap/web-src/index.js
@@ -32,6 +32,8 @@ const fetchConfig = fetch('/config').then(res => res.json()).then(config => {
 	constants.PIXEL_SIZE = config.pixel_size || 12;
 	constants.EXPLORE_RADIUS = config.explore_radius || 100;
 	constants.UPDATE_INTERVAL = config.update_interval || 0.5;
+	constants.WORLD_NAME = config.world_name;
+	document.title = `Valheim WebMap - ${constants.WORLD_NAME}`;
 	createStyleSheet(`.mapIcon.player {
 		transition: top ${constants.UPDATE_INTERVAL}s linear, left ${constants.UPDATE_INTERVAL}s linear;
 	}`);