From c1c301264eea27bff032d7600807938f04eeb3fa Mon Sep 17 00:00:00 2001
From: Razzmatazz <razz@badkarma.xyz>
Date: Sat, 6 Mar 2021 19:24:39 -0600
Subject: [PATCH] Raw server log now auto-refreshes by default.

---
 MainWindow.xaml             |   2 +-
 MainWindow.xaml.cs          |   6 +-
 ServerDetailsWindow.xaml    |  17 +++
 ServerDetailsWindow.xaml.cs |  47 ++++++-
 ServerLogWindow.xaml        |  32 ++++-
 ServerLogWindow.xaml.cs     | 136 ++++++++++++++++---
 ValheimServer.cs            | 253 ++++++++++++++++++++++--------------
 ValheimServerWarden.csproj  |  10 +-
 uMod.cs                     | 245 ++++++++++++++++++++++++++++++++++
 9 files changed, 616 insertions(+), 132 deletions(-)
 create mode 100644 uMod.cs

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 955852c..64e189a 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -67,7 +67,7 @@
                                     <Image Source="Resources/ListView_32x.png"/>
                                 </MenuItem.Icon>
                             </MenuItem>
-                            <MenuItem x:Name="serversMenuLog" Header="Server Log" Click="serversMenuLog_Click">
+                            <MenuItem x:Name="serversMenuLog" Header="Raw Server Log" Click="serversMenuLog_Click">
                                 <MenuItem.Icon>
                                     <Image Source="Resources/Log_32x.png"/>
                                 </MenuItem.Icon>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 98afdf2..1d74105 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1048,12 +1048,12 @@ private void ShowServerLog(ValheimServer server)
                     if (win.Server == server)
                     {
                         win.WindowState = WindowState.Normal;
-                        win.LoadLogText();
+                        //win.LoadLogText();
                         return;
                     }
                 }
                 ServerLogWindow window = new ServerLogWindow(server);
-                window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
                 this.serverLogWindows.Add(window);
                 window.Closed += ((object sender, EventArgs e) =>
                 {
@@ -1188,7 +1188,7 @@ private void menuLogSelectAll_Click(object sender, RoutedEventArgs e)
 
         private void menuLogCopy_Click(object sender, RoutedEventArgs e)
         {
-            txtLog.SelectAll();
+            Clipboard.SetText(txtLog.Selection.Text);
         }
 
         private void menuLogClear_Click(object sender, RoutedEventArgs e)
diff --git a/ServerDetailsWindow.xaml b/ServerDetailsWindow.xaml
index 0b965d0..462370d 100644
--- a/ServerDetailsWindow.xaml
+++ b/ServerDetailsWindow.xaml
@@ -356,6 +356,23 @@
                     <Button x:Name="btnSavePermittedList" Content="Save" Margin="0,10" HorizontalAlignment="Center" Grid.Row="2" Click="btnSavePermittedList_Click"/>
                 </Grid>
             </TabItem>
+            <TabItem x:Name="tabuMod" Header="uMod">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Button x:Name="btnuModUpdate" Content="Update" ToolTip="Update server, uMod, apps, and extensions via uMod" Margin="5" Grid.Row="0" Grid.Column="0" Click="btnuModUpdate_Click"/>
+                    <TextBlock TextWrapping="Wrap" Margin="5" Grid.Row="1" Grid.Column="0">
+                        This tab is visible because VSW detected you have uMod installed and you selected uMod for the server install method. uMod support is extremely experimental and may not work at all.<LineBreak/><LineBreak/>
+                        Because uMod does not have a command to check for updates, it is not currently possible to check for updates while a uMod server is running. But if you have the "Update on restart" option selected, 
+                        VSW will attempt to use uMod to update the server on scheduled restarts.
+                    </TextBlock>
+                </Grid>
+            </TabItem>
         </TabControl>
     </Grid>
 </Window>
diff --git a/ServerDetailsWindow.xaml.cs b/ServerDetailsWindow.xaml.cs
index fca4428..a355551 100644
--- a/ServerDetailsWindow.xaml.cs
+++ b/ServerDetailsWindow.xaml.cs
@@ -46,9 +46,13 @@ public ServerDetailsWindow(ValheimServer server)
             InitializeComponent();
             this._server = server;
             txtServerLog.Document.Blocks.Clear();
-            foreach (var i in Enum.GetValues(typeof(ValheimServer.ServerInstallMethod)))
+            foreach (var installmethod in Enum.GetValues(typeof(ValheimServer.ServerInstallMethod)))
             {
-                cmbServerType.Items.Add(Enum.GetName(typeof(ValheimServer.ServerInstallMethod), i));
+                cmbServerType.Items.Add(installmethod);
+            }
+            if (!uMod.Installed)
+            {
+                cmbServerType.Items.Remove(ValheimServer.ServerInstallMethod.uMod);
             }
             RefreshControls();
             attachServerEventHandlers();
@@ -123,6 +127,7 @@ public void RefreshControls()
                     //btnStop.Content = FindResource("StopGrey");
                     //btnStart.Content = FindResource("StartGrey");
                     btnConnect.Content = FindResource("ConnectGrey");
+                    btnuModUpdate.IsEnabled = false;
                     if (status == ValheimServer.ServerStatus.Running)
                     {
                         //btnStop.IsEnabled = true;
@@ -141,6 +146,7 @@ public void RefreshControls()
                         //btnStart.Content = FindResource("Start");
                         btnStart.Visibility = Visibility.Visible;
                         menuSteamCmdUpdate.Visibility = Visibility.Visible;
+                        btnuModUpdate.IsEnabled = true;
                     } 
                     else
                     {
@@ -149,10 +155,14 @@ public void RefreshControls()
                         {
                             btnWorking.ToolTip = "Starting...";
                         }
-                        else
+                        else if (status == ValheimServer.ServerStatus.Stopping)
                         {
                             btnWorking.ToolTip = "Stopping...";
                         }
+                        else if (status == ValheimServer.ServerStatus.Updating)
+                        {
+                            btnWorking.ToolTip = "Updating...";
+                        }
                         menuSteamCmdUpdate.Visibility = Visibility.Collapsed;
                     }
                     //btnLog.IsEnabled = (File.Exists(Server.LogRawName));
@@ -164,12 +174,26 @@ public void RefreshControls()
                         chkUpdateOnRestart.Visibility = Visibility.Visible;
                         gridAutoUpdate.Visibility = Visibility.Visible;
                     }
+                    else if (uMod.Installed && Server.InstallMethod == ValheimServer.ServerInstallMethod.uMod)
+                    {
+                        btnSteamCmd.Visibility = Visibility.Collapsed;
+                        chkUpdateOnRestart.Visibility = Visibility.Visible;
+                        gridAutoUpdate.Visibility = Visibility.Collapsed;
+                    }
                     else
                     {
                         btnSteamCmd.Visibility = Visibility.Collapsed;
                         chkUpdateOnRestart.Visibility = Visibility.Collapsed;
                         gridAutoUpdate.Visibility = Visibility.Collapsed;
                     }
+                    if (uMod.Installed && Server.InstallMethod == ValheimServer.ServerInstallMethod.uMod)
+                    {
+                        tabuMod.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        tabuMod.Visibility = Visibility.Collapsed;
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -410,6 +434,10 @@ private void btnSave_Click(object sender, RoutedEventArgs e)
             Server.Public = chkPublic.IsChecked.GetValueOrDefault();
             Server.InstallPath = txtServerDir.Text;
             Server.InstallMethod = (ValheimServer.ServerInstallMethod)cmbServerType.SelectedIndex;
+            if (Server.InstallMethod == ValheimServer.ServerInstallMethod.uMod)
+            {
+                chkAutoUpdate.IsChecked = false;
+            }
             Server.Autostart = chkAutostart.IsChecked.GetValueOrDefault();
             Server.RawLog = chkRawLog.IsChecked.GetValueOrDefault();
             Server.ProcessPriority = (ProcessPriorityClass)cmbPriority.SelectedItem;
@@ -793,6 +821,19 @@ private void chkAutoUpdate_Checked(object sender, RoutedEventArgs e)
                 txtUpdateCheckInterval.Text = "20";
             }
         }
