Merge pull request #48 from runeberry/jb-crossplay

Add support for -crossplay flag
runeberry · Nov 10, 2022 · 04ea66d · 04ea66d
2 parents e9e16f2 + 10201f2
commit 04ea66d
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 230 deletions.
diff --git a/ValheimServerGUI/Forms/MainWindow.Designer.cs b/ValheimServerGUI/Forms/MainWindow.Designer.cs
diff --git a/ValheimServerGUI/Forms/MainWindow.cs b/ValheimServerGUI/Forms/MainWindow.cs
@@ -687,6 +687,7 @@ private void StartServer()
                 NewWorld = newWorld,
                 Public = this.CommunityServerField.Value,
                 Port = this.ServerPortField.Value,
+                Crossplay = this.ServerCrossplayField.Value,
             };
 
             try
@@ -712,6 +713,7 @@ private void StartServer()
             prefs.ServerPassword = this.ServerPasswordField.Value;
             prefs.ServerWorldName = worldName;
             prefs.ServerPublic = this.CommunityServerField.Value;
+            prefs.ServerCrossplay = this.ServerCrossplayField.Value;
 
             this.UserPrefsProvider.SavePreferences(prefs);
         }
@@ -927,6 +929,7 @@ private void RefreshFormStateForServer()
             this.ServerPasswordField.Enabled = allowServerChanges;
             this.WorldSelectGroupBox.Enabled = allowServerChanges;
             this.CommunityServerField.Enabled = allowServerChanges;
+            this.ServerCrossplayField.Enabled = allowServerChanges;
 
             this.ButtonStartServer.Enabled = this.Server.CanStart;
             this.ButtonRestartServer.Enabled = this.Server.CanRestart;
@@ -961,6 +964,7 @@ private void LoadFormValuesFromUserPrefs(UserPreferences prefs)
             this.ServerPortField.Value = prefs.ServerPort;
             this.ServerPasswordField.Value = prefs.ServerPassword;
             this.CommunityServerField.Value = prefs.ServerPublic;
+            this.ServerCrossplayField.Value = prefs.ServerCrossplay;
             this.ShowPasswordField.Value = false;
 
             this.WorldSelectExistingNameField.Value = prefs.ServerWorldName;

diff --git a/ValheimServerGUI/Forms/MainWindow.resx b/ValheimServerGUI/Forms/MainWindow.resx
diff --git a/ValheimServerGUI/Game/UserPreferences.cs b/ValheimServerGUI/Game/UserPreferences.cs
@@ -35,6 +35,8 @@ public class UserPreferences
 
         public int ServerPort { get; set; } = DefaultServerPort;
 
+        public bool ServerCrossplay { get; set; }
+
         public static UserPreferences FromFile(UserPreferencesFile file)
         {
             var prefs = new UserPreferences();
@@ -49,7 +51,7 @@ public static UserPreferences FromFile(UserPreferencesFile file)
             prefs.StartMinimized = file.StartMinimized ?? prefs.StartMinimized;
             prefs.CheckServerRunning = file.CheckServerRunning ?? prefs.CheckServerRunning;
             prefs.CheckForUpdates = file.CheckForUpdates ?? prefs.CheckForUpdates;
-            
+
             var server = file.Servers?.FirstOrDefault();
 
             if (server != null)
@@ -59,6 +61,7 @@ public static UserPreferences FromFile(UserPreferencesFile file)
                 prefs.ServerWorldName = server.WorldName ?? prefs.ServerWorldName;
                 prefs.ServerPublic = server.CommunityServer ?? prefs.ServerPublic;
                 prefs.ServerPort = server.Port ?? prefs.ServerPort;
+                prefs.ServerCrossplay = server.Crossplay ?? prefs.ServerCrossplay;
             }
 
             return prefs;
@@ -85,6 +88,7 @@ public UserPreferencesFile ToFile()
                         WorldName = this.ServerWorldName,
                         CommunityServer = this.ServerPublic,
                         Port = this.ServerPort,
+                        Crossplay = this.ServerCrossplay,
                     }
                 }
             };

diff --git a/ValheimServerGUI/Game/UserPreferencesFile.cs b/ValheimServerGUI/Game/UserPreferencesFile.cs
@@ -52,6 +52,9 @@ public class ServerPreferencesFile
 
             [JsonProperty("port")]
             public int? Port { get; set; }
