Merge pull request #76 from runeberry/jb-cli-options

Add world modifier settings

ValheimServerGUI.Tools/DictionaryExtensions.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ValheimServerGUI.Tools
+{
+    public static class DictionaryExtensions
+    {
+        /// <summary>
+        /// Returns a new dictionary where values become keys and vice-versa.
+        /// Probably throws an exception if any values are duplicated (i.e. would create a duplicate key).
+        /// </summary>
+        public static Dictionary<TValue, TKey> Invert<TKey, TValue>(this Dictionary<TKey, TValue> dictionary)
+        {
+            return dictionary.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
+        }
+    }
+}

ValheimServerGUI/Controls/SettingsButton.cs

@@ -0,0 +1,33 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace ValheimServerGUI.Controls
+{
+    public partial class SettingsButton : UserControl
+    {
+        [Browsable(false)]
+        public Action ClickFunction { get; set; }
+
+        public string HelpText
+        {
+            get => IconButton.HelpText;
+            set => IconButton.HelpText = value;
+        }
+
+        public SettingsButton()
+        {
+            InitializeComponent();
+
+            IconButton.IconClicked = OnIconClicked;
+        }
+
+        private bool OnIconClicked()
+        {
+            if (ClickFunction == null) return false;
+
+            ClickFunction.Invoke();
+            return true;
+        }
+    }
+}

ValheimServerGUI/Controls/SettingsButton.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ValheimServerGUI/Forms/MainWindow.cs

@@ -62,6 +62,7 @@ public string CurrentProfile
         private readonly IFormProvider FormProvider;
         private readonly IUserPreferencesProvider UserPrefsProvider;
         private readonly IServerPreferencesProvider ServerPrefsProvider;
+        private readonly IWorldPreferencesProvider WorldPrefsProvider;
         private readonly IPlayerDataRepository PlayerDataProvider;
         private readonly ValheimServer Server;
         private readonly IApplicationLogger Logger;
@@ -72,6 +73,7 @@ public MainWindow(
             IFormProvider formProvider,
             IUserPreferencesProvider userPrefsProvider,
             IServerPreferencesProvider serverPrefsProvider,
+            IWorldPreferencesProvider worldPrefsProvider,
             IPlayerDataRepository playerDataProvider,
             ValheimServer server,
             IApplicationLogger appLogger,
@@ -84,6 +86,7 @@ public MainWindow(
             FormProvider = formProvider;
             UserPrefsProvider = userPrefsProvider;
             ServerPrefsProvider = serverPrefsProvider;
+            WorldPrefsProvider = worldPrefsProvider;
             PlayerDataProvider = playerDataProvider;
             Server = server;
             Logger = appLogger;
@@ -170,6 +173,7 @@ private void InitializeFormEvents()
             LinkCharacterNamesHelp.Click += LinkCharacterNamesHelp_Click;
             ButtonRemovePlayer.Click += ButtonRemovePlayer_Click;
             CopyButtonServerPassword.CopyFunction = () => ServerPasswordField.Value;
+            WorldsListSettingsButton.ClickFunction = WorldsListSettingsButton_Click;
             WorldsListRefreshButton.RefreshFunction = WorldsListRefreshButton_Click;
             WorldsFolderOpenButton.PathFunction = () => GetServerOptionsFromFormState().SaveDataFolderPath;
             CopyButtonExternalIpAddress.CopyFunction = () => LabelExternalIpAddress.Value;
@@ -657,6 +661,44 @@ private void TrayContextMenuServerName_Click(object sender, EventArgs e)
             RefocusWindow();
         }
 
+        private void WorldsListSettingsButton_Click()
+        {
+            string worldName;
+
+            if (WorldSelectRadioNew.Value)
+            {
+                worldName = WorldSelectNewNameField.Value;
+
+                if (string.IsNullOrWhiteSpace(worldName))
+                {
+                    MessageBox.Show(
+                        "Please enter a new world name before changing modifier settings.",
+                        "World Name Missing",
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Error);
+                    return;
+                }
+            }
+            else
+            {
+                worldName = WorldSelectExistingNameField.Value;
+
+                if (string.IsNullOrWhiteSpace(worldName))
+                {
+                    MessageBox.Show(
+                        "Unable to change modifier settings. No world is selected.",
+                        "World Name Missing",
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Error);
+                    return;
+                }
+            }
+
+            var form = FormProvider.GetForm<WorldPreferencesForm>();
+            form.SetWorld(worldName);
+            form.ShowDialog();
+        }
+
         private void WorldsListRefreshButton_Click()
         {
             RefreshWorldSelect();
@@ -1128,6 +1170,26 @@ private ValheimServerOptions GetServerOptionsFromFormState()
                 LogMessageHandler = this.BuildActionHandler<string>(OnServerLogReceived),
             };
 
+            // If a world is selected, load preferences for that world
+            var worldName = serverPrefs.WorldName;
+            if (!string.IsNullOrWhiteSpace(worldName))
+            {
+                var worldPrefs = WorldPrefsProvider.LoadPreferences(worldName);
+                if (worldPrefs != null)
+                {
+                    if (!string.IsNullOrEmpty(worldPrefs.Preset))
+                    {
+                        options.WorldPreset = worldPrefs.Preset;
+                    }
+                    else
+                    {
+                        options.WorldModifiers = worldPrefs.Modifiers;
+                    }
+
+                    options.WorldKeys = worldPrefs.Keys;
+                }
+            }
+
             return options;
         }