+
+        private void btnuModUpdate_Click(object sender, RoutedEventArgs e)
+        {
+            if (Server.Status == ValheimServer.ServerStatus.Stopped)
+            {
+                Server.Update();
+            }
+            else
+            {
+                var mmb = new ModernMessageBox(this);
+                mmb.Show("Stop server before updating.", "Server Running", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
     }
 
     public class ServerEventArgs : EventArgs
diff --git a/ServerLogWindow.xaml b/ServerLogWindow.xaml
index eaccee0..fb46bff 100644
--- a/ServerLogWindow.xaml
+++ b/ServerLogWindow.xaml
@@ -9,7 +9,37 @@
         ui:WindowHelper.UseModernWindowStyle="True"
         Title="ServerLogWindow" Height="450" Width="800">
     <Grid>
-        <RichTextBox x:Name="txtLog" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <RichTextBox x:Name="txtLog" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ContextMenuOpening="txtLog_ContextMenuOpening">
+            <RichTextBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem x:Name="menuLogSelectAll" Header="Select All" Click="menuLogSelectAll_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/SelectAll_32x.png"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem x:Name="menuLogCopy" Header="Copy" Click="menuLogCopy_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/Copy_32x.png"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <Separator/>
+                    <MenuItem x:Name="menuRefresh" Header="Refresh" Visibility="Collapsed" Click="menuRefresh_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/Refresh_32x.png"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem x:Name="menuStop" Header="Stop automatic refresh" Click="menuStop_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/Stop_32x.png"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem x:Name="menuStart" Header="Start automatic refresh" Visibility="Collapsed" Click="menuStart_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/StartWithoutDebug_32x.png"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+            </RichTextBox.ContextMenu>
             <FlowDocument>
             </FlowDocument>
         </RichTextBox>
diff --git a/ServerLogWindow.xaml.cs b/ServerLogWindow.xaml.cs
index 3033253..3b9ae58 100644
--- a/ServerLogWindow.xaml.cs
+++ b/ServerLogWindow.xaml.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -20,7 +22,13 @@ namespace ValheimServerWarden
     /// </summary>
     public partial class ServerLogWindow : Window
     {
-        ValheimServer _server;
+        private ValheimServer _server;
+        private FileSystemWatcher logWatcher;
+        private DateTime lastRefresh;
+        private Timer refreshTimer;
+        private int refreshInterval;
+        private Timer retryTimer;
+        private int retryInterval;
         public ValheimServer Server
         {
             get
@@ -32,30 +40,122 @@ public ServerLogWindow(ValheimServer server)
         {
             InitializeComponent();
             _server = server;
-            this.Title = $"{server.LogRawName} (does not update live)";
-            LoadLogText();
+            this.Title = $"{server.LogRawName}";
+            RefreshLogText();
+
+            refreshInterval = 1000;
+            refreshTimer = new();
+            refreshTimer.AutoReset = false;
+            refreshTimer.Elapsed += RefreshTimer_Elapsed;
+
+            retryInterval = 4000;
+            retryTimer = new();
+            retryTimer.AutoReset = false;
+            retryTimer.Elapsed += RetryTimer_Elapsed;
+
+            logWatcher = new FileSystemWatcher();
+            // Watch for changes in LastWrite times.
+            logWatcher.NotifyFilter = NotifyFilters.LastWrite;
+            logWatcher.Path = Environment.CurrentDirectory;
+
+            // Only watch .db files.
+            logWatcher.Filter = $"{server.LogRawName}";
+
+            logWatcher.Changed += LogWatcher_Changed;
+            logWatcher.EnableRaisingEvents = true;
         }
 
-        public void LoadLogText()
+        private void RefreshTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
-            try
+            RefreshLogText();
+        }
+
+        private void RetryTimer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            Debug.WriteLine("timer elapsed");
+            if (lastRefresh.AddMilliseconds(retryInterval) >= DateTime.Now)
             {
-                if (File.Exists(_server.LogRawName))
-                {
-                    txtLog.Document.Blocks.Clear();
-                    Run run = new Run(File.ReadAllText(_server.LogRawName));
-                    Paragraph paragraph = new Paragraph(run);
-                    paragraph.Margin = new Thickness(0);
-                    txtLog.Document.Blocks.Add(paragraph);
-                }
+                Debug.WriteLine($"timer elapsed >= {retryInterval}ms ago");
+                RefreshLogText();
+            }
+        }
+
+        private void LogWatcher_Changed(object sender, FileSystemEventArgs e)
+        {
+            refreshTimer.Interval = refreshInterval;
+            refreshTimer.Enabled = true;
+        }
+
+        public void RefreshLogText()
+        {
+            if (_server == null)
+            {
+                this.Close();
+                return;
             }
-            catch (IOException ex)
+            if (File.Exists(_server.LogRawName))
             {
-                if (ex.Message.Contains("being used by another process"))
+                this.Dispatcher.Invoke(() =>
                 {
-                    System.Threading.Thread.Sleep(500);
-                    LoadLogText();
-                }
+                    try
+                    {
+                        txtLog.Document.Blocks.Clear();
+                        Run run = new Run(File.ReadAllText(_server.LogRawName));
+                        Paragraph paragraph = new Paragraph(run);
+                        paragraph.Margin = new Thickness(0);
+                        txtLog.Document.Blocks.Add(paragraph);
+                        lastRefresh = DateTime.Now;
+                    }
+                    catch (IOException ex)
+                    {
+                        retryTimer.Interval = retryInterval;
+                        retryTimer.Enabled = true;
+                        retryTimer.Start();
+                    }
+                });
+            }
+        }
+
+        private void menuRefresh_Click(object sender, RoutedEventArgs e)
+        {
+            RefreshLogText();
+        }
+
+        private void menuStop_Click(object sender, RoutedEventArgs e)
+        {
+            logWatcher.EnableRaisingEvents = false;
+            menuStop.Visibility = Visibility.Collapsed;
+            menuRefresh.Visibility = Visibility.Visible;
+            menuStart.Visibility = Visibility.Visible;
+        }
+
+        private void menuStart_Click(object sender, RoutedEventArgs e)
+        {
+            logWatcher.EnableRaisingEvents = true;
+            menuStop.Visibility = Visibility.Visible;
+            menuRefresh.Visibility = Visibility.Collapsed;
+            menuStart.Visibility = Visibility.Collapsed;
+        }
+
+        private void menuLogSelectAll_Click(object sender, RoutedEventArgs e)
+        {
+            txtLog.SelectAll();
+        }
+
+        private void menuLogCopy_Click(object sender, RoutedEventArgs e)
+        {
+            Clipboard.SetText(txtLog.Selection.Text);
+        }
+
+        private void txtLog_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+        {
+            if (txtLog.Selection.IsEmpty)
+            {
+                menuLogCopy.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                menuLogCopy.Visibility = Visibility.Visible;
             }
         }
     }