+
+            [JsonProperty("crossplay")]
+            public bool? Crossplay { get; set; }
         }
     }
 }
diff --git a/ValheimServerGUI/Game/ValheimServer.cs b/ValheimServerGUI/Game/ValheimServer.cs
@@ -19,7 +19,7 @@ public class ValheimServer : IDisposable
         /// </summary>        
         public IValheimServerOptions Options { get; private set; } = new ValheimServerOptions();
 
-        public ServerStatus Status 
+        public ServerStatus Status
         {
             get => this._status;
             private set
@@ -46,9 +46,9 @@ private set
         private readonly IPlayerDataRepository PlayerDataRepository;
         private readonly ValheimServerLogger ServerLogger;
         private readonly IEventLogger ApplicationLogger;
-        
+
         public ValheimServer(
-            IProcessProvider processProvider, 
+            IProcessProvider processProvider,
             IValheimFileProvider fileProvider,
             IPlayerDataRepository playerDataRepository,
             ValheimServerLogger serverLogger,
@@ -71,18 +71,18 @@ public ValheimServer(
         private void InitializeLogBasedActions()
         {
             LogBasedActions.Add(@"Game server connected", this.OnServerConnected);
-            
+
             LogBasedActions.Add(@"Got connection SteamID (\d+?)\D*?$", this.OnPlayerConnecting);
             LogBasedActions.Add(@"Got character ZDOID from (.+?) : ([\d-]+?)\D*?:(\d+?)\D*?$", this.OnPlayerConnected);
             LogBasedActions.Add(@"Peer (\d+?) has wrong password", this.OnPlayerDisconnecting);
             LogBasedActions.Add(@"Closing socket (\d+?)\D*?$", this.OnPlayerDisconnected); // Technically "disconnecting" but it's the best terminator I can find
-            
+
             LogBasedActions.Add(@"World saved \(\s*?([[\d\.]+?)\s*?ms\s*?\)\s*?$", this.OnWorldSaved);
         }
 
         private void InitializeStatusBasedActions()
         {
-            this.StatusChanged += BuildStatusHandler(ServerStatus.Stopped, () => 
+            this.StatusChanged += BuildStatusHandler(ServerStatus.Stopped, () =>
             {
                 if (this.IsRestarting)
                 {
@@ -126,6 +126,12 @@ public void Start(IValheimServerOptions options)
             var saveDataFolder = this.FileProvider.SaveDataFolder.FullName;
             var publicFlag = options.Public ? 1 : 0;
             var processArgs = @$"-nographics -batchmode -name ""{options.Name}"" -port {options.Port} -world ""{options.WorldName}"" -password ""{options.Password}"" -public {publicFlag} -savedir ""{saveDataFolder}""";
+
+            if (options.Crossplay)
+            {
+                processArgs += " -crossplay";
+            }
+
             var process = this.ProcessProvider.AddBackgroundProcess(ProcessKeys.ValheimServer, exePath, processArgs);
 
             process.StartInfo.EnvironmentVariables.Add("SteamAppId", Resources.ValheimSteamAppId);

diff --git a/ValheimServerGUI/Game/ValheimServerOptions.cs b/ValheimServerGUI/Game/ValheimServerOptions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 
 namespace ValheimServerGUI.Game
 {
@@ -17,6 +16,8 @@ public class ValheimServerOptions : IValheimServerOptions
 
         public int Port { get; set; }
 
+        public bool Crossplay { get; set; }
+
         public void Validate()
         {
             // Ensure all required fields exist
@@ -55,5 +56,7 @@ public interface IValheimServerOptions
         bool Public { get; }
 
         int Port { get; set; }
+
+        bool Crossplay { get; }
     }
 }
diff --git a/ValheimServerGUI/ValheimServerGUI.csproj b/ValheimServerGUI/ValheimServerGUI.csproj
@@ -10,7 +10,7 @@
     <Description>A simple user interface for running Valheim Dedicated Server on Windows.</Description>
     <Copyright>2022</Copyright>
     <PackageLicenseExpression>GNU GPLv3</PackageLicenseExpression>
-    <Version>2.0.0-rc.2</Version>
+    <Version>2.0.0-rc.3</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <SignAssembly>true</SignAssembly>