diff --git a/ValheimServer.cs b/ValheimServer.cs
index 7345f49..88b3a5d 100644
--- a/ValheimServer.cs
+++ b/ValheimServer.cs
@@ -30,7 +30,8 @@ public enum ServerInstallMethod
         {
             Manual,
             Steam,
-            SteamCMD
+            SteamCMD,
+            uMod
         }
         public static List<ValheimServer> Servers { get; } = new List<ValheimServer>();
         public static string DefaultSaveDir { get { return $@"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\AppData\LocalLow\IronGate\Valheim"; } }
@@ -370,7 +371,27 @@ public string DisplayName
                 }
             }
         }
-        public ValheimServer(string name, int port, string world, string password, bool pubserver, bool autostart, bool rawlog, int restarthours, bool updateonrestart, int updatecheckminutes, string discordwebhook, Dictionary<string,string> discordmessages, ServerInstallMethod install, string instpath, ProcessPriorityClass processpriority)
+        [JsonIgnore]
+        public string LogRawName
+        {
+            get
+            {
+                return LogName.Replace(".log", "-raw.log");
+            }
+        }
+        [JsonIgnore]
+        public string LogName
+        {
+            get
+            {
+                string logname = this.DisplayName.Replace(" ", "_");
+                logname = Regex.Replace(logname, @"[<]", "[");
+                logname = Regex.Replace(logname, @"[>]", "]");
+                foreach (var c in Path.GetInvalidFileNameChars()) { logname = logname.Replace(c, '-'); }
+                return $"{logname}-{this.Port}-{this.World}.log";
+            }
+        }
+        public ValheimServer(string name, int port, string world, string password, bool pubserver, bool autostart, bool rawlog, int restarthours, bool updateonrestart, int updatecheckminutes, string discordwebhook, Dictionary<string,string> discordmessages, ServerInstallMethod install, string instpath, ProcessPriorityClass processpriority, bool umodupdating)
         {
             this.data.name = name;
             this.data.port = 2456;
@@ -422,8 +443,11 @@ public ValheimServer(string name, int port, string world, string password, bool
 
         private void UpdateTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            CheckedForUpdate += ValheimServer_ScheduledCheckedForUpdate;
-            this.CheckForUpdate();
+            if (InstallMethod != ServerInstallMethod.uMod)
+            {
+                CheckedForUpdate += ValheimServer_ScheduledCheckedForUpdate;
+                this.CheckForUpdate();
+            }
         }
 
         private void ValheimServer_ScheduledCheckedForUpdate(object sender, UpdateCheckEventArgs e)
@@ -459,31 +483,13 @@ private void RestartTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs
             }
         }
 
-        public ValheimServer() : this("My Server", 2456, "Dedicated", "Secret", false, false, false, 0, false, 0, null, new Dictionary<string,string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal)
+        public ValheimServer() : this("My Server", 2456, "Dedicated", "Secret", false, false, false, 0, false, 0, null, new Dictionary<string,string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal, false)
         {
         }
 
-        public ValheimServer(string name) : this(name, 2456, "Dedicated", "Secret", false, false, false, 0, false, 0, null, new Dictionary<string,string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal)
+        public ValheimServer(string name) : this(name, 2456, "Dedicated", "Secret", false, false, false, 0, false, 0, null, new Dictionary<string,string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal, false)
         {
 
-        }
-        public string LogRawName
-        {
-            get
-            {
-                return LogName.Replace(".log", "-raw.log");
-            }
-        }
-        public string LogName
-        {
-            get
-            {
-                string logname = this.DisplayName.Replace(" ", "_");
-                logname = Regex.Replace(logname, @"[<]", "[");
-                logname = Regex.Replace(logname, @"[>]", "]");
-                foreach (var c in Path.GetInvalidFileNameChars()) { logname = logname.Replace(c, '-'); }
-                return $"{logname}-{this.Port}-{this.World}.log";
-            }
         }
         public double GetMilisecondsUntilRestart()
         {
@@ -1173,7 +1179,10 @@ private void OnCheckedForUpdate(UpdateCheckEventArgs args)
             {
                 if (args.UpdateAvailable)
                 {
-                    addToLog($"Server update available.", LogEntryType.Success);
+                    if (InstallMethod == ServerInstallMethod.SteamCMD)
+                    {
+                        addToLog($"Server update available.", LogEntryType.Success);
+                    }
                 }
                 else
                 {
@@ -1189,6 +1198,7 @@ private void OnCheckedForUpdate(UpdateCheckEventArgs args)
         }
         private void OnUpdateEnded(UpdateEndedEventArgs args)
         {
+            status = ServerStatus.Stopped;
             if (args.Updated)
             {
                 addToLog("Update complete.", LogEntryType.Success);
@@ -1230,70 +1240,77 @@ public void CheckForUpdate()
             {
                 new Thread(() =>
                 {
-                    //addToLog($"Checking for server update...");
-                    if (!File.Exists(Properties.Settings.Default.SteamCMDPath))
+                    if (InstallMethod == ServerInstallMethod.SteamCMD)
                     {
-                        OnCheckedForUpdate(new UpdateCheckEventArgs($"SteamCMD was not found at {Properties.Settings.Default.SteamCMDPath}."));
-                        return;
-                    }
-                    var process = new Process();
-                    process.StartInfo.FileName = Properties.Settings.Default.SteamCMDPath;
-                    process.StartInfo.Arguments = $"+login anonymous +app_info_update 1 +app_info_print {ValheimServer.SteamID} +quit";
-                    process.StartInfo.CreateNoWindow = true;
-                    process.EnableRaisingEvents = true;
-                    process.StartInfo.RedirectStandardOutput = true;
-                    //process.Exited += SteamCmdProcess_Exited;
+                        //addToLog($"Checking for server update...");
+                        if (!File.Exists(Properties.Settings.Default.SteamCMDPath))
+                        {
+                            OnCheckedForUpdate(new UpdateCheckEventArgs($"SteamCMD was not found at {Properties.Settings.Default.SteamCMDPath}."));
+                            return;
+                        }
+                        var process = new Process();
+                        process.StartInfo.FileName = Properties.Settings.Default.SteamCMDPath;
+                        process.StartInfo.Arguments = $"+login anonymous +app_info_update 1 +app_info_print {ValheimServer.SteamID} +quit";
+                        process.StartInfo.CreateNoWindow = true;
+                        process.EnableRaisingEvents = true;
+                        process.StartInfo.RedirectStandardOutput = true;
+                        //process.Exited += SteamCmdProcess_Exited;
 
-                    process.Exited += ((object sender, EventArgs e) =>
-                    {
-                        var process = (Process)sender;
-                        var output = process.StandardOutput.ReadToEnd();
-                        output = output.Substring(output.IndexOf("\"depots\""));
-                        output = output.Substring(output.IndexOf("\"branches\""));
-                        output = output.Substring(output.IndexOf("\"public\""));
-                        output = output.Substring(0, output.IndexOf("}"));
-                        Regex rx = new Regex("\"buildid\"\\s+\"(\\d+)\"", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-                        Match match = rx.Match(output);
-                        if (match.Success)
+                        process.Exited += ((object sender, EventArgs e) =>
                         {
-                            var remoteBuild = Convert.ToInt32(match.Groups[1].ToString());
-                            if (remoteBuild == 0)
-                            {
-                                OnCheckedForUpdate(new UpdateCheckEventArgs($"Remote buildid {match.Groups[1]} is not a valid number."));
-                                return;
-                            }
-                            var manifestpath = new FileInfo(this.InstallPath).DirectoryName + $@"\steamapps\appmanifest_{ValheimServer.SteamID}.acf";
-                            if (File.Exists(manifestpath))
+                            var process = (Process)sender;
+                            var output = process.StandardOutput.ReadToEnd();
+                            output = output.Substring(output.IndexOf("\"depots\""));
+                            output = output.Substring(output.IndexOf("\"branches\""));
+                            output = output.Substring(output.IndexOf("\"public\""));
+                            output = output.Substring(0, output.IndexOf("}"));
+                            Regex rx = new Regex("\"buildid\"\\s+\"(\\d+)\"", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+                            Match match = rx.Match(output);
+                            if (match.Success)
                             {
-                                var manifest = File.ReadAllText(manifestpath);
-                                match = rx.Match(manifest);
-                                if (match.Success)
+                                var remoteBuild = Convert.ToInt32(match.Groups[1].ToString());
+                                if (remoteBuild == 0)
                                 {
-                                    var localBuild = Convert.ToInt32(match.Groups[1].ToString());
-                                    if (localBuild == 0)
+                                    OnCheckedForUpdate(new UpdateCheckEventArgs($"Remote buildid {match.Groups[1]} is not a valid number."));
+                                    return;
+                                }
+                                var manifestpath = new FileInfo(this.InstallPath).DirectoryName + $@"\steamapps\appmanifest_{ValheimServer.SteamID}.acf";
+                                if (File.Exists(manifestpath))
+                                {
+                                    var manifest = File.ReadAllText(manifestpath);
+                                    match = rx.Match(manifest);
+                                    if (match.Success)
+                                    {
+                                        var localBuild = Convert.ToInt32(match.Groups[1].ToString());
+                                        if (localBuild == 0)
+                                        {
+                                            OnCheckedForUpdate(new UpdateCheckEventArgs($"Local buildid {match.Groups[1]} is not a valid number."));
+                                            return;
+                                        }
+                                        OnCheckedForUpdate(new UpdateCheckEventArgs(true, remoteBuild > localBuild));
+                                    }
+                                    else
                                     {
-                                        OnCheckedForUpdate(new UpdateCheckEventArgs($"Local buildid {match.Groups[1]} is not a valid number."));
-                                        return;
+                                        OnCheckedForUpdate(new UpdateCheckEventArgs($"Could not find local buildid for update check."));
                                     }
-                                    OnCheckedForUpdate(new UpdateCheckEventArgs(true, remoteBuild > localBuild));
                                 }
                                 else
                                 {
-                                    OnCheckedForUpdate(new UpdateCheckEventArgs($"Could not find local buildid for update check."));
+                                    OnCheckedForUpdate(new UpdateCheckEventArgs($"Could not find {manifestpath} for update check."));
                                 }
                             }
                             else
                             {
-                                OnCheckedForUpdate(new UpdateCheckEventArgs($"Could not find {manifestpath} for update check."));
+                                OnCheckedForUpdate(new UpdateCheckEventArgs($"Could find not remote buildid for update check."));
                             }
-                        }
-                        else
-                        {
-                            OnCheckedForUpdate(new UpdateCheckEventArgs($"Could find not remote buildid for update check."));
-                        }
-                    });
-                    process.Start();
-                    //process.WaitForExit();
+                        });
+                        process.Start();
+                        //process.WaitForExit();
+                    }
+                    else if (InstallMethod == ServerInstallMethod.uMod)
+                    {
+                        OnCheckedForUpdate(new UpdateCheckEventArgs(true, true));
+                    }
                 }).Start();
             }
             catch (Exception ex)
@@ -1305,6 +1322,7 @@ public void Update()
         {
             if (!this.Running)
             {
+                status = ServerStatus.Updating;
                 foreach (var s in ValheimServer.Servers)
                 {
                     if (s != this && s.Status != ServerStatus.Stopped && s.InstallPath == this.InstallPath)
@@ -1314,46 +1332,79 @@ public void Update()
                     }
                 }
                 addToLog($"Updating server...");
-                if (!File.Exists(Properties.Settings.Default.SteamCMDPath))
+                if (InstallMethod == ServerInstallMethod.SteamCMD)
                 {
-                    OnUpdateEnded(new UpdateEndedEventArgs($"SteamCMD was not found at {Properties.Settings.Default.SteamCMDPath}."));
-                    return;
-                }
-                var process = new Process();
-                process.StartInfo.FileName = Properties.Settings.Default.SteamCMDPath;
-                process.StartInfo.Arguments = $"+login anonymous +force_install_dir \"{(new FileInfo(this.InstallPath).Directory.FullName)}\" +app_update {ValheimServer.SteamID} +quit";
-                process.StartInfo.CreateNoWindow = true;
-                process.EnableRaisingEvents = true;
-                process.StartInfo.RedirectStandardOutput = true;
-                process.Exited += ((object sender, EventArgs e) =>
-                {
-                    var process = (Process)sender;
-                    var output = process.StandardOutput.ReadToEnd();
-                    //Debug.Write(output);
-                    Regex rx = new Regex($"App '{SteamID}' already up to date.", RegexOptions.Compiled);
-                    Match match = rx.Match(output);
-                    if (match.Success)
+                    if (!File.Exists(Properties.Settings.Default.SteamCMDPath))
                     {
-                        OnUpdateEnded(new UpdateEndedEventArgs(UpdateEndedEventArgs.UpdateResults.AlreadyUpToDate));
+                        OnUpdateEnded(new UpdateEndedEventArgs($"SteamCMD was not found at {Properties.Settings.Default.SteamCMDPath}."));
                         return;
                     }
-                    rx = new Regex($"App '{SteamID}' fully installed.", RegexOptions.Compiled);
-                    match = rx.Match(output);
-                    if (match.Success)
+                    var process = new Process();
+                    process.StartInfo.FileName = Properties.Settings.Default.SteamCMDPath;
+                    process.StartInfo.Arguments = $"+login anonymous +force_install_dir \"{(new FileInfo(this.InstallPath).Directory.FullName)}\" +app_update {ValheimServer.SteamID} +quit";
+                    process.StartInfo.CreateNoWindow = true;
+                    process.EnableRaisingEvents = true;
+                    process.StartInfo.RedirectStandardOutput = true;
+                    process.Exited += ((object sender, EventArgs e) =>
                     {
-                        OnUpdateEnded(new UpdateEndedEventArgs(UpdateEndedEventArgs.UpdateResults.Updated));
+                        var process = (Process)sender;
+                        var output = process.StandardOutput.ReadToEnd();
+                        //Debug.Write(output);
+                        Regex rx = new Regex($"App '{SteamID}' already up to date.", RegexOptions.Compiled);
+                        Match match = rx.Match(output);
+                        if (match.Success)
+                        {
+                            OnUpdateEnded(new UpdateEndedEventArgs(UpdateEndedEventArgs.UpdateResults.AlreadyUpToDate));
+                            return;
+                        }
+                        rx = new Regex($"App '{SteamID}' fully installed.", RegexOptions.Compiled);
+                        match = rx.Match(output);
+                        if (match.Success)
+                        {
+                            OnUpdateEnded(new UpdateEndedEventArgs(UpdateEndedEventArgs.UpdateResults.Updated));
+                            return;
+                        }
+                        OnUpdateEnded(new UpdateEndedEventArgs("Update probably failed. Unrecognized output from SteamCMD."));
+                    });
+                    process.Start();
+                    //process.WaitForExit();
+                }
+                else if (InstallMethod == ServerInstallMethod.uMod)
+                {
+                    if (!uMod.Installed)
+                    {
+                        OnUpdateEnded(new UpdateEndedEventArgs($"uMod does not appear to be installed."));
                         return;
                     }
-                    OnUpdateEnded(new UpdateEndedEventArgs("Update probably failed. Unrecognized output from SteamCMD."));
-                });
-                process.Start();
-                //process.WaitForExit();
+                    var umod = new uMod(InstallPath, "valheim");
+                    umod.UpdateEnded += ((object sender, uMod.ProcessEndedEventArgs e) =>
+                    {
+                        if (e.ExitCode == 0)
+                        {
+                            OnUpdateEnded(new UpdateEndedEventArgs(UpdateEndedEventArgs.UpdateResults.Updated));
+                        }
+                        else if (e.ExitCode == 1)
+                        {
+                            OnUpdateEnded(new UpdateEndedEventArgs("Unable to update game, uMod core, or uMod apps."));
+                        }
+                        else if (e.ExitCode == 2)
+                        {
+                            OnUpdateEnded(new UpdateEndedEventArgs(UpdateEndedEventArgs.UpdateResults.AlreadyUpToDate));
+                        }
+                        else
+                        {
+                            OnUpdateEnded(new UpdateEndedEventArgs("Update probably failed. Unrecognized output from uMod."));
+                        }
+                    });
+                    umod.Update();
+                }
             }
             else
             {
                 OnUpdateEnded(new UpdateEndedEventArgs("Please stop the server before updating."));
             }
         }
+
         public static void TerminateAll(Process[] servers)
         {
             new Thread(() =>
diff --git a/ValheimServerWarden.csproj b/ValheimServerWarden.csproj
index 5accb0d..103aeda 100644
--- a/ValheimServerWarden.csproj
+++ b/ValheimServerWarden.csproj
@@ -6,14 +6,14 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <StartupObject>ValheimServerWarden.App</StartupObject>
-    <Version>0.4.10</Version>
-    <AssemblyVersion>0.4.10.0</AssemblyVersion>
+    <Version>0.4.11</Version>
+    <AssemblyVersion>0.4.11.0</AssemblyVersion>
     <Product>ValheimServerWarden</Product>
     <Authors>Razzmatazz</Authors>
     <ApplicationIcon>Resources\vsw2.ico</ApplicationIcon>
     <PackageId>ValheimServerWarden</PackageId>
     <AssemblyName>Valheim Server Warden</AssemblyName>
-    <FileVersion>0.4.10.0</FileVersion>
+    <FileVersion>0.4.11.0</FileVersion>
     <Company>ValheimServerWarden</Company>
   </PropertyGroup>
 
@@ -119,7 +119,7 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy &quot;$(TargetDir)Valheim Server Warden.runtimeconfig.json&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)Valheim Server Warden.dll&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)Valheim Server Warden.exe&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)ModernWpf.dll&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)HtmlAgilityPack.dll&quot; &quot;$(TargetDir)app.publish\&quot;" />
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent"> 
+    <Exec Command="copy &quot;$(TargetDir)Valheim Server Warden.runtimeconfig.json&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)Valheim Server Warden.dll&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)Valheim Server Warden.exe&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)ModernWpf.dll&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;copy &quot;$(TargetDir)HtmlAgilityPack.dll&quot; &quot;$(TargetDir)app.publish\&quot;&#xD;&#xA;if $(ConfigurationName) == Release &quot;C:\Program Files\7-Zip\7z.exe&quot; a %25userprofile%25\Desktop\vsw.zip &quot;$(TargetDir)app.publish\*&quot;" />
   </Target>
 </Project>
diff --git a/uMod.cs b/uMod.cs
new file mode 100644
index 0000000..5766720
--- /dev/null
+++ b/uMod.cs
@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace RazzTools
+{
+    class uMod
+    {
+        public static bool Installed
+        {
+            get
+            {
+                return File.Exists(ExecutablePath);
+            }
+        }
+        public static string ExecutablePath
+        {
+            get
+            {
+                return $@"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\.dotnet\tools\umod.exe";
+            }
+        }
+        private string _serverPath;
+        private string _gameName;
+        public event EventHandler<LoggedMessageEventArgs> LoggedMessage;
+        public event EventHandler<ProcessEndedEventArgs> InstallEnded;
+        public event EventHandler<ProcessEndedEventArgs> UpdateEnded;
+        public event EventHandler<ProcessEndedEventArgs> PluginInstallEnded;
+        public event EventHandler<ProcessEndedEventArgs> RemoveEnded;
+        public string ServerPath {  get { return _serverPath; } }
+        public string GameName { get { return _gameName; } }
+        public bool Prerelease { get; set; }
+        public uMod(string serverPath, string gameName)
+        {
+            _serverPath = serverPath;
+            _gameName = gameName;
+            Prerelease = true;
+        }
+        public void Install()
+        {
+            new Thread(() =>
+            {
+                try
+                {
+                    Thread.CurrentThread.IsBackground = true;
+                    var process = new Process();
+                    process.StartInfo.FileName = ExecutablePath;
+                    process.StartInfo.Arguments = $"install {GameName} --force --strict --no-input";
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.WorkingDirectory = ServerPath;
+                    process.StartInfo.CreateNoWindow = true;
+                    process.StartInfo.RedirectStandardOutput = true;
+                    process.StartInfo.RedirectStandardError = true;
+                    process.StartInfo.RedirectStandardInput = true;
+                    process.EnableRaisingEvents = true;
+                    process.OutputDataReceived += Process_OutputDataReceived;
+                    process.Exited += InstallProcess_Exited;
+                    process.Start();
+                    process.BeginOutputReadLine();
+                    process.WaitForExit();
+                }
+                catch (Exception ex)
+                {
+                    LogMessage($"Error installing server: {ex.Message}", LogEntryType.Error);
+                }
+            }).Start();
+        }
+        private void InstallProcess_Exited(object sender, EventArgs e)
+        {
+            var process = (Process)sender;
+            OnInstallEnded(process.ExitCode);
+            process.Dispose();
+        }
+
+        public void Update()
+        {
+            Update("game core apps extensions");
+        }
+        public void Update(string updateComponents)
+        {
+            new Thread(() =>
+            {
+                try
+                {
+                    Thread.CurrentThread.IsBackground = true;
+                    var process = new Process();
+                    process.StartInfo.FileName = ExecutablePath;
+                    process.StartInfo.Arguments = $"update {updateComponents} --patch-available --strict --validate --prerelease --no-input";
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.WorkingDirectory = ServerPath;
+                    process.StartInfo.CreateNoWindow = true;
+                    process.StartInfo.RedirectStandardOutput = true;
+                    process.StartInfo.RedirectStandardError = true;
+                    process.StartInfo.RedirectStandardInput = true;
+                    process.EnableRaisingEvents = true;
+                    process.OutputDataReceived += Process_OutputDataReceived;
+                    process.Exited += UpdateProcess_Exited;
+                    process.Start();
+                    process.BeginOutputReadLine();
+                    process.WaitForExit();
+                }
+                catch (Exception ex)
+                {
+                    LogMessage($"Error updating server: {ex.Message}", LogEntryType.Error);
+                }
+            }).Start();
+        }
+
+        private void Process_OutputDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            Debug.WriteLine(e.Data);
+        }
+
+        private void UpdateProcess_Exited(object sender, EventArgs e)
+        {
+            var process = (Process)sender;
+            OnUpdateEnded(process.ExitCode);
+            process.Dispose();
+        }
+        public void InstallPlugin(string pluginName)
+        {
+            new Thread(() =>
+            {
+                try
+                {
+                    Thread.CurrentThread.IsBackground = true;
+                    var process = new Process();
+                    process.StartInfo.FileName = ExecutablePath;
+                    process.StartInfo.Arguments = $"require {pluginName} --strict --no-input";
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.WorkingDirectory = ServerPath;
+                    process.StartInfo.CreateNoWindow = true;
+                    process.StartInfo.RedirectStandardOutput = true;
+                    process.StartInfo.RedirectStandardError = true;
+                    process.StartInfo.RedirectStandardInput = true;
+                    process.EnableRaisingEvents = true;
+                    process.OutputDataReceived += Process_OutputDataReceived;
+                    process.Exited += InstallPluginProcess_Exited;
+                    process.Start();
+                    process.BeginOutputReadLine();
+                    process.WaitForExit();
+                }
+                catch (Exception ex)
+                {
+                    LogMessage($"Error installing plugin: {ex.Message}", LogEntryType.Error);
+                }
+            }).Start();
+        }
+        private void InstallPluginProcess_Exited(object sender, EventArgs e)
+        {
+            var process = (Process)sender;
+            OnPluginInstallEnded(process.ExitCode);
+            process.Dispose();
+        }
+        public void Remove(string pluginName)
+        {
+            new Thread(() =>
+            {
+                try
+                {
+                    Thread.CurrentThread.IsBackground = true;
+                    var process = new Process();
+                    process.StartInfo.FileName = ExecutablePath;
+                    process.StartInfo.Arguments = $"remove {pluginName} --strict --no-input";
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.WorkingDirectory = ServerPath;
+                    process.StartInfo.CreateNoWindow = true;
+                    process.StartInfo.RedirectStandardOutput = true;
+                    process.StartInfo.RedirectStandardError = true;
+                    process.StartInfo.RedirectStandardInput = true;
+                    process.EnableRaisingEvents = true;
+                    process.OutputDataReceived += Process_OutputDataReceived;
+                    process.Exited += RemovePluginProcess_Exited;
+                    process.Start();
+                    process.BeginOutputReadLine();
+                    process.WaitForExit();
+                }
+                catch (Exception ex)
+                {
+                    LogMessage($"Error installing plugin: {ex.Message}", LogEntryType.Error);
+                }
+            }).Start();
+        }
+
+        private void RemovePluginProcess_Exited(object sender, EventArgs e)
+        {
+            var process = (Process)sender;
+            OnRemoveEnded(process.ExitCode);
+            process.Dispose();
+        }
+
+        private void LogMessage(string message)
+        {
+            LogMessage(message, LogEntryType.Normal);
+        }
+        private void LogMessage(string message, LogEntryType entrytype)
+        {
+            EventHandler<LoggedMessageEventArgs> handler = LoggedMessage;
+            if (null != handler) handler(this, new LoggedMessageEventArgs(message, entrytype));
+        }
+        private void OnInstallEnded(int exitcode)
+        {
+            if (exitcode == 1)
+            {
+                LogMessage("Unable to update game, uMod core, or uMod apps.", LogEntryType.Warning);
+            }
+            else if (exitcode == 2)
+            {
+                LogMessage("No updated needed.");
+            }
+            EventHandler<ProcessEndedEventArgs> handler = InstallEnded;
+            if (null != handler) handler(this, new ProcessEndedEventArgs(exitcode));
+        }
+        private void OnUpdateEnded(int exitcode)
+        {
+            EventHandler<ProcessEndedEventArgs> handler = UpdateEnded;
+            if (null != handler) handler(this, new ProcessEndedEventArgs(exitcode));
+        }
+        private void OnPluginInstallEnded(int exitcode)
+        {
+            EventHandler<ProcessEndedEventArgs> handler = PluginInstallEnded;
+            if (null != handler) handler(this, new ProcessEndedEventArgs(exitcode));
+        }
+        private void OnRemoveEnded(int exitcode)
+        {
+            EventHandler<ProcessEndedEventArgs> handler = RemoveEnded;
+            if (null != handler) handler(this, new ProcessEndedEventArgs(exitcode));
+        }
+
+        public class ProcessEndedEventArgs : EventArgs
+        {
+            private int _exitCode;
+            public int ExitCode { get { return _exitCode; } }
+            public ProcessEndedEventArgs(int exitcode)
+            {
+                _exitCode = exitcode;
+            }
+        }
+    }
+}