From 0b76ded5aaef3b8cb71c83d7c70f3b18658c88d9 Mon Sep 17 00:00:00 2001
From: Yannick <sirhamsteralot@gmail.com>
Date: Thu, 3 Jan 2019 22:15:47 +0100
Subject: [PATCH 001/170] Jam this in a grid cuz rexxar didnt want to (#267)

---
 Torch.Server/Views/PlayerListControl.xaml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Torch.Server/Views/PlayerListControl.xaml b/Torch.Server/Views/PlayerListControl.xaml
index 943f2f5..5a67271 100644
--- a/Torch.Server/Views/PlayerListControl.xaml
+++ b/Torch.Server/Views/PlayerListControl.xaml
@@ -6,10 +6,22 @@
              mc:Ignorable="d">
     <DockPanel>
         <StackPanel DockPanel.Dock="Bottom">
-            <Button x:Name="KickButton" Content="Kick" Margin="5,5,5,5" Click="KickButton_Click"/>
-            <Button x:Name="BanButton" Content="Ban" Margin="5,5,5,5" Click="BanButton_Click"/>
-            <Button x:Name="PromoteButton" Content ="Promote" Margin="5,5,5,5" Click="PromoteButton_OnClick"/>
-            <Button x:Name="DemoteButton" Content ="Demote" Margin="5,5,5,5" Click="DemoteButton_OnClick"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <Button x:Name="KickButton" Grid.Column="0" Grid.Row="0" Content="Kick" Margin="5,5,5,5" Click="KickButton_Click"/>
+                <Button x:Name="BanButton" Grid.Column="1" Grid.Row="0" Content="Ban" Margin="5,5,5,5" Click="BanButton_Click"/>
+                <Button x:Name="PromoteButton" Grid.Column="0" Grid.Row="1" Content ="Promote" Margin="5,5,5,5" Click="PromoteButton_OnClick"/>
+                <Button x:Name="DemoteButton" Grid.Column="1" Grid.Row="1" Content ="Demote" Margin="5,5,5,5" Click="DemoteButton_OnClick"/>
+            </Grid>
+
         </StackPanel>
         <ListView x:Name="PlayerList" ItemsSource="{Binding Players}" DockPanel.Dock="Top" Margin="5,5,5,5">
             <ListView.ItemTemplate>

From 844d4be96af206a38203c2ec04557bf398f584c8 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 6 Jan 2019 21:21:36 -0500
Subject: [PATCH 002/170] Rearrange client join auth again

---
 .../Managers/MultiplayerManagerDedicated.cs   | 84 +++++++++----------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/Torch.Server/Managers/MultiplayerManagerDedicated.cs b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
index 4a704bd..6ddc6fb 100644
--- a/Torch.Server/Managers/MultiplayerManagerDedicated.cs
+++ b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
@@ -170,27 +170,17 @@ namespace Torch.Server.Managers
         //Largely copied from SE
         private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner)
         {
-            //SteamNetworking.GetP2PSessionState(new CSteamID(steamId), out P2PSessionState_t state);            
-            //state.GetRemoteIP();
-            MyP2PSessionState statehack = new MyP2PSessionState();
-            VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
-            var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
+            var state = new MyP2PSessionState();
+            MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
+            var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
 
             Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel);
 
             _log.Debug($"ValidateAuthTicketResponse(user={steamId}, response={response}, owner={steamOwner}, permissions={promoteLevel})");
 
             _log.Info($"Connection attempt by {steamId} from {ip}");
-            // TODO implement IP bans
-            var config = (TorchConfig) Torch.Config;
-            if (config.EnableWhitelist && !config.Whitelist.Contains(steamId))
-            {
-                _log.Warn($"Rejecting user {steamId} because they are not whitelisted in Torch.cfg.");
-                UserRejected(steamId, JoinResult.NotInGroup);
-            }
-            else if(config.EnableReservedSlots && config.ReservedPlayers.Contains(steamId))
-                UserAccepted(steamId);
-            else if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
+            
+            if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
                      promoteLevel < MyPromoteLevel.Admin)
             {
                 _log.Warn($"Rejecting user {steamId}, world is set to offline and user is not admin.");
@@ -213,40 +203,48 @@ namespace Torch.Server.Managers
 
         private void RunEvent(ValidateAuthTicketEvent info)
         {
-            MultiplayerManagerDedicatedEventShim.RaiseValidateAuthTicket(ref info);
+            JoinResult internalAuth;
 
-            if (info.FutureVerdict == null)
+
+            if (IsBanned(info.SteamOwner) || IsBanned(info.SteamID))
+                internalAuth = JoinResult.BannedByAdmins;
+            else if (_isClientKicked(MyMultiplayer.Static, info.SteamID) ||
+                     _isClientKicked(MyMultiplayer.Static, info.SteamOwner))
+                internalAuth = JoinResult.KickedRecently;
+            else if (info.SteamResponse == JoinResult.OK)
             {
-                if (IsBanned(info.SteamOwner) || IsBanned(info.SteamID))
-                    CommitVerdict(info.SteamID, JoinResult.BannedByAdmins);
-                else if (_isClientKicked(MyMultiplayer.Static, info.SteamID) ||
-                         _isClientKicked(MyMultiplayer.Static, info.SteamOwner))
-                    CommitVerdict(info.SteamID, JoinResult.KickedRecently);
-                else if (info.SteamResponse == JoinResult.OK)
+                var config = (TorchConfig) Torch.Config;
+                if (config.EnableWhitelist && !config.Whitelist.Contains(info.SteamID))
                 {
-                    //Admins can bypass member limit
-                    if (MySandboxGame.ConfigDedicated.Administrators.Contains(info.SteamID.ToString()) ||
-                        MySandboxGame.ConfigDedicated.Administrators.Contains(_convertSteamIDFrom64(info.SteamID)))
-                        CommitVerdict(info.SteamID, JoinResult.OK);
-                    //Server counts as a client, so subtract 1 from MemberCount
-                    else if (MyMultiplayer.Static.MemberLimit > 0 &&
-                             MyMultiplayer.Static.MemberCount - 1 >= MyMultiplayer.Static.MemberLimit)
-                        CommitVerdict(info.SteamID, JoinResult.ServerFull);
-                    else if (MySandboxGame.ConfigDedicated.GroupID == 0uL)
-                        CommitVerdict(info.SteamID, JoinResult.OK);
-                    else
-                    {
-                        if (MySandboxGame.ConfigDedicated.GroupID == info.Group && (info.Member || info.Officer))
-                            CommitVerdict(info.SteamID, JoinResult.OK);
-                        else
-                            CommitVerdict(info.SteamID, JoinResult.NotInGroup);
-                    }
+                    _log.Warn($"Rejecting user {info.SteamID} because they are not whitelisted in Torch.cfg.");
+                    internalAuth = JoinResult.NotInGroup;
                 }
+                else if (config.EnableReservedSlots && config.ReservedPlayers.Contains(info.SteamID))
+                    internalAuth = JoinResult.OK;
+                //Admins can bypass member limit
+                else if (MySandboxGame.ConfigDedicated.Administrators.Contains(info.SteamID.ToString()) ||
+                         MySandboxGame.ConfigDedicated.Administrators.Contains(_convertSteamIDFrom64(info.SteamID)))
+                    internalAuth = JoinResult.OK;
+                //Server counts as a client, so subtract 1 from MemberCount
+                else if (MyMultiplayer.Static.MemberLimit > 0 &&
+                         MyMultiplayer.Static.MemberCount - 1 >= MyMultiplayer.Static.MemberLimit)
+                    internalAuth = JoinResult.ServerFull;
+                else if (MySandboxGame.ConfigDedicated.GroupID == 0uL)
+                    internalAuth = JoinResult.OK;
                 else
-                    CommitVerdict(info.SteamID, info.SteamResponse);
-                
-                return;
+                {
+                    if (MySandboxGame.ConfigDedicated.GroupID == info.Group && (info.Member || info.Officer))
+                        internalAuth = JoinResult.OK;
+                    else
+                        internalAuth = JoinResult.NotInGroup;
+                }
             }
+            else
+                internalAuth = info.SteamResponse;
+
+            info.FutureVerdict = Task.FromResult(internalAuth);
+
+            MultiplayerManagerDedicatedEventShim.RaiseValidateAuthTicket(ref info);
 
             info.FutureVerdict.ContinueWith((task) =>
             {

From 90479dfea2db95cf32f61dc874a2286786b89aed Mon Sep 17 00:00:00 2001
From: N1Ran <38772205+N1Ran@users.noreply.github.com>
Date: Tue, 8 Jan 2019 17:30:42 -0500
Subject: [PATCH 003/170] Add server description to config uI and adjusted the
 mod blocks to fit (#268)

---
 Torch.Server/ViewModels/ConfigDedicatedViewModel.cs |  2 ++
 Torch.Server/Views/ConfigControl.xaml               | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
index 3ee6ee8..61e2f35 100644
--- a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
+++ b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
@@ -90,6 +90,8 @@ namespace Torch.Server.ViewModels
 
         public string ServerName { get => _config.ServerName; set => SetValue(x => _config.ServerName = x, value); }
 
+        public string ServerDescription { get => _config.ServerDescription; set => SetValue(x => _config.ServerDescription = x, value); }
+
         public bool PauseGameWhenEmpty { get => _config.PauseGameWhenEmpty; set => SetValue(x => _config.PauseGameWhenEmpty = x, value); }
 
         public string PremadeCheckpointPath { get => _config.PremadeCheckpointPath; set => SetValue(x => _config.PremadeCheckpointPath = x, value); }
diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index f6c7f04..4bbb20d 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -65,9 +65,12 @@
                     <StackPanel Grid.Column="0" Margin="3" DockPanel.Dock="Left">
                         <Label Content="Server Name" />
                         <TextBox Text="{Binding ServerName}" Margin="3,0,3,3" Width="160" />
-                        <Label Content="World Name" />
-                        <TextBox Text="{Binding WorldName}" Margin="3,0,3,3" Width="160" />
-                        <Label Content="Whitelist Group ID" />
+                      <Label Content="World Name" />
+                      <TextBox Text="{Binding WorldName}" Margin="3,0,3,3" Width="160" />
+                      <Label Content="Server Description" />
+                      <TextBox Text="{Binding ServerDescription}" Margin="3,0,3,3" Width="160" Height="100"
+                               AcceptsReturn="true" VerticalScrollBarVisibility="Auto"/>
+                      <Label Content="Whitelist Group ID" />
                         <TextBox Margin="3,0,3,3" Width="160" Style="{StaticResource ValidatedTextBox}">
                             <TextBox.Text>
                                 <Binding Path="GroupId" UpdateSourceTrigger="PropertyChanged"
@@ -90,7 +93,7 @@
                     </StackPanel>
                     <StackPanel Grid.Column="1" Margin="3">
                         <Label Content="Mods" />
-                        <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
+                        <TextBox Margin="3" Height="60" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
                                  Style="{StaticResource ValidatedTextBox}">
                             <TextBox.Text>
                                 <Binding Path="Mods" UpdateSourceTrigger="PropertyChanged"

From 3d8bf7821396d7e035e05e9a1ba51206b44d217d Mon Sep 17 00:00:00 2001
From: N1Ran <38772205+N1Ran@users.noreply.github.com>
Date: Thu, 10 Jan 2019 09:28:35 -0500
Subject: [PATCH 004/170] Add Reserved slot and "Auto Detect Dependencies" to
 config ui plus Torch reserve management oversees all  (#269)

* Add server description to config uI and adjusted the mod blocks to fit

* Added checkbox for "Auto detect dependencies" and Reserved players slot.

* Torch reserved slot management is now main and will scan sededi also to match steamid making new config ui addition usable
---
 .../Managers/MultiplayerManagerDedicated.cs        |  3 ++-
 .../ViewModels/ConfigDedicatedViewModel.cs         |  6 +++++-
 Torch.Server/Views/ConfigControl.xaml              | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Managers/MultiplayerManagerDedicated.cs b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
index 6ddc6fb..7fd5b10 100644
--- a/Torch.Server/Managers/MultiplayerManagerDedicated.cs
+++ b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
@@ -219,7 +219,8 @@ namespace Torch.Server.Managers
                     _log.Warn($"Rejecting user {info.SteamID} because they are not whitelisted in Torch.cfg.");
                     internalAuth = JoinResult.NotInGroup;
                 }
-                else if (config.EnableReservedSlots && config.ReservedPlayers.Contains(info.SteamID))
+                else if (config.EnableReservedSlots && (config.ReservedPlayers.Contains(info.SteamID) ||
+                    MySandboxGame.ConfigDedicated.Reserved.Contains(info.SteamID)))
                     internalAuth = JoinResult.OK;
                 //Admins can bypass member limit
                 else if (MySandboxGame.ConfigDedicated.Administrators.Contains(info.SteamID.ToString()) ||
diff --git a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
index 61e2f35..e1b4456 100644
--- a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
+++ b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
@@ -76,7 +76,9 @@ namespace Torch.Server.ViewModels
         public List<string> Administrators { get => _config.Administrators; set => SetValue(x => _config.Administrators = x, value); }
 
         public List<ulong> Banned { get => _config.Banned; set => SetValue(x => _config.Banned = x, value); }
-        
+
+        public List<ulong> Reserved { get => _config.Reserved; set => SetValue(x => _config.Reserved = x, value); }
+
         private List<ulong> _mods = new List<ulong>();
         public List<ulong> Mods { get => _mods; set => SetValue(x => _mods = x, value); }
 
@@ -94,6 +96,8 @@ namespace Torch.Server.ViewModels
 
         public bool PauseGameWhenEmpty { get => _config.PauseGameWhenEmpty; set => SetValue(x => _config.PauseGameWhenEmpty = x, value); }
 
+        public bool AutodetectDependencies { get => _config.AutodetectDependencies; set => SetValue(x => _config.AutodetectDependencies = x, value); }
+
         public string PremadeCheckpointPath { get => _config.PremadeCheckpointPath; set => SetValue(x => _config.PremadeCheckpointPath = x, value); }
 
         public string LoadWorld { get => _config.LoadWorld; set => SetValue(x => _config.LoadWorld = x, value); }
diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index 4bbb20d..b4b58c4 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -90,6 +90,7 @@
                         <Label Content="Server Password"/>
                         <TextBox Text="{Binding Password}" Width="160"/>
                         <CheckBox IsChecked="{Binding PauseGameWhenEmpty}" Content="Pause When Empty" Margin="3" />
+                        <CheckBox IsChecked="{Binding AutodetectDependencies}" Content="Auto Detect Dependencies" Margin="3" />
                     </StackPanel>
                     <StackPanel Grid.Column="1" Margin="3">
                         <Label Content="Mods" />
@@ -109,6 +110,19 @@
                         <TextBox Text="{Binding Administrators, Converter={StaticResource ListConverterString}}"
                                  Margin="3"
                                  Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto" />
+                        <Label Content="Reserved Players" />
+                        <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
+                                 Style="{StaticResource ValidatedTextBox}">
+                            <TextBox.Text>
+                                <Binding Path="Reserved" UpdateSourceTrigger="PropertyChanged"
+                                         ValidatesOnDataErrors="True" NotifyOnValidationError="True"
+                                         Converter="{StaticResource ListConverterUInt64}">
+                                    <Binding.ValidationRules>
+                                        <validationRules:ListConverterValidationRule Type="system:UInt64" />
+                                    </Binding.ValidationRules>
+                                </Binding>
+                            </TextBox.Text>
+                        </TextBox>
                         <Label Content="Banned Players" />
                         <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
                                  Style="{StaticResource ValidatedTextBox}">

From f990d278514cabef976be9ed9e94e850eefc9ca7 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 10 Jan 2019 19:11:19 -0500
Subject: [PATCH 005/170] Enable creation of new worlds in Torch

---
 Torch.Server/Views/ConfigControl.xaml         |  1 +
 Torch.Server/Views/ConfigControl.xaml.cs      |  6 ++
 Torch.Server/Views/WorldGeneratorDialog.xaml  | 20 ++++---
 .../Views/WorldGeneratorDialog.xaml.cs        | 59 ++++++++++++++-----
 4 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index b4b58c4..f6e9f99 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -27,6 +27,7 @@
         <DockPanel Grid.Row="0">
             <Label Content="World:" DockPanel.Dock="Left" />
             <Button Content="Import World Config" Margin="3" Padding="3" DockPanel.Dock="Right" Click="ImportConfig_OnClick" ToolTip="Override the DS config with the one from the selected world." IsEnabled="{Binding ElementName=WorldList, Path=Items.Count, Mode=OneWay}"/>
+            <Button Content="New World" Margin="3" Padding="3" DockPanel.Dock="Right" Click="NewWorld_OnClick"/>
             <ComboBox x:Name="WorldList" ItemsSource="{Binding Worlds}" SelectedItem="{Binding SelectedWorld}" Margin="3"
                       SelectionChanged="Selector_OnSelectionChanged">
                 <ComboBox.ItemTemplate>
diff --git a/Torch.Server/Views/ConfigControl.xaml.cs b/Torch.Server/Views/ConfigControl.xaml.cs
index 33dde95..750906e 100644
--- a/Torch.Server/Views/ConfigControl.xaml.cs
+++ b/Torch.Server/Views/ConfigControl.xaml.cs
@@ -116,5 +116,11 @@ namespace Torch.Server.Views
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
+
+        private void NewWorld_OnClick(object sender, RoutedEventArgs e)
+        {
+            var c  = new WorldGeneratorDialog(_instanceManager);
+            c.Show();
+        }
     }
 }
diff --git a/Torch.Server/Views/WorldGeneratorDialog.xaml b/Torch.Server/Views/WorldGeneratorDialog.xaml
index c06deae..65fec77 100644
--- a/Torch.Server/Views/WorldGeneratorDialog.xaml
+++ b/Torch.Server/Views/WorldGeneratorDialog.xaml
@@ -5,14 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Torch.Server"
         xmlns:views="clr-namespace:Torch.Server.Views"
+        xmlns:views1="clr-namespace:Torch.Views;assembly=Torch"
         mc:Ignorable="d"
-        Title="WorldGeneratorDialog" Height="300" Width="700">
+        Title="WorldGeneratorDialog" Height="500" Width="700">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="250"/>
-            <ColumnDefinition Width="440"/>
+            <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <ListView Grid.Column="0" x:Name="PremadeCheckpoints" ScrollViewer.CanContentScroll="False" HorizontalContentAlignment="Center" Margin="3">
+        <ListView Grid.Column="0" x:Name="PremadeCheckpoints" ScrollViewer.CanContentScroll="False" HorizontalContentAlignment="Center" Margin="3" SelectionChanged="PremadeCheckpoints_SelectionChanged">
             <ListView.ItemTemplate>
                 <DataTemplate DataType="local:PremadeCheckpointItem">
                     <StackPanel HorizontalAlignment="Center">
@@ -26,13 +27,18 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-        <StackPanel Grid.Column="1" Margin="3">
+        <Grid Grid.Column="1" Margin="3">
+            <Grid.RowDefinitions>
+                <RowDefinition Height ="Auto"/>
+                <RowDefinition Height ="*"/>
+                <RowDefinition Height ="Auto"/>
+            </Grid.RowDefinitions>
             <StackPanel Orientation="Horizontal">
                 <Label Content="World Name: "/>
                 <TextBox x:Name="WorldName" Width="300" Margin="3"/>
             </StackPanel>
-            <views:SessionSettingsView/>
-            <Button Content="Create World" Click="ButtonBase_OnClick"/>
-        </StackPanel>
+            <views1:PropertyGrid Grid.Row="1" x:Name="SettingsView" Margin="3"/>
+            <Button Grid.Row="2"  Content="Create World" Click="ButtonBase_OnClick" Margin ="3"/>
+        </Grid>
     </Grid>
 </Window>
diff --git a/Torch.Server/Views/WorldGeneratorDialog.xaml.cs b/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
index 0dc3c4b..cfbfad8 100644
--- a/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
+++ b/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
@@ -13,7 +13,15 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using NLog;
 using Sandbox.Definitions;
+using Sandbox.Engine.Networking;
+using Sandbox.Game.World;
 using Torch.Server.Managers;
+using Torch.Server.ViewModels;
+using Torch.Utils;
+using VRage;
+using VRage.Dedicated;
+using VRage.FileSystem;
+using VRage.Game;
 using VRage.Game.Localization;
 using VRage.Utils;
 
@@ -26,19 +34,25 @@ namespace Torch.Server
     {
         private InstanceManager _instanceManager;
         private List<PremadeCheckpointItem> _checkpoints = new List<PremadeCheckpointItem>();
+        private PremadeCheckpointItem _currentItem;
+
+        [ReflectedStaticMethod(Type = typeof(ConfigForm), Name = "LoadLocalization")]
+        private static Action _loadLocalization;
 
         public WorldGeneratorDialog(InstanceManager instanceManager)
         {
             _instanceManager = instanceManager;
             InitializeComponent();
-
-            MyDefinitionManager.Static.LoadScenarios();
-            var scenarios = MyDefinitionManager.Static.GetScenarioDefinitions();
-            MyDefinitionManager.Static.UnloadData();
-            foreach (var scenario in scenarios)
+            _loadLocalization();
+            var scenarios = MyLocalCache.GetAvailableWorldInfos(Path.Combine(MyFileSystem.ContentPath, "CustomWorlds"));
+            foreach (var tup in scenarios)
             {
-                //TODO: Load localization
-                _checkpoints.Add(new PremadeCheckpointItem { Name = scenario.DisplayNameText, Icon = @"C:\Users\jgross\Documents\Projects\TorchAPI\Torch\bin\x64\Release\Content\CustomWorlds\Empty World\thumb.jpg" });
+                string directory = tup.Item1;
+                MyWorldInfo info = tup.Item2;
+                string localizedName = MyTexts.GetString(MyStringId.GetOrCompute(info.SessionName));
+                var checkpoint = MyLocalCache.LoadCheckpoint(directory, out _);
+                checkpoint.OnlineMode = MyOnlineModeEnum.PUBLIC;
+                _checkpoints.Add(new PremadeCheckpointItem { Name = localizedName, Icon = Path.Combine(directory, "thumb.jpg"), Path = directory, Checkpoint = checkpoint});
             }
 
             /*
@@ -56,23 +70,39 @@ namespace Torch.Server
             }*/
             PremadeCheckpoints.ItemsSource = _checkpoints;
         }
-
+        
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         {
-            /*
-            var worldPath = Path.Combine("Instance", "Saves", WorldName.Text);
-            var checkpointItem = (PremadeCheckpointItem)PremadeCheckpoints.SelectedItem;
+            string worldName = string.IsNullOrEmpty(WorldName.Text) ? _currentItem.Name : WorldName.Text;
+            var worldPath = Path.Combine("Instance", "Saves", worldName);
+            var checkpoint= _currentItem.Checkpoint;
             if (Directory.Exists(worldPath))
             {
                 MessageBox.Show("World already exists with that name.");
                 return;
             }
             Directory.CreateDirectory(worldPath);
-            foreach (var file in Directory.EnumerateFiles(checkpointItem.Path, "*", SearchOption.AllDirectories))
+            foreach (var file in Directory.EnumerateFiles(_currentItem.Path, "*", SearchOption.AllDirectories))
             {
-                File.Copy(file, Path.Combine(worldPath, file.Replace($"{checkpointItem.Path}\\", "")));
+                File.Copy(file, Path.Combine(worldPath, file.Replace($"{_currentItem.Path}\\", "")));
             }
-            _instanceManager.SelectWorld(worldPath, false);*/
+
+            checkpoint.SessionName = worldName;
+
+            MyLocalCache.SaveCheckpoint(checkpoint, worldPath);
+
+
+            _instanceManager.SelectWorld(worldPath, false);
+            _instanceManager.LoadInstance(worldPath);
+            _instanceManager.ImportSelectedWorldConfig();
+            Close();
+        }
+
+        private void PremadeCheckpoints_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var selected = (PremadeCheckpointItem)PremadeCheckpoints.SelectedItem;
+            _currentItem = selected;
+            SettingsView.DataContext = new SessionSettingsViewModel(_currentItem.Checkpoint.Settings);
         }
     }
 
@@ -81,5 +111,6 @@ namespace Torch.Server
         public string Path { get; set; }
         public string Name { get; set; }
         public string Icon { get; set; }
+        public MyObjectBuilder_Checkpoint Checkpoint { get; set; }
     }
 }

From 8b7a07ffe74dbb1aab02d8464fccc8bd761a43b0 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 10 Jan 2019 21:35:48 -0500
Subject: [PATCH 006/170] Deprecate ReservedPlayers in Torch cfg Add a
 scrollpanel to fix clipped controls

---
 Torch.Server/Managers/InstanceManager.cs      |  10 ++
 .../Managers/MultiplayerManagerDedicated.cs   |   3 +-
 Torch.Server/TorchConfig.cs                   |   7 +-
 Torch.Server/Views/ConfigControl.xaml         | 162 +++++++++---------
 4 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index 5011932..245f8d1 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -167,6 +167,16 @@ namespace Torch.Server.Managers
 
         public void SaveConfig()
         {
+            var cf = Torch.Config as TorchConfig;
+            if (cf?.ReservedPlayers?.Count > 0)
+            {
+                foreach (var res in cf.ReservedPlayers)
+                {
+                    if (!DedicatedConfig.Reserved.Contains(res))
+                        DedicatedConfig.Reserved.Add(res);
+                }
+            }
+
             DedicatedConfig.Save(Path.Combine(Torch.Config.InstancePath, CONFIG_NAME));
             Log.Info("Saved dedicated config.");
 
diff --git a/Torch.Server/Managers/MultiplayerManagerDedicated.cs b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
index 7fd5b10..ddee914 100644
--- a/Torch.Server/Managers/MultiplayerManagerDedicated.cs
+++ b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
@@ -219,8 +219,7 @@ namespace Torch.Server.Managers
                     _log.Warn($"Rejecting user {info.SteamID} because they are not whitelisted in Torch.cfg.");
                     internalAuth = JoinResult.NotInGroup;
                 }
-                else if (config.EnableReservedSlots && (config.ReservedPlayers.Contains(info.SteamID) ||
-                    MySandboxGame.ConfigDedicated.Reserved.Contains(info.SteamID)))
+                else if (MySandboxGame.ConfigDedicated.Reserved.Contains(info.SteamID))
                     internalAuth = JoinResult.OK;
                 //Admins can bypass member limit
                 else if (MySandboxGame.ConfigDedicated.Administrators.Contains(info.SteamID.ToString()) ||
diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index f686315..0b9fdad 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -68,9 +68,14 @@ namespace Torch.Server
 
         public string LastUsedTheme { get; set; } = "Torch Theme";
 
-        public bool EnableReservedSlots { get; set; } = false;
+        //TODO: REMOVE ME BY JULY 2019
+        [Obsolete("Use vanilla reserved slot config")]
         public HashSet<ulong> ReservedPlayers { get; set; } = new HashSet<ulong>();
 
+        //Prevent reserved players being written to disk, but allow it to bre read
+        //remove this when ReservedPlayers is removed
+        private bool ShouldSerializeReservedPlayers() => false;
+
         [XmlIgnore]
         private string _path;
 
diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index f6e9f99..9d0cb99 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -58,87 +58,89 @@
                     <RowDefinition />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0" Margin="3" DockPanel.Dock="Left">
-                        <Label Content="Server Name" />
-                        <TextBox Text="{Binding ServerName}" Margin="3,0,3,3" Width="160" />
-                      <Label Content="World Name" />
-                      <TextBox Text="{Binding WorldName}" Margin="3,0,3,3" Width="160" />
-                      <Label Content="Server Description" />
-                      <TextBox Text="{Binding ServerDescription}" Margin="3,0,3,3" Width="160" Height="100"
-                               AcceptsReturn="true" VerticalScrollBarVisibility="Auto"/>
-                      <Label Content="Whitelist Group ID" />
-                        <TextBox Margin="3,0,3,3" Width="160" Style="{StaticResource ValidatedTextBox}">
-                            <TextBox.Text>
-                                <Binding Path="GroupId" UpdateSourceTrigger="PropertyChanged"
-                                         ValidatesOnDataErrors="True" NotifyOnValidationError="True">
-                                    <Binding.ValidationRules>
-                                        <validationRules:NumberValidationRule />
-                                    </Binding.ValidationRules>
-                                </Binding>
-                            </TextBox.Text>
-                        </TextBox>
-                        <Label Content="Server IP" />
-                        <StackPanel Orientation="Horizontal" Margin="3,0,3,3">
-                            <TextBox Text="{Binding IP}" Width="100" Height="20" />
-                            <Label Content=":" Width="12" />
-                            <TextBox Text="{Binding Port}" Width="48" Height="20" />
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" Margin="3" DockPanel.Dock="Left">
+                            <Label Content="Server Name" />
+                            <TextBox Text="{Binding ServerName}" Margin="3,0,3,3" Width="160" />
+                          <Label Content="World Name" />
+                          <TextBox Text="{Binding WorldName}" Margin="3,0,3,3" Width="160" />
+                          <Label Content="Server Description" />
+                          <TextBox Text="{Binding ServerDescription}" Margin="3,0,3,3" Width="160" Height="100"
+                                   AcceptsReturn="true" VerticalScrollBarVisibility="Auto"/>
+                          <Label Content="Whitelist Group ID" />
+                            <TextBox Margin="3,0,3,3" Width="160" Style="{StaticResource ValidatedTextBox}">
+                                <TextBox.Text>
+                                    <Binding Path="GroupId" UpdateSourceTrigger="PropertyChanged"
+                                             ValidatesOnDataErrors="True" NotifyOnValidationError="True">
+                                        <Binding.ValidationRules>
+                                            <validationRules:NumberValidationRule />
+                                        </Binding.ValidationRules>
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+                            <Label Content="Server IP" />
+                            <StackPanel Orientation="Horizontal" Margin="3,0,3,3">
+                                <TextBox Text="{Binding IP}" Width="100" Height="20" />
+                                <Label Content=":" Width="12" />
+                                <TextBox Text="{Binding Port}" Width="48" Height="20" />
+                            </StackPanel>
+                            <Label Content="Server Password"/>
+                            <TextBox Text="{Binding Password}" Width="160"/>
+                            <CheckBox IsChecked="{Binding PauseGameWhenEmpty}" Content="Pause When Empty" Margin="3" />
+                            <CheckBox IsChecked="{Binding AutodetectDependencies}" Content="Auto Detect Dependencies" Margin="3" />
                         </StackPanel>
-                        <Label Content="Server Password"/>
-                        <TextBox Text="{Binding Password}" Width="160"/>
-                        <CheckBox IsChecked="{Binding PauseGameWhenEmpty}" Content="Pause When Empty" Margin="3" />
-                        <CheckBox IsChecked="{Binding AutodetectDependencies}" Content="Auto Detect Dependencies" Margin="3" />
-                    </StackPanel>
-                    <StackPanel Grid.Column="1" Margin="3">
-                        <Label Content="Mods" />
-                        <TextBox Margin="3" Height="60" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
-                                 Style="{StaticResource ValidatedTextBox}">
-                            <TextBox.Text>
-                                <Binding Path="Mods" UpdateSourceTrigger="PropertyChanged"
-                                         ValidatesOnDataErrors="True" NotifyOnValidationError="True"
-                                         Converter="{StaticResource ListConverterUInt64}">
-                                    <Binding.ValidationRules>
-                                        <validationRules:ListConverterValidationRule Type="system:UInt64" />
-                                    </Binding.ValidationRules>
-                                </Binding>
-                            </TextBox.Text>
-                        </TextBox>
-                        <Label Content="Administrators" />
-                        <TextBox Text="{Binding Administrators, Converter={StaticResource ListConverterString}}"
-                                 Margin="3"
-                                 Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto" />
-                        <Label Content="Reserved Players" />
-                        <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
-                                 Style="{StaticResource ValidatedTextBox}">
-                            <TextBox.Text>
-                                <Binding Path="Reserved" UpdateSourceTrigger="PropertyChanged"
-                                         ValidatesOnDataErrors="True" NotifyOnValidationError="True"
-                                         Converter="{StaticResource ListConverterUInt64}">
-                                    <Binding.ValidationRules>
-                                        <validationRules:ListConverterValidationRule Type="system:UInt64" />
-                                    </Binding.ValidationRules>
-                                </Binding>
-                            </TextBox.Text>
-                        </TextBox>
-                        <Label Content="Banned Players" />
-                        <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
-                                 Style="{StaticResource ValidatedTextBox}">
-                            <TextBox.Text>
-                                <Binding Path="Banned" UpdateSourceTrigger="PropertyChanged"
-                                         ValidatesOnDataErrors="True" NotifyOnValidationError="True"
-                                         Converter="{StaticResource ListConverterUInt64}">
-                                    <Binding.ValidationRules>
-                                        <validationRules:ListConverterValidationRule Type="system:UInt64" />
-                                    </Binding.ValidationRules>
-                                </Binding>
-                            </TextBox.Text>
-                        </TextBox>
-                    </StackPanel>
-                </Grid>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Mods" />
+                            <TextBox Margin="3" Height="60" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
+                                     Style="{StaticResource ValidatedTextBox}">
+                                <TextBox.Text>
+                                    <Binding Path="Mods" UpdateSourceTrigger="PropertyChanged"
+                                             ValidatesOnDataErrors="True" NotifyOnValidationError="True"
+                                             Converter="{StaticResource ListConverterUInt64}">
+                                        <Binding.ValidationRules>
+                                            <validationRules:ListConverterValidationRule Type="system:UInt64" />
+                                        </Binding.ValidationRules>
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+                            <Label Content="Administrators" />
+                            <TextBox Text="{Binding Administrators, Converter={StaticResource ListConverterString}}"
+                                     Margin="3"
+                                     Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto" />
+                            <Label Content="Reserved Players" />
+                            <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
+                                     Style="{StaticResource ValidatedTextBox}">
+                                <TextBox.Text>
+                                    <Binding Path="Reserved" UpdateSourceTrigger="PropertyChanged"
+                                             ValidatesOnDataErrors="True" NotifyOnValidationError="True"
+                                             Converter="{StaticResource ListConverterUInt64}">
+                                        <Binding.ValidationRules>
+                                            <validationRules:ListConverterValidationRule Type="system:UInt64" />
+                                        </Binding.ValidationRules>
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+                            <Label Content="Banned Players" />
+                            <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
+                                     Style="{StaticResource ValidatedTextBox}">
+                                <TextBox.Text>
+                                    <Binding Path="Banned" UpdateSourceTrigger="PropertyChanged"
+                                             ValidatesOnDataErrors="True" NotifyOnValidationError="True"
+                                             Converter="{StaticResource ListConverterUInt64}">
+                                        <Binding.ValidationRules>
+                                            <validationRules:ListConverterValidationRule Type="system:UInt64" />
+                                        </Binding.ValidationRules>
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+                        </StackPanel>
+                    </Grid>
+                </ScrollViewer>
                 <Button Grid.Row="1" Content="Save Config" Margin="3" Click="Save_OnClick" />
             </Grid>
             <views:PropertyGrid Grid.Column="1" Margin="3" DataContext="{Binding SessionSettings}" IgnoreDisplay ="True" />

From 276a4522d63e6c2d0f95aedc19ca7747918babba Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 10:22:09 -0800
Subject: [PATCH 007/170] Disable building Torch client

---
 Torch.sln | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Torch.sln b/Torch.sln
index 9f2f29b..f011ab3 100644
--- a/Torch.sln
+++ b/Torch.sln
@@ -55,10 +55,8 @@ Global
 		{FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}.Release|x64.Build.0 = Release|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Debug|x64.ActiveCfg = Debug|x64
-		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Debug|x64.Build.0 = Debug|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Release|Any CPU.ActiveCfg = Release|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Release|x64.ActiveCfg = Release|x64
-		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Release|x64.Build.0 = Release|x64
 		{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|x64.ActiveCfg = Debug|x64
 		{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|x64.Build.0 = Debug|x64
@@ -79,10 +77,8 @@ Global
 		{9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}.Release|x64.Build.0 = Release|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Debug|x64.ActiveCfg = Debug|x64
-		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Debug|x64.Build.0 = Debug|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Release|Any CPU.ActiveCfg = Release|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Release|x64.ActiveCfg = Release|x64
-		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 9c630549263a509abeabb803d702290966990776 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 10:29:05 -0800
Subject: [PATCH 008/170] Add SteamCMD beta arguments

---
 Torch.Server/Initializer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 3e83980..7289f36 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -31,7 +31,7 @@ namespace Torch.Server
 
         private const string RUNSCRIPT = @"force_install_dir ../
 login anonymous
-app_update 298740
+app_update 298740 -beta playtest -betapassword nt7WuDw9kdvC
 quit";
 
         private TorchConfig _config;

From 36b931f6800bb51d0d2ffd3edbd847ffb67d5b67 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 14:51:24 -0800
Subject: [PATCH 009/170] Fix compilation errors, disable XML warnings

---
 Torch.API/Torch.API.csproj       | 1 +
 Torch.Client/Torch.Client.csproj | 1 +
 Torch.Server/Torch.Server.csproj | 1 +
 Torch/Torch.csproj               | 1 +
 Torch/VRageGame.cs               | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj
index c7137e0..10bedc2 100644
--- a/Torch.API/Torch.API.csproj
+++ b/Torch.API/Torch.API.csproj
@@ -31,6 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.API.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HavokWrapper, Version=1.0.6278.22649, Culture=neutral, processorArchitecture=AMD64">
diff --git a/Torch.Client/Torch.Client.csproj b/Torch.Client/Torch.Client.csproj
index 40f2506..82a74fa 100644
--- a/Torch.Client/Torch.Client.csproj
+++ b/Torch.Client/Torch.Client.csproj
@@ -36,6 +36,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
     <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.Client.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>torchicon.ico</ApplicationIcon>
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 545f740..0e0b2fb 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -51,6 +51,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
     <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.Server.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Torch.Server.Program</StartupObject>
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 1a50d4f..defaca4 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -33,6 +33,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index e470878..eafe74a 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -277,7 +277,7 @@ namespace Torch
             MyObjectBuilder_Checkpoint checkpoint = MyLocalCache.LoadCheckpoint(sessionPath, out checkpointSize);
             if (MySession.IsCompatibleVersion(checkpoint))
             {
-                if (MyWorkshop.DownloadWorldModsBlocking(checkpoint.Mods, null).Success)
+                if (MyWorkshop.DownloadWorldModsBlocking(checkpoint.Mods).Success)
                 {
                     // MySpaceAnalytics.Instance.SetEntry(MyGameEntryEnum.Load);
                     MySession.Load(sessionPath, checkpoint, checkpointSize);

From b66db19c0a6a7c42fd3ce4bb36d88becfd44bda7 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 15:07:50 -0800
Subject: [PATCH 010/170] Fix post world generation behavior

---
 Torch.Server/Managers/InstanceManager.cs        | 10 +++++++++-
 Torch.Server/Views/WorldGeneratorDialog.xaml.cs |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index 245f8d1..b47cb4e 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -87,7 +87,15 @@ namespace Torch.Server.Managers
         public void SelectWorld(string worldPath, bool modsOnly = true)
         {
             DedicatedConfig.LoadWorld = worldPath;
-            DedicatedConfig.SelectedWorld = DedicatedConfig.Worlds.FirstOrDefault(x => x.WorldPath == worldPath);
+            
+            var worldInfo = DedicatedConfig.Worlds.FirstOrDefault(x => x.WorldPath == worldPath);
+            if (worldInfo?.Checkpoint == null)
+            {
+                worldInfo = new WorldViewModel(worldPath);
+                DedicatedConfig.Worlds.Add(worldInfo);
+            }
+
+            DedicatedConfig.SelectedWorld = worldInfo;
             if (DedicatedConfig.SelectedWorld?.Checkpoint != null)
             {
                 DedicatedConfig.Mods.Clear();
diff --git a/Torch.Server/Views/WorldGeneratorDialog.xaml.cs b/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
index cfbfad8..eec25de 100644
--- a/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
+++ b/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
@@ -93,7 +93,6 @@ namespace Torch.Server
 
 
             _instanceManager.SelectWorld(worldPath, false);
-            _instanceManager.LoadInstance(worldPath);
             _instanceManager.ImportSelectedWorldConfig();
             Close();
         }

From ae3edd67da3831f994bc3a977d0938a1f1dac4b5 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 15:52:16 -0800
Subject: [PATCH 011/170] Update chat schtuff

---
 .../ViewModels/SessionSettingsViewModel.cs      | 10 ++++++++--
 Torch/Managers/ChatManager/ChatManagerClient.cs | 17 ++++++-----------
 Torch/Managers/ChatManager/ChatManagerServer.cs |  8 ++++----
 Torch/VRageGame.cs                              |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Torch.Server/ViewModels/SessionSettingsViewModel.cs b/Torch.Server/ViewModels/SessionSettingsViewModel.cs
index 9f43d01..5a658ca 100644
--- a/Torch.Server/ViewModels/SessionSettingsViewModel.cs
+++ b/Torch.Server/ViewModels/SessionSettingsViewModel.cs
@@ -120,8 +120,14 @@ namespace Torch.Server.ViewModels
         public bool EnableSaving { get => _settings.EnableSaving; set => SetValue(ref _settings.EnableSaving, value); }
 
         [Torch.Views.Display(Description = "Enables respawn screen.", Name = "Enable Respawn Screen in the Game", GroupName = "Players")]
-        public bool EnableRespawnScreen { get => _settings.EnableRespawnScreen; set => SetValue(ref _settings.EnableRespawnScreen, value); }
-
+        public bool StartInRespawnScreen { get => _settings.StartInRespawnScreen; set => SetValue(ref _settings.StartInRespawnScreen, value); }
+        
+        [Torch.Views.Display(Description = "Enables research.", Name = "Enable Research", GroupName = "Players")]
+        public bool EnableResearch { get => _settings.EnableResearch; set => SetValue(ref _settings.EnableResearch, value); }
+        
+        [Torch.Views.Display(Description = "Enables Good.bot hints.", Name = "Enable Good.bot hints", GroupName = "Players")]
+        public bool EnableGoodBotHints { get => _settings.EnableGoodBotHints; set => SetValue(ref _settings.EnableGoodBotHints, value); }
+        
         [Torch.Views.Display(Description = "Enables infinite ammunition in survival game mode.", Name = "Enable Infinite Ammunition in Survival", GroupName = "Others")]
         public bool InfiniteAmmo { get => _settings.InfiniteAmmo; set => SetValue(ref _settings.InfiniteAmmo, value); }
 
diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index 0ded357..f7b175c 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -48,7 +48,8 @@ namespace Torch.Managers.ChatManager
                     MyMultiplayerBase.SendScriptedChatMessage(ref scripted);
                 }
                 else
-                    MyMultiplayer.Static.SendChatMessage(message);
+                    throw new NotImplementedException("Chat system changes broke this");
+                    //MyMultiplayer.Static.SendChatMessage(message);
             }
             else if (HasHud)
                 MyHud.Chat.ShowMessage(MySession.Static.LocalHumanPlayer?.DisplayName ?? "Player", message);
@@ -59,12 +60,6 @@ namespace Torch.Managers.ChatManager
         {
             if (HasHud)
                 MyHud.Chat?.ShowMessage(author, message, font);
-            MySession.Static.GlobalChatHistory.GlobalChatHistory.Chat.Enqueue(new MyGlobalChatItem()
-            {
-                Author = author,
-                AuthorFont = font,
-                Text = message
-            });
         }
 
         /// <inheritdoc/>
@@ -76,7 +71,7 @@ namespace Torch.Managers.ChatManager
             {
                 _chatMessageRecievedReplacer = _chatMessageReceivedFactory.Invoke();
                 _scriptedChatMessageRecievedReplacer = _scriptedChatMessageReceivedFactory.Invoke();
-                _chatMessageRecievedReplacer.Replace(new Action<ulong, string>(Multiplayer_ChatMessageReceived),
+                _chatMessageRecievedReplacer.Replace(new Action<ulong, string, ChatChannel, long, string>(Multiplayer_ChatMessageReceived),
                     MyMultiplayer.Static);
                 _scriptedChatMessageRecievedReplacer.Replace(
                     new Action<string, string, string>(Multiplayer_ScriptedChatMessageReceived), MyMultiplayer.Static);
@@ -130,12 +125,12 @@ namespace Torch.Managers.ChatManager
         }
 
 
-        private void Multiplayer_ChatMessageReceived(ulong steamUserId, string message)
+        private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName)
         {
-            var torchMsg = new TorchChatMessage(steamUserId, message,
+            var torchMsg = new TorchChatMessage(steamUserId, $"[{channel}] {messageText}",
                 (steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue);
             if (!RaiseMessageRecieved(torchMsg) && HasHud)
-                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, message);
+                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, $"[{channel}] {messageText}");
         }
 
         private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font)
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index ba92ad3..6a0ec34 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -137,13 +137,13 @@ namespace Torch.Managers.ChatManager
             return consumed;
         }
 
-        private void MpStaticChatMessageReceived(ulong a, string b)
+        private void MpStaticChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName)
         {
             var tmp = false;
-            RaiseMessageRecieved(new ChatMsg()
+            RaiseMessageRecieved(new ChatMsg
             {
-                Author = a,
-                Text = b
+                Author = steamUserId,
+                Text = messageText
             }, ref tmp);
         }
 
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index eafe74a..e470878 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -277,7 +277,7 @@ namespace Torch
             MyObjectBuilder_Checkpoint checkpoint = MyLocalCache.LoadCheckpoint(sessionPath, out checkpointSize);
             if (MySession.IsCompatibleVersion(checkpoint))
             {
-                if (MyWorkshop.DownloadWorldModsBlocking(checkpoint.Mods).Success)
+                if (MyWorkshop.DownloadWorldModsBlocking(checkpoint.Mods, null).Success)
                 {
                     // MySpaceAnalytics.Instance.SetEntry(MyGameEntryEnum.Load);
                     MySession.Load(sessionPath, checkpoint, checkpointSize);

From 6973bc8e7d8ba8fe4be98d762a8d5f1d03220660 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 15:58:35 -0800
Subject: [PATCH 012/170] Make Jenkins download playtest branch

---
 Jenkins/jenkins-grab-se.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 7670e02..f3c636e 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -1,6 +1,6 @@
 pushd
 
-$steamData = "C:/Steam/Data/"
+$steamData = "C:/Steam/Data-playtest/"
 $steamCMDPath = "C:/Steam/steamcmd/"
 $steamCMDZip = "C:/Steam/steamcmd.zip"
 
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword nt7WuDw9kdvC" "+quit"
 
 popd
\ No newline at end of file

From 1a0f80dce7de599d233d2743af486d9d4e3af032 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 16:07:13 -0800
Subject: [PATCH 013/170] Actually finish making Jenkins work

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e554cf4..b2a5471 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@ node {
 	stage('Acquire SE') {
 		bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
 		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
-		bat 'mklink /J GameBinaries "C:/Steam/Data/DedicatedServer64/"'		
+		bat 'mklink /J GameBinaries "C:/Steam/Data-playtest/DedicatedServer64/"'		
 	}
 
 	stage('Acquire NuGet Packages') {

From 30729049b317987e016146264a79b2cf46245812 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 17 Jan 2019 17:02:03 -0800
Subject: [PATCH 014/170] Give Mr. Parenthesis a friend

---
 Torch/Managers/MultiplayerManagerBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Managers/MultiplayerManagerBase.cs b/Torch/Managers/MultiplayerManagerBase.cs
index d892a8e..30bf775 100644
--- a/Torch/Managers/MultiplayerManagerBase.cs
+++ b/Torch/Managers/MultiplayerManagerBase.cs
@@ -116,7 +116,7 @@ namespace Torch.Managers
         protected void RaiseClientJoined(ulong steamId)
         {
             var vm = new PlayerViewModel(steamId) { State = ConnectionState.Connected };
-            _log.Info($"Player {vm.Name} joined ({vm.SteamId}");
+            _log.Info($"Player {vm.Name} joined ({vm.SteamId})");
             Players.Add(steamId, vm);
             PlayerJoined?.Invoke(vm);
         }

From 8c7891809e94965e61b25c074f0157019ab5eba6 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 21 Jan 2019 16:11:44 -0800
Subject: [PATCH 015/170] Update readme

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index f80cbe2..f553aaa 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,10 @@ Torch is the successor to SE Server Extender and gives server admins the tools t
 * Unzip the Torch release into its own directory and run the executable. It will automatically download the SE DS and generate the other necessary files.
   - If you already have a DS installed you can unzip the Torch files into the folder that contains the DedicatedServer64 folder.
 
-## Torch.Client
-* An optional client-side version of Torch. More documentation to come.
-
 # Building
 To build Torch you must first have a complete SE Dedicated installation somewhere. Before you open the solution, run the Setup batch file and enter the path of that installation's DedicatedServer64 folder. The script will make a symlink to that folder so the Torch solution can find the DLL references it needs.
 
 In both cases you will need to set the InstancePath in TorchConfig.xml to an existing dedicated server instance as Torch can't fully generate it on its own yet.
 
-# Official Plugins
-Install plugins by unzipping them into the 'Plugins' folder which should be in the same location as the Torch files. If it doesn't exist you can simply create it.
-* [Essentials](https://github.com/TorchAPI/Essentials): Adds a slew of chat commands and other tools to help manage your server.
-* [Concealment](https://github.com/TorchAPI/Concealment): Adds game logic and physics optimizations that significantly improve sim speed.
-
 If you have a more enjoyable server experience because of Torch, please consider supporting us on Patreon.
 [![Patreon](http://i.imgur.com/VzzIMgn.png)](https://www.patreon.com/bePatron?u=847269)!

From 814a9def7f5f92e73fd684c66279f51ee4396278 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 21 Jan 2019 16:13:14 -0800
Subject: [PATCH 016/170] Update readme

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index f80cbe2..f553aaa 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,10 @@ Torch is the successor to SE Server Extender and gives server admins the tools t
 * Unzip the Torch release into its own directory and run the executable. It will automatically download the SE DS and generate the other necessary files.
   - If you already have a DS installed you can unzip the Torch files into the folder that contains the DedicatedServer64 folder.
 
-## Torch.Client
-* An optional client-side version of Torch. More documentation to come.
-
 # Building
 To build Torch you must first have a complete SE Dedicated installation somewhere. Before you open the solution, run the Setup batch file and enter the path of that installation's DedicatedServer64 folder. The script will make a symlink to that folder so the Torch solution can find the DLL references it needs.
 
 In both cases you will need to set the InstancePath in TorchConfig.xml to an existing dedicated server instance as Torch can't fully generate it on its own yet.
 
-# Official Plugins
-Install plugins by unzipping them into the 'Plugins' folder which should be in the same location as the Torch files. If it doesn't exist you can simply create it.
-* [Essentials](https://github.com/TorchAPI/Essentials): Adds a slew of chat commands and other tools to help manage your server.
-* [Concealment](https://github.com/TorchAPI/Concealment): Adds game logic and physics optimizations that significantly improve sim speed.
-
 If you have a more enjoyable server experience because of Torch, please consider supporting us on Patreon.
 [![Patreon](http://i.imgur.com/VzzIMgn.png)](https://www.patreon.com/bePatron?u=847269)!

From 3f803b8107bcc16516662f024af8ecd3ac6032e5 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 25 Jan 2019 12:22:30 -0800
Subject: [PATCH 017/170] Change init order to ensure paths are initialized for
 plugins

---
 Torch.Server/TorchServer.cs | 2 ++
 Torch/TorchBase.cs          | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 4832c9c..db8fdc4 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -18,6 +18,7 @@ using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Session;
 using Torch.Commands;
+using Torch.Managers;
 using Torch.Mod;
 using Torch.Server.Commands;
 using Torch.Server.Managers;
@@ -100,6 +101,7 @@ namespace Torch.Server
             base.Init();
             Managers.GetManager<ITorchSessionManager>().SessionStateChanged += OnSessionStateChanged;
             GetManager<InstanceManager>().LoadInstance(Config.InstancePath);
+            GetManager<PluginManager>().LoadPlugins();
             CanRun = true;
             Initialized?.Invoke(this);
             Log.Info($"Initialized server '{Config.InstanceName}' at '{Config.InstancePath}'");
diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index 8f661f8..6a864f1 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -334,7 +334,6 @@ namespace Torch
             Log.Info($"Executing assembly: {Assembly.GetEntryAssembly().FullName}");
             Log.Info($"Executing directory: {AppDomain.CurrentDomain.BaseDirectory}");
 
-            Managers.GetManager<PluginManager>().LoadPlugins();
             Game = new VRageGame(this, TweakGameSettings, SteamAppName, SteamAppId, Config.InstancePath, RunArgs);
             if (!Game.WaitFor(VRageGame.GameState.Stopped))
                 Log.Warn("Failed to wait for game to be initialized");

From 6b039288d50aa1c4faadae3bee3c53c27cc8e3b2 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 25 Jan 2019 12:31:34 -0800
Subject: [PATCH 018/170] Reorder exception logging to reduce duplication

---
 Torch.Server/Initializer.cs | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 3e83980..3a7e11e 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -190,21 +190,29 @@ quit";
         }
 
         private void LogException(Exception ex)
-        {         
+        {
+            if (ex is AggregateException ag)
+            {
+                foreach (var e in ag.InnerExceptions)
+                    LogException(e);
+
+                return;
+            }
+            
+            Log.Fatal(ex);
+            
+            if (ex is ReflectionTypeLoadException extl)
+            {
+                foreach (var exl in extl.LoaderExceptions)
+                    LogException(exl);
+
+                return;
+            }
+            
             if (ex.InnerException != null)
             {
                 LogException(ex.InnerException);
             }
-
-            Log.Fatal(ex);
-            
-            if (ex is ReflectionTypeLoadException exti)
-                foreach (Exception exl in exti.LoaderExceptions)
-                    LogException(exl);
-            
-            if (ex is AggregateException ag)
-                foreach (Exception e in ag.InnerExceptions)
-                    LogException(e);
         }
 
         private void HandleException(object sender, UnhandledExceptionEventArgs e)

From 6d29bce267790b7179665b082a3ab6e24deea186 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 25 Jan 2019 12:36:41 -0800
Subject: [PATCH 019/170] Use thread safe queues in MtObservableCollectionBase

---
 Torch/Collections/MtObservableCollectionBase.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Torch/Collections/MtObservableCollectionBase.cs b/Torch/Collections/MtObservableCollectionBase.cs
index 580e682..0473e8d 100644
--- a/Torch/Collections/MtObservableCollectionBase.cs
+++ b/Torch/Collections/MtObservableCollectionBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -123,10 +124,10 @@ namespace Torch.Collections
         private readonly Timer _flushEventQueue;
         private const int _eventRaiseDelay = 50;
 
-        private readonly Queue<NotifyCollectionChangedEventArgs> _collectionEventQueue =
-            new Queue<NotifyCollectionChangedEventArgs>();
+        private readonly ConcurrentQueue<NotifyCollectionChangedEventArgs> _collectionEventQueue =
+            new ConcurrentQueue<NotifyCollectionChangedEventArgs>();
 
-        private readonly Queue<string> _propertyEventQueue = new Queue<string>();
+        private readonly ConcurrentQueue<string> _propertyEventQueue = new ConcurrentQueue<string>();
 
         private void FlushEventQueue(object data)
         {
@@ -137,7 +138,8 @@ namespace Torch.Collections
             // :/, but works better
             bool reset = _collectionEventQueue.Count > 0;
             if (reset)
-                _collectionEventQueue.Clear();
+                while (_collectionEventQueue.Count > 0)
+                    _collectionEventQueue.TryDequeue(out _);
             else
                 while (_collectionEventQueue.TryDequeue(out NotifyCollectionChangedEventArgs e))
                     _collectionChangedEvent.Raise(this, e);

From 63ac99f97a0be81b6b93fa8d0ed58df79607cc3b Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 25 Jan 2019 13:16:14 -0800
Subject: [PATCH 020/170] Revert "Change init order to ensure paths are
 initialized for plugins"

This reverts commit 3f803b8107bcc16516662f024af8ecd3ac6032e5.
---
 Torch.Server/TorchServer.cs | 2 --
 Torch/TorchBase.cs          | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index db8fdc4..4832c9c 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -18,7 +18,6 @@ using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Session;
 using Torch.Commands;
-using Torch.Managers;
 using Torch.Mod;
 using Torch.Server.Commands;
 using Torch.Server.Managers;
@@ -101,7 +100,6 @@ namespace Torch.Server
             base.Init();
             Managers.GetManager<ITorchSessionManager>().SessionStateChanged += OnSessionStateChanged;
             GetManager<InstanceManager>().LoadInstance(Config.InstancePath);
-            GetManager<PluginManager>().LoadPlugins();
             CanRun = true;
             Initialized?.Invoke(this);
             Log.Info($"Initialized server '{Config.InstanceName}' at '{Config.InstancePath}'");
diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index 6a864f1..8f661f8 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -334,6 +334,7 @@ namespace Torch
             Log.Info($"Executing assembly: {Assembly.GetEntryAssembly().FullName}");
             Log.Info($"Executing directory: {AppDomain.CurrentDomain.BaseDirectory}");
 
+            Managers.GetManager<PluginManager>().LoadPlugins();
             Game = new VRageGame(this, TweakGameSettings, SteamAppName, SteamAppId, Config.InstancePath, RunArgs);
             if (!Game.WaitFor(VRageGame.GameState.Stopped))
                 Log.Warn("Failed to wait for game to be initialized");

From bbcfc9fb0746c51a16da189aabbe94fa789bdb8d Mon Sep 17 00:00:00 2001
From: Jimmacle <mindstorms11@cox.net>
Date: Thu, 31 Jan 2019 08:45:01 -0800
Subject: [PATCH 021/170] Update jenkins-grab-se.ps1

---
 Jenkins/jenkins-grab-se.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index f3c636e..70a5537 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword nt7WuDw9kdvC" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword nt7WuDw9kdvC validate" "+quit"
 
-popd
\ No newline at end of file
+popd

From c3addd05f7d1744ee70be07c31e877b6df9407d3 Mon Sep 17 00:00:00 2001
From: Jimmacle <mindstorms11@cox.net>
Date: Thu, 31 Jan 2019 08:46:19 -0800
Subject: [PATCH 022/170] Keen why did you change the beta password

---
 Jenkins/jenkins-grab-se.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 70a5537..26ca62e 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword nt7WuDw9kdvC validate" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword nt8WuDw9kdvE validate" "+quit"
 
 popd

From 8f755a5cfca53e869c1b477cd65e33d8eae8e9f8 Mon Sep 17 00:00:00 2001
From: Jimmacle <mindstorms11@cox.net>
Date: Thu, 31 Jan 2019 11:45:11 -0800
Subject: [PATCH 023/170] Update Initializer.cs

---
 Torch.Server/Initializer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 7289f36..0844df8 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -31,7 +31,7 @@ namespace Torch.Server
 
         private const string RUNSCRIPT = @"force_install_dir ../
 login anonymous
-app_update 298740 -beta playtest -betapassword nt7WuDw9kdvC
+app_update 298740 -beta playtest -betapassword nt8WuDw9kdvE
 quit";
 
         private TorchConfig _config;
@@ -235,4 +235,4 @@ quit";
             Process.GetCurrentProcess().Kill();
         }
     }
-}
\ No newline at end of file
+}

From f265f7e773d93f1c20e8ac7a098b114859338265 Mon Sep 17 00:00:00 2001
From: Tobias K <3knoeppl@informatik.uni-hamburg.de>
Date: Sat, 2 Feb 2019 12:26:55 +0100
Subject: [PATCH 024/170] Replace mod text box by separate tab with workshop
 support (#263)

* Implement ModList tab which fetches and displays mod information from the workshop.

* ModListEditor: Implement drag and drop ordering, adding, removing and saving.

* Add SteamWorkshopService to VCS

* Add missing file to SteamworkshopService project.

* ModlistControl: Implement checkbox for hiding/showing dependency mods
disable until config is loaded.
design improvements.

* Add documentation for the new classes.

* Comply to naming conventions.

* Update Torch.Server.csproj

* Fix Mod.IsDependency not being serialized when saving

* Remove superfluous update of mod meta data.
Remove commented section in ConfigControl.xaml.

* Optimized SteamworkshopService according to commit review.

* Move SteamWorkshopService to Torch.Utils.SteamworkshopTools

* Remove debug output.

* Don't break stack trace with custom exception in SteamWorkshopTools.

* User ViewModel base class for ModItemInfo instead of implementing INotifyProperty directly.

* Wrap ModListControl in ScrollViewer.

* Rename SteamWorkshopTools utility to WebAPI.

* Revert steamkit call to use dynamic typing for clarity :/

* Mark webAPI based method for downloading workshop content as obsolete.

* Update Torch project definition.

* Disable building Torch client

* Update readme

* Change init order to ensure paths are initialized for plugins

* Reorder exception logging to reduce duplication

* Use thread safe queues in MtObservableCollectionBase

* Revert "Change init order to ensure paths are initialized for plugins"

This reverts commit 3f803b8107bcc16516662f024af8ecd3ac6032e5.

* Fix layout of ModListControl

* Combine Invokes to reduce allocations

* Replace string comparisons by string.Equals / string.IsNullOrEmpty

* Replace string comparisons by string.Equals / string.IsNullOrEmpty

* Use MtObservableList for Modlist to avoid race conditions.
---
 README.md                                     |   8 -
 Torch.Server/Initializer.cs                   |  30 +-
 Torch.Server/Managers/InstanceManager.cs      |  31 +-
 Torch.Server/Torch.Server.csproj              |  22 ++
 .../ViewModels/ConfigDedicatedViewModel.cs    |  54 +++-
 Torch.Server/ViewModels/ModItemInfo.cs        | 131 ++++++++
 Torch.Server/Views/ConfigControl.xaml         |   2 +-
 .../Converters/ListConverterWorkshopId.cs     |  77 +++++
 .../Views/Converters/ModToIdConverter.cs      |  53 ++++
 Torch.Server/Views/ModListControl.xaml        | 125 ++++++++
 Torch.Server/Views/ModListControl.xaml.cs     | 248 +++++++++++++++
 Torch.Server/Views/Resources.xaml             |   2 +
 Torch.Server/Views/TorchUI.xaml               |   3 +
 Torch.Server/packages.config                  |   5 +
 Torch.sln                                     |   4 -
 .../Collections/MtObservableCollectionBase.cs |  10 +-
 Torch/Torch.csproj                            |  15 +
 .../SteamWorkshopTools/KeyValueExtensions.cs  |  48 +++
 .../PublishedItemDetails.cs                   |  26 ++
 Torch/Utils/SteamWorkshopTools/WebAPI.cs      | 291 ++++++++++++++++++
 Torch/packages.config                         |   5 +
 21 files changed, 1150 insertions(+), 40 deletions(-)
 create mode 100644 Torch.Server/ViewModels/ModItemInfo.cs
 create mode 100644 Torch.Server/Views/Converters/ListConverterWorkshopId.cs
 create mode 100644 Torch.Server/Views/Converters/ModToIdConverter.cs
 create mode 100644 Torch.Server/Views/ModListControl.xaml
 create mode 100644 Torch.Server/Views/ModListControl.xaml.cs
 create mode 100644 Torch/Utils/SteamWorkshopTools/KeyValueExtensions.cs
 create mode 100644 Torch/Utils/SteamWorkshopTools/PublishedItemDetails.cs
 create mode 100644 Torch/Utils/SteamWorkshopTools/WebAPI.cs

diff --git a/README.md b/README.md
index f80cbe2..f553aaa 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,10 @@ Torch is the successor to SE Server Extender and gives server admins the tools t
 * Unzip the Torch release into its own directory and run the executable. It will automatically download the SE DS and generate the other necessary files.
   - If you already have a DS installed you can unzip the Torch files into the folder that contains the DedicatedServer64 folder.
 
-## Torch.Client
-* An optional client-side version of Torch. More documentation to come.
-
 # Building
 To build Torch you must first have a complete SE Dedicated installation somewhere. Before you open the solution, run the Setup batch file and enter the path of that installation's DedicatedServer64 folder. The script will make a symlink to that folder so the Torch solution can find the DLL references it needs.
 
 In both cases you will need to set the InstancePath in TorchConfig.xml to an existing dedicated server instance as Torch can't fully generate it on its own yet.
 
-# Official Plugins
-Install plugins by unzipping them into the 'Plugins' folder which should be in the same location as the Torch files. If it doesn't exist you can simply create it.
-* [Essentials](https://github.com/TorchAPI/Essentials): Adds a slew of chat commands and other tools to help manage your server.
-* [Concealment](https://github.com/TorchAPI/Concealment): Adds game logic and physics optimizations that significantly improve sim speed.
-
 If you have a more enjoyable server experience because of Torch, please consider supporting us on Patreon.
 [![Patreon](http://i.imgur.com/VzzIMgn.png)](https://www.patreon.com/bePatron?u=847269)!
diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 3e83980..3a7e11e 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -190,21 +190,29 @@ quit";
         }
 
         private void LogException(Exception ex)
-        {         
+        {
+            if (ex is AggregateException ag)
+            {
+                foreach (var e in ag.InnerExceptions)
+                    LogException(e);
+
+                return;
+            }
+            
+            Log.Fatal(ex);
+            
+            if (ex is ReflectionTypeLoadException extl)
+            {
+                foreach (var exl in extl.LoaderExceptions)
+                    LogException(exl);
+
+                return;
+            }
+            
             if (ex.InnerException != null)
             {
                 LogException(ex.InnerException);
             }
-
-            Log.Fatal(ex);
-            
-            if (ex is ReflectionTypeLoadException exti)
-                foreach (Exception exl in exti.LoaderExceptions)
-                    LogException(exl);
-            
-            if (ex is AggregateException ag)
-                foreach (Exception e in ag.InnerExceptions)
-                    LogException(e);
         }
 
         private void HandleException(object sender, UnhandledExceptionEventArgs e)
diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index 245f8d1..b1d313c 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -14,6 +15,7 @@ using Sandbox.Game;
 using Sandbox.Game.Gui;
 using Torch.API;
 using Torch.API.Managers;
+using Torch.Collections;
 using Torch.Managers;
 using Torch.Mod;
 using Torch.Server.ViewModels;
@@ -94,7 +96,8 @@ namespace Torch.Server.Managers
                 //remove the Torch mod to avoid running multiple copies of it
                 DedicatedConfig.SelectedWorld.Checkpoint.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
                 foreach (var m in DedicatedConfig.SelectedWorld.Checkpoint.Mods)
-                    DedicatedConfig.Mods.Add(m.PublishedFileId);
+                    DedicatedConfig.Mods.Add(new ModItemInfo(m));
+                Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
             }
         }
 
@@ -108,7 +111,8 @@ namespace Torch.Server.Managers
                 //remove the Torch mod to avoid running multiple copies of it
                 DedicatedConfig.SelectedWorld.Checkpoint.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
                 foreach (var m in DedicatedConfig.SelectedWorld.Checkpoint.Mods)
-                    DedicatedConfig.Mods.Add(m.PublishedFileId);
+                    DedicatedConfig.Mods.Add(new ModItemInfo(m));
+                Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
             }
         }
 
@@ -119,11 +123,10 @@ namespace Torch.Server.Managers
 
         private void ImportWorldConfig(WorldViewModel world, bool modsOnly = true)
         {
-            var sb = new StringBuilder();
+            var mods = new MtObservableList<ModItemInfo>();
             foreach (var mod in world.Checkpoint.Mods)
-                sb.AppendLine(mod.PublishedFileId.ToString());
-            
-            DedicatedConfig.Mods = world.Checkpoint.Mods.Select(x => x.PublishedFileId).ToList();
+                mods.Add(new ModItemInfo(mod));
+            DedicatedConfig.Mods = mods;
 
 
             Log.Debug("Loaded mod list from world");
@@ -151,7 +154,10 @@ namespace Torch.Server.Managers
                     return;
                 }
 
-                DedicatedConfig.Mods = checkpoint.Mods.Select(x => x.PublishedFileId).ToList();
+                var mods = new MtObservableList<ModItemInfo>();
+                foreach (var mod in checkpoint.Mods)
+                    mods.Add(new ModItemInfo(mod));
+                DedicatedConfig.Mods = mods;
 
                 Log.Debug("Loaded mod list from world");
 
@@ -193,9 +199,14 @@ namespace Torch.Server.Managers
                 checkpoint.SessionName = DedicatedConfig.WorldName;
                 checkpoint.Settings = DedicatedConfig.SessionSettings;
                 checkpoint.Mods.Clear();
-                
-                foreach (var modId in DedicatedConfig.Mods)
-                    checkpoint.Mods.Add(new MyObjectBuilder_Checkpoint.ModItem(modId));
+
+                foreach (var mod in DedicatedConfig.Mods)
+                {
+                    var savedMod = new MyObjectBuilder_Checkpoint.ModItem(mod.Name, mod.PublishedFileId, mod.FriendlyName);
+                    savedMod.IsDependency = mod.IsDependency;
+                    checkpoint.Mods.Add(savedMod);
+                }
+                Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
 
                 MyObjectBuilderSerializer.SerializeXML(sandboxPath, false, checkpoint);
 
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index ed9e330..798b576 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -80,6 +80,9 @@
       <HintPath>..\GameBinaries\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.Win32.Registry, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -87,6 +90,9 @@
       <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll</HintPath>
+    </Reference>
     <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
@@ -126,6 +132,12 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Security.AccessControl, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -245,15 +257,21 @@
     <Compile Include="ViewModels\Entities\CharacterViewModel.cs" />
     <Compile Include="ViewModels\ConfigDedicatedViewModel.cs" />
     <Compile Include="ViewModels\Entities\EntityControlViewModel.cs" />
+    <Compile Include="ViewModels\ModItemInfo.cs" />
     <Compile Include="ViewModels\SessionSettingsViewModel.cs" />
     <Compile Include="Views\Converters\DefinitionToIdConverter.cs" />
     <Compile Include="Views\Converters\BooleanAndConverter.cs" />
     <Compile Include="Views\Converters\ListConverter.cs" />
     <Compile Include="MultiTextWriter.cs" />
     <Compile Include="RichTextBoxWriter.cs" />
+    <Compile Include="Views\Converters\ListConverterWorkshopId.cs" />
+    <Compile Include="Views\Converters\ModToIdConverter.cs" />
     <Compile Include="Views\Entities\CharacterView.xaml.cs">
       <DependentUpon>CharacterView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ModListControl.xaml.cs">
+      <DependentUpon>ModListControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ThemeControl.xaml.cs">
       <DependentUpon>ThemeControl.xaml</DependentUpon>
     </Compile>
@@ -414,6 +432,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ModListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\PluginsControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
index e1b4456..abe4c33 100644
--- a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
+++ b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
@@ -10,6 +10,8 @@ using Torch.Collections;
 using Torch.Server.Managers;
 using VRage.Game;
 using VRage.Game.ModAPI;
+using Torch.Utils.SteamWorkshopTools;
+using Torch.Collections;
 
 namespace Torch.Server.ViewModels
 {
@@ -29,6 +31,7 @@ namespace Torch.Server.ViewModels
             _config = configDedicated;
             _config.IgnoreLastSession = true;
             SessionSettings = new SessionSettingsViewModel(_config.SessionSettings);
+            Task.Run(() => UpdateAllModInfosAsync());
         }
 
         public void Save(string path = null)
@@ -73,14 +76,61 @@ namespace Torch.Server.ViewModels
             }
         }
 
+        public async Task UpdateAllModInfosAsync(Action<string> messageHandler = null)
+        {
+            if (Mods.Count() == 0)
+                return;
+
+            var ids = Mods.Select(m => m.PublishedFileId);
+            var workshopService = WebAPI.Instance;
+            Dictionary<ulong, PublishedItemDetails> modInfos = null;
+
+            try
+            {
+                modInfos = (await workshopService.GetPublishedFileDetails(ids.ToArray()));
+            }
+            catch (Exception e)
+            {
+                Log.Error(e.Message);
+                return;
+            }
+
+            Log.Info($"Mods Info successfully retrieved!");
+
+            foreach (var mod in Mods)
+            {
+                if (!modInfos.ContainsKey(mod.PublishedFileId) || modInfos[mod.PublishedFileId] == null)
+                {
+                    Log.Error($"Failed to retrieve info for mod with workshop id '{mod.PublishedFileId}'!");
+                }
+                //else if (!modInfo.Tags.Contains(""))
+                else
+                {
+                    mod.FriendlyName = modInfos[mod.PublishedFileId].Title;
+                    mod.Description = modInfos[mod.PublishedFileId].Description;
+                    //mod.Name = modInfos[mod.PublishedFileId].FileName;
+                }
+            }
+
+        }
+
         public List<string> Administrators { get => _config.Administrators; set => SetValue(x => _config.Administrators = x, value); }
 
         public List<ulong> Banned { get => _config.Banned; set => SetValue(x => _config.Banned = x, value); }
 
+        private MtObservableList<ModItemInfo> _mods = new MtObservableList<ModItemInfo>();
+        public MtObservableList<ModItemInfo> Mods
+        {
+            get => _mods;
+            set
+            {
+                SetValue(x => _mods = x, value);
+                Task.Run(() => UpdateAllModInfosAsync());
+            }
+        }
+
         public List<ulong> Reserved { get => _config.Reserved; set => SetValue(x => _config.Reserved = x, value); }
 
-        private List<ulong> _mods = new List<ulong>();
-        public List<ulong> Mods { get => _mods; set => SetValue(x => _mods = x, value); }
 
         public int AsteroidAmount { get => _config.AsteroidAmount; set => SetValue(x => _config.AsteroidAmount = x, value); }
 
diff --git a/Torch.Server/ViewModels/ModItemInfo.cs b/Torch.Server/ViewModels/ModItemInfo.cs
new file mode 100644
index 0000000..9212fa1
--- /dev/null
+++ b/Torch.Server/ViewModels/ModItemInfo.cs
@@ -0,0 +1,131 @@
+using System;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Threading;
+using System.Runtime.CompilerServices;
+using NLog;
+using VRage.Game;
+using Torch.Server.Annotations;
+using Torch.Utils.SteamWorkshopTools;
+
+namespace Torch.Server.ViewModels
+{
+    /// <summary>
+    /// Wrapper around VRage.Game.Objectbuilder_Checkpoint.ModItem 
+    /// that holds additional meta information
+    /// (e.g. workshop description)
+    /// </summary>
+    public class ModItemInfo : ViewModel
+    {
+        MyObjectBuilder_Checkpoint.ModItem _modItem;
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Human friendly name of the mod
+        /// </summary>
+        public string FriendlyName
+        {
+            get { return _modItem.FriendlyName;  }
+            set {
+                SetValue(ref _modItem.FriendlyName, value);
+            }
+        }
+
+        /// <summary>
+        /// Workshop ID of the mod
+        /// </summary>
+        public ulong PublishedFileId
+        {
+            get { return _modItem.PublishedFileId; }
+            set
+            {
+                SetValue(ref _modItem.PublishedFileId, value);
+            }
+        }
+
+        /// <summary>
+        /// Local filename of the mod
+        /// </summary>
+        public string Name
+        {
+            get { return _modItem.Name; }
+            set
+            {
+                SetValue(ref _modItem.FriendlyName, value);
+            }
+        }
+
+        /// <summary>
+        /// Whether or not the mod was added
+        /// because another mod depends on it
+        /// </summary>
+        public bool IsDependency
+        {
+            get { return _modItem.IsDependency; }
+            set
+            {
+                SetValue(ref _modItem.IsDependency, value);
+            }
+        }
+
+        private string _description;
+        /// <summary>
+        /// Workshop description of the mod
+        /// </summary>
+        public string Description
+        {
+            get { return _description; }
+            set
+            {
+                SetValue(ref _description, value);
+            }
+        }
+
+        /// <summary>
+        /// Constructor, returns a new ModItemInfo instance
+        /// </summary>
+        /// <param name="mod">The wrapped mod</param>
+        public ModItemInfo(MyObjectBuilder_Checkpoint.ModItem mod)
+        {
+            _modItem = mod;
+        }
+
+        /// <summary>
+        /// Retrieve information about the
+        /// wrapped mod from the workhop asynchronously
+        /// via the Steam web API.
+        /// </summary>
+        /// <returns></returns>
+        public async Task<bool> UpdateModInfoAsync()
+        {
+            var msg = "";
+            var workshopService = WebAPI.Instance;
+            PublishedItemDetails modInfo = null;
+            try
+            {
+                modInfo = (await workshopService.GetPublishedFileDetails(new ulong[] { PublishedFileId }))?[PublishedFileId];
+            }
+            catch( Exception e ) 
+            {
+                Log.Error(e.Message);
+            }
+            if (modInfo == null)
+            {
+                Log.Error($"Failed to retrieve mod with workshop id '{PublishedFileId}'!");
+                return false;
+            }
+            //else if (!modInfo.Tags.Contains(""))
+            else
+            {
+                Log.Info($"Mod Info successfully retrieved!");
+                FriendlyName = modInfo.Title;
+                Description = modInfo.Description;
+                //Name = modInfo.FileName;
+                return true;
+            }
+        }
+    }
+}
diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index 9d0cb99..898b4ca 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -58,7 +58,7 @@
                     <RowDefinition />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <ScrollViewer VerticalScrollBarVisibility="Disabled">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
diff --git a/Torch.Server/Views/Converters/ListConverterWorkshopId.cs b/Torch.Server/Views/Converters/ListConverterWorkshopId.cs
new file mode 100644
index 0000000..f58afac
--- /dev/null
+++ b/Torch.Server/Views/Converters/ListConverterWorkshopId.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using Torch.Server.ViewModels;
+using VRage.Game;
+
+namespace Torch.Server.Views.Converters
+{
+    class ListConverterWorkshopId : IValueConverter
+    {
+        public Type Type { get; set; }
+
+        /// <summary>
+        /// Converts a list of ModItemInfo objects into a list of their workshop IDs (PublishedFileIds).
+        /// </summary>
+        /// <param name="valueList">
+        /// Expected to contain a list of ModItemInfo objects
+        /// </param>
+        /// <param name="targetType">This parameter will be ignored</param>
+        /// <param name="parameter">This parameter will be ignored</param>
+        /// <param name="culture"> This parameter will be ignored</param>
+        /// <returns>A string containing the workshop ids of all mods, one per line</returns>
+        public object Convert(object valueList, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (!(valueList is IList list))
+                throw new InvalidOperationException("Value is not the proper type.");
+
+            var sb = new StringBuilder();
+            foreach (var item in list)
+            {
+                sb.AppendLine(((ModItemInfo) item).PublishedFileId.ToString());
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Converts a list of workshop ids into a list of ModItemInfo objects
+        /// </summary>
+        /// <param name="value">A string containing workshop ids separated by new lines</param>
+        /// <param name="targetType">This parameter will be ignored</param>
+        /// <param name="parameter">
+        /// A list of ModItemInfos which should 
+        /// contain the requestted mods
+        /// (or they will be dropped)
+        /// </param>
+        /// <param name="culture">This parameter will be ignored</param>
+        /// <returns>A list of ModItemInfo objects</returns>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var list = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(Type));
+            var mods = parameter as ICollection<ModItemInfo>;
+            if (mods == null)
+                throw new ArgumentException("parameter needs to be of type ICollection<ModItemInfo>!");
+            var input = ((string)value).Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var item in input)
+            {
+                if( ulong.TryParse(item, out ulong id))
+                {
+                    var mod = mods.FirstOrDefault((m) => m.PublishedFileId == id);
+                    if (mod != null)
+                        list.Add(mod);
+                    else
+                        list.Add(new MyObjectBuilder_Checkpoint.ModItem(id));
+                }
+            }
+
+            return list;
+        }
+    }
+}
diff --git a/Torch.Server/Views/Converters/ModToIdConverter.cs b/Torch.Server/Views/Converters/ModToIdConverter.cs
new file mode 100644
index 0000000..512bbf2
--- /dev/null
+++ b/Torch.Server/Views/Converters/ModToIdConverter.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Threading.Tasks;
+using Torch.Server.ViewModels;
+using NLog;
+using Torch.Collections;
+
+namespace Torch.Server.Views.Converters
+{
+    /// <summary>
+    /// A converter to get the index of a ModItemInfo object within a collection of ModItemInfo objects
+    /// </summary>
+    public class ModToListIdConverter : IMultiValueConverter
+    {
+        /// <summary>
+        /// Converts a ModItemInfo object into its index within a Collection of ModItemInfo objects
+        /// </summary>
+        /// <param name="values">
+        /// Expected to contain a ModItemInfo object at index 0
+        /// and a Collection of ModItemInfo objects at index 1
+        /// </param>
+        /// <param name="targetType">This parameter will be ignored</param>
+        /// <param name="parameter">This parameter will be ignored</param>
+        /// <param name="culture"> This parameter will be ignored</param>
+        /// <returns>the index of the mod within the provided mod list.</returns>
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            //if (targetType != typeof(int))
+            //    throw new NotSupportedException("ModToIdConverter can only convert mods into int values or vise versa!");
+            var mod = (ModItemInfo) values[0];
+            var theModList = (MtObservableList<ModItemInfo>) values[1];
+            return theModList.IndexOf(mod);
+        }
+
+        /// <summary>
+        /// It is not supported to reverse this converter
+        /// </summary>
+        /// <param name="values"></param>
+        /// <param name="targetType"></param>
+        /// <param name="parameter"></param>
+        /// <param name="culture"></param>
+        /// <returns>Raises a NotSupportedException</returns>
+        public object[] ConvertBack(object values, Type[] targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException("ModToIdConverter can not convert back!");
+        }
+    }
+}
diff --git a/Torch.Server/Views/ModListControl.xaml b/Torch.Server/Views/ModListControl.xaml
new file mode 100644
index 0000000..89a092f
--- /dev/null
+++ b/Torch.Server/Views/ModListControl.xaml
@@ -0,0 +1,125 @@
+<UserControl x:Class="Torch.Server.Views.ModListControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:viewModels="clr-namespace:Torch.Server.ViewModels"   
+             xmlns:s="clr-namespace:System"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800"
+             MouseMove="UserControl_MouseMove">
+    <!--<UserControl.DataContext>
+        <viewModels:ConfigDedicatedViewModel />
+    </UserControl.DataContext>-->
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style TargetType="Grid" x:Key="RootGridStyle">
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding Mode=OneWay, UpdateSourceTrigger=PropertyChanged, BindingGroupName=RootEnabledBinding}" Value="{x:Null}">
+                        <Setter Property="IsEnabled" Value="False"/>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <UserControl.DataContext>
+        <viewModels:ConfigDedicatedViewModel />
+    </UserControl.DataContext>
+        <Grid Style="{StaticResource RootGridStyle}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="500px"/>
+                <ColumnDefinition Width="10px"/>
+                <ColumnDefinition Width="*" MinWidth="200px"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="80px"/>
+            </Grid.RowDefinitions>
+        
+            <DataGrid Name="ModList" Grid.Column="0" Grid.ColumnSpan="1" ItemsSource="{Binding UpdateSourceTrigger=PropertyChanged}"
+                      Sorting="ModList_Sorting"
+                      SelectionMode="Single"
+                      SelectionUnit="FullRow"
+                      AllowDrop="True"
+                      CanUserReorderColumns="False"
+                      CanUserSortColumns="True"
+                      PreviewMouseLeftButtonDown="ModList_MouseLeftButtonDown"
+                      MouseLeftButtonUp="ModList_MouseLeftButtonUp"
+                      SelectedCellsChanged="ModList_Selected"
+                      AutoGenerateColumns="False">
+                <!--:DesignSource="{d:DesignInstance Type={x:Type MyObjectBuilder_Checkpoint:ModItem, CreateList=True}}">-->
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Load Order"
+                                        Width="Auto"
+                                        IsReadOnly="True">
+                        <DataGridTextColumn.Binding>
+                            <MultiBinding Converter="{StaticResource ModToListIdConverter}" StringFormat="{}{0}">
+                                <Binding />
+                                <Binding ElementName="ModList" Path="DataContext"></Binding>
+                            </MultiBinding>
+                        </DataGridTextColumn.Binding>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Workshop Id" 
+                                        IsReadOnly="True"
+                                        Binding="{Binding PublishedFileId, NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged}">
+                    
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Name" 
+                                        Width="*"
+                                        IsReadOnly="True"
+                                        Binding="{Binding FriendlyName, NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged}">
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+                <DataGrid.ItemContainerStyle>
+                        <Style TargetType="DataGridRow">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding IsDependency}" Value="True">
+                                    <Setter Property="Foreground" Value="#222222"/>
+                                    <Setter Property="Background" Value="#FFCCAA"/>
+                                </DataTrigger>
+                                <MultiDataTrigger>
+                                    <MultiDataTrigger.Conditions>
+                                        <Condition Binding="{Binding IsDependency}" Value="True"/>
+                                        <Condition Binding="{Binding ElementName=ShowDependencyModsCheckBox, Path=IsChecked}" Value="False"/>
+                                    </MultiDataTrigger.Conditions>
+                                    <Setter Property="Height" Value="0px"/>
+                                </MultiDataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                </DataGrid.ItemContainerStyle>
+            </DataGrid>
+            <ScrollViewer Grid.Column="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Background="#1b2838">
+                <TextBlock Name="ModDescription" TextWrapping="Wrap" Foreground="White" Padding="2px"
+                       Text="{Binding ElementName=ModList, Path=SelectedItem.Description}">
+                </TextBlock>
+            </ScrollViewer>
+            <Grid Grid.Row="2" Margin="0 0 0 6px">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition MinHeight="40px"/>
+                </Grid.RowDefinitions>
+                <CheckBox Name="ShowDependencyModsCheckBox" VerticalAlignment="Center"
+                          HorizontalAlignment="Left" Margin="6px 0" Grid.Column="0" Grid.Row="0"/>
+                <Label Content="Show Dependency Mods" Padding="0" Margin="6px 0" Grid.Column="1" VerticalAlignment="Center"/>
+                <Label Content="ID/URL:" Padding="0" Margin="6px 0" HorizontalAlignment="Left" 
+                       VerticalAlignment="Center" Grid.Column="0" Grid.Row="1"/>
+                <TextBox Name="AddModIDTextBox" Grid.Column="1" VerticalContentAlignment="Center"
+                         HorizontalAlignment="Stretch" MinWidth="100px" Margin="6px 4px"  Grid.Row="1"/>
+                <Button Content="Add" Grid.Column="2" Margin="6px 0" Width="60px" Height="40px" Click="AddBtn_OnClick"  Grid.Row="1"/>
+                <Button Content="Remove" Grid.Column="4" Margin="6px 0" Width="60px" Height="40px" Click="RemoveBtn_OnClick"  Grid.Row="1"
+                         IsEnabled="{Binding ElementName=ModList, Path=SelectedItems.Count}"/>
+            </Grid>
+        
+            <Button Content="Save Config" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="6px" Grid.Column="3" Width="80px" Height="40px" Click="SaveBtn_OnClick"/>
+        </Grid>
+</UserControl>
diff --git a/Torch.Server/Views/ModListControl.xaml.cs b/Torch.Server/Views/ModListControl.xaml.cs
new file mode 100644
index 0000000..66da625
--- /dev/null
+++ b/Torch.Server/Views/ModListControl.xaml.cs
@@ -0,0 +1,248 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Runtime.CompilerServices;
+using System.Windows.Threading;
+using VRage.Game;
+using NLog;
+using Torch.Server.Managers;
+using Torch.API.Managers;
+using Torch.Server.ViewModels;
+using Torch.Server.Annotations;
+using Torch.Collections;
+
+namespace Torch.Server.Views
+{
+    /// <summary>
+    /// Interaction logic for ModListControl.xaml
+    /// </summary>
+    public partial class ModListControl : UserControl, INotifyPropertyChanged
+    {
+        private static Logger Log = LogManager.GetLogger(nameof(ModListControl));
+        private InstanceManager _instanceManager;
+        ModItemInfo _draggedMod;
+        bool _hasOrderChanged = false;
+        bool _isSortedByLoadOrder = true;
+
+        //private List<BindingExpression> _bindingExpressions = new List<BindingExpression>();
+        /// <summary>
+        /// Constructor for ModListControl 
+        /// </summary>
+        public ModListControl()
+        {
+            InitializeComponent();
+            _instanceManager = TorchBase.Instance.Managers.GetManager<InstanceManager>();
+            _instanceManager.InstanceLoaded += _instanceManager_InstanceLoaded;
+            //var mods = _instanceManager.DedicatedConfig?.Mods;
+            //if( mods != null)
+            //    DataContext = new ObservableCollection<MyObjectBuilder_Checkpoint.ModItem>();
+            DataContext = _instanceManager.DedicatedConfig?.Mods;
+
+            // Gets called once all children are loaded
+            //Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(ApplyStyles));
+        }
+
+        private void ModListControl_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void ResetSorting()
+        {
+            CollectionViewSource.GetDefaultView(ModList.ItemsSource).SortDescriptions.Clear();
+        }
+
+
+        private void _instanceManager_InstanceLoaded(ConfigDedicatedViewModel obj)
+        {
+            Log.Info("Instance loaded.");
+            Dispatcher.Invoke(() => {
+                DataContext = obj?.Mods ?? new MtObservableList<ModItemInfo>();
+                UpdateLayout();
+                ((MtObservableList<ModItemInfo>)DataContext).CollectionChanged += OnModlistUpdate;
+            });
+        }
+
+        private void OnModlistUpdate(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            ModList.Items.Refresh();
+            //if (e.Action == NotifyCollectionChangedAction.Remove)
+            //    _instanceManager.SaveConfig();
+        }
+
+        private void SaveBtn_OnClick(object sender, RoutedEventArgs e)
+        {
+            _instanceManager.SaveConfig();
+        }
+
+
+        private void AddBtn_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (TryExtractId(AddModIDTextBox.Text, out ulong id))
+            {
+                var mod = new ModItemInfo(new MyObjectBuilder_Checkpoint.ModItem(id));
+                //mod.PublishedFileId = id;
+                _instanceManager.DedicatedConfig.Mods.Add(mod);
+                Task.Run(mod.UpdateModInfoAsync)
+                    .ContinueWith((t) =>
+                    {
+                        Dispatcher.Invoke(() =>
+                        {
+                            _instanceManager.DedicatedConfig.Save();
+                        });
+                    });
+                AddModIDTextBox.Text = "";
+            }
+            else
+            {
+                AddModIDTextBox.BorderBrush = Brushes.Red;
+                Log.Warn("Invalid mod id!");
+                MessageBox.Show("Invalid mod id!");
+            }
+        }
+        private void RemoveBtn_OnClick(object sender, RoutedEventArgs e)
+        {
+            var modList = ((MtObservableList<ModItemInfo>)DataContext);
+            if (ModList.SelectedItem is ModItemInfo mod && modList.Contains(mod))
+                modList.Remove(mod);
+        }
+
+        private bool TryExtractId(string input, out ulong result)
+        {
+            var match = Regex.Match(input, @"(?<=id=)\d+").Value;
+
+            bool success;
+            if (string.IsNullOrEmpty(match))
+                success = ulong.TryParse(input, out result);
+            else
+                success = ulong.TryParse(match, out result);
+
+            return success;
+        }
+
+        private void ModList_Sorting(object sender, DataGridSortingEventArgs e)
+        {
+            Log.Info($"Sorting by '{e.Column.Header}'");
+            if (e.Column == ModList.Columns[0])
+            {
+                var dataView = CollectionViewSource.GetDefaultView(ModList.ItemsSource);
+                dataView.SortDescriptions.Clear();
+                dataView.Refresh();
+                _isSortedByLoadOrder = true;
+            }
+            else
+                _isSortedByLoadOrder = false;
+        }
+
+        private void ModList_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            //return;
+
+            _draggedMod = (ModItemInfo) TryFindRowAtPoint((UIElement) sender, e.GetPosition(ModList))?.DataContext;
+
+            //DraggedMod = (ModItemInfo) ModList.SelectedItem;
+        }
+
+        private static DataGridRow TryFindRowAtPoint(UIElement reference, Point point)
+        {
+            var element = reference.InputHitTest(point) as DependencyObject;
+            if (element == null)
+                return null;
+            if (element is DataGridRow row)
+                return row;
+            else
+                return TryFindParent<DataGridRow>(element);
+        }
+
+        private static T TryFindParent<T>(DependencyObject child) where T : DependencyObject
+        {
+            DependencyObject parent;
+            if (child == null)
+                return null;
+            if (child is ContentElement contentElement)
+            {
+                parent = ContentOperations.GetParent(contentElement);
+                if (parent == null && child is FrameworkContentElement fce)
+                    parent = fce.Parent;
+            }
+            else
+            {
+                parent = VisualTreeHelper.GetParent(child);
+            }
+
+            if (parent is T result)
+                return result;
+            else
+                return TryFindParent<T>(parent);
+        }
+
+        private void UserControl_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (_draggedMod == null)
+                return;
+
+            if (!_isSortedByLoadOrder)
+                return;
+
+            var targetMod = (ModItemInfo)TryFindRowAtPoint((UIElement)sender, e.GetPosition(ModList))?.DataContext;
+            if( targetMod != null && !ReferenceEquals(_draggedMod, targetMod))
+            {
+                _hasOrderChanged = true;
+                var modList = (MtObservableList<ModItemInfo>)DataContext;
+                //modList.Move(modList.IndexOf(_draggedMod), modList.IndexOf(targetMod));
+                modList.RemoveAt(modList.IndexOf(_draggedMod));
+                modList.Insert(modList.IndexOf(targetMod), _draggedMod);
+                ModList.Items.Refresh();
+                ModList.SelectedItem = _draggedMod;
+            }
+        }
+
+        private void ModList_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            if (!_isSortedByLoadOrder)
+            {
+                var targetMod = (ModItemInfo)TryFindRowAtPoint((UIElement)sender, e.GetPosition(ModList))?.DataContext;
+                if (targetMod != null && !ReferenceEquals(_draggedMod, targetMod))
+                {
+                    var msg = "Drag and drop is only available when sorted by load order!";
+                    Log.Warn(msg);
+                    MessageBox.Show(msg);
+                }
+            }
+            //if (DraggedMod != null && HasOrderChanged)
+                //Log.Info("Dragging over, saving...");
+                //_instanceManager.SaveConfig();
+            _draggedMod = null;
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private void ModList_Selected(object sender, SelectedCellsChangedEventArgs e)
+        {
+            if (_draggedMod != null)
+                ModList.SelectedItem = _draggedMod;
+            else if( e.AddedCells.Count > 0)
+                ModList.SelectedItem = e.AddedCells[0].Item;
+        }
+    } 
+}
diff --git a/Torch.Server/Views/Resources.xaml b/Torch.Server/Views/Resources.xaml
index 4f313ed..14154a7 100644
--- a/Torch.Server/Views/Resources.xaml
+++ b/Torch.Server/Views/Resources.xaml
@@ -18,5 +18,7 @@
     </Style>
     <converters:ListConverter x:Key="ListConverterString" Type="system:String"/>
     <converters:ListConverter x:Key="ListConverterUInt64" Type="system:UInt64"/>
+    <converters:ModToListIdConverter x:Key="ModToListIdConverter"/>
+    <converters:ListConverterWorkshopId x:Key="ListConverterWorkshopId"/>
     <converters:BooleanAndConverter x:Key="BooleanAndConverter"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Torch.Server/Views/TorchUI.xaml b/Torch.Server/Views/TorchUI.xaml
index ce10d64..a198cae 100644
--- a/Torch.Server/Views/TorchUI.xaml
+++ b/Torch.Server/Views/TorchUI.xaml
@@ -80,6 +80,9 @@
                     <views:ConfigControl Grid.Row="1" x:Name="ConfigControl" Margin="3" DockPanel.Dock="Bottom" IsEnabled="{Binding CanRun}"/>
                 </Grid>
             </TabItem>
+            <TabItem Header="Mods">
+                <views:ModListControl/>
+            </TabItem>
             <TabItem Header="Chat/Players">
                 <Grid>
                     <Grid.ColumnDefinitions>
diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config
index efe1c27..643d580 100644
--- a/Torch.Server/packages.config
+++ b/Torch.Server/packages.config
@@ -2,7 +2,12 @@
 <packages>
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.6.1" targetFramework="net461" />
+  <package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net461" />
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
+  <package id="protobuf-net" version="2.1.0" targetFramework="net461" />
+  <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
+  <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
+  <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Torch.sln b/Torch.sln
index 9f2f29b..f011ab3 100644
--- a/Torch.sln
+++ b/Torch.sln
@@ -55,10 +55,8 @@ Global
 		{FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}.Release|x64.Build.0 = Release|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Debug|x64.ActiveCfg = Debug|x64
-		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Debug|x64.Build.0 = Debug|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Release|Any CPU.ActiveCfg = Release|x64
 		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Release|x64.ActiveCfg = Release|x64
-		{E36DF745-260B-4956-A2E8-09F08B2E7161}.Release|x64.Build.0 = Release|x64
 		{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|x64.ActiveCfg = Debug|x64
 		{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|x64.Build.0 = Debug|x64
@@ -79,10 +77,8 @@ Global
 		{9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}.Release|x64.Build.0 = Release|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Debug|x64.ActiveCfg = Debug|x64
-		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Debug|x64.Build.0 = Debug|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Release|Any CPU.ActiveCfg = Release|x64
 		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Release|x64.ActiveCfg = Release|x64
-		{632E78C0-0DAC-4B71-B411-2F1B333CC310}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Torch/Collections/MtObservableCollectionBase.cs b/Torch/Collections/MtObservableCollectionBase.cs
index 580e682..0473e8d 100644
--- a/Torch/Collections/MtObservableCollectionBase.cs
+++ b/Torch/Collections/MtObservableCollectionBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -123,10 +124,10 @@ namespace Torch.Collections
         private readonly Timer _flushEventQueue;
         private const int _eventRaiseDelay = 50;
 
-        private readonly Queue<NotifyCollectionChangedEventArgs> _collectionEventQueue =
-            new Queue<NotifyCollectionChangedEventArgs>();
+        private readonly ConcurrentQueue<NotifyCollectionChangedEventArgs> _collectionEventQueue =
+            new ConcurrentQueue<NotifyCollectionChangedEventArgs>();
 
-        private readonly Queue<string> _propertyEventQueue = new Queue<string>();
+        private readonly ConcurrentQueue<string> _propertyEventQueue = new ConcurrentQueue<string>();
 
         private void FlushEventQueue(object data)
         {
@@ -137,7 +138,8 @@ namespace Torch.Collections
             // :/, but works better
             bool reset = _collectionEventQueue.Count > 0;
             if (reset)
-                _collectionEventQueue.Clear();
+                while (_collectionEventQueue.Count > 0)
+                    _collectionEventQueue.TryDequeue(out _);
             else
                 while (_collectionEventQueue.TryDequeue(out NotifyCollectionChangedEventArgs e))
                     _collectionChangedEvent.Raise(this, e);
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 1a50d4f..ca444dd 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -47,6 +47,9 @@
     <Reference Include="MahApps.Metro, Version=1.6.1.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.6.1\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Win32.Registry, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\GameBinaries\Newtonsoft.Json.dll</HintPath>
@@ -84,6 +87,9 @@
       <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="SteamKit2, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamKit2.2.1.0\lib\netstandard2.0\SteamKit2.dll</HintPath>
+    </Reference>
     <Reference Include="Steamworks.NET">
       <HintPath>..\GameBinaries\Steamworks.NET.dll</HintPath>
     </Reference>
@@ -92,6 +98,12 @@
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Security.AccessControl, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
@@ -233,6 +245,7 @@
     <Compile Include="Managers\UpdateManager.cs" />
     <Compile Include="Persistent.cs" />
     <Compile Include="Plugins\PluginManifest.cs" />
+    <Compile Include="Utils\SteamWorkshopTools\KeyValueExtensions.cs" />
     <Compile Include="Utils\MiscExtensions.cs" />
     <Compile Include="Utils\Reflected\ReflectedEventReplaceAttribute.cs" />
     <Compile Include="Utils\Reflected\ReflectedEventReplacer.cs" />
@@ -247,6 +260,7 @@
     <Compile Include="Utils\Reflected\ReflectedStaticMethodAttribute.cs" />
     <Compile Include="Utils\Reflection.cs" />
     <Compile Include="Managers\ScriptingManager.cs" />
+    <Compile Include="Utils\SteamWorkshopTools\WebAPI.cs" />
     <Compile Include="Utils\StringUtils.cs" />
     <Compile Include="Utils\SynchronizationExtensions.cs" />
     <Compile Include="Utils\TorchAssemblyResolver.cs" />
@@ -256,6 +270,7 @@
     <Compile Include="TorchPluginBase.cs" />
     <Compile Include="Session\TorchSession.cs" />
     <Compile Include="Utils\TorchLauncher.cs" />
+    <Compile Include="Utils\SteamWorkshopTools\PublishedItemDetails.cs" />
     <Compile Include="ViewModels\ModViewModel.cs" />
     <Compile Include="Extensions\MyPlayerCollectionExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
diff --git a/Torch/Utils/SteamWorkshopTools/KeyValueExtensions.cs b/Torch/Utils/SteamWorkshopTools/KeyValueExtensions.cs
new file mode 100644
index 0000000..1b37983
--- /dev/null
+++ b/Torch/Utils/SteamWorkshopTools/KeyValueExtensions.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Reflection;
+using System.Linq;
+using NLog;
+using SteamKit2;
+
+namespace Torch.Utils.SteamWorkshopTools
+{
+    public static class KeyValueExtensions
+    {
+        private static Logger Log = LogManager.GetLogger("SteamWorkshopService");
+
+        public static T GetValueOrDefault<T>(this KeyValue kv, string key)
+        {
+            kv.TryGetValueOrDefault<T>(key, out T result);
+            return result;
+        }
+        public static bool TryGetValueOrDefault<T>(this KeyValue kv, string key, out T typedValue)
+        {
+            var match = kv.Children?.Find((KeyValue item) => item.Name == key);
+            object result = default(T);
+            if (match == null)
+            {
+                typedValue = (T) result;
+                return false;
+            }
+
+            var value = match.Value ?? "";
+
+            try
+            {
+                var converter = TypeDescriptor.GetConverter(typeof(T));
+                result = converter.ConvertFromString(value);
+                typedValue = (T)result;
+                return true;
+            }
+            catch (NotSupportedException)
+            {
+                throw new Exception($"Unexpected Type '{typeof(T)}'!");
+            }
+        }
+    }
+}
diff --git a/Torch/Utils/SteamWorkshopTools/PublishedItemDetails.cs b/Torch/Utils/SteamWorkshopTools/PublishedItemDetails.cs
new file mode 100644
index 0000000..4842919
--- /dev/null
+++ b/Torch/Utils/SteamWorkshopTools/PublishedItemDetails.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Torch.Utils.SteamWorkshopTools
+{
+    public class PublishedItemDetails
+    {
+        public ulong PublishedFileId;
+        public uint Views;
+        public uint Subscriptions;
+        public DateTime TimeUpdated;
+        public DateTime TimeCreated;
+        public string Description;
+        public string Title;
+        public string FileUrl;
+        public long FileSize;
+        public string FileName;
+        public ulong ConsumerAppId;
+        public ulong CreatorAppId;
+        public ulong Creator;
+        public string[] Tags;
+    }
+}
diff --git a/Torch/Utils/SteamWorkshopTools/WebAPI.cs b/Torch/Utils/SteamWorkshopTools/WebAPI.cs
new file mode 100644
index 0000000..f957172
--- /dev/null
+++ b/Torch/Utils/SteamWorkshopTools/WebAPI.cs
@@ -0,0 +1,291 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Serialization;
+using System.IO;
+using System.Net;
+using NLog;
+using SteamKit2;
+using System.Net.Http;
+
+namespace Torch.Utils.SteamWorkshopTools
+{
+    public class WebAPI
+    {
+        private static Logger Log = LogManager.GetLogger("SteamWorkshopService");
+        public const uint AppID = 244850U;
+        public string Username { get; private set; }
+        private string password;
+        public bool IsReady { get; private set; }
+        public bool IsRunning { get; private set; }
+        private TaskCompletionSource<bool> logonTaskCompletionSource;
+
+        private SteamClient steamClient;
+        private CallbackManager cbManager;
+        private SteamUser steamUser;
+
+        private static WebAPI _instance;
+        public static WebAPI Instance
+        {
+            get
+            {
+                return _instance ?? (_instance = new WebAPI());
+            }
+        }
+
+        private WebAPI()
+        {
+            steamClient = new SteamClient();
+            cbManager = new CallbackManager(steamClient);
+
+            IsRunning = true;
+        }
+
+        public async Task<bool> Logon(string user = "anonymous", string pw = "")
+        {
+            if (string.IsNullOrEmpty(user))
+                throw new ArgumentNullException("User can't be null!");
+            if (!user.Equals("anonymous") && !pw.Equals(""))
+                throw new ArgumentNullException("Password can't be null if user is not anonymous!");
+
+            Username = user;
+            password = pw;
+
+            logonTaskCompletionSource = new TaskCompletionSource<bool>();
+
+            steamUser = steamClient.GetHandler<SteamUser>();
+            cbManager.Subscribe<SteamClient.ConnectedCallback>(OnConnected);
+            cbManager.Subscribe<SteamClient.DisconnectedCallback>(OnDisconnected);
+            cbManager.Subscribe<SteamUser.LoggedOnCallback>(OnLoggedOn);
+            cbManager.Subscribe<SteamUser.LoggedOffCallback>(OnLoggedOff);
+
+            Log.Info("Connecting to Steam...");
+
+            steamClient.Connect();
+
+            await logonTaskCompletionSource.Task;
+            return logonTaskCompletionSource.Task.Result;
+        }
+
+        public void CancelLogon()
+        {
+            logonTaskCompletionSource?.SetCanceled();
+        }
+
+        public async Task<Dictionary<ulong, PublishedItemDetails>> GetPublishedFileDetails(IEnumerable<ulong> workshopIds)
+        {
+            //if (!IsReady)
+            //    throw new Exception("SteamWorkshopService not initialized!");
+
+            using (dynamic remoteStorage = SteamKit2.WebAPI.GetInterface("ISteamRemoteStorage"))
+            {
+                KeyValue allFilesDetails = null ;
+                remoteStorage.Timeout = TimeSpan.FromSeconds(30);
+                allFilesDetails = await Task.Run(delegate {
+                    try
+                    {
+                        return remoteStorage.GetPublishedFileDetails1(
+                            itemcount: workshopIds.Count(),
+                            publishedfileids: workshopIds,
+                            method: HttpMethod.Post);
+                        // var ifaceArgs = new Dictionary<string, string>();
+                        // ifaceArgs["itemcount"] = workshopIds.Count().ToString();
+                        // no idea if that formatting is correct - in fact I get a 404 response
+                        // ifaceArgs["publishedfileids"] = string.Join(",", workshopIds);
+                        // return remoteStorage.Call(HttpMethod.Post, "GetPublishedFileDetails", args: ifaceArgs);
+                    }
+                    catch (HttpRequestException e)
+                    {
+                        Log.Error($"Fetching File Details failed: {e.Message}");
+                        return null;
+                    }
+                });
+                if (allFilesDetails == null)
+                    return null;
+                //fileDetails = remoteStorage.Call(HttpMethod.Post, "GetPublishedFileDetails", 1, new Dictionary<string, string>() { { "itemcount", workshopIds.Count().ToString() }, { "publishedfileids", workshopIds.ToString() } });
+                var detailsList = allFilesDetails?.Children.Find((KeyValue kv) => kv.Name == "publishedfiledetails")?.Children;
+                var resultCount = allFilesDetails?.GetValueOrDefault<int>("resultcount");
+                if( detailsList == null || resultCount == null)
+                {
+                    Log.Error("Received invalid data: ");
+#if DEBUG
+                    if(allFilesDetails != null)
+                        PrintKeyValue(allFilesDetails);
+                    return null;
+#endif
+                }
+                if ( detailsList.Count != workshopIds.Count() || resultCount != workshopIds.Count())
+                {
+                    Log.Error($"Received unexpected number of fileDetails. Expected: {workshopIds.Count()}, Received: {resultCount}");
+                    return null;
+                }
+
+                var result = new Dictionary<ulong, PublishedItemDetails>();
+                for( int i = 0; i < resultCount; i++ )
+                {
+                    var fileDetails = detailsList[i];
+
+                    var tagContainer = fileDetails.Children.Find(item => item.Name == "tags");
+                    List<string> tags = new List<string>();
+                    if (tagContainer != null)
+                        foreach (var tagKv in tagContainer.Children)
+                        {
+                            var tag = tagKv.Children.Find(item => item.Name == "tag")?.Value;
+                            if( tag != null)
+                                tags.Add(tag);
+                        }
+
+                    var publishedFileId = fileDetails.GetValueOrDefault<ulong>("publishedfileid");
+                    result[publishedFileId] = new PublishedItemDetails()
+                    {
+                        PublishedFileId = publishedFileId,
+                        Views           = fileDetails.GetValueOrDefault<uint>("views"),
+                        Subscriptions   = fileDetails.GetValueOrDefault<uint>("subscriptions"),
+                        TimeUpdated     = DateTimeOffset.FromUnixTimeSeconds(fileDetails.GetValueOrDefault<long>("time_updated")).DateTime,
+                        TimeCreated     = DateTimeOffset.FromUnixTimeSeconds(fileDetails.GetValueOrDefault<long>("time_created")).DateTime,
+                        Description     = fileDetails.GetValueOrDefault<string>("description"),
+                        Title           = fileDetails.GetValueOrDefault<string>("title"),
+                        FileUrl         = fileDetails.GetValueOrDefault<string>("file_url"),
+                        FileSize        = fileDetails.GetValueOrDefault<long>("file_size"),
+                        FileName        = fileDetails.GetValueOrDefault<string>("filename"),
+                        ConsumerAppId   = fileDetails.GetValueOrDefault<ulong>("consumer_app_id"),
+                        CreatorAppId    = fileDetails.GetValueOrDefault<ulong>("creator_app_id"),
+                        Creator         = fileDetails.GetValueOrDefault<ulong>("creator"),
+                        Tags            = tags.ToArray()
+                    };
+                }
+                return result;
+            }
+        }
+
+        [Obsolete("Space Engineers has transitioned to Steam's UGC api, therefore this method might not always work!")]
+        public async Task DownloadPublishedFile(PublishedItemDetails fileDetails, string dir, string name = null)
+        {
+            var fullPath = Path.Combine(dir, name);
+            if (name == null)
+                name = fileDetails.FileName;
+            var expectedSize = (fileDetails.FileSize == 0) ? -1 : fileDetails.FileSize;
+
+            using (var client = new WebClient())
+            {
+                try
+                {
+                    var downloadTask = client.DownloadFileTaskAsync(fileDetails.FileUrl, Path.Combine(dir, name));
+                    DateTime start = DateTime.Now;
+                    for (int i = 0; i < 30; i++)
+                    {
+                        await Task.Delay(1000);
+                        if (downloadTask.IsCompleted)
+                            break;
+                    }
+                    if ( !downloadTask.IsCompleted )
+                    {
+                        client.CancelAsync();
+                        throw new Exception("Timeout while attempting to downloading published workshop item!");
+                    }
+                    //var text = await client.DownloadStringTaskAsync(url);
+                    //File.WriteAllText(fullPath, text);
+                }
+                catch (Exception e)
+                {
+                    Log.Error("Failed to download workshop item! /n" +
+                        $"{e.Message} - url: {fileDetails.FileUrl}, path: {Path.Combine(dir, name)}");
+                    throw e;
+                }
+            }
+
+        }
+
+        class Printable
+        {
+            public KeyValue Data;
+            public int Offset;
+
+            public void Print()
+            {
+                Log.Info($"{new string(' ', Offset)}{Data.Name}: {Data.Value}");
+            }
+        }
+
+        private static void PrintKeyValue(KeyValue data)
+        {
+
+            var dataSet = new Stack<Printable>();
+            dataSet.Push(new Printable()
+            {
+                Data = data,
+                Offset = 0
+            });
+            while (dataSet.Count != 0)
+            {
+                var printable = dataSet.Pop();
+                foreach (var child in printable.Data.Children)
+                    dataSet.Push(new Printable()
+                    {
+                        Data = child,
+                        Offset = printable.Offset + 2
+                    });
+                printable.Print();
+            }
+        }
+
+
+#region CALLBACKS
+        private void OnConnected( SteamClient.ConnectedCallback callback)
+        {
+            Log.Info("Connected to Steam! Logging in '{0}'...", Username);
+            if( Username == "anonymous" )
+                steamUser.LogOnAnonymous();
+            else
+                steamUser.LogOn(new SteamUser.LogOnDetails
+                {
+                    Username = Username,
+                    Password = password
+                });
+        }
+
+        private void OnDisconnected( SteamClient.DisconnectedCallback callback )
+        {
+            Log.Info("Disconnected from Steam");
+            IsReady = false;
+            IsRunning = false;
+        }
+
+        private void OnLoggedOn( SteamUser.LoggedOnCallback callback )
+        {
+            if( callback.Result != EResult.OK )
+            {
+                string msg;
+                if( callback.Result == EResult.AccountLogonDenied )
+                {
+                    msg = "Unable to logon to Steam: This account is Steamguard protected.";
+                    Log.Warn(msg);
+                    logonTaskCompletionSource.SetException(new Exception(msg));
+                    IsRunning = false;
+                    return;
+                }
+
+                msg = $"Unable to logon to Steam: {callback.Result} / {callback.ExtendedResult}";
+                Log.Warn(msg);
+                logonTaskCompletionSource.SetException(new Exception(msg));
+                IsRunning = false;
+                return;
+            }
+            IsReady = true;
+            Log.Info("Successfully logged on!");
+            logonTaskCompletionSource.SetResult(true);
+        }
+
+        private void OnLoggedOff( SteamUser.LoggedOffCallback callback )
+        {
+            IsReady = false;
+            Log.Info($"Logged off of Steam: {callback.Result}");
+        }
+#endregion
+
+    }
+}
diff --git a/Torch/packages.config b/Torch/packages.config
index b6b880f..3bc7aff 100644
--- a/Torch/packages.config
+++ b/Torch/packages.config
@@ -2,7 +2,12 @@
 <packages>
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.6.1" targetFramework="net461" />
+  <package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net461" />
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
   <package id="Octokit" version="0.24.0" targetFramework="net461" />
+  <package id="protobuf-net" version="2.1.0" targetFramework="net461" />
+  <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
+  <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
+  <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file

From 0122f9e9892a550677fa18109e4a3b2e21c6d542 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Fri, 8 Feb 2019 13:53:37 -0500
Subject: [PATCH 025/170] Add API for injecting client mods

---
 Torch.API/Session/ITorchSessionManager.cs | 26 +++++++++++++++++
 Torch/Patches/SessionDownloadPatch.cs     |  8 +++++-
 Torch/Session/TorchSessionManager.cs      | 35 +++++++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/Torch.API/Session/ITorchSessionManager.cs b/Torch.API/Session/ITorchSessionManager.cs
index bfa3b88..1b13e95 100644
--- a/Torch.API/Session/ITorchSessionManager.cs
+++ b/Torch.API/Session/ITorchSessionManager.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Torch.API.Managers;
+using VRage.Game;
 
 namespace Torch.API.Session
 {
@@ -47,5 +49,29 @@ namespace Torch.API.Session
         /// <returns>true if removed, false if not present</returns>
         /// <exception cref="ArgumentNullException">If the factory is null</exception>
         bool RemoveFactory(SessionManagerFactoryDel factory);
+
+        /// <summary>
+        /// Add a mod to be injected into client's world download.
+        /// </summary>
+        /// <param name="modId"></param>
+        /// <returns></returns>
+        bool AddOverrideMod(ulong modId);
+        
+        /// <summary>
+        /// Removes a mod from the injected mod list.
+        /// </summary>
+        /// <param name="modId"></param>
+        /// <returns></returns>
+        bool RemoveOverrideMod(ulong modId);
+        
+        /// <summary>
+        /// List over mods that will be injected into client world downloads.
+        /// </summary>
+        IReadOnlyCollection<MyObjectBuilder_Checkpoint.ModItem> OverrideMods { get; }
+
+        /// <summary>
+        /// Event raised when injected mod list changes.
+        /// </summary>
+        event Action<CollectionChangeEventArgs> OverrideModsChanged;
     }
 }
diff --git a/Torch/Patches/SessionDownloadPatch.cs b/Torch/Patches/SessionDownloadPatch.cs
index d7d8986..d739bcd 100644
--- a/Torch/Patches/SessionDownloadPatch.cs
+++ b/Torch/Patches/SessionDownloadPatch.cs
@@ -7,6 +7,8 @@ using System.Text;
 using System.Threading.Tasks;
 using NLog;
 using Sandbox.Game.World;
+using Torch.API.Session;
+using Torch.API.Managers;
 using Torch.Managers.PatchManager;
 using Torch.Mod;
 using VRage.Game;
@@ -16,6 +18,10 @@ namespace Torch.Patches
     [PatchShim]
     internal static class SessionDownloadPatch
     {
+        private static ITorchSessionManager _sessionManager;
+        private static ITorchSessionManager SessionManager => _sessionManager ?? (_sessionManager = TorchBase.Instance.Managers.GetManager<ITorchSessionManager>());
+
+
         internal static void Patch(PatchContext context)
         {
             context.GetPattern(typeof(MySession).GetMethod(nameof(MySession.GetWorld))).Suffixes.Add(typeof(SessionDownloadPatch).GetMethod(nameof(SuffixGetWorld), BindingFlags.Static | BindingFlags.NonPublic));
@@ -27,7 +33,7 @@ namespace Torch.Patches
             //copy this list so mods added here don't propagate up to the real session
             __result.Checkpoint.Mods = __result.Checkpoint.Mods.ToList();
             
-            __result.Checkpoint.Mods.Add(new MyObjectBuilder_Checkpoint.ModItem(TorchModCore.MOD_ID));
+            __result.Checkpoint.Mods.AddRange(SessionManager.OverrideMods);
         }
     }
 }
diff --git a/Torch/Session/TorchSessionManager.cs b/Torch/Session/TorchSessionManager.cs
index 08ed019..b021772 100644
--- a/Torch/Session/TorchSessionManager.cs
+++ b/Torch/Session/TorchSessionManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,7 +10,9 @@ using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Session;
 using Torch.Managers;
+using Torch.Mod;
 using Torch.Session;
+using VRage.Game;
 
 namespace Torch.Session
 {
@@ -21,6 +24,15 @@ namespace Torch.Session
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         private TorchSession _currentSession;
 
+        private readonly Dictionary<ulong, MyObjectBuilder_Checkpoint.ModItem> _overrideMods;
+
+        public event Action<CollectionChangeEventArgs> OverrideModsChanged;
+
+        /// <summary>
+        /// List of mods that will be injected into client world downloads.
+        /// </summary>
+        public IReadOnlyCollection<MyObjectBuilder_Checkpoint.ModItem> OverrideMods => _overrideMods.Values;
+
         /// <inheritdoc />
         public event TorchSessionStateChangedDel SessionStateChanged;
 
@@ -31,6 +43,8 @@ namespace Torch.Session
 
         public TorchSessionManager(ITorchBase torchInstance) : base(torchInstance)
         {
+            _overrideMods = new Dictionary<ulong, MyObjectBuilder_Checkpoint.ModItem>();
+            _overrideMods.Add(TorchModCore.MOD_ID, new MyObjectBuilder_Checkpoint.ModItem(TorchModCore.MOD_ID));
         }
 
         /// <inheritdoc/>
@@ -49,6 +63,27 @@ namespace Torch.Session
             return _factories.Remove(factory);
         }
 
+        /// <inheritdoc/>
+        public bool AddOverrideMod(ulong modId)
+        {
+            if (_overrideMods.ContainsKey(modId))
+                return false;
+            var item = new MyObjectBuilder_Checkpoint.ModItem();
+            _overrideMods.Add(modId, item);
+
+            OverrideModsChanged?.Invoke(new CollectionChangeEventArgs(CollectionChangeAction.Add, item));
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public bool RemoveOverrideMod(ulong modId)
+        {
+            if(_overrideMods.TryGetValue(modId, out var item))
+                OverrideModsChanged?.Invoke(new CollectionChangeEventArgs(CollectionChangeAction.Remove, item));
+
+            return _overrideMods.Remove(modId);
+        }
+
         #region Session events
 
         private void SetState(TorchSessionState state)

From 95ac2392e8b0c802ad938b25ad33d9e9df40b7c6 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 9 Feb 2019 08:56:46 -0500
Subject: [PATCH 026/170] Fix mod injection

---
 Torch/Session/TorchSessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Session/TorchSessionManager.cs b/Torch/Session/TorchSessionManager.cs
index b021772..d8fab39 100644
--- a/Torch/Session/TorchSessionManager.cs
+++ b/Torch/Session/TorchSessionManager.cs
@@ -68,7 +68,7 @@ namespace Torch.Session
         {
             if (_overrideMods.ContainsKey(modId))
                 return false;
-            var item = new MyObjectBuilder_Checkpoint.ModItem();
+            var item = new MyObjectBuilder_Checkpoint.ModItem(modId);
             _overrideMods.Add(modId, item);
 
             OverrideModsChanged?.Invoke(new CollectionChangeEventArgs(CollectionChangeAction.Add, item));

From ddc13cccec8ff4cb07f4d77c8361d36fb4cfb4f9 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 9 Feb 2019 12:17:36 -0500
Subject: [PATCH 027/170] Overhaul NetworkManager. Old systems of network
 injection and intercept are deprecated and will be removed in the future!

---
 .../Managers/NetworkManager/NetworkManager.cs | 343 +++++-------------
 .../NetworkManager_Deprecated.cs              | 318 ++++++++++++++++
 Torch/Torch.csproj                            |   1 +
 3 files changed, 401 insertions(+), 261 deletions(-)
 create mode 100644 Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs

diff --git a/Torch/Managers/NetworkManager/NetworkManager.cs b/Torch/Managers/NetworkManager/NetworkManager.cs
index 0fd8d69..0ce57a3 100644
--- a/Torch/Managers/NetworkManager/NetworkManager.cs
+++ b/Torch/Managers/NetworkManager/NetworkManager.cs
@@ -17,7 +17,7 @@ using VRageMath;
 
 namespace Torch.Managers
 {
-    public class NetworkManager : Manager, INetworkManager
+    public partial class NetworkManager : Manager, INetworkManager
     {
         private static Logger _log = LogManager.GetCurrentClassLogger();
 
@@ -26,18 +26,8 @@ namespace Torch.Managers
         private readonly HashSet<INetworkHandler> _networkHandlers = new HashSet<INetworkHandler>();
         private bool _init;
 
-        private const int MAX_ARGUMENT = 6;
-        private const int GENERIC_PARAMETERS = 8;
-        private const int DISPATCH_PARAMETERS = 10;
-        private static readonly DBNull DbNull = DBNull.Value;
-        private static MethodInfo _dispatchInfo;
-
-        private static MethodInfo DispatchEventInfo => _dispatchInfo ?? (_dispatchInfo = typeof(MyReplicationLayerBase).GetMethod("DispatchEvent", BindingFlags.NonPublic | BindingFlags.Instance));
-
         [ReflectedGetter(Name = "m_typeTable")]
         private static Func<MyReplicationLayerBase, MyTypeTable> _typeTableGetter;
-        [ReflectedGetter(Name = "m_methodInfoLookup")]
-        private static Func<MyEventTable, Dictionary<MethodInfo, CallSite>> _methodInfoLookupGetter;
         [ReflectedMethod(Type = typeof(MyReplicationLayer), Name = "GetObjectByNetworkId")]
         private static Func<MyReplicationLayer, NetworkId, IMyNetObject> _getObjectByNetworkId;
 
@@ -45,7 +35,7 @@ namespace Torch.Managers
         {
 
         }
-
+        
         private static bool ReflectionUnitTest(bool suppress = false)
         {
             try
@@ -116,281 +106,112 @@ namespace Torch.Managers
             // TODO reverse what was done in Attach
         }
 
-        #region Network Intercept
-        
-        //TODO: Change this to a method patch so I don't have to try to keep up with Keen.
-        /// <summary>
-        /// This is the main body of the network intercept system. When messages come in from clients, they are processed here
-        /// before being passed on to the game server.
-        /// 
-        /// DO NOT modify this method unless you're absolutely sure of what you're doing. This can very easily destabilize the game!
-        /// </summary>
-        /// <param name="packet"></param>
-        private void OnEvent(MyPacket packet)
-        {
-            if (_networkHandlers.Count == 0)
-            {
-                //pass the message back to the game server
-                try
-                {
-                    ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).OnEvent(packet);
-                }
-                catch (Exception ex)
-                {
-                    _log.Error(ex);
-                    //crash after logging, bad things could happen if we continue on with bad data
-                    throw;
-                }
-                return;
-            }
-
-            var stream = new BitStream();
-            stream.ResetRead(packet.BitStream);
-
-            var networkId = stream.ReadNetworkId();
-            //this value is unused, but removing this line corrupts the rest of the stream
-            var blockedNetworkId = stream.ReadNetworkId();
-            var eventId = (uint)stream.ReadUInt16();
-            bool flag = stream.ReadBool();
-            Vector3D? position = new Vector3D?();
-            if (flag)
-                position = new Vector3D?(stream.ReadVector3D());
-
-            CallSite site;
-            object obj;
-            if (networkId.IsInvalid) // Static event
-            {
-                site = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).StaticEventTable.Get(eventId);
-                obj = null;
-            }
-            else // Instance event
-            {
-                //var sendAs = ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).GetObjectByNetworkId(networkId);
-                var sendAs = _getObjectByNetworkId((MyReplicationLayer)MyMultiplayer.ReplicationLayer, networkId);
-                if (sendAs == null)
-                {
-                    return;
-                }
-                var typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(sendAs.GetType());
-                var eventCount = typeInfo.EventTable.Count;
-                if (eventId < eventCount) // Directly
-                {
-                    obj = sendAs;
-                    site = typeInfo.EventTable.Get(eventId);
-                }
-                else // Through proxy
-                {
-                    obj = ((IMyProxyTarget)sendAs).Target;
-                    typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(obj.GetType());
-                    site = typeInfo.EventTable.Get(eventId - (uint)eventCount); // Subtract max id of Proxy
-                }
-            }
-
-            //we're handling the network live in the game thread, this needs to go as fast as possible
-            var discard = false;
-            foreach (var handler in _networkHandlers)
-            //Parallel.ForEach(_networkHandlers, handler =>
-            {
-                try
-                {
-                    if (handler.CanHandle(site))
-                        discard |= handler.Handle(packet.Sender.Id.Value, site, stream, obj, packet);
-                }
-                catch (Exception ex)
-                {
-                    //ApplicationLog.Error(ex.ToString());
-                    _log.Error(ex);
-                }
-            }
-
-            //one of the handlers wants us to discard this packet
-            if (discard)
-                return;
-
-            //pass the message back to the game server
-            try
-            {
-                ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).OnEvent(packet);
-            }
-            catch (Exception ex)
-            {
-                _log.Error(ex, "Error processing network event!");
-                _log.Error(ex);
-                //crash after logging, bad things could happen if we continue on with bad data
-                throw;
-            }
-        }
-
-
-        /// <inheritdoc />
-        public void RegisterNetworkHandler(INetworkHandler handler)
-        {
-            var handlerType = handler.GetType().FullName;
-            var toRemove = new List<INetworkHandler>();
-            foreach (var item in _networkHandlers)
-            {
-                if (item.GetType().FullName == handlerType)
-                {
-                    //if (ExtenderOptions.IsDebugging)
-                    _log.Error("Network handler already registered! " + handlerType);
-                    toRemove.Add(item);
-                }
-            }
-
-            foreach (var oldHandler in toRemove)
-                _networkHandlers.Remove(oldHandler);
-
-            _networkHandlers.Add(handler);
-        }
-
-        /// <inheritdoc />
-        public bool UnregisterNetworkHandler(INetworkHandler handler)
-        {
-            return _networkHandlers.Remove(handler);
-        }
-
-        public void RegisterNetworkHandlers(params INetworkHandler[] handlers)
-        {
-            foreach (var handler in handlers)
-                RegisterNetworkHandler(handler);
-        }
-
-        #endregion
-
         #region Network Injection
-
-
-        /// <summary>
-        /// Broadcasts an event to all connected clients
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="obj"></param>
-        /// <param name="args"></param>
-        public void RaiseEvent(MethodInfo method, object obj, params object[] args)
+        
+        private static Func<T, TA> GetDelegate<T, TA>(MethodInfo method) where TA : class
         {
-            //default(EndpointId) tells the network to broadcast the message
-            RaiseEvent(method, obj, default(EndpointId), args);
+            return x => Delegate.CreateDelegate(typeof(TA), x, method) as TA;
         }
 
-        /// <summary>
-        /// Sends an event to one client by SteamId
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="obj"></param>
-        /// <param name="steamId"></param>
-        /// <param name="args"></param>
-	    public void RaiseEvent(MethodInfo method, object obj, ulong steamId, params object[] args)
+        public static void RaiseEvent<T1>(T1 instance, MethodInfo method, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner
         {
-            RaiseEvent(method, obj, new EndpointId(steamId), args);
+            var del = GetDelegate<T1, Action>(method);
+
+            MyMultiplayer.RaiseEvent(instance, del, target);
         }
 
-        /// <summary>
-        /// Sends an event to one client
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="obj"></param>
-        /// <param name="endpoint"></param>
-        /// <param name="args"></param>
-        public void RaiseEvent(MethodInfo method, object obj, EndpointId endpoint, params object[] args)
+        public static void RaiseEvent<T1, T2>(T1 instance, MethodInfo method, T2 arg1, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner
         {
-            if (method == null)
-                throw new ArgumentNullException(nameof(method), "MethodInfo cannot be null!");
+            var del = GetDelegate<T1, Action<T2>> (method);
 
-            if (args.Length > MAX_ARGUMENT)
-                throw new ArgumentOutOfRangeException(nameof(args), $"Cannot pass more than {MAX_ARGUMENT} arguments!");
-
-            var owner = obj as IMyEventOwner;
-            if (obj != null && owner == null)
-                throw new InvalidCastException("Provided event target is not of type IMyEventOwner!");
-
-            if (!method.HasAttribute<EventAttribute>())
-                throw new CustomAttributeFormatException("Provided event target does not have the Event attribute! Replication will not succeed!");
-
-            //array to hold arguments to pass into DispatchEvent
-            object[] arguments = new object[DISPATCH_PARAMETERS];
-            
-
-            arguments[0] = obj == null ? TryGetStaticCallSite(method) : TryGetCallSite(method, obj);
-            arguments[1] = endpoint;
-            arguments[2] = owner;
-
-            //copy supplied arguments into the reflection arguments
-            for (var i = 0; i < args.Length; i++)
-                arguments[i + 3] = args[i];
-
-            //pad the array out with DBNull, skip last element
-            //last element should stay null (this is for blocking events -- not used?)
-            for (var j = args.Length + 3; j < arguments.Length - 1; j++)
-                arguments[j] = DbNull;
-            
-            //create an array of Types so we can create a generic method
-            var argTypes = new Type[GENERIC_PARAMETERS];
-
-            //any null arguments (not DBNull) must be of type IMyEventOwner
-            for (var k = 2; k < arguments.Length; k++)
-                argTypes[k - 2] = arguments[k]?.GetType() ?? typeof(IMyEventOwner);
-
-            var parameters = method.GetParameters();
-            for (var i = 0; i < parameters.Length; i++)
-            {
-                if (argTypes[i + 1] != parameters[i].ParameterType)
-                    throw new TypeLoadException($"Type mismatch on method parameters. Expected {string.Join(", ", parameters.Select(p => p.ParameterType.ToString()))} got {string.Join(", ", argTypes.Select(t => t.ToString()))}");
-            }
-
-            //create a generic method of DispatchEvent and invoke to inject our data into the network
-            var dispatch = DispatchEventInfo.MakeGenericMethod(argTypes);
-            dispatch.Invoke(MyMultiplayer.ReplicationLayer, arguments);
+            MyMultiplayer.RaiseEvent(instance, del, arg1, target);
         }
 
-        /// <summary>
-        /// Broadcasts a static event to all connected clients
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="args"></param>
-	    public void RaiseStaticEvent(MethodInfo method, params object[] args)
+        public static void RaiseEvent<T1, T2, T3>(T1 instance, MethodInfo method, T2 arg1, T3 arg2, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner
         {
-            //default(EndpointId) tells the network to broadcast the message
-            RaiseStaticEvent(method, default(EndpointId), args);
+            var del = GetDelegate<T1, Action<T2, T3>>(method);
+
+            MyMultiplayer.RaiseEvent(instance, del, arg1, arg2, target);
         }
 
-        /// <summary>
-        /// Sends a static event to one client by SteamId
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="steamId"></param>
-        /// <param name="args"></param>
-	    public void RaiseStaticEvent(MethodInfo method, ulong steamId, params object[] args)
+        public static void RaiseEvent<T1, T2, T3, T4>(T1 instance, MethodInfo method, T2 arg1, T3 arg2, T4 arg3, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner
         {
-            RaiseEvent(method, null, new EndpointId(steamId), args);
+            var del = GetDelegate<T1, Action<T2, T3, T4>>(method);
+
+            MyMultiplayer.RaiseEvent(instance, del, arg1, arg2, arg3, target);
         }
 
-        /// <summary>
-        /// Sends a static event to one client
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="endpoint"></param>
-        /// <param name="args"></param>
-        public void RaiseStaticEvent(MethodInfo method, EndpointId endpoint, params object[] args)
+        public static void RaiseEvent<T1, T2, T3, T4, T5>(T1 instance, MethodInfo method, T2 arg1, T3 arg2, T4 arg3, T5 arg4, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner
         {
-            RaiseEvent(method, null, endpoint, args);
+            var del = GetDelegate<T1, Action<T2, T3, T4, T5>>(method);
+
+            MyMultiplayer.RaiseEvent(instance, del, arg1, arg2, arg3, arg4, target);
         }
 
-        private CallSite TryGetStaticCallSite(MethodInfo method)
+        public static void RaiseEvent<T1, T2, T3, T4, T5, T6>(T1 instance, MethodInfo method, T2 arg1, T3 arg2, T4 arg3, T5 arg4, T6 arg5, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner
         {
-            MyTypeTable typeTable = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer);
-            if (!_methodInfoLookupGetter.Invoke(typeTable.StaticEventTable).TryGetValue(method, out CallSite result))
-                throw new MissingMemberException("Provided event target not found!");
-            return result;
+            var del = GetDelegate<T1, Action<T2, T3, T4, T5, T6>>(method);
+
+            MyMultiplayer.RaiseEvent(instance, del, arg1, arg2, arg3, arg4, arg5, target);
         }
 
-        private CallSite TryGetCallSite(MethodInfo method, object arg)
+        public static void RaiseEvent<T1, T2, T3, T4, T5, T6, T7>(T1 instance, MethodInfo method, T2 arg1, T3 arg2, T4 arg3, T5 arg4, T6 arg5, T7 arg6, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner
         {
-            MySynchronizedTypeInfo typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(arg.GetType());
-            if (!_methodInfoLookupGetter.Invoke(typeInfo.EventTable).TryGetValue(method, out CallSite result))
-                throw new MissingMemberException("Provided event target not found!");
-            return result;
+            var del = GetDelegate<T1, Action<T2, T3, T4, T5, T6, T7>>(method);
+
+            MyMultiplayer.RaiseEvent(instance, del, arg1, arg2, arg3, arg4, arg5, arg6, target);
         }
 
+        public static void RaiseStaticEvent(MethodInfo method, EndpointId target = default(EndpointId), Vector3D? position = null)
+        {
+            var del = GetDelegate<IMyEventOwner, Action>(method);
+
+            MyMultiplayer.RaiseStaticEvent(del, target, position);
+        }
+
+        public static void RaiseStaticEvent<T1>(MethodInfo method, T1 arg1, EndpointId target = default(EndpointId), Vector3D? position = null)
+        {
+            var del = GetDelegate<IMyEventOwner, Action<T1>>(method);
+
+            MyMultiplayer.RaiseStaticEvent(del, arg1, target, position);
+        }
+
+        public static void RaiseStaticEvent<T1, T2>(MethodInfo method, T1 arg1, T2 arg2, EndpointId target = default(EndpointId), Vector3D? position = null)
+        {
+            var del = GetDelegate<IMyEventOwner, Action<T1, T2>>(method);
+
+            MyMultiplayer.RaiseStaticEvent(del, arg1, arg2, target, position);
+        }
+        
+        public static void RaiseStaticEvent<T1, T2, T3>(MethodInfo method, T1 arg1, T2 arg2, T3 arg3, EndpointId target = default(EndpointId), Vector3D? position = null)
+        {
+            var del = GetDelegate<IMyEventOwner, Action<T1, T2, T3>>(method);
+
+            MyMultiplayer.RaiseStaticEvent(del, arg1, arg2, arg3, target, position);
+        }
+
+        public static void RaiseStaticEvent<T1, T2, T3, T4>(MethodInfo method, T1 arg1, T2 arg2, T3 arg3, T4 arg4, EndpointId target = default(EndpointId), Vector3D? position = null)
+        {
+            var del = GetDelegate<IMyEventOwner, Action<T1, T2, T3, T4>>(method);
+
+            MyMultiplayer.RaiseStaticEvent(del, arg1, arg2, arg3, arg4, target, position);
+        }
+
+        public static void RaiseStaticEvent<T1, T2, T3, T4, T5>(MethodInfo method, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, EndpointId target = default(EndpointId), Vector3D? position = null)
+        {
+            var del = GetDelegate<IMyEventOwner, Action<T1, T2, T3, T4, T5>>(method);
+
+            MyMultiplayer.RaiseStaticEvent(del, arg1, arg2, arg3, arg4, arg5, target, position);
+        }
+
+        public static void RaiseStaticEvent<T1, T2, T3, T4, T5, T6>(MethodInfo method, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, EndpointId target = default(EndpointId), Vector3D? position = null)
+        {
+            var del = GetDelegate<IMyEventOwner, Action<T1, T2, T3, T4, T5, T6>>(method);
+
+            MyMultiplayer.RaiseStaticEvent(del, arg1, arg2, arg3, arg4, arg5, arg6, target, position);
+        }
         #endregion
+
+
     }
 }
diff --git a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
new file mode 100644
index 0000000..1e25769
--- /dev/null
+++ b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
@@ -0,0 +1,318 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Sandbox.Engine.Multiplayer;
+using Torch.API.Managers;
+using Torch.Utils;
+using VRage;
+using VRage.Library.Collections;
+using VRage.Network;
+using VRageMath;
+
+namespace Torch.Managers
+{
+    //Everything in this file is deprecated and should be deleted Eventually(tm)
+    public partial class NetworkManager
+    {
+        [ReflectedGetter(Name = "m_methodInfoLookup")]
+        private static Func<MyEventTable, Dictionary<MethodInfo, CallSite>> _methodInfoLookupGetter;
+        private const int MAX_ARGUMENT = 6;
+        private const int GENERIC_PARAMETERS = 8;
+        private const int DISPATCH_PARAMETERS = 11;
+        private static readonly DBNull DbNull = DBNull.Value;
+        private static MethodInfo _dispatchInfo;
+
+        private static MethodInfo DispatchEventInfo => _dispatchInfo ?? (_dispatchInfo = typeof(MyReplicationLayerBase).GetMethod("DispatchEvent", BindingFlags.NonPublic | BindingFlags.Instance));
+
+        #region Network Injection
+
+
+        /// <summary>
+        /// Broadcasts an event to all connected clients
+        /// </summary>
+        /// <param name="method"></param>
+        /// <param name="obj"></param>
+        /// <param name="args"></param>
+        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
+        public void RaiseEvent(MethodInfo method, object obj, params object[] args)
+        {
+            //default(EndpointId) tells the network to broadcast the message
+            RaiseEvent(method, obj, default(EndpointId), args);
+        }
+
+        /// <summary>
+        /// Sends an event to one client by SteamId
+        /// </summary>
+        /// <param name="method"></param>
+        /// <param name="obj"></param>
+        /// <param name="steamId"></param>
+        /// <param name="args"></param>
+        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
+	    public void RaiseEvent(MethodInfo method, object obj, ulong steamId, params object[] args)
+        {
+            RaiseEvent(method, obj, new EndpointId(steamId), args);
+        }
+
+        /// <summary>
+        /// Sends an event to one client
+        /// </summary>
+        /// <param name="method"></param>
+        /// <param name="obj"></param>
+        /// <param name="endpoint"></param>
+        /// <param name="args"></param>
+        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
+        public void RaiseEvent(MethodInfo method, object obj, EndpointId endpoint, params object[] args)
+        {
+            if (method == null)
+                throw new ArgumentNullException(nameof(method), "MethodInfo cannot be null!");
+
+            if (args.Length > MAX_ARGUMENT)
+                throw new ArgumentOutOfRangeException(nameof(args), $"Cannot pass more than {MAX_ARGUMENT} arguments!");
+
+            var owner = obj as IMyEventOwner;
+            if (obj != null && owner == null)
+                throw new InvalidCastException("Provided event target is not of type IMyEventOwner!");
+
+            if (!method.HasAttribute<EventAttribute>())
+                throw new CustomAttributeFormatException("Provided event target does not have the Event attribute! Replication will not succeed!");
+
+            //array to hold arguments to pass into DispatchEvent
+            object[] arguments = new object[DISPATCH_PARAMETERS];
+            
+
+            arguments[0] = obj == null ? TryGetStaticCallSite(method) : TryGetCallSite(method, obj);
+            arguments[1] = endpoint;
+            arguments[2] = new Vector3D?();
+            arguments[3] = owner;
+
+            //copy supplied arguments into the reflection arguments
+            for (var i = 0; i < args.Length; i++)
+                arguments[i + 4] = args[i];
+
+            //pad the array out with DBNull, skip last element
+            //last element should stay null (this is for blocking events -- not used?)
+            for (var j = args.Length + 4; j < arguments.Length - 1; j++)
+                arguments[j] = DbNull;
+            
+            //create an array of Types so we can create a generic method
+            var argTypes = new Type[GENERIC_PARAMETERS];
+
+            //any null arguments (not DBNull) must be of type IMyEventOwner
+            for (var k = 2; k < arguments.Length; k++)
+                argTypes[k - 2] = arguments[k]?.GetType() ?? typeof(IMyEventOwner);
+
+            var parameters = method.GetParameters();
+            for (var i = 0; i < parameters.Length; i++)
+            {
+                if (argTypes[i + 1] != parameters[i].ParameterType)
+                    throw new TypeLoadException($"Type mismatch on method parameters. Expected {string.Join(", ", parameters.Select(p => p.ParameterType.ToString()))} got {string.Join(", ", argTypes.Select(t => t.ToString()))}");
+            }
+
+            //create a generic method of DispatchEvent and invoke to inject our data into the network
+            var dispatch = DispatchEventInfo.MakeGenericMethod(argTypes);
+            dispatch.Invoke(MyMultiplayer.ReplicationLayer, arguments);
+        }
+
+        /// <summary>
+        /// Broadcasts a static event to all connected clients
+        /// </summary>
+        /// <param name="method"></param>
+        /// <param name="args"></param>
+        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
+	    public void RaiseStaticEvent(MethodInfo method, params object[] args)
+        {
+            //default(EndpointId) tells the network to broadcast the message
+            RaiseStaticEvent(method, default(EndpointId), args);
+        }
+
+        /// <summary>
+        /// Sends a static event to one client by SteamId
+        /// </summary>
+        /// <param name="method"></param>
+        /// <param name="steamId"></param>
+        /// <param name="args"></param>
+        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
+	    public void RaiseStaticEvent(MethodInfo method, ulong steamId, params object[] args)
+        {
+            RaiseEvent(method, (object)null, new EndpointId(steamId), args);
+        }
+
+        /// <summary>
+        /// Sends a static event to one client
+        /// </summary>
+        /// <param name="method"></param>
+        /// <param name="endpoint"></param>
+        /// <param name="args"></param>
+        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
+        public void RaiseStaticEvent(MethodInfo method, EndpointId endpoint, params object[] args)
+        {
+            RaiseEvent(method, (object)null, endpoint, args);
+        }
+
+        private CallSite TryGetStaticCallSite(MethodInfo method)
+        {
+            MyTypeTable typeTable = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer);
+            if (!_methodInfoLookupGetter.Invoke(typeTable.StaticEventTable).TryGetValue(method, out CallSite result))
+                throw new MissingMemberException("Provided event target not found!");
+            return result;
+        }
+
+        private CallSite TryGetCallSite(MethodInfo method, object arg)
+        {
+            MySynchronizedTypeInfo typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(arg.GetType());
+            if (!_methodInfoLookupGetter.Invoke(typeInfo.EventTable).TryGetValue(method, out CallSite result))
+                throw new MissingMemberException("Provided event target not found!");
+            return result;
+        }
+
+        #endregion
+    
+        #region Network Intercept
+        
+        [Obsolete]
+        //TODO: Change this to a method patch so I don't have to try to keep up with Keen.
+        /// <summary>
+        /// This is the main body of the network intercept system. When messages come in from clients, they are processed here
+        /// before being passed on to the game server.
+        /// 
+        /// DO NOT modify this method unless you're absolutely sure of what you're doing. This can very easily destabilize the game!
+        /// </summary>
+        /// <param name="packet"></param>
+        private void OnEvent(MyPacket packet)
+        {
+            if (_networkHandlers.Count == 0)
+            {
+                //pass the message back to the game server
+                try
+                {
+                    ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).OnEvent(packet);
+                }
+                catch (Exception ex)
+                {
+                    _log.Error(ex);
+                    //crash after logging, bad things could happen if we continue on with bad data
+                    throw;
+                }
+                return;
+            }
+
+            var stream = new BitStream();
+            stream.ResetRead(packet.BitStream);
+
+            var networkId = stream.ReadNetworkId();
+            //this value is unused, but removing this line corrupts the rest of the stream
+            var blockedNetworkId = stream.ReadNetworkId();
+            var eventId = (uint)stream.ReadUInt16();
+            bool flag = stream.ReadBool();
+            Vector3D? position = new Vector3D?();
+            if (flag)
+                position = new Vector3D?(stream.ReadVector3D());
+
+            CallSite site;
+            object obj;
+            if (networkId.IsInvalid) // Static event
+            {
+                site = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).StaticEventTable.Get(eventId);
+                obj = null;
+            }
+            else // Instance event
+            {
+                //var sendAs = ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).GetObjectByNetworkId(networkId);
+                var sendAs = _getObjectByNetworkId((MyReplicationLayer)MyMultiplayer.ReplicationLayer, networkId);
+                if (sendAs == null)
+                {
+                    return;
+                }
+                var typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(sendAs.GetType());
+                var eventCount = typeInfo.EventTable.Count;
+                if (eventId < eventCount) // Directly
+                {
+                    obj = sendAs;
+                    site = typeInfo.EventTable.Get(eventId);
+                }
+                else // Through proxy
+                {
+                    obj = ((IMyProxyTarget)sendAs).Target;
+                    typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(obj.GetType());
+                    site = typeInfo.EventTable.Get(eventId - (uint)eventCount); // Subtract max id of Proxy
+                }
+            }
+
+            //we're handling the network live in the game thread, this needs to go as fast as possible
+            var discard = false;
+            foreach (var handler in _networkHandlers)
+            //Parallel.ForEach(_networkHandlers, handler =>
+            {
+                try
+                {
+                    if (handler.CanHandle(site))
+                        discard |= handler.Handle(packet.Sender.Id.Value, site, stream, obj, packet);
+                }
+                catch (Exception ex)
+                {
+                    //ApplicationLog.Error(ex.ToString());
+                    _log.Error(ex);
+                }
+            }
+
+            //one of the handlers wants us to discard this packet
+            if (discard)
+                return;
+
+            //pass the message back to the game server
+            try
+            {
+                ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).OnEvent(packet);
+            }
+            catch (Exception ex)
+            {
+                _log.Error(ex, "Error processing network event!");
+                _log.Error(ex);
+                //crash after logging, bad things could happen if we continue on with bad data
+                throw;
+            }
+        }
+
+        [Obsolete("Deprecated. Use a method patch instead.")]
+        /// <inheritdoc />
+        public void RegisterNetworkHandler(INetworkHandler handler)
+        {
+            var handlerType = handler.GetType().FullName;
+            var toRemove = new List<INetworkHandler>();
+            foreach (var item in _networkHandlers)
+            {
+                if (item.GetType().FullName == handlerType)
+                {
+                    //if (ExtenderOptions.IsDebugging)
+                    _log.Error("Network handler already registered! " + handlerType);
+                    toRemove.Add(item);
+                }
+            }
+
+            foreach (var oldHandler in toRemove)
+                _networkHandlers.Remove(oldHandler);
+
+            _networkHandlers.Add(handler);
+        }
+
+        [Obsolete("Deprecated. Use a method patch instead.")]
+        /// <inheritdoc />
+        public bool UnregisterNetworkHandler(INetworkHandler handler)
+        {
+            return _networkHandlers.Remove(handler);
+        }
+
+        [Obsolete("Deprecated. Use a method patch instead.")]
+        public void RegisterNetworkHandlers(params INetworkHandler[] handlers)
+        {
+            foreach (var handler in handlers)
+                RegisterNetworkHandler(handler);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index ca444dd..747f50b 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -194,6 +194,7 @@
     <Compile Include="Event\EventManager.cs" />
     <Compile Include="Event\IEventList.cs" />
     <Compile Include="Managers\KeenLogPatch.cs" />
+    <Compile Include="Managers\NetworkManager\NetworkManager_Deprecated.cs" />
     <Compile Include="Managers\PatchManager\AssemblyMemory.cs" />
     <Compile Include="Managers\PatchManager\DecoratedMethod.cs" />
     <Compile Include="Managers\PatchManager\EmitExtensions.cs" />

From dda7864c1a61580b57147db0f3108527581d9a2b Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 10 Feb 2019 14:58:31 -0500
Subject: [PATCH 028/170] Add !uptime command

---
 Torch.API/ITorchBase.cs         | 2 ++
 Torch/Commands/TorchCommands.cs | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/Torch.API/ITorchBase.cs b/Torch.API/ITorchBase.cs
index b8b2e68..779d004 100644
--- a/Torch.API/ITorchBase.cs
+++ b/Torch.API/ITorchBase.cs
@@ -154,6 +154,8 @@ namespace Torch.API
         /// Raised when the server's Init() method has completed.
         /// </summary>
         event Action<ITorchServer> Initialized;
+        
+        TimeSpan ElapsedPlayTime { get; set; }
     }
 
     /// <summary>
diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index 26d676e..30d1a6c 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -290,5 +290,11 @@ namespace Torch.Commands
                 }
             }, this, TaskContinuationOptions.RunContinuationsAsynchronously);
         }
+
+        [Command("uptime", "Check how long the server has been online.")]
+        public void Uptime()
+        {
+            Context.Respond(((ITorchServer)Context.Torch).ElapsedPlayTime.ToString());
+        }
     }
 }

From 1c6eec61af1da0ba666515782d7a5f4405c79ed9 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 10 Feb 2019 16:29:08 -0500
Subject: [PATCH 029/170] Add basic, experimental entity sorting

---
 .../ViewModels/Entities/EntityViewModel.cs    |  94 +++++++++++++-
 .../ViewModels/Entities/GridViewModel.cs      |   7 +-
 .../ViewModels/EntityTreeViewModel.cs         |  35 ++++-
 Torch.Server/Views/EntitiesControl.xaml       |  30 +++--
 Torch.Server/Views/EntitiesControl.xaml.cs    |  26 ++++
 Torch/Collections/MtObservableList.cs         |  38 ++++--
 Torch/Collections/SortedView.cs               | 122 ++++++++++++++++++
 Torch/Torch.csproj                            |   3 +
 Torch/Utils/MiscExtensions.cs                 |  12 ++
 9 files changed, 333 insertions(+), 34 deletions(-)
 create mode 100644 Torch/Collections/SortedView.cs

diff --git a/Torch.Server/ViewModels/Entities/EntityViewModel.cs b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
index c3502d6..c1f7d0d 100644
--- a/Torch.Server/ViewModels/Entities/EntityViewModel.cs
+++ b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
@@ -1,8 +1,14 @@
-using System.Windows.Controls;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows.Controls;
+using NLog;
+using Sandbox.Game.Entities;
 using Sandbox.Game.World;
 using Torch.API.Managers;
 using Torch.Collections;
 using Torch.Server.Managers;
+using Torch.Utils;
 using VRage.Game.Entity;
 using VRage.Game.ModAPI;
 using VRage.ModAPI;
@@ -14,6 +20,8 @@ namespace Torch.Server.ViewModels.Entities
     {
         protected EntityTreeViewModel Tree { get; }
 
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
         private IMyEntity _backing;
         public IMyEntity Entity
         {
@@ -43,6 +51,75 @@ namespace Torch.Server.ViewModels.Entities
             }
         }
 
+        private string _descriptiveName;
+        public string DescriptiveName
+        {
+            get => _descriptiveName ?? (_descriptiveName = GetSortedName(EntityTreeViewModel.SortEnum.Name));
+            set => _descriptiveName = value;
+        }
+
+        public virtual string GetSortedName(EntityTreeViewModel.SortEnum sort)
+        {
+            switch (sort)
+            {
+                case EntityTreeViewModel.SortEnum.Name:
+                    return Name;
+                case EntityTreeViewModel.SortEnum.Size:
+                    return $"{Name} ({Entity.WorldVolume.Radius * 2:N}m)";
+                case EntityTreeViewModel.SortEnum.Speed:
+                    return $"{Name} ({Entity.Physics?.LinearVelocity.Length() ?? 0:N}m/s)";
+                case EntityTreeViewModel.SortEnum.BlockCount:
+                    if (Entity is MyCubeGrid grid)
+                        return $"{Name} ({grid.BlocksCount} blocks)";
+                    return Name;
+                case EntityTreeViewModel.SortEnum.DistFromCenter:
+                    return $"{Name} ({Entity.GetPosition().Length():N}m)";
+                case EntityTreeViewModel.SortEnum.Owner:
+                    if (Entity is MyCubeGrid g)
+                        return $"{Name} ({g.GetGridOwnerName()})";
+                    return Name;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(sort), sort, null);
+            }
+        }
+
+        public virtual int CompareToSort(EntityViewModel other, EntityTreeViewModel.SortEnum sort)
+        {
+            switch (sort)
+            {
+                case EntityTreeViewModel.SortEnum.Name:
+                    return string.Compare(Name, other.Name, StringComparison.InvariantCultureIgnoreCase);
+                case EntityTreeViewModel.SortEnum.Size:
+                    return Entity.WorldVolume.Radius.CompareTo(other.Entity.WorldVolume.Radius);
+                case EntityTreeViewModel.SortEnum.Speed:
+                    if (Entity.Physics == null)
+                    {
+                        if (other.Entity.Physics == null)
+                            return 0;
+                        return -1;
+                    }
+                    if (other.Entity.Physics == null)
+                        return 1;
+                    return Entity.Physics.LinearVelocity.LengthSquared().CompareTo(other.Entity.Physics.LinearVelocity.LengthSquared());
+                case EntityTreeViewModel.SortEnum.BlockCount:
+                {
+                    if (Entity is MyCubeGrid ga && other.Entity is MyCubeGrid gb)
+                        return ga.BlocksCount.CompareTo(gb.BlocksCount);
+                    goto case EntityTreeViewModel.SortEnum.Name;
+                }
+                case EntityTreeViewModel.SortEnum.DistFromCenter:
+                    return Entity.GetPosition().LengthSquared().CompareTo(other.Entity.GetPosition().LengthSquared());
+                case EntityTreeViewModel.SortEnum.Owner:
+                {
+                    if (Entity is MyCubeGrid ga && other.Entity is MyCubeGrid gb)
+                        return string.Compare(ga.GetGridOwnerName(), gb.GetGridOwnerName(), StringComparison.InvariantCultureIgnoreCase);
+                    goto case EntityTreeViewModel.SortEnum.Name;
+                }
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(sort), sort, null);
+            }
+        }
+
         public virtual string Position
         {
             get => Entity?.GetPosition().ToString();
@@ -76,5 +153,20 @@ namespace Torch.Server.ViewModels.Entities
         {
             
         }
+
+        public class Comparer : IComparer<EntityViewModel>
+        {
+            private EntityTreeViewModel.SortEnum _sort;
+
+            public Comparer(EntityTreeViewModel.SortEnum sort)
+            {
+                _sort = sort;
+            }
+
+            public int Compare(EntityViewModel x, EntityViewModel y)
+            {
+                return x.CompareToSort(y, _sort);
+            }
+        }
     }
 }
diff --git a/Torch.Server/ViewModels/Entities/GridViewModel.cs b/Torch.Server/ViewModels/Entities/GridViewModel.cs
index 50db707..9a6229c 100644
--- a/Torch.Server/ViewModels/Entities/GridViewModel.cs
+++ b/Torch.Server/ViewModels/Entities/GridViewModel.cs
@@ -50,17 +50,14 @@ namespace Torch.Server.ViewModels.Entities
             Blocks { get; } =
             new MtObservableSortedDictionary<MyCubeBlockDefinition, MtObservableSortedDictionary<long, BlockViewModel>>(
                 CubeBlockDefinitionComparer.Default);
-
-        /// <inheritdoc />
-        public string DescriptiveName { get; }
-
+        
         public GridViewModel()
         {
         }
 
         public GridViewModel(MyCubeGrid grid, EntityTreeViewModel tree) : base(grid, tree)
         {
-            DescriptiveName = $"{grid.DisplayName} ({grid.BlocksCount} blocks)";
+            //DescriptiveName = $"{grid.DisplayName} ({grid.BlocksCount} blocks)";
             Blocks.Add(_fillerDefinition, new MtObservableSortedDictionary<long, BlockViewModel>());
         }
 
diff --git a/Torch.Server/ViewModels/EntityTreeViewModel.cs b/Torch.Server/ViewModels/EntityTreeViewModel.cs
index 54b8e7a..3ef4472 100644
--- a/Torch.Server/ViewModels/EntityTreeViewModel.cs
+++ b/Torch.Server/ViewModels/EntityTreeViewModel.cs
@@ -12,11 +12,21 @@ using VRage.ModAPI;
 using System.Windows.Threading;
 using NLog;
 using Torch.Collections;
+using Torch.Server.Views.Entities;
 
 namespace Torch.Server.ViewModels
 {
     public class EntityTreeViewModel : ViewModel
     {
+        public enum SortEnum
+        {
+            Name,
+            Size,
+            Speed,
+            Owner,
+            BlockCount,
+            DistFromCenter,
+        }
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
 
         //TODO: these should be sorted sets for speed
@@ -26,7 +36,13 @@ namespace Torch.Server.ViewModels
         public MtObservableSortedDictionary<long, VoxelMapViewModel> VoxelMaps { get; set; } = new MtObservableSortedDictionary<long, VoxelMapViewModel>();
         public Dispatcher ControlDispatcher => _control.Dispatcher;
 
+        public SortedView<GridViewModel> SortedGrids { get; }
+        public SortedView<CharacterViewModel> SortedCharacters { get; }
+        public SortedView<EntityViewModel> SortedFloatingObjects { get; }
+        public SortedView<VoxelMapViewModel> SortedVoxelMaps { get; }
+
         private EntityViewModel _currentEntity;
+        private SortEnum _currentSort;
         private UserControl _control;
 
         public EntityViewModel CurrentEntity
@@ -35,6 +51,12 @@ namespace Torch.Server.ViewModels
             set { _currentEntity = value; OnPropertyChanged(nameof(CurrentEntity)); }
         }
 
+        public SortEnum CurrentSort
+        {
+            get => _currentSort;
+            set => SetValue(ref _currentSort, value);
+        }
+
         // I hate you today WPF
         public EntityTreeViewModel() : this(null)
         {
@@ -43,6 +65,11 @@ namespace Torch.Server.ViewModels
         public EntityTreeViewModel(UserControl control)
         {
             _control = control;
+            var comparer = new EntityViewModel.Comparer(_currentSort);
+            SortedGrids = new SortedView<GridViewModel>(Grids.Values, comparer);
+            SortedCharacters = new SortedView<CharacterViewModel>(Characters.Values, comparer);
+            SortedFloatingObjects = new SortedView<EntityViewModel>(FloatingObjects.Values, comparer);
+            SortedVoxelMaps = new SortedView<VoxelMapViewModel>(VoxelMaps.Values, comparer);
         }
 
         public void Init()
@@ -85,16 +112,16 @@ namespace Torch.Server.ViewModels
                 switch (obj)
                 {
                     case MyCubeGrid grid:
-                        Grids.Add(obj.EntityId, new GridViewModel(grid, this));
+                        Grids.Add(grid.EntityId, new GridViewModel(grid, this));
                         break;
                     case MyCharacter character:
-                        Characters.Add(obj.EntityId, new CharacterViewModel(character, this));
+                        Characters.Add(character.EntityId, new CharacterViewModel(character, this));
                         break;
                     case MyFloatingObject floating:
-                        FloatingObjects.Add(obj.EntityId, new FloatingObjectViewModel(floating, this));
+                        FloatingObjects.Add(floating.EntityId, new FloatingObjectViewModel(floating, this));
                         break;
                     case MyVoxelBase voxel:
-                        VoxelMaps.Add(obj.EntityId, new VoxelMapViewModel(voxel, this));
+                        VoxelMaps.Add(voxel.EntityId, new VoxelMapViewModel(voxel, this));
                         break;
                 }
             }
diff --git a/Torch.Server/Views/EntitiesControl.xaml b/Torch.Server/Views/EntitiesControl.xaml
index d7472f0..db907d4 100644
--- a/Torch.Server/Views/EntitiesControl.xaml
+++ b/Torch.Server/Views/EntitiesControl.xaml
@@ -22,10 +22,11 @@
         <Grid Grid.Column="0">
             <Grid.RowDefinitions>
                 <RowDefinition />
+                <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TreeView Grid.Row="0" Margin="3" DockPanel.Dock="Top" SelectedItemChanged="TreeView_OnSelectedItemChanged"
-                      TreeViewItem.Expanded="TreeViewItem_OnExpanded">
+                      TreeViewItem.Expanded="TreeViewItem_OnExpanded" Name="EntityTree">
                 <TreeView.Resources>
                     <HierarchicalDataTemplate DataType="{x:Type entities:GridViewModel}"
                                               ItemsSource="{Binding Path=Blocks}">
@@ -46,46 +47,47 @@
                     </HierarchicalDataTemplate>
                     <HierarchicalDataTemplate DataType="{x:Type entities:VoxelMapViewModel}"
                                               ItemsSource="{Binding AttachedGrids}">
-                        <TextBlock Text="{Binding Name}" />
+                        <TextBlock Text="{Binding DescriptiveName}" />
                     </HierarchicalDataTemplate>
                 </TreeView.Resources>
-                <TreeViewItem ItemsSource="{Binding Path=Grids.Values}">
+                <TreeViewItem ItemsSource="{Binding Path=SortedGrids}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding Grids.Count, StringFormat=Grids ({0})}" />
+                        <TextBlock Text="{Binding SortedGrids.Count, StringFormat=Grids ({0})}" />
                     </TreeViewItem.Header>
                 </TreeViewItem>
-                <TreeViewItem ItemsSource="{Binding Characters.Values}">
+                <TreeViewItem ItemsSource="{Binding SortedCharacters}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding Characters.Count, StringFormat=Characters ({0})}" />
+                        <TextBlock Text="{Binding SortedCharacters.Count, StringFormat=Characters ({0})}" />
                     </TreeViewItem.Header>
                     <TreeViewItem.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock Text="{Binding Name}" />
+                            <TextBlock Text="{Binding DescriptiveName}" />
                         </DataTemplate>
                     </TreeViewItem.ItemTemplate>
                 </TreeViewItem>
-                <TreeViewItem ItemsSource="{Binding VoxelMaps.Values}">
+                <TreeViewItem ItemsSource="{Binding SortedVoxelMaps}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding VoxelMaps.Count, StringFormat=Voxel Maps ({0})}" />
+                        <TextBlock Text="{Binding SortedVoxelMaps.Count, StringFormat=Voxel Maps ({0})}" />
                     </TreeViewItem.Header>
                     <TreeViewItem.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock Text="{Binding Name}" />
+                            <TextBlock Text="{Binding DescriptiveName}" />
                         </DataTemplate>
                     </TreeViewItem.ItemTemplate>
                 </TreeViewItem>
-                <TreeViewItem ItemsSource="{Binding FloatingObjects.Values}">
+                <TreeViewItem ItemsSource="{Binding SortedFloatingObjects}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding FloatingObjects.Count, StringFormat=Floating Objects ({0})}" />
+                        <TextBlock Text="{Binding SortedFloatingObjects.Count, StringFormat=Floating Objects ({0})}" />
                     </TreeViewItem.Header>
                     <TreeViewItem.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock Text="{Binding Name}" />
+                            <TextBlock Text="{Binding DescriptiveName}" />
                         </DataTemplate>
                     </TreeViewItem.ItemTemplate>
                 </TreeViewItem>
             </TreeView>
-            <StackPanel Grid.Row="1" DockPanel.Dock="Bottom">
+            <ComboBox Grid.Row="1" Margin="3" Name="SortCombo" SelectionChanged="SortCombo_SelectionChanged"/>
+            <StackPanel Grid.Row="2" DockPanel.Dock="Bottom">
                 <Button Content="Delete" Click="Delete_OnClick" IsEnabled="{Binding CurrentEntity.CanDelete}"
                         Margin="3" />
                 <Button Content="Stop" Click="Stop_OnClick" IsEnabled="{Binding CurrentEntity.CanStop}" Margin="3" />
diff --git a/Torch.Server/Views/EntitiesControl.xaml.cs b/Torch.Server/Views/EntitiesControl.xaml.cs
index 1095912..95469c6 100644
--- a/Torch.Server/Views/EntitiesControl.xaml.cs
+++ b/Torch.Server/Views/EntitiesControl.xaml.cs
@@ -35,6 +35,7 @@ namespace Torch.Server.Views
             Entities = new EntityTreeViewModel(this);
             DataContext = Entities;
             Entities.Init();
+            SortCombo.ItemsSource = Enum.GetNames(typeof(EntityTreeViewModel.SortEnum));
         }
 
         private void TreeView_OnSelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
@@ -77,5 +78,30 @@ namespace Torch.Server.Views
             if (item.DataContext is ILazyLoad l)
                 l.Load();
         }
+
+        private void SortCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var sort = (EntityTreeViewModel.SortEnum)SortCombo.SelectedIndex;
+
+            var comparer = new EntityViewModel.Comparer(sort);
+
+            Task[] sortTasks = new Task[4];
+
+            Entities.CurrentSort = sort;
+            Entities.SortedCharacters.Sort(comparer);
+            Entities.SortedFloatingObjects.Sort(comparer);
+            Entities.SortedGrids.Sort(comparer);
+            Entities.SortedVoxelMaps.Sort(comparer);
+
+            foreach (var i in Entities.SortedCharacters)
+                i.DescriptiveName = i.GetSortedName(sort);
+            foreach (var i in Entities.SortedFloatingObjects)
+                i.DescriptiveName = i.GetSortedName(sort);
+            foreach (var i in Entities.SortedGrids)
+                i.DescriptiveName = i.GetSortedName(sort);
+            foreach (var i in Entities.SortedVoxelMaps)
+                i.DescriptiveName = i.GetSortedName(sort);
+            
+        }
     }
 }
diff --git a/Torch/Collections/MtObservableList.cs b/Torch/Collections/MtObservableList.cs
index af21eb0..e846b3e 100644
--- a/Torch/Collections/MtObservableList.cs
+++ b/Torch/Collections/MtObservableList.cs
@@ -13,7 +13,7 @@ namespace Torch.Collections
     /// Multithread safe, observable list
     /// </summary>
     /// <typeparam name="T">Value type</typeparam>
-    public class MtObservableList<T> : MtObservableCollection<IList<T>, T>, IList<T>, IList
+    public class MtObservableList<T> : MtObservableCollection<List<T>, T>, IList<T>, IList
     {
         /// <summary>
         /// Initializes a new instance of the MtObservableList class that is empty and has the default initial capacity.
@@ -114,16 +114,34 @@ namespace Torch.Collections
             using (Lock.WriteUsing())
             {
                 comparer = comparer ?? Comparer<TKey>.Default;
-                if (Backing is List<T> lst)
-                    lst.Sort(new TransformComparer<T, TKey>(selector, comparer));
-                else
-                {
-                    List<T> sortedItems = Backing.OrderBy(selector, comparer).ToList();
-                    Backing.Clear();
-                    foreach (T v in sortedItems)
-                        Backing.Add(v);
-                }
+                Backing.Sort(new TransformComparer<T, TKey>(selector, comparer));
             }
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move));
+        }
+
+        /// <summary>
+        /// Sorts the list using the given comparer./>
+        /// </summary>
+        public void Sort(IComparer<T> comparer)
+        {
+            using (DeferredUpdate())
+            using (Lock.WriteUsing())
+            {
+                Backing.Sort(comparer);
+            }
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move));
+        }
+
+        /// <summary>
+        /// Searches the entire list for an element using the specified comparer and returns the zero-based index of the element.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="comparer"></param>
+        /// <returns></returns>
+        public int BinarySearch(T item, IComparer<T> comparer = null)
+        {
+            using(Lock.ReadUsing())
+                return Backing.BinarySearch(item, comparer ?? Comparer<T>.Default);
         }
 
         /// <inheritdoc/>
diff --git a/Torch/Collections/SortedView.cs b/Torch/Collections/SortedView.cs
new file mode 100644
index 0000000..64c68e3
--- /dev/null
+++ b/Torch/Collections/SortedView.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Torch.Collections
+{
+    public class SortedView<T>: IReadOnlyCollection<T>, INotifyCollectionChanged
+    {
+        private readonly MtObservableCollectionBase<T> _backing;
+        private IComparer<T> _comparer;
+        private readonly List<T> _store;
+
+        public SortedView(MtObservableCollectionBase<T> backing, IComparer<T> comparer)
+        {
+            _comparer = comparer;
+            _backing = backing;
+            _store = new List<T>(_backing.Count);
+            _store.AddRange(_backing);
+            _backing.CollectionChanged += backing_CollectionChanged;
+        }
+
+        private void backing_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    InsertSorted(e.NewItems);
+                    CollectionChanged?.Invoke(this, e);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    _store.RemoveAll(r => e.OldItems.Contains(r));
+                    CollectionChanged?.Invoke(this, e);
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                case NotifyCollectionChangedAction.Replace:
+                case NotifyCollectionChangedAction.Reset:
+                    Refresh();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return _backing.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public int Count => _backing.Count;
+
+        private void InsertSorted(IEnumerable items)
+        {
+            foreach (var t in items)
+                InsertSorted((T)t);
+        }
+
+        private int InsertSorted(T item, IComparer<T> comparer = null)
+        {
+            if (comparer == null)
+                comparer = _comparer;
+
+            if (_store.Count == 0 || comparer == null)
+            {
+                _store.Add(item);
+                return 0;
+            }
+            if(comparer.Compare(_store[_store.Count - 1], item) <= 0)
+            {
+                _store.Add(item);
+                return _store.Count - 1;
+            }
+            if(comparer.Compare(_store[0], item) >= 0)
+            {
+                _store.Insert(0, item);
+                return 0;
+            }
+            int index = _store.BinarySearch(item);
+            if (index < 0)
+                index = ~index;
+            _store.Insert(index, item);
+            return index;
+        }
+
+        public void Sort(IComparer<T> comparer = null)
+        {
+            if (comparer == null)
+                comparer = _comparer;
+
+            if (comparer == null)
+                return;
+
+            _store.Sort(comparer);
+            CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+
+        public void Refresh()
+        {
+            _store.Clear();
+            _store.AddRange(_backing);
+            Sort();
+        }
+
+        public void SetComparer(IComparer<T> comparer, bool resort = true)
+        {
+            _comparer = comparer;
+            if(resort)
+                Sort();
+        }
+
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+    }
+}
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 747f50b..ef3c88c 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -34,6 +34,8 @@
     <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <!-- I don't know why this needs to exist -->
+  <ItemGroup> <Reference Include="netstandard" /> </ItemGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
@@ -182,6 +184,7 @@
     <Compile Include="Collections\MtObservableSortedDictionary.cs" />
     <Compile Include="Collections\MtObservableEvent.cs" />
     <Compile Include="Collections\MtObservableList.cs" />
+    <Compile Include="Collections\SortedView.cs" />
     <Compile Include="Collections\TransformComparer.cs" />
     <Compile Include="Collections\TransformEnumerator.cs" />
     <Compile Include="Event\EventShimAttribute.cs" />
diff --git a/Torch/Utils/MiscExtensions.cs b/Torch/Utils/MiscExtensions.cs
index 272b20d..2ab227e 100644
--- a/Torch/Utils/MiscExtensions.cs
+++ b/Torch/Utils/MiscExtensions.cs
@@ -6,7 +6,12 @@ using System.Net;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Sandbox;
+using Sandbox.Engine.Multiplayer;
+using Sandbox.Game.Entities;
+using Sandbox.Game.World;
 using Steamworks;
+using VRage.Game.ModAPI;
 
 namespace Torch.Utils
 {
@@ -57,5 +62,12 @@ namespace Torch.Utils
             // What is endianness anyway?
             return new IPAddress(BitConverter.GetBytes(state.m_nRemoteIP).Reverse().ToArray());
         }
+
+        public static string GetGridOwnerName(this MyCubeGrid grid)
+        {
+            if (grid.BigOwners.Count == 0 || grid.BigOwners[0] == 0)
+                return "nobody";
+            return MyMultiplayer.Static.GetMemberName(MySession.Static.Players.TryGetSteamId(grid.BigOwners[0]));
+        }
     }
 }

From ac672092f1891ddb749d3d75f119950515776c83 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 10 Feb 2019 19:14:15 -0500
Subject: [PATCH 030/170] Implement delegate caching

---
 Torch/Managers/NetworkManager/NetworkManager.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Torch/Managers/NetworkManager/NetworkManager.cs b/Torch/Managers/NetworkManager/NetworkManager.cs
index 0ce57a3..fc2b5c8 100644
--- a/Torch/Managers/NetworkManager/NetworkManager.cs
+++ b/Torch/Managers/NetworkManager/NetworkManager.cs
@@ -107,10 +107,18 @@ namespace Torch.Managers
         }
 
         #region Network Injection
-        
+
+        private static Dictionary<MethodInfo, Delegate> _delegateCache = new Dictionary<MethodInfo, Delegate>();
+
         private static Func<T, TA> GetDelegate<T, TA>(MethodInfo method) where TA : class
         {
-            return x => Delegate.CreateDelegate(typeof(TA), x, method) as TA;
+            if (!_delegateCache.TryGetValue(method, out var del))
+            {
+                del = (Func<T, TA>)(x => Delegate.CreateDelegate(typeof(TA), x, method) as TA);
+                _delegateCache[method] = del;
+            }
+
+            return (Func<T, TA>)del;
         }
 
         public static void RaiseEvent<T1>(T1 instance, MethodInfo method, EndpointId target = default(EndpointId)) where T1 : IMyEventOwner

From 82ddd3942b5ccc06d29234ac4278ebe3cdbcd616 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 20 Feb 2019 16:04:59 -0500
Subject: [PATCH 031/170] Remove mod textbox

---
 Torch.Server/Views/ConfigControl.xaml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index 898b4ca..8ab19d5 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -95,19 +95,6 @@
                             <CheckBox IsChecked="{Binding AutodetectDependencies}" Content="Auto Detect Dependencies" Margin="3" />
                         </StackPanel>
                         <StackPanel Grid.Column="1" Margin="3">
-                            <Label Content="Mods" />
-                            <TextBox Margin="3" Height="60" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
-                                     Style="{StaticResource ValidatedTextBox}">
-                                <TextBox.Text>
-                                    <Binding Path="Mods" UpdateSourceTrigger="PropertyChanged"
-                                             ValidatesOnDataErrors="True" NotifyOnValidationError="True"
-                                             Converter="{StaticResource ListConverterUInt64}">
-                                        <Binding.ValidationRules>
-                                            <validationRules:ListConverterValidationRule Type="system:UInt64" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </TextBox.Text>
-                            </TextBox>
                             <Label Content="Administrators" />
                             <TextBox Text="{Binding Administrators, Converter={StaticResource ListConverterString}}"
                                      Margin="3"

From 2bb3aa84a74000a21246147023adcf614643f94b Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 20 Feb 2019 20:19:46 -0500
Subject: [PATCH 032/170] Fix entity sorting

---
 Torch.Server/Views/EntitiesControl.xaml.cs | 16 ++++++++++------
 Torch/Collections/SortedView.cs            |  3 ++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Torch.Server/Views/EntitiesControl.xaml.cs b/Torch.Server/Views/EntitiesControl.xaml.cs
index 95469c6..4cdfa45 100644
--- a/Torch.Server/Views/EntitiesControl.xaml.cs
+++ b/Torch.Server/Views/EntitiesControl.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -13,6 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using NLog;
+using Torch.Collections;
 using Torch.Server.ViewModels;
 using Torch.Server.ViewModels.Blocks;
 using Torch.Server.ViewModels.Entities;
@@ -29,6 +31,8 @@ namespace Torch.Server.Views
     {
         public EntityTreeViewModel Entities { get; set; }
 
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+
         public EntitiesControl()
         {
             InitializeComponent();
@@ -37,7 +41,7 @@ namespace Torch.Server.Views
             Entities.Init();
             SortCombo.ItemsSource = Enum.GetNames(typeof(EntityTreeViewModel.SortEnum));
         }
-
+        
         private void TreeView_OnSelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
             if (e.NewValue is EntityViewModel vm)
@@ -82,16 +86,16 @@ namespace Torch.Server.Views
         private void SortCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var sort = (EntityTreeViewModel.SortEnum)SortCombo.SelectedIndex;
-
+            
             var comparer = new EntityViewModel.Comparer(sort);
 
             Task[] sortTasks = new Task[4];
 
             Entities.CurrentSort = sort;
-            Entities.SortedCharacters.Sort(comparer);
-            Entities.SortedFloatingObjects.Sort(comparer);
-            Entities.SortedGrids.Sort(comparer);
-            Entities.SortedVoxelMaps.Sort(comparer);
+            Entities.SortedCharacters.SetComparer(comparer);
+            Entities.SortedFloatingObjects.SetComparer(comparer);
+            Entities.SortedGrids.SetComparer(comparer);
+            Entities.SortedVoxelMaps.SetComparer(comparer);
 
             foreach (var i in Entities.SortedCharacters)
                 i.DescriptiveName = i.GetSortedName(sort);
diff --git a/Torch/Collections/SortedView.cs b/Torch/Collections/SortedView.cs
index 64c68e3..bfa5953 100644
--- a/Torch/Collections/SortedView.cs
+++ b/Torch/Collections/SortedView.cs
@@ -48,7 +48,7 @@ namespace Torch.Collections
 
         public IEnumerator<T> GetEnumerator()
         {
-            return _backing.GetEnumerator();
+            return _store.GetEnumerator();
         }
 
         IEnumerator IEnumerable.GetEnumerator()
@@ -100,6 +100,7 @@ namespace Torch.Collections
                 return;
 
             _store.Sort(comparer);
+            
             CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
         }
 

From 967d8ce0688f4593be74fd04f7ecd9ba081ce099 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 20 Feb 2019 20:20:09 -0500
Subject: [PATCH 033/170] Add independent console option. Various random fixes

---
 Torch.Server/Initializer.cs | 11 +++++++++--
 Torch.Server/TorchConfig.cs |  5 ++++-
 Torch.Server/TorchServer.cs |  3 +--
 Torch/VRageGame.cs          |  3 +--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 3a7e11e..f8a7468 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -111,8 +111,15 @@ quit";
                     init.ContinueWith(x => _server.Start());
 
                 Log.Info("Showing UI");
-                Console.SetOut(TextWriter.Null);
-                NativeMethods.FreeConsole();
+
+#if !DEBUG
+                if (!_config.IndependentConsole)
+                {
+                    Console.SetOut(TextWriter.Null);
+                    NativeMethods.FreeConsole();
+                }
+#endif
+
                 new TorchUI(_server).ShowDialog();
             }
             else
diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 0b9fdad..2c90848 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -72,10 +72,13 @@ namespace Torch.Server
         [Obsolete("Use vanilla reserved slot config")]
         public HashSet<ulong> ReservedPlayers { get; set; } = new HashSet<ulong>();
 
-        //Prevent reserved players being written to disk, but allow it to bre read
+        //Prevent reserved players being written to disk, but allow it to be read
         //remove this when ReservedPlayers is removed
         private bool ShouldSerializeReservedPlayers() => false;
 
+        [Arg("console", "Keeps a separate console window open after the main UI loads.")]
+        public bool IndependentConsole { get; set; } = false;
+
         [XmlIgnore]
         private string _path;
 
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 4832c9c..c4070cd 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -195,8 +195,7 @@ namespace Torch.Server
         public override void Init(object gameInstance)
         {
             base.Init(gameInstance);
-            var game = gameInstance as MySandboxGame;
-            if (game != null && MySession.Static != null)
+            if (gameInstance is MySandboxGame && MySession.Static != null)
                 State = ServerState.Running;
             else
                 State = ServerState.Stopped;
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index e470878..1065f49 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -273,8 +273,7 @@ namespace Torch
                 MySessionLoader.LoadSingleplayerSession(sessionPath);
                 return;
             }
-            ulong checkpointSize;
-            MyObjectBuilder_Checkpoint checkpoint = MyLocalCache.LoadCheckpoint(sessionPath, out checkpointSize);
+            MyObjectBuilder_Checkpoint checkpoint = MyLocalCache.LoadCheckpoint(sessionPath, out ulong checkpointSize);
             if (MySession.IsCompatibleVersion(checkpoint))
             {
                 if (MyWorkshop.DownloadWorldModsBlocking(checkpoint.Mods, null).Success)

From e37357aea5a996cbf4eb4c0f41c0c5a791e3f0da Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:17:37 -0500
Subject: [PATCH 034/170] Don't build in debug please

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e554cf4..4f3eba7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ node {
 
 	stage('Build') {
 		currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim()
-		if (env.BRANCH_NAME == "master") {
+		if (env.BRANCH_NAME == "Patron") {
 			buildMode = "Release"
 		} else {
 			buildMode = "Debug"

From 642186678e0b521c0248fc42433817ef7367b90c Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 12:55:04 -0500
Subject: [PATCH 035/170] Fix new world generator breaking with non-default
 instance paths #286

---
 Torch.Server/Views/WorldGeneratorDialog.xaml.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Views/WorldGeneratorDialog.xaml.cs b/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
index cfbfad8..45b7a01 100644
--- a/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
+++ b/Torch.Server/Views/WorldGeneratorDialog.xaml.cs
@@ -74,8 +74,9 @@ namespace Torch.Server
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         {
             string worldName = string.IsNullOrEmpty(WorldName.Text) ? _currentItem.Name : WorldName.Text;
-            var worldPath = Path.Combine("Instance", "Saves", worldName);
-            var checkpoint= _currentItem.Checkpoint;
+            
+            var worldPath = Path.Combine(TorchBase.Instance.Config.InstancePath, "Saves", worldName);
+            var checkpoint = _currentItem.Checkpoint;
             if (Directory.Exists(worldPath))
             {
                 MessageBox.Show("World already exists with that name.");

From a673848089cfe2d0560bca8a2bc6c50194d4d17a Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 13:59:13 -0500
Subject: [PATCH 036/170] Implement a truly terrible bulk mod editing mode.

---
 Torch.Server/Views/ModListControl.xaml    |  4 ++-
 Torch.Server/Views/ModListControl.xaml.cs | 36 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/Views/ModListControl.xaml b/Torch.Server/Views/ModListControl.xaml
index 89a092f..8d563be 100644
--- a/Torch.Server/Views/ModListControl.xaml
+++ b/Torch.Server/Views/ModListControl.xaml
@@ -103,6 +103,7 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition/>
@@ -116,8 +117,9 @@
                 <TextBox Name="AddModIDTextBox" Grid.Column="1" VerticalContentAlignment="Center"
                          HorizontalAlignment="Stretch" MinWidth="100px" Margin="6px 4px"  Grid.Row="1"/>
                 <Button Content="Add" Grid.Column="2" Margin="6px 0" Width="60px" Height="40px" Click="AddBtn_OnClick"  Grid.Row="1"/>
-                <Button Content="Remove" Grid.Column="4" Margin="6px 0" Width="60px" Height="40px" Click="RemoveBtn_OnClick"  Grid.Row="1"
+                <Button Content="Remove" Grid.Column="3" Margin="6px 0" Width="60px" Height="40px" Click="RemoveBtn_OnClick"  Grid.Row="1"
                          IsEnabled="{Binding ElementName=ModList, Path=SelectedItems.Count}"/>
+                <Button Content="Bulk Edit" Grid.Column="4" Margin="6px 0" Width="60px" Height="40px" Click="BulkButton_OnClick"  Grid.Row="1"/>
             </Grid>
         
             <Button Content="Save Config" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="6px" Grid.Column="3" Width="80px" Height="40px" Click="SaveBtn_OnClick"/>
diff --git a/Torch.Server/Views/ModListControl.xaml.cs b/Torch.Server/Views/ModListControl.xaml.cs
index 66da625..eebb419 100644
--- a/Torch.Server/Views/ModListControl.xaml.cs
+++ b/Torch.Server/Views/ModListControl.xaml.cs
@@ -25,6 +25,7 @@ using Torch.API.Managers;
 using Torch.Server.ViewModels;
 using Torch.Server.Annotations;
 using Torch.Collections;
+using Torch.Views;
 
 namespace Torch.Server.Views
 {
@@ -244,5 +245,40 @@ namespace Torch.Server.Views
             else if( e.AddedCells.Count > 0)
                 ModList.SelectedItem = e.AddedCells[0].Item;
         }
+
+        private void BulkButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            var editor = new CollectionEditor();
+
+            //let's see just how poorly we can do this
+            var modList = ((MtObservableList<ModItemInfo>)DataContext).ToList();
+            var idList = modList.Select(m => m.PublishedFileId).ToList();
+            var tasks = new List<Task>();
+            //blocking
+            editor.Edit<ulong>(idList, "Mods");
+
+            modList.RemoveAll(m => !idList.Contains(m.PublishedFileId));
+            foreach (var id in idList)
+            {
+                if (!modList.Any(m => m.PublishedFileId == id))
+                {
+                    var mod = new ModItemInfo(new MyObjectBuilder_Checkpoint.ModItem(id));
+                    tasks.Add(Task.Run(mod.UpdateModInfoAsync));
+                    modList.Add(mod);
+                }
+            }
+            _instanceManager.DedicatedConfig.Mods.Clear();
+            foreach (var mod in modList)
+                _instanceManager.DedicatedConfig.Mods.Add(mod);
+
+            if (tasks.Any())
+                Task.WaitAll(tasks.ToArray());
+
+            Dispatcher.Invoke(() =>
+                              {
+                                  _instanceManager.DedicatedConfig.Save();
+                              });
+
+        }
     } 
 }

From 3e341e02c8ea3c7a5d2efc9f852890faa32b5c88 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 14:06:38 -0500
Subject: [PATCH 037/170] Make Torch UI remember its last screen size/position.
 Fixes #260 (this is Jim's fault)

---
 Torch.Server/TorchConfig.cs        | 4 ++--
 Torch.Server/Views/TorchUI.xaml.cs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 2c90848..25a2452 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -63,8 +63,8 @@ namespace Torch.Server
         public bool EnableWhitelist { get; set; } = false;
         public HashSet<ulong> Whitelist { get; set; } = new HashSet<ulong>();
 
-        internal Point WindowSize { get; set; } = new Point(800, 600);
-        internal Point WindowPosition { get; set; } = new Point();
+        public Point WindowSize { get; set; } = new Point(800, 600);
+        public Point WindowPosition { get; set; } = new Point();
 
         public string LastUsedTheme { get; set; } = "Torch Theme";
 
diff --git a/Torch.Server/Views/TorchUI.xaml.cs b/Torch.Server/Views/TorchUI.xaml.cs
index 29a8fdf..200bb41 100644
--- a/Torch.Server/Views/TorchUI.xaml.cs
+++ b/Torch.Server/Views/TorchUI.xaml.cs
@@ -102,6 +102,8 @@ namespace Torch.Server
             var newPos = new Point((int)Left, (int)Top);
             _config.WindowPosition = newPos;
 
+            _config.Save(); //you idiot
+
             if (_server?.State == ServerState.Running)
                 _server.Stop();
 

From 53c279fa0003bfbc1ac9f9e3e45130d27b37ffe7 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 15:38:02 -0500
Subject: [PATCH 038/170] Reconfigure jenkins data

---
 Jenkins/jenkins-grab-se.ps1 | 4 ++--
 Jenkinsfile                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 26ca62e..7c65179 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -1,6 +1,6 @@
 pushd
 
-$steamData = "C:/Steam/Data-playtest/"
+$steamData = "C:/Steam/Data-preview/"
 $steamCMDPath = "C:/Steam/steamcmd/"
 $steamCMDZip = "C:/Steam/steamcmd.zip"
 
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword nt8WuDw9kdvE validate" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword $previewSecretPass validate" "+quit"
 
 popd
diff --git a/Jenkinsfile b/Jenkinsfile
index d032dfb..7ad065e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@ node {
 	stage('Acquire SE') {
 		bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
 		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
-		bat 'mklink /J GameBinaries "C:/Steam/Data-playtest/DedicatedServer64/"'		
+		bat 'mklink /J GameBinaries "C:/Steam/Data-preview/DedicatedServer64/"'		
 	}
 
 	stage('Acquire NuGet Packages') {
@@ -31,7 +31,7 @@ node {
 
 	stage('Build') {
 		currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim()
-		if (env.BRANCH_NAME == "Patron") {
+		if (env.BRANCH_NAME == "master") {
 			buildMode = "Release"
 		} else {
 			buildMode = "Debug"

From 7a71cbf75627ee85182e8715e37a5871b826b168 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 15:39:27 -0500
Subject: [PATCH 039/170] branch name

---
 Jenkins/jenkins-grab-se.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 7c65179..2c2498a 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta playtest -betapassword $previewSecretPass validate" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta steamctg -betapassword $previewSecretPass validate" "+quit"
 
 popd

From fb3082094ade0a15024c12fd6ad78ff439901d2e Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 25 Feb 2019 12:47:25 -0800
Subject: [PATCH 040/170] Revert unnecessary playtest things

---
 Torch.Server/Initializer.cs                     | 2 +-
 Torch/Managers/ChatManager/ChatManagerClient.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 2f09f24..dd32e75 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -31,7 +31,7 @@ namespace Torch.Server
 
         private const string RUNSCRIPT = @"force_install_dir ../
 login anonymous
-app_update 298740 -beta playtest -betapassword nt8WuDw9kdvE
+app_update 298740
 quit";
 
         private TorchConfig _config;
diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index f7b175c..832f927 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -127,10 +127,10 @@ namespace Torch.Managers.ChatManager
 
         private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName)
         {
-            var torchMsg = new TorchChatMessage(steamUserId, $"[{channel}] {messageText}",
+            var torchMsg = new TorchChatMessage(steamUserId, messageText,
                 (steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue);
             if (!RaiseMessageRecieved(torchMsg) && HasHud)
-                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, $"[{channel}] {messageText}");
+                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText);
         }
 
         private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font)

From 704f202ce83fb70365e152d3b555ed2e375beb58 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 16:24:15 -0500
Subject: [PATCH 041/170] asdg

---
 Jenkins/jenkins-grab-se.ps1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 2c2498a..bdec89b 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -16,7 +16,10 @@ if (!(Test-Path $steamCMDPath)) {
 	[System.IO.Compression.ZipFile]::ExtractToDirectory($steamCMDZip, $steamCMDPath)
 }
 
+echo test
+echo $previewPass
+
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta steamctg -betapassword $previewSecretPass validate" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta steamctg -betapassword $previewPass validate" "+quit"
 
 popd

From 74cdd9d055c596a1ac22c353af3a779be89f3473 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 16:56:57 -0500
Subject: [PATCH 042/170] fix the thing

---
 Jenkins/jenkins-grab-se.ps1 | 7 ++++---
 Jenkinsfile                 | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index bdec89b..0e3f998 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -1,5 +1,9 @@
 pushd
 
+param(
+    [Parameter(Mandatory=$true)][string]$previewPass
+)
+
 $steamData = "C:/Steam/Data-preview/"
 $steamCMDPath = "C:/Steam/steamcmd/"
 $steamCMDZip = "C:/Steam/steamcmd.zip"
@@ -16,9 +20,6 @@ if (!(Test-Path $steamCMDPath)) {
 	[System.IO.Compression.ZipFile]::ExtractToDirectory($steamCMDZip, $steamCMDPath)
 }
 
-echo test
-echo $previewPass
-
 cd "$steamData"
 & "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta steamctg -betapassword $previewPass validate" "+quit"
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 7ad065e..767d47e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,9 @@ node {
 	}
 
 	stage('Acquire SE') {
-		bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
+	withCredentials([string(credentialsId: 'previewSecretPass', variable: 'previewPass')]) {
+		bat 'powershell -File Jenkins/jenkins-grab-se.ps1 $previewPass'
+		}
 		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
 		bat 'mklink /J GameBinaries "C:/Steam/Data-preview/DedicatedServer64/"'		
 	}

From 8aa0ccd437f332b4e797366bb10d8e5a70d61aed Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 16:58:22 -0500
Subject: [PATCH 043/170] .

---
 Jenkins/jenkins-grab-se.ps1 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 0e3f998..c62c9d9 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -1,8 +1,6 @@
-pushd
+param([string]$previewPass)
 
-param(
-    [Parameter(Mandatory=$true)][string]$previewPass
-)
+pushd
 
 $steamData = "C:/Steam/Data-preview/"
 $steamCMDPath = "C:/Steam/steamcmd/"

From bbd45df54d40fb85cd38719d0bfa836a8d32100a Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 25 Feb 2019 17:03:36 -0500
Subject: [PATCH 044/170] fix jenkins for real

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 767d47e..7226c76 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ node {
 
 	stage('Acquire SE') {
 	withCredentials([string(credentialsId: 'previewSecretPass', variable: 'previewPass')]) {
-		bat 'powershell -File Jenkins/jenkins-grab-se.ps1 $previewPass'
+		powershell "& Jenkins/jenkins-grab-se.ps1 $previewPass"
 		}
 		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
 		bat 'mklink /J GameBinaries "C:/Steam/Data-preview/DedicatedServer64/"'		

From 8c59098c2809bc2a20f55c84dd43462c8820d73a Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 27 Feb 2019 16:31:28 -0500
Subject: [PATCH 045/170] Replace the stupid MyMultiplayer.GetMemberName with
 something that actually works.

---
 Torch/Extensions/MyPlayerCollectionExtensions.cs | 15 +++++++++++++++
 Torch/Managers/ChatManager/ChatManagerServer.cs  |  2 +-
 Torch/Managers/MultiplayerManagerBase.cs         |  2 +-
 Torch/ViewModels/PlayerViewModel.cs              |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Torch/Extensions/MyPlayerCollectionExtensions.cs b/Torch/Extensions/MyPlayerCollectionExtensions.cs
index aa9bf39..08f0789 100644
--- a/Torch/Extensions/MyPlayerCollectionExtensions.cs
+++ b/Torch/Extensions/MyPlayerCollectionExtensions.cs
@@ -19,5 +19,20 @@ namespace Torch
                 return null;
             return collection.TryGetPlayerById(playerId, out MyPlayer player) ? player : null;
         }
+
+        public static string TryGetPlayerName(this MyPlayerCollection collection, ulong steamId, int serialId = 0)
+        {
+            return collection.TryGetPlayerBySteamId(steamId, serialId)?.DisplayName ?? $"ID: {steamId}";
+        }
+
+        public static string TryGetPlayerName(this MyPlayerCollection collection, long identityId)
+        {
+            if (!collection.TryGetPlayerId(identityId, out MyPlayer.PlayerId playerId))
+                return null;
+
+            collection.TryGetPlayerById(playerId, out MyPlayer player);
+
+            return player?.DisplayName ?? $"ID: {collection.TryGetSteamId(identityId)}";
+        }
     }
 }
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index 6a0ec34..efc31c4 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -167,7 +167,7 @@ namespace Torch.Managers.ChatManager
 
         public static string GetMemberName(ulong steamId)
         {
-            return MyMultiplayer.Static?.GetMemberName(steamId) ?? $"user_{steamId}";
+            return MySession.Static.Players.TryGetPlayerName(steamId);
         }
 
         internal class ChatIntercept : NetworkHandlerBase, INetworkHandler
diff --git a/Torch/Managers/MultiplayerManagerBase.cs b/Torch/Managers/MultiplayerManagerBase.cs
index 30bf775..4a72ecc 100644
--- a/Torch/Managers/MultiplayerManagerBase.cs
+++ b/Torch/Managers/MultiplayerManagerBase.cs
@@ -100,7 +100,7 @@ namespace Torch.Managers
         /// <inheritdoc />
         public string GetSteamUsername(ulong steamId)
         {
-            return MyMultiplayer.Static.GetMemberName(steamId);
+            return MySession.Static.Players.TryGetPlayerName(steamId);
         }
 
         private void OnClientLeft(ulong steamId, MyChatMemberStateChangeEnum stateChange)
diff --git a/Torch/ViewModels/PlayerViewModel.cs b/Torch/ViewModels/PlayerViewModel.cs
index f070a3a..4876b8b 100644
--- a/Torch/ViewModels/PlayerViewModel.cs
+++ b/Torch/ViewModels/PlayerViewModel.cs
@@ -34,7 +34,7 @@ namespace Torch.ViewModels
         public PlayerViewModel(ulong steamId, string name = null)
         {
             SteamId = steamId;
-            Name = name ?? ((MyDedicatedServerBase)MyMultiplayerMinimalBase.Instance).GetMemberName(steamId);
+            Name = name ?? MySession.Static.Players.TryGetPlayerName(steamId);
         }
     }
 }

From df225a3d2f5a938f8d415d9118ba357f31041cf9 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 27 Feb 2019 17:05:15 -0500
Subject: [PATCH 046/170] Add new config options

---
 Torch.Server/ViewModels/SessionSettingsViewModel.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/ViewModels/SessionSettingsViewModel.cs b/Torch.Server/ViewModels/SessionSettingsViewModel.cs
index 5a658ca..cdb4833 100644
--- a/Torch.Server/ViewModels/SessionSettingsViewModel.cs
+++ b/Torch.Server/ViewModels/SessionSettingsViewModel.cs
@@ -21,8 +21,11 @@ namespace Torch.Server.ViewModels
         [Torch.Views.Display(Description = "The type of the game online mode.", Name = "Online Mode", GroupName = "Others")]
         public MyOnlineModeEnum OnlineMode { get => _settings.OnlineMode; set => SetValue(ref _settings.OnlineMode, value); }
 
-        [Torch.Views.Display(Description = "The multiplier for inventory size.", Name = "Inventory Size", GroupName = "Multipliers")]
-        public float InventorySizeMultiplier { get => _settings.InventorySizeMultiplier; set => SetValue(ref _settings.InventorySizeMultiplier, value); }
+        [Torch.Views.Display(Description = "The multiplier for character inventory size.", Name = "Character Inventory Size", GroupName = "Multipliers")]
+        public float CharacterInventorySizeMultiplier { get => _settings.InventorySizeMultiplier; set => SetValue(ref _settings.InventorySizeMultiplier, value); }
+
+        [Torch.Views.Display(Description = "The multiplier for block inventory size.", Name = "Block Inventory Size", GroupName = "Multipliers")]
+        public float BlockInventorySizeMultiplier { get => _settings.BlocksInventorySizeMultiplier; set => SetValue(ref _settings.BlocksInventorySizeMultiplier, value); }
 
         [Torch.Views.Display(Description = "The multiplier for assembler speed.", Name = "Assembler Speed", GroupName = "Multipliers")]
         public float AssemblerSpeedMultiplier { get => _settings.AssemblerSpeedMultiplier; set => SetValue(ref _settings.AssemblerSpeedMultiplier, value); }
@@ -261,6 +264,12 @@ namespace Torch.Server.ViewModels
         [Torch.Views.Display(Description = "Defines character removal threshold for trash removal system. If player disconnects it will remove his character after this time.\n Set to 0 to disable.", Name = "Character Removal Threshold [mins]", GroupName = "Trash Removal")]
         public int PlayerCharacterRemovalThreshold { get => _settings.PlayerCharacterRemovalThreshold; set => SetValue(ref _settings.PlayerCharacterRemovalThreshold, value); }
 
+        [Torch.Views.Display(Description = "Sets optimal distance in meters when spawning new players near others.", Name = "Optimal Spawn Distance", GroupName = "Players")]
+        public float OptimalSpawnDistance { get => _settings.OptimalSpawnDistance; set => SetValue(ref _settings.OptimalSpawnDistance, value); }
+
+        [Torch.Views.Display(Description = "Enables automatic respawn at nearest available respawn point.", Name = "Enable Auto Respawn", GroupName = "Players")]
+        public bool EnableAutoRespawn { get => _settings.EnableAutorespawn; set => SetValue(ref _settings.EnableAutorespawn, value); }
+
         public SessionSettingsViewModel(MyObjectBuilder_SessionSettings settings)
         {
             _settings = settings;

From a237185e4c9c252a8dbc06a700b7565c742eb794 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 27 Feb 2019 19:11:47 -0500
Subject: [PATCH 047/170] Move all deprecated junk to the deprecated file

---
 .../NetworkManager/NetworkHandlerBase.cs      | 12 ++-
 .../Managers/NetworkManager/NetworkManager.cs | 88 +------------------
 .../NetworkManager_Deprecated.cs              | 82 +++++++++++++++++
 3 files changed, 94 insertions(+), 88 deletions(-)

diff --git a/Torch/Managers/NetworkManager/NetworkHandlerBase.cs b/Torch/Managers/NetworkManager/NetworkHandlerBase.cs
index dc3ce19..3add688 100644
--- a/Torch/Managers/NetworkManager/NetworkHandlerBase.cs
+++ b/Torch/Managers/NetworkManager/NetworkHandlerBase.cs
@@ -11,6 +11,7 @@ using VRage.Serialization;
 
 namespace Torch.Managers
 {
+    [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
     public abstract class NetworkHandlerBase
     {
         /// <summary>
@@ -18,6 +19,7 @@ namespace Torch.Managers
         /// </summary>
         /// <param name="site"></param>
         /// <returns></returns>
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public abstract bool CanHandle(CallSite site);
 
         /// <summary>
@@ -29,8 +31,9 @@ namespace Torch.Managers
         /// <param name="obj"></param>
         /// <param name="packet"></param>
         /// <returns></returns>
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public abstract bool Handle(ulong remoteUserId, CallSite site, BitStream stream, object obj, MyPacket packet);
-        
+
         /// <summary>
         /// Extracts method arguments from the bitstream or packs them back in, depending on stream read mode.
         /// </summary>
@@ -38,6 +41,7 @@ namespace Torch.Managers
         /// <param name="info"></param>
         /// <param name="stream"></param>
         /// <param name="arg1"></param>
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public void Serialize<T1>(MethodInfo info, BitStream stream, ref T1 arg1)
         {
             var s1 = MyFactory.GetSerializer<T1>();
@@ -55,6 +59,7 @@ namespace Torch.Managers
             }
         }
 
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public void Serialize<T1, T2>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2)
         {
             var s1 = MyFactory.GetSerializer<T1>();
@@ -76,6 +81,7 @@ namespace Torch.Managers
             }
         }
 
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public void Serialize<T1, T2, T3>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3)
         {
             var s1 = MyFactory.GetSerializer<T1>();
@@ -101,6 +107,7 @@ namespace Torch.Managers
             }
         }
 
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public void Serialize<T1, T2, T3, T4>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4)
         {
             var s1 = MyFactory.GetSerializer<T1>();
@@ -130,6 +137,7 @@ namespace Torch.Managers
             }
         }
 
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public void Serialize<T1, T2, T3, T4, T5>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4, ref T5 arg5)
         {
             var s1 = MyFactory.GetSerializer<T1>();
@@ -163,6 +171,7 @@ namespace Torch.Managers
             }
         }
 
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public void Serialize<T1, T2, T3, T4, T5, T6>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4, ref T5 arg5, ref T6 arg6)
         {
             var s1 = MyFactory.GetSerializer<T1>();
@@ -200,6 +209,7 @@ namespace Torch.Managers
             }
         }
 
+        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
         public void Serialize<T1, T2, T3, T4, T5, T6, T7>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4, ref T5 arg5, ref T6 arg6, ref T7 arg7)
         {
             var s1 = MyFactory.GetSerializer<T1>();
diff --git a/Torch/Managers/NetworkManager/NetworkManager.cs b/Torch/Managers/NetworkManager/NetworkManager.cs
index fc2b5c8..a054835 100644
--- a/Torch/Managers/NetworkManager/NetworkManager.cs
+++ b/Torch/Managers/NetworkManager/NetworkManager.cs
@@ -1,110 +1,24 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using NLog;
 using Sandbox.Engine.Multiplayer;
-using Sandbox.Game.Multiplayer;
 using Torch.API;
 using Torch.API.Managers;
-using Torch.Utils;
-using VRage;
-using VRage.Library.Collections;
 using VRage.Network;
 using VRageMath;
 
 namespace Torch.Managers
 {
+    //TOOD: Make this not a manager, and instead just a static class?
     public partial class NetworkManager : Manager, INetworkManager
     {
         private static Logger _log = LogManager.GetCurrentClassLogger();
 
-        private const string _myTransportLayerField = "TransportLayer";
-        private const string _transportHandlersField = "m_handlers";
-        private readonly HashSet<INetworkHandler> _networkHandlers = new HashSet<INetworkHandler>();
-        private bool _init;
-
-        [ReflectedGetter(Name = "m_typeTable")]
-        private static Func<MyReplicationLayerBase, MyTypeTable> _typeTableGetter;
-        [ReflectedMethod(Type = typeof(MyReplicationLayer), Name = "GetObjectByNetworkId")]
-        private static Func<MyReplicationLayer, NetworkId, IMyNetObject> _getObjectByNetworkId;
-
         public NetworkManager(ITorchBase torchInstance) : base(torchInstance)
         {
 
         }
-        
-        private static bool ReflectionUnitTest(bool suppress = false)
-        {
-            try
-            {
-                var syncLayerType = typeof(MySyncLayer);
-                var transportLayerField = syncLayerType.GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance);
-
-                if (transportLayerField == null)
-                    throw new TypeLoadException("Could not find internal type for TransportLayer");
-
-                var transportLayerType = transportLayerField.FieldType;
-
-                if (!Reflection.HasField(transportLayerType, _transportHandlersField))
-                    throw new TypeLoadException("Could not find Handlers field");
-
-                return true;
-            }
-            catch (TypeLoadException ex)
-            {
-                _log.Error(ex);
-                if (suppress)
-                    return false;
-                throw;
-            }
-        }
-        
-        /// <inheritdoc/>
-        public override void Attach()
-        {
-            if (_init)
-                return;
-
-            _init = true;
-
-            if (!ReflectionUnitTest())
-                throw new InvalidOperationException("Reflection unit test failed.");
-
-            //don't bother with nullchecks here, it was all handled in ReflectionUnitTest
-            var transportType = typeof(MySyncLayer).GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance).FieldType;
-            var transportInstance = typeof(MySyncLayer).GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(MyMultiplayer.Static.SyncLayer);
-            var handlers = (IDictionary)transportType.GetField(_transportHandlersField, BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(transportInstance);
-            var handlerTypeField = handlers.GetType().GenericTypeArguments[0].GetField("messageId"); //Should be MyTransportLayer.HandlerId
-            object id = null;
-            foreach (var key in handlers.Keys)
-            {
-                if ((MyMessageId)handlerTypeField.GetValue(key) != MyMessageId.RPC)
-                    continue;
-
-                id = key;
-                break;
-            }
-            if (id == null)
-                throw new InvalidOperationException("RPC handler not found.");
-
-            //remove Keen's network listener
-            handlers.Remove(id);
-            //replace it with our own
-            handlers.Add(id, new Action<MyPacket>(OnEvent));
-
-            //PrintDebug();
-
-            _log.Debug("Initialized network intercept");
-        }
-
-        /// <inheritdoc/>
-        public override void Detach()
-        {
-            // TODO reverse what was done in Attach
-        }
 
         #region Network Injection
 
diff --git a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
index 1e25769..5bfa3cc 100644
--- a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
+++ b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Sandbox.Engine.Multiplayer;
+using Sandbox.Game.Multiplayer;
 using Torch.API.Managers;
 using Torch.Utils;
 using VRage;
@@ -26,6 +28,86 @@ namespace Torch.Managers
         private static MethodInfo _dispatchInfo;
 
         private static MethodInfo DispatchEventInfo => _dispatchInfo ?? (_dispatchInfo = typeof(MyReplicationLayerBase).GetMethod("DispatchEvent", BindingFlags.NonPublic | BindingFlags.Instance));
+        
+        private const string _myTransportLayerField = "TransportLayer";
+        private const string _transportHandlersField = "m_handlers";
+        private readonly HashSet<INetworkHandler> _networkHandlers = new HashSet<INetworkHandler>();
+        private bool _init;
+
+        [ReflectedGetter(Name = "m_typeTable")]
+        private static Func<MyReplicationLayerBase, MyTypeTable> _typeTableGetter;
+        [ReflectedMethod(Type = typeof(MyReplicationLayer), Name = "GetObjectByNetworkId")]
+        private static Func<MyReplicationLayer, NetworkId, IMyNetObject> _getObjectByNetworkId;
+
+        private static bool ReflectionUnitTest(bool suppress = false)
+        {
+            try
+            {
+                var syncLayerType = typeof(MySyncLayer);
+                var transportLayerField = syncLayerType.GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance);
+
+                if (transportLayerField == null)
+                    throw new TypeLoadException("Could not find internal type for TransportLayer");
+
+                var transportLayerType = transportLayerField.FieldType;
+
+                if (!Reflection.HasField(transportLayerType, _transportHandlersField))
+                    throw new TypeLoadException("Could not find Handlers field");
+
+                return true;
+            }
+            catch (TypeLoadException ex)
+            {
+                _log.Error(ex);
+                if (suppress)
+                    return false;
+                throw;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override void Attach()
+        {
+            if (_init)
+                return;
+
+            _init = true;
+
+            if (!ReflectionUnitTest())
+                throw new InvalidOperationException("Reflection unit test failed.");
+
+            //don't bother with nullchecks here, it was all handled in ReflectionUnitTest
+            var transportType = typeof(MySyncLayer).GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance).FieldType;
+            var transportInstance = typeof(MySyncLayer).GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(MyMultiplayer.Static.SyncLayer);
+            var handlers = (IDictionary)transportType.GetField(_transportHandlersField, BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(transportInstance);
+            var handlerTypeField = handlers.GetType().GenericTypeArguments[0].GetField("messageId"); //Should be MyTransportLayer.HandlerId
+            object id = null;
+            foreach (var key in handlers.Keys)
+            {
+                if ((MyMessageId)handlerTypeField.GetValue(key) != MyMessageId.RPC)
+                    continue;
+
+                id = key;
+                break;
+            }
+            if (id == null)
+                throw new InvalidOperationException("RPC handler not found.");
+
+            //remove Keen's network listener
+            handlers.Remove(id);
+            //replace it with our own
+            handlers.Add(id, new Action<MyPacket>(OnEvent));
+
+            //PrintDebug();
+
+            _log.Debug("Initialized network intercept");
+        }
+
+        /// <inheritdoc/>
+        public override void Detach()
+        {
+            // TODO reverse what was done in Attach
+        }
 
         #region Network Injection
 

From 42a66b04c58c13547b7851f0472400b7ab1f29c4 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 28 Feb 2019 08:28:33 -0800
Subject: [PATCH 048/170] Revert build scripts for merge

---
 Jenkins/jenkins-grab-se.ps1 | 6 ++----
 Jenkinsfile                 | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index c62c9d9..10d4105 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -1,8 +1,6 @@
-param([string]$previewPass)
-
 pushd
 
-$steamData = "C:/Steam/Data-preview/"
+$steamData = "C:/Steam/Data/"
 $steamCMDPath = "C:/Steam/steamcmd/"
 $steamCMDZip = "C:/Steam/steamcmd.zip"
 
@@ -19,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta steamctg -betapassword $previewPass validate" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit"
 
 popd
diff --git a/Jenkinsfile b/Jenkinsfile
index 7226c76..e554cf4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,11 +20,9 @@ node {
 	}
 
 	stage('Acquire SE') {
-	withCredentials([string(credentialsId: 'previewSecretPass', variable: 'previewPass')]) {
-		powershell "& Jenkins/jenkins-grab-se.ps1 $previewPass"
-		}
+		bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
 		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
-		bat 'mklink /J GameBinaries "C:/Steam/Data-preview/DedicatedServer64/"'		
+		bat 'mklink /J GameBinaries "C:/Steam/Data/DedicatedServer64/"'		
 	}
 
 	stage('Acquire NuGet Packages') {

From 5cd5873ec3624aa54d9eb5d26bcaaabc15745fc3 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 28 Feb 2019 11:57:36 -0800
Subject: [PATCH 049/170] Replace chat intercept with patch

---
 .../Managers/ChatManager/ChatManagerClient.cs |  4 +-
 .../Managers/ChatManager/ChatManagerServer.cs | 84 +++++--------------
 2 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index 832f927..5dfe6d8 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -130,7 +130,7 @@ namespace Torch.Managers.ChatManager
             var torchMsg = new TorchChatMessage(steamUserId, messageText,
                 (steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue);
             if (!RaiseMessageRecieved(torchMsg) && HasHud)
-                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText);
+                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName);
         }
 
         private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font)
@@ -153,7 +153,7 @@ namespace Torch.Managers.ChatManager
         protected static bool HasHud => !Sandbox.Engine.Platform.Game.IsDedicated;
 
         [ReflectedMethod(Name = _hudChatMessageReceivedName)]
-        private static Action<MyHudChat, ulong, string> _hudChatMessageReceived;
+        private static Action<MyHudChat, ulong, string, ChatChannel, long, string> _hudChatMessageReceived;
         [ReflectedMethod(Name = _hudChatScriptedMessageReceivedName)]
         private static Action<MyHudChat, string, string, string> _hudChatScriptedMessageReceived;
 
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index efc31c4..66ca9af 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -13,6 +13,7 @@ using Sandbox.Game.Multiplayer;
 using Sandbox.Game.World;
 using Torch.API;
 using Torch.API.Managers;
+using Torch.Managers.PatchManager;
 using Torch.Utils;
 using VRage;
 using VRage.Library.Collections;
@@ -20,6 +21,26 @@ using VRage.Network;
 
 namespace Torch.Managers.ChatManager
 {
+    [PatchShim]
+    internal static class ChatInterceptPatch
+    {
+        private static ChatManagerServer _chatManager;
+        private static ChatManagerServer ChatManager => _chatManager ?? (_chatManager = TorchBase.Instance.Managers.GetManager<ChatManagerServer>());
+            
+        internal static void Patch(PatchContext context)
+        {
+            var target = typeof(MyMultiplayerBase).GetMethod("OnChatMessageRecieved_Server", BindingFlags.Static | BindingFlags.NonPublic);
+            var patchMethod = typeof(ChatInterceptPatch).GetMethod(nameof(PrefixMessageProcessing), BindingFlags.Static | BindingFlags.NonPublic);
+            context.GetPattern(target).Prefixes.Add(patchMethod);
+        }
+
+        private static void PrefixMessageProcessing(ref ChatMsg msg)
+        {
+            var consumed = false;
+            ChatManager?.RaiseMessageRecieved(msg, ref consumed);
+        }
+    }
+    
     public class ChatManagerServer : ChatManagerClient, IChatManagerServer
     {
         [Dependency(Optional = true)]
@@ -28,12 +49,10 @@ namespace Torch.Managers.ChatManager
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         private static readonly Logger _chatLog = LogManager.GetLogger("Chat");
 
-        private readonly ChatIntercept _chatIntercept;
-
         /// <inheritdoc />
         public ChatManagerServer(ITorchBase torchInstance) : base(torchInstance)
         {
-            _chatIntercept = new ChatIntercept(this);
+            
         }
 
         /// <inheritdoc />
@@ -103,17 +122,6 @@ namespace Torch.Managers.ChatManager
         public override void Attach()
         {
             base.Attach();
-            if (_networkManager != null)
-                try
-                {
-                    _networkManager.RegisterNetworkHandler(_chatIntercept);
-                    _log.Debug("Initialized network intercept for chat messages");
-                    return;
-                }
-                catch
-                {
-                    // Discard exception and use second method
-                }
 
             if (MyMultiplayer.Static != null)
             {
@@ -152,7 +160,6 @@ namespace Torch.Managers.ChatManager
         {
             if (MyMultiplayer.Static != null)
                 MyMultiplayer.Static.ChatMessageReceived -= MpStaticChatMessageReceived;
-            _networkManager?.UnregisterNetworkHandler(_chatIntercept);
             base.Detach();
         }
 
@@ -169,52 +176,5 @@ namespace Torch.Managers.ChatManager
         {
             return MySession.Static.Players.TryGetPlayerName(steamId);
         }
-
-        internal class ChatIntercept : NetworkHandlerBase, INetworkHandler
-        {
-            private readonly ChatManagerServer _chatManager;
-            private bool? _unitTestResult;
-
-            public ChatIntercept(ChatManagerServer chatManager)
-            {
-                _chatManager = chatManager;
-            }
-
-            /// <inheritdoc/>
-            public override bool CanHandle(CallSite site)
-            {
-                if (site.MethodInfo.Name != "OnChatMessageRecieved")
-                    return false;
-
-                if (_unitTestResult.HasValue)
-                    return _unitTestResult.Value;
-
-                ParameterInfo[] parameters = site.MethodInfo.GetParameters();
-                if (parameters.Length != 1)
-                {
-                    _unitTestResult = false;
-                    return false;
-                }
-
-                if (parameters[0].ParameterType != typeof(ChatMsg))
-                    _unitTestResult = false;
-
-                _unitTestResult = true;
-
-                return _unitTestResult.Value;
-            }
-
-            /// <inheritdoc/>
-            public override bool Handle(ulong remoteUserId, CallSite site, BitStream stream, object obj, MyPacket packet)
-            {
-                var msg = new ChatMsg();
-                Serialize(site.MethodInfo, stream, ref msg);
-
-                var consumed = false;
-                _chatManager.RaiseMessageRecieved(msg, ref consumed);
-
-                return consumed;
-            }
-        }
     }
 }

From c650e190fb759d5a40b107784f97178d77643c32 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 28 Feb 2019 12:03:26 -0800
Subject: [PATCH 050/170] Clean up mess from last commit

---
 Torch/Managers/ChatManager/ChatManagerServer.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index 66ca9af..61101a3 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -43,9 +43,6 @@ namespace Torch.Managers.ChatManager
     
     public class ChatManagerServer : ChatManagerClient, IChatManagerServer
     {
-        [Dependency(Optional = true)]
-        private INetworkManager _networkManager;
-
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         private static readonly Logger _chatLog = LogManager.GetLogger("Chat");
 
@@ -126,8 +123,6 @@ namespace Torch.Managers.ChatManager
             if (MyMultiplayer.Static != null)
             {
                 MyMultiplayer.Static.ChatMessageReceived += MpStaticChatMessageReceived;
-                _log.Warn(
-                    "Failed to initialize network intercept, we can't discard chat messages! Falling back to another method.");
             }
             else
             {

From 5cf3ae120331917ddfd62a85959678b2abb56c80 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 28 Feb 2019 12:33:26 -0800
Subject: [PATCH 051/170] Fix command hiding, add new chat properties to
 TorchChatMessage

---
 Torch.API/Managers/IChatManagerClient.cs        | 17 ++++++++++++++++-
 Torch/Managers/ChatManager/ChatManagerClient.cs |  2 +-
 Torch/Managers/ChatManager/ChatManagerServer.cs |  5 +++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Torch.API/Managers/IChatManagerClient.cs b/Torch.API/Managers/IChatManagerClient.cs
index 2be2fc8..f4ce06c 100644
--- a/Torch.API/Managers/IChatManagerClient.cs
+++ b/Torch.API/Managers/IChatManagerClient.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Sandbox.Engine.Multiplayer;
+using Sandbox.Game.Gui;
 using Sandbox.Game.Multiplayer;
 using VRage.Game;
 using VRage.Network;
@@ -28,6 +29,8 @@ namespace Torch.API.Managers
             AuthorSteamId = null;
             Author = author;
             Message = message;
+            Channel = ChatChannel.Global;
+            Target = 0;
             Font = font;
         }
 
@@ -38,12 +41,14 @@ namespace Torch.API.Managers
         /// <param name="authorSteamId">Author's steam ID</param>
         /// <param name="message">Message</param>
         /// <param name="font">Font</param>
-        public TorchChatMessage(string author, ulong authorSteamId, string message, string font = MyFontEnum.Blue)
+        public TorchChatMessage(string author, ulong authorSteamId, string message, ChatChannel channel, long target, string font = MyFontEnum.Blue)
         {
             Timestamp = DateTime.Now;
             AuthorSteamId = authorSteamId;
             Author = author;
             Message = message;
+            Channel = channel;
+            Target = target;
             Font = font;
         }
 
@@ -59,6 +64,8 @@ namespace Torch.API.Managers
             AuthorSteamId = authorSteamId;
             Author = MyMultiplayer.Static?.GetMemberName(authorSteamId) ?? "Player";
             Message = message;
+            Channel = ChatChannel.Global;
+            Target = 0;
             Font = font;
         }
 
@@ -79,6 +86,14 @@ namespace Torch.API.Managers
         /// </summary>
         public readonly string Message;
         /// <summary>
+        /// The chat channel the message is part of.
+        /// </summary>
+        public readonly ChatChannel Channel;
+        /// <summary>
+        /// The intended recipient of the message.
+        /// </summary>
+        public readonly long Target;
+        /// <summary>
         /// The font, or null if default.
         /// </summary>
         public readonly string Font;
diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index 5dfe6d8..4b72e1c 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -108,7 +108,7 @@ namespace Torch.Managers.ChatManager
         {
             if (!sendToOthers)
                 return;
-            var torchMsg = new TorchChatMessage(MySession.Static.LocalHumanPlayer?.DisplayName ?? "Player", Sync.MyId, messageText);
+            var torchMsg = new TorchChatMessage(MySession.Static.LocalHumanPlayer?.DisplayName ?? "Player", Sync.MyId, messageText, ChatChannel.Global, 0);
             bool consumed = RaiseMessageRecieved(torchMsg);
             if (!consumed)
                 consumed = OfflineMessageProcessor(torchMsg);
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index 61101a3..ee6270c 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -34,10 +34,11 @@ namespace Torch.Managers.ChatManager
             context.GetPattern(target).Prefixes.Add(patchMethod);
         }
 
-        private static void PrefixMessageProcessing(ref ChatMsg msg)
+        private static bool PrefixMessageProcessing(ref ChatMsg msg)
         {
             var consumed = false;
             ChatManager?.RaiseMessageRecieved(msg, ref consumed);
+            return !consumed;
         }
     }
     
@@ -160,7 +161,7 @@ namespace Torch.Managers.ChatManager
 
         internal void RaiseMessageRecieved(ChatMsg message, ref bool consumed)
         {
-            var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text);
+            var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text, (ChatChannel)message.Channel, message.TargetId);
             MessageProcessing?.Invoke(torchMsg, ref consumed);
 
             if (!consumed)

From 295bbd62b8fc3f219a808c978b2fac12db702d5d Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 28 Feb 2019 13:44:14 -0800
Subject: [PATCH 052/170] Fix window size shenanigans breaking the config

---
 Torch.Server/Views/TorchUI.xaml.cs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/Torch.Server/Views/TorchUI.xaml.cs b/Torch.Server/Views/TorchUI.xaml.cs
index 200bb41..26a7294 100644
--- a/Torch.Server/Views/TorchUI.xaml.cs
+++ b/Torch.Server/Views/TorchUI.xaml.cs
@@ -33,6 +33,9 @@ namespace Torch.Server
 
         public TorchUI(TorchServer server)
         {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            Width = 800;
+            Height = 600;
             _config = (TorchConfig)server.Config;
             _server = server;
             //TODO: data binding for whole server
@@ -41,10 +44,10 @@ namespace Torch.Server
 
             AttachConsole();
 
-            Left = _config.WindowPosition.X;
-            Top = _config.WindowPosition.Y;
-            Width = _config.WindowSize.X;
-            Height = _config.WindowSize.Y;
+            //Left = _config.WindowPosition.X;
+            //Top = _config.WindowPosition.Y;
+            //Width = _config.WindowSize.X;
+            //Height = _config.WindowSize.Y;
 
             Chat.BindServer(server);
             PlayerList.BindServer(server);
@@ -97,12 +100,14 @@ namespace Torch.Server
 
         protected override void OnClosing(CancelEventArgs e)
         {
-            var newSize = new Point((int)Width, (int)Height);
-            _config.WindowSize = newSize;
-            var newPos = new Point((int)Left, (int)Top);
-            _config.WindowPosition = newPos;
+            // Can't save here or you'll persist all the command line arguments
+            //
+            //var newSize = new Point((int)Width, (int)Height);
+            //_config.WindowSize = newSize;
+            //var newPos = new Point((int)Left, (int)Top);
+            //_config.WindowPosition = newPos;
 
-            _config.Save(); //you idiot
+            //_config.Save(); //you idiot
 
             if (_server?.State == ServerState.Running)
                 _server.Stop();

From 27493d3b23d3e4e506f43a5655fe125b2d491a19 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 1 Mar 2019 20:28:38 -0800
Subject: [PATCH 053/170] Revert "Replace the stupid
 MyMultiplayer.GetMemberName with something that actually works."

This reverts commit 8c59098c2809bc2a20f55c84dd43462c8820d73a.
---
 Torch/Extensions/MyPlayerCollectionExtensions.cs | 15 ---------------
 Torch/Managers/ChatManager/ChatManagerServer.cs  |  2 +-
 Torch/Managers/MultiplayerManagerBase.cs         |  2 +-
 Torch/ViewModels/PlayerViewModel.cs              |  2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Torch/Extensions/MyPlayerCollectionExtensions.cs b/Torch/Extensions/MyPlayerCollectionExtensions.cs
index 08f0789..aa9bf39 100644
--- a/Torch/Extensions/MyPlayerCollectionExtensions.cs
+++ b/Torch/Extensions/MyPlayerCollectionExtensions.cs
@@ -19,20 +19,5 @@ namespace Torch
                 return null;
             return collection.TryGetPlayerById(playerId, out MyPlayer player) ? player : null;
         }
-
-        public static string TryGetPlayerName(this MyPlayerCollection collection, ulong steamId, int serialId = 0)
-        {
-            return collection.TryGetPlayerBySteamId(steamId, serialId)?.DisplayName ?? $"ID: {steamId}";
-        }
-
-        public static string TryGetPlayerName(this MyPlayerCollection collection, long identityId)
-        {
-            if (!collection.TryGetPlayerId(identityId, out MyPlayer.PlayerId playerId))
-                return null;
-
-            collection.TryGetPlayerById(playerId, out MyPlayer player);
-
-            return player?.DisplayName ?? $"ID: {collection.TryGetSteamId(identityId)}";
-        }
     }
 }
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index ee6270c..e58a840 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -170,7 +170,7 @@ namespace Torch.Managers.ChatManager
 
         public static string GetMemberName(ulong steamId)
         {
-            return MySession.Static.Players.TryGetPlayerName(steamId);
+            return MyMultiplayer.Static?.GetMemberName(steamId) ?? $"user_{steamId}";
         }
     }
 }
diff --git a/Torch/Managers/MultiplayerManagerBase.cs b/Torch/Managers/MultiplayerManagerBase.cs
index 4a72ecc..30bf775 100644
--- a/Torch/Managers/MultiplayerManagerBase.cs
+++ b/Torch/Managers/MultiplayerManagerBase.cs
@@ -100,7 +100,7 @@ namespace Torch.Managers
         /// <inheritdoc />
         public string GetSteamUsername(ulong steamId)
         {
-            return MySession.Static.Players.TryGetPlayerName(steamId);
+            return MyMultiplayer.Static.GetMemberName(steamId);
         }
 
         private void OnClientLeft(ulong steamId, MyChatMemberStateChangeEnum stateChange)
diff --git a/Torch/ViewModels/PlayerViewModel.cs b/Torch/ViewModels/PlayerViewModel.cs
index 4876b8b..f070a3a 100644
--- a/Torch/ViewModels/PlayerViewModel.cs
+++ b/Torch/ViewModels/PlayerViewModel.cs
@@ -34,7 +34,7 @@ namespace Torch.ViewModels
         public PlayerViewModel(ulong steamId, string name = null)
         {
             SteamId = steamId;
-            Name = name ?? MySession.Static.Players.TryGetPlayerName(steamId);
+            Name = name ?? ((MyDedicatedServerBase)MyMultiplayerMinimalBase.Instance).GetMemberName(steamId);
         }
     }
 }

From 651865f28a9347747cdac0a55820a269c5678b98 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 2 Mar 2019 11:42:08 -0500
Subject: [PATCH 054/170] Implement plugin browser and downloader

---
 Torch.API/Torch.API.csproj                |   5 +
 Torch.API/WebAPI/PluginQuery.cs           | 159 ++++++++++++++++++++++
 Torch.API/packages.config                 |   1 +
 Torch.Server/Torch.Server.csproj          |  12 +-
 Torch.Server/Views/PluginBrowser.xaml     | 124 +++++++++++++++++
 Torch.Server/Views/PluginBrowser.xaml.cs  |  90 ++++++++++++
 Torch.Server/Views/PluginsControl.xaml    |   9 +-
 Torch.Server/Views/PluginsControl.xaml.cs |   6 +
 Torch.Server/packages.config              |   1 +
 9 files changed, 405 insertions(+), 2 deletions(-)
 create mode 100644 Torch.API/WebAPI/PluginQuery.cs
 create mode 100644 Torch.Server/Views/PluginBrowser.xaml
 create mode 100644 Torch.Server/Views/PluginBrowser.xaml.cs

diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj
index 10bedc2..987b979 100644
--- a/Torch.API/Torch.API.csproj
+++ b/Torch.API/Torch.API.csproj
@@ -39,6 +39,10 @@
       <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
@@ -189,6 +193,7 @@
     <Compile Include="Session\ITorchSessionManager.cs" />
     <Compile Include="Session\TorchSessionState.cs" />
     <Compile Include="TorchGameState.cs" />
+    <Compile Include="WebAPI\PluginQuery.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/Torch.API/WebAPI/PluginQuery.cs b/Torch.API/WebAPI/PluginQuery.cs
new file mode 100644
index 0000000..74da68f
--- /dev/null
+++ b/Torch.API/WebAPI/PluginQuery.cs
@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NLog;
+
+namespace Torch.API.WebAPI
+{
+    public class PluginQuery
+    {
+        private const string ALL_QUERY = "https://torchapi.net/api/plugins";
+        private const string PLUGIN_QUERY = "https://torchapi.net/api/plugins/{0}";
+        private readonly HttpClient _client;
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+
+        private static PluginQuery _instance;
+        public static PluginQuery Instance => _instance ?? (_instance = new PluginQuery());
+
+        private PluginQuery()
+        {
+            _client = new HttpClient();
+        }
+
+        public async Task<PluginResponse> QueryAll()
+        {
+            var h = await _client.GetAsync(ALL_QUERY);
+            if (!h.IsSuccessStatusCode)
+            {
+                Log.Error($"Plugin query returned response {h.StatusCode}");
+                return null;
+            }
+
+            var r = await h.Content.ReadAsStringAsync();
+
+            PluginResponse response;
+            try
+            {
+                response = JsonConvert.DeserializeObject<PluginResponse>(r);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to deserialize plugin query response!");
+                return null;
+            }
+            return response;
+        }
+
+        public async Task<PluginFullItem> QueryOne(Guid guid)
+        {
+            return await QueryOne(guid.ToString());
+        }
+
+        public async Task<PluginFullItem> QueryOne(string guid)
+        {
+
+            var h = await _client.GetAsync(string.Format(PLUGIN_QUERY, guid));
+            if (!h.IsSuccessStatusCode)
+            {
+                Log.Error($"Plugin query returned response {h.StatusCode}");
+                return null;
+            }
+
+            var r = await h.Content.ReadAsStringAsync();
+
+            PluginFullItem response;
+            try
+            {
+                response = JsonConvert.DeserializeObject<PluginFullItem>(r);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to deserialize plugin query response!");
+                return null;
+            }
+            return response;
+        }
+
+        public async Task<bool> DownloadPlugin(Guid guid)
+        {
+            return await DownloadPlugin(guid.ToString());
+        }
+
+        public async Task<bool> DownloadPlugin(string guid)
+        {
+            var item = await QueryOne(guid);
+            return await DownloadPlugin(item);
+        }
+
+        public async Task<bool> DownloadPlugin(PluginFullItem item)
+        {
+            try
+            {
+                var h = await _client.GetAsync(string.Format(PLUGIN_QUERY, item.ID));
+                string res = await h.Content.ReadAsStringAsync();
+                var response = JsonConvert.DeserializeObject<PluginFullItem>(res);
+                if (response.Versions.Length == 0)
+                {
+                    Log.Error($"Selected plugin {item.Name} does not have any versions to download!");
+                    return false;
+                }
+                var version = response.Versions.FirstOrDefault(v => v.Version == response.LatestVersion);
+                if (version == null)
+                {
+                    Log.Error($"Could not find latest version for selected plugin {item.Name}");
+                    return false;
+                }
+                var s = await _client.GetStreamAsync(version.URL);
+                using (var f = new FileStream($"Plugins\\{item.Name}.zip", FileMode.Create))
+                {
+                    await s.CopyToAsync(f);
+                    await f.FlushAsync();
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to download plugin!");
+            }
+
+            return true;
+        }
+    }
+
+    public class PluginResponse
+    {
+        public PluginItem[] Plugins;
+        public int Count;
+    }
+
+    public class PluginItem
+    {
+        public string ID;
+        public string Name;
+        public string Author;
+        public string Description;
+        public string LatestVersion;
+
+        public override string ToString()
+        {
+            return Name;
+        }
+    }
+
+    public class PluginFullItem : PluginItem
+    {
+        public VersionItem[] Versions;
+    }
+
+    public class VersionItem
+    {
+        public string Version;
+        public string Note;
+        public bool IsBeta;
+        public string URL;
+    }
+}
diff --git a/Torch.API/packages.config b/Torch.API/packages.config
index 9d88a31..5221eb5 100644
--- a/Torch.API/packages.config
+++ b/Torch.API/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index ec1c672..506686b 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -51,7 +51,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
     <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.Server.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Torch.Server.Program</StartupObject>
@@ -71,6 +70,9 @@
     <Reference Include="MahApps.Metro, Version=1.6.1.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.6.1\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
+    <Reference Include="Markdown.Xaml, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.Xaml.1.0.0\lib\net45\Markdown.Xaml.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\GameBinaries\Microsoft.CodeAnalysis.dll</HintPath>
@@ -273,6 +275,9 @@
     <Compile Include="Views\ModListControl.xaml.cs">
       <DependentUpon>ModListControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\PluginBrowser.xaml.cs">
+      <DependentUpon>PluginBrowser.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ThemeControl.xaml.cs">
       <DependentUpon>ThemeControl.xaml</DependentUpon>
     </Compile>
@@ -437,6 +442,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\PluginBrowser.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\PluginsControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -492,6 +501,7 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
   <PropertyGroup>
diff --git a/Torch.Server/Views/PluginBrowser.xaml b/Torch.Server/Views/PluginBrowser.xaml
new file mode 100644
index 0000000..e4cd24f
--- /dev/null
+++ b/Torch.Server/Views/PluginBrowser.xaml
@@ -0,0 +1,124 @@
+<Window x:Class="Torch.Server.Views.PluginBrowser"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
+        xmlns:system="clr-namespace:System;assembly=mscorlib"
+        xmlns:views="clr-namespace:Torch.Server.Views"
+        mc:Ignorable="d"
+        Title="PluginBrowser" Height="400" Width="600"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}">
+    
+    <Window.Resources>
+        <Style TargetType="FlowDocument" x:Key="DocumentStyle">
+        <Setter Property="FontFamily"
+                Value="Calibri" />
+        <Setter Property="TextAlignment"
+                Value="Left" />
+        </Style>
+
+        <Style x:Key="H1Style"
+               TargetType="Paragraph">
+            <Setter Property="FontSize"
+                    Value="42" />
+            <Setter Property="Foreground"
+                    Value="#ff000000" />
+            <Setter Property="FontWeight"
+                    Value="Light" />
+        </Style>
+
+        <Style x:Key="H2Style"
+               TargetType="Paragraph">
+            <Setter Property="FontSize"
+                    Value="20" />
+            <Setter Property="Foreground"
+                    Value="#ff000000" />
+            <Setter Property="FontWeight"
+                    Value="Light" />
+        </Style>
+
+        <Style x:Key="H3Style"
+               TargetType="Paragraph">
+            <Setter Property="FontSize"
+                    Value="20" />
+            <Setter Property="Foreground"
+                    Value="#99000000" />
+            <Setter Property="FontWeight"
+                    Value="Light" />
+        </Style>
+
+        <Style x:Key="H4Style"
+               TargetType="Paragraph">
+            <Setter Property="FontSize"
+                    Value="14" />
+            <Setter Property="Foreground"
+                    Value="#99000000" />
+            <Setter Property="FontWeight"
+                    Value="Light" />
+        </Style>
+
+        <Style x:Key="LinkStyle"
+               TargetType="Hyperlink">
+            <Setter Property="TextDecorations"
+                    Value="None" />
+        </Style>
+
+        <Style x:Key="ImageStyle"
+               TargetType="Image">
+          <Setter Property="RenderOptions.BitmapScalingMode"
+                  Value="NearestNeighbor" />
+          <Style.Triggers>
+              <Trigger Property="Tag"
+                       Value="imageright">
+                  <Setter Property="Margin" 
+                          Value="20,0,0,0" />
+              </Trigger>
+          </Style.Triggers>
+      </Style>
+
+      <Style x:Key="SeparatorStyle"
+             TargetType="Line">
+          <Setter Property="X2"
+                  Value="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=FlowDocumentScrollViewer}}" />
+          <Setter Property="Stroke"
+                  Value="#99000000" />
+          <Setter Property="StrokeThickness"
+                  Value="2" />
+      </Style>
+    <local:Markdown x:Key="Markdown"
+                        DocumentStyle="{StaticResource DocumentStyle}"
+                        Heading1Style="{StaticResource H1Style}"
+                        Heading2Style="{StaticResource H2Style}"
+                        Heading3Style="{StaticResource H3Style}"
+                        Heading4Style="{StaticResource H4Style}"
+                        LinkStyle="{StaticResource LinkStyle}"
+                        ImageStyle="{StaticResource ImageStyle}"
+                        SeparatorStyle="{StaticResource SeparatorStyle}"
+                        AssetPathRoot="{x:Static system:Environment.CurrentDirectory}"/>
+    
+            <local:TextToFlowDocumentConverter x:Key="TextToFlowDocumentConverter" 
+Markdown="{StaticResource Markdown}"/>
+    
+    </Window.Resources>
+    
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <ListView Name="PluginsList" Width="150" Height="Auto" Margin="3" ItemsSource="{Binding Plugins}" SelectionChanged="PluginsList_SelectionChanged">
+                
+            </ListView>
+            <Button Name="DownloadButton" Grid.Row ="1" Content="Download" Margin="3" Height="30" Click="DownloadButton_OnClick" IsEnabled="False"/>
+        </Grid>
+        <FlowDocumentScrollViewer Grid.Column="1" Name="MarkdownFlow" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="3" Document="{Binding CurrentDescription, Converter={StaticResource TextToFlowDocumentConverter}}"/>
+    </Grid>
+</Window>
+    
+    
diff --git a/Torch.Server/Views/PluginBrowser.xaml.cs b/Torch.Server/Views/PluginBrowser.xaml.cs
new file mode 100644
index 0000000..370ccbb
--- /dev/null
+++ b/Torch.Server/Views/PluginBrowser.xaml.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using Newtonsoft.Json;
+using NLog;
+using Torch.API.WebAPI;
+using Torch.Collections;
+using Torch.Server.Annotations;
+
+namespace Torch.Server.Views
+{
+    /// <summary>
+    /// Interaction logic for PluginBrowser.xaml
+    /// </summary>
+    public partial class PluginBrowser : Window, INotifyPropertyChanged
+    {
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+        public MtObservableList<PluginItem> Plugins { get; set; } = new MtObservableList<PluginItem>();
+        public PluginItem CurrentItem { get; set; }
+
+        private string _description = "Loading data from server, please wait..";
+        public string CurrentDescription
+        {
+            get { return _description; }
+            set
+            {
+                _description = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public PluginBrowser()
+        {
+            InitializeComponent();
+            Task.Run(async () =>
+                     {
+                         var res = await PluginQuery.Instance.QueryAll();
+                         if (res == null)
+                             return;
+                         foreach(var item in res.Plugins)
+                             Plugins.Add(item);
+                     });
+        }
+
+        private void PluginsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            CurrentItem = (PluginItem)PluginsList.SelectedItem;
+            CurrentDescription = CurrentItem.Description;
+            DownloadButton.IsEnabled = !string.IsNullOrEmpty(CurrentItem.LatestVersion);
+        }
+
+        private void DownloadButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            var item = CurrentItem;
+            Task.Run(async () =>
+                     {
+                         var result = await PluginQuery.Instance.DownloadPlugin(item.ID);
+                         MessageBox.Show(result ? "Plugin downloaded successfully! Please restart the server to load changes."
+                                                : "Plugin failed to download! See log for details.", 
+                                                "Plugin Downloader",
+                                                MessageBoxButton.OK);
+                     });
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
+}
diff --git a/Torch.Server/Views/PluginsControl.xaml b/Torch.Server/Views/PluginsControl.xaml
index 2dfbec0..8885eba 100644
--- a/Torch.Server/Views/PluginsControl.xaml
+++ b/Torch.Server/Views/PluginsControl.xaml
@@ -26,7 +26,14 @@
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>
-            <Button Grid.Row="1" Content="Open Folder" Margin="3" DockPanel.Dock="Bottom" Click="OpenFolder_OnClick"/>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+            <Button Grid.Row="0" Grid.Column="0" Content="Open Folder" Margin="3" Click="OpenFolder_OnClick"/>
+                <Button Grid.Row="0" Grid.Column="1" Content="Browse Plugins" Margin="3" Click="BrowsPlugins_OnClick"/>
+            </Grid>
         </Grid>
         <ScrollViewer Name="PScroll" Grid.Column="1" Margin="3">
             <Frame NavigationUIVisibility="Hidden" Content="{Binding SelectedPlugin.Control}"/>
diff --git a/Torch.Server/Views/PluginsControl.xaml.cs b/Torch.Server/Views/PluginsControl.xaml.cs
index 3000f9c..8e522c2 100644
--- a/Torch.Server/Views/PluginsControl.xaml.cs
+++ b/Torch.Server/Views/PluginsControl.xaml.cs
@@ -71,5 +71,11 @@ namespace Torch.Server.Views
             if (_plugins?.PluginDir != null)
                 Process.Start(_plugins.PluginDir);
         }
+
+        private void BrowsPlugins_OnClick(object sender, RoutedEventArgs e)
+        {
+            var browser = new PluginBrowser();
+            browser.Show();
+        }
     }
 }
diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config
index 643d580..11d6e4d 100644
--- a/Torch.Server/packages.config
+++ b/Torch.Server/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.6.1" targetFramework="net461" />
+  <package id="Markdown.Xaml" version="1.0.0" targetFramework="net461" />
   <package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net461" />
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />

From 263a8229faded7f194acf96ce6bdbb58f8b61a23 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 2 Mar 2019 12:14:32 -0500
Subject: [PATCH 055/170] Enable hyperlinks.

Sanitize hyperlinks.
---
 Torch.Server/Torch.Server.csproj         |  4 ++--
 Torch.Server/Views/PluginBrowser.xaml.cs | 24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 506686b..b769c94 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -275,7 +275,7 @@
     <Compile Include="Views\ModListControl.xaml.cs">
       <DependentUpon>ModListControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\PluginBrowser.xaml.cs">
+    <Compile Include="Views\PluginBrowser\PluginBrowser.xaml.cs">
       <DependentUpon>PluginBrowser.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\ThemeControl.xaml.cs">
@@ -442,7 +442,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\PluginBrowser.xaml">
+    <Page Include="Views\PluginBrowser\PluginBrowser.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Torch.Server/Views/PluginBrowser.xaml.cs b/Torch.Server/Views/PluginBrowser.xaml.cs
index 370ccbb..50c0f56 100644
--- a/Torch.Server/Views/PluginBrowser.xaml.cs
+++ b/Torch.Server/Views/PluginBrowser.xaml.cs
@@ -48,14 +48,36 @@ namespace Torch.Server.Views
         public PluginBrowser()
         {
             InitializeComponent();
+
             Task.Run(async () =>
                      {
                          var res = await PluginQuery.Instance.QueryAll();
                          if (res == null)
                              return;
-                         foreach(var item in res.Plugins)
+                         foreach (var item in res.Plugins)
                              Plugins.Add(item);
+                         PluginsList.Dispatcher.Invoke(() => PluginsList.SelectedIndex = 0);
                      });
+
+            MarkdownFlow.CommandBindings.Add(new CommandBinding(NavigationCommands.GoToPage, (sender, e) => OpenUri((string)e.Parameter)));
+        }
+
+        public static bool IsValidUri(string uri)
+        {
+            if (!Uri.IsWellFormedUriString(uri, UriKind.Absolute))
+                return false;
+            Uri tmp;
+            if (!Uri.TryCreate(uri, UriKind.Absolute, out tmp))
+                return false;
+            return tmp.Scheme == Uri.UriSchemeHttp || tmp.Scheme == Uri.UriSchemeHttps;
+        }
+
+        public static bool OpenUri(string uri)
+        {
+            if (!IsValidUri(uri))
+                return false;
+            System.Diagnostics.Process.Start(uri);
+            return true;
         }
 
         private void PluginsList_SelectionChanged(object sender, SelectionChangedEventArgs e)

From f16e825b5717cf15cbdff9fdc21cdea08e91e3b4 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 2 Mar 2019 11:14:23 -0800
Subject: [PATCH 056/170] Fix command hiding, remove duplicate event invoke

---
 .../Managers/ChatManager/ChatManagerServer.cs | 38 +------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index e58a840..a045095 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -25,7 +25,7 @@ namespace Torch.Managers.ChatManager
     internal static class ChatInterceptPatch
     {
         private static ChatManagerServer _chatManager;
-        private static ChatManagerServer ChatManager => _chatManager ?? (_chatManager = TorchBase.Instance.Managers.GetManager<ChatManagerServer>());
+        private static ChatManagerServer ChatManager => _chatManager ?? (_chatManager = TorchBase.Instance.CurrentSession.Managers.GetManager<ChatManagerServer>());
             
         internal static void Patch(PatchContext context)
         {
@@ -37,7 +37,7 @@ namespace Torch.Managers.ChatManager
         private static bool PrefixMessageProcessing(ref ChatMsg msg)
         {
             var consumed = false;
-            ChatManager?.RaiseMessageRecieved(msg, ref consumed);
+            ChatManager.RaiseMessageRecieved(msg, ref consumed);
             return !consumed;
         }
     }
@@ -115,22 +115,6 @@ namespace Torch.Managers.ChatManager
             MyMultiplayerBase.SendScriptedChatMessage(ref scripted);
         }
 
-
-        /// <inheritdoc/>
-        public override void Attach()
-        {
-            base.Attach();
-
-            if (MyMultiplayer.Static != null)
-            {
-                MyMultiplayer.Static.ChatMessageReceived += MpStaticChatMessageReceived;
-            }
-            else
-            {
-                _log.Debug("Using offline message processor");
-            }
-        }
-
         /// <inheritdoc />
         protected override bool OfflineMessageProcessor(TorchChatMessage msg)
         {
@@ -141,24 +125,6 @@ namespace Torch.Managers.ChatManager
             return consumed;
         }
 
-        private void MpStaticChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName)
-        {
-            var tmp = false;
-            RaiseMessageRecieved(new ChatMsg
-            {
-                Author = steamUserId,
-                Text = messageText
-            }, ref tmp);
-        }
-
-        /// <inheritdoc/>
-        public override void Detach()
-        {
-            if (MyMultiplayer.Static != null)
-                MyMultiplayer.Static.ChatMessageReceived -= MpStaticChatMessageReceived;
-            base.Detach();
-        }
-
         internal void RaiseMessageRecieved(ChatMsg message, ref bool consumed)
         {
             var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text, (ChatChannel)message.Channel, message.TargetId);

From 0a5a70f5836decaabf357de576baaa93242bf980 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 2 Mar 2019 14:38:52 -0500
Subject: [PATCH 057/170] csproj didn't update for some reason

---
 Torch.Server/Torch.Server.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index b769c94..506686b 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -275,7 +275,7 @@
     <Compile Include="Views\ModListControl.xaml.cs">
       <DependentUpon>ModListControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\PluginBrowser\PluginBrowser.xaml.cs">
+    <Compile Include="Views\PluginBrowser.xaml.cs">
       <DependentUpon>PluginBrowser.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\ThemeControl.xaml.cs">
@@ -442,7 +442,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\PluginBrowser\PluginBrowser.xaml">
+    <Page Include="Views\PluginBrowser.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

From dc5e7e4cb06b1fc06258ac352b28126a3bde7c7c Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:01:51 -0500
Subject: [PATCH 058/170] Try new version scheme

---
 Versioning/version.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Versioning/version.ps1 b/Versioning/version.ps1
index 25f7560..9c401ee 100644
--- a/Versioning/version.ps1
+++ b/Versioning/version.ps1
@@ -1,4 +1,4 @@
-$buildSalt = $Env:BUILD_NUMBER
+$buildSalt = $Env:BRANCH_NAME
 $gitVersion = git describe --tags
 $gitSimpleVersion = git describe --tags --abbrev=0
 $simpleVersionStandard = echo $gitSimpleVersion | Select-String -Pattern "([0-9]+)\.([0-9]+)\.([0-9]+)" | % {$_.Matches} | %{$_.Groups[1].Value+"."+$_.Groups[2].Value+"."+$_.Groups[3].Value}

From b555f46f569af660fafe467d223c0958988c7b0c Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:17:00 -0500
Subject: [PATCH 059/170] Try versioning again

---
 Versioning/version.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Versioning/version.ps1 b/Versioning/version.ps1
index 9c401ee..35b65b7 100644
--- a/Versioning/version.ps1
+++ b/Versioning/version.ps1
@@ -1,9 +1,9 @@
-$buildSalt = $Env:BRANCH_NAME
+$buildSalt = $Env:BUILD_NUMBER
 $gitVersion = git describe --tags
 $gitSimpleVersion = git describe --tags --abbrev=0
 $simpleVersionStandard = echo $gitSimpleVersion | Select-String -Pattern "([0-9]+)\.([0-9]+)\.([0-9]+)" | % {$_.Matches} | %{$_.Groups[1].Value+"."+$_.Groups[2].Value+"."+$_.Groups[3].Value}
 $dotNetVersion = "$simpleVersionStandard.$buildSalt"
-$infoVersion = "$gitVersion" -replace "([0-9]+)\.([0-9]+)\.([0-9]+)","$dotNetVersion"
+$infoVersion = "$gitSimpleVersion" -replace "([0-9]+)\.([0-9]+)\.([0-9]+)","$dotNetVersion" + "$Env.BRANCH_NAME"
 
 $fileContent = @"
 using System.Reflection;

From 14ae58ca0c927affcb986a4ae3781afe35c390a7 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:21:57 -0500
Subject: [PATCH 060/170] Versioning should work now

---
 Versioning/version.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Versioning/version.ps1 b/Versioning/version.ps1
index 35b65b7..343764f 100644
--- a/Versioning/version.ps1
+++ b/Versioning/version.ps1
@@ -1,9 +1,9 @@
-$buildSalt = $Env:BUILD_NUMBER
-$gitVersion = git describe --tags
+$buildSalt = $Env.BUILD_NUMBER
+$branchName = $Env.BRANCH_NAME
 $gitSimpleVersion = git describe --tags --abbrev=0
 $simpleVersionStandard = echo $gitSimpleVersion | Select-String -Pattern "([0-9]+)\.([0-9]+)\.([0-9]+)" | % {$_.Matches} | %{$_.Groups[1].Value+"."+$_.Groups[2].Value+"."+$_.Groups[3].Value}
 $dotNetVersion = "$simpleVersionStandard.$buildSalt"
-$infoVersion = "$gitSimpleVersion" -replace "([0-9]+)\.([0-9]+)\.([0-9]+)","$dotNetVersion" + "$Env.BRANCH_NAME"
+$infoVersion = -join(("$gitSimpleVersion" -replace "([0-9]+)\.([0-9]+)\.([0-9]+)","$dotNetVersion"), "-", "$branchName")
 
 $fileContent = @"
 using System.Reflection;

From 796feb05e6a443df354f8a3f26459ff179e6fa4f Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:23:43 -0500
Subject: [PATCH 061/170] I shouldn't be allowed to have a computer

---
 Versioning/version.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Versioning/version.ps1 b/Versioning/version.ps1
index 343764f..184a208 100644
--- a/Versioning/version.ps1
+++ b/Versioning/version.ps1
@@ -1,5 +1,5 @@
-$buildSalt = $Env.BUILD_NUMBER
-$branchName = $Env.BRANCH_NAME
+$buildSalt = $Env:BUILD_NUMBER
+$branchName = $Env:BRANCH_NAME
 $gitSimpleVersion = git describe --tags --abbrev=0
 $simpleVersionStandard = echo $gitSimpleVersion | Select-String -Pattern "([0-9]+)\.([0-9]+)\.([0-9]+)" | % {$_.Matches} | %{$_.Groups[1].Value+"."+$_.Groups[2].Value+"."+$_.Groups[3].Value}
 $dotNetVersion = "$simpleVersionStandard.$buildSalt"

From 34616607a83282304de74e9a8b8945d8a8148cb3 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 17:42:02 -0500
Subject: [PATCH 062/170] Implement Torch auto-update. Sadly does not work for
 Patron branch.

---
 Jenkinsfile                         |   2 +-
 Torch.API/InformationalVersion.cs   |  24 +++--
 Torch.API/Torch.API.csproj          |   1 +
 Torch.API/WebAPI/JenkinsQuery.cs    | 133 ++++++++++++++++++++++++++++
 Torch/Managers/FilesystemManager.cs |  12 +--
 Torch/Managers/UpdateManager.cs     |  61 +++++--------
 Torch/Plugins/PluginManager.cs      |  97 ++++++++++----------
 Torch/Torch.csproj                  |   7 +-
 Torch/packages.config               |   1 -
 9 files changed, 234 insertions(+), 104 deletions(-)
 create mode 100644 Torch.API/WebAPI/JenkinsQuery.cs

diff --git a/Jenkinsfile b/Jenkinsfile
index e554cf4..98d7c36 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ node {
 
 	stage('Build') {
 		currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim()
-		if (env.BRANCH_NAME == "master") {
+		if (env.BRANCH_NAME == "master" || enb.BRANCH_NAME == "Patron") {
 			buildMode = "Release"
 		} else {
 			buildMode = "Debug"
diff --git a/Torch.API/InformationalVersion.cs b/Torch.API/InformationalVersion.cs
index 5310234..ef80213 100644
--- a/Torch.API/InformationalVersion.cs
+++ b/Torch.API/InformationalVersion.cs
@@ -7,36 +7,36 @@ using System.Threading.Tasks;
 namespace Torch.API
 {
     /// <summary>
-    /// Version in the form v#.#.#.#-info
+    /// Version in the form v#.#.#.#-branch
     /// </summary>
     public class InformationalVersion
     {
         public Version Version { get; set; }
-        public string[] Information { get; set; }
+        public string Branch { get; set; }
 
         public static bool TryParse(string input, out InformationalVersion version)
         {
             version = default(InformationalVersion);
             var trim = input.TrimStart('v');
-            var info = trim.Split('-');
+            var info = trim.Split(new[]{'-'}, 2);
             if (!Version.TryParse(info[0], out Version result))
                 return false;
 
             version = new InformationalVersion { Version = result };
 
             if (info.Length > 1)
-                version.Information = info.Skip(1).ToArray();
-
+                version.Branch = info[1];
+            
             return true;
         }
 
         /// <inheritdoc />
         public override string ToString()
         {
-            if (Information == null || Information.Length == 0)
+            if (Branch == null)
                 return $"v{Version}";
 
-            return $"v{Version}-{string.Join("-", Information)}";
+            return $"v{Version}-{string.Join("-", Branch)}";
         }
 
         public static explicit operator InformationalVersion(Version v)
@@ -48,5 +48,15 @@ namespace Torch.API
         {
             return v.Version;
         }
+
+        public static bool operator >(InformationalVersion lhs, InformationalVersion rhs)
+        {
+            return lhs.Version > rhs.Version;
+        }
+
+        public static bool operator <(InformationalVersion lhs, InformationalVersion rhs)
+        {
+            return lhs.Version < rhs.Version;
+        }
     }
 }
diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj
index 987b979..aa0dea8 100644
--- a/Torch.API/Torch.API.csproj
+++ b/Torch.API/Torch.API.csproj
@@ -193,6 +193,7 @@
     <Compile Include="Session\ITorchSessionManager.cs" />
     <Compile Include="Session\TorchSessionState.cs" />
     <Compile Include="TorchGameState.cs" />
+    <Compile Include="WebAPI\JenkinsQuery.cs" />
     <Compile Include="WebAPI\PluginQuery.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch.API/WebAPI/JenkinsQuery.cs b/Torch.API/WebAPI/JenkinsQuery.cs
new file mode 100644
index 0000000..5c9ea1c
--- /dev/null
+++ b/Torch.API/WebAPI/JenkinsQuery.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NLog;
+
+namespace Torch.API.WebAPI
+{
+    public class JenkinsQuery
+    {
+        private const string BRANCH_QUERY = "https://build.torchapi.net/job/Torch/job/Torch/job/{0}/" + API_PATH;
+        private const string ARTIFACT_PATH = "artifact/bin/torch-server.zip";
+        private const string API_PATH = "api/json";
+
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+
+        private static JenkinsQuery _instance;
+        public static JenkinsQuery Instance => _instance ?? (_instance = new JenkinsQuery());
+        private HttpClient _client;
+
+        private JenkinsQuery()
+        {
+            _client = new HttpClient();
+        }
+
+        public async Task<Job> GetLatestVersion(string branch)
+        {
+#if DEBUG
+            branch = "master";
+#endif
+            var h = await _client.GetAsync(string.Format(BRANCH_QUERY, branch));
+            if (!h.IsSuccessStatusCode)
+            {
+                Log.Error($"Branch query failed with code {h.StatusCode}");
+                if(h.StatusCode == HttpStatusCode.NotFound)
+                    Log.Error("This likely means you're trying to update a branch that is not public on Jenkins. Sorry :(");
+                return null;
+            }
+
+            string r = await h.Content.ReadAsStringAsync();
+
+            BranchResponse response;
+            try
+            {
+                response = JsonConvert.DeserializeObject<BranchResponse>(r);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to deserialize branch response!");
+                return null;
+            }
+
+            h = await _client.GetAsync($"{response.LastStableBuild.URL}{API_PATH}");
+            if (!h.IsSuccessStatusCode)
+            {
+                Log.Error($"Job query failed with code {h.StatusCode}");
+                return null;
+            }
+
+            r = await h.Content.ReadAsStringAsync();
+
+            Job job;
+            try
+            {
+                job = JsonConvert.DeserializeObject<Job>(r);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to deserialize job response!");
+                return null;
+            }
+            return job;
+        }
+
+        public async Task<bool> DownloadRelease(Job job, string path)
+        {
+            var h = await _client.GetAsync(job.URL + ARTIFACT_PATH);
+            if (!h.IsSuccessStatusCode)
+            {
+                Log.Error($"Job download failed with code {h.StatusCode}");
+                return false;
+            }
+            var s = await h.Content.ReadAsStreamAsync();
+            using (var fs = new FileStream(path, FileMode.Create))
+            {
+                await s.CopyToAsync(fs);
+                await fs.FlushAsync();
+            }
+            return true;
+        }
+
+    }
+
+    public class BranchResponse
+    {
+        public string Name;
+        public string URL;
+        public Build LastBuild;
+        public Build LastStableBuild;
+    }
+
+    public class Build
+    {
+        public int Number;
+        public string URL;
+    }
+
+    public class Job
+    {
+        public int Number;
+        public bool Building;
+        public string Description;
+        public string Result;
+        public string URL;
+        private InformationalVersion _version;
+
+        public InformationalVersion Version
+        {
+            get
+            {
+                if (_version == null)
+                    InformationalVersion.TryParse(Description, out _version);
+
+                return _version;
+            }
+        }
+    }
+}
diff --git a/Torch/Managers/FilesystemManager.cs b/Torch/Managers/FilesystemManager.cs
index b0fdcb1..254c9a0 100644
--- a/Torch/Managers/FilesystemManager.cs
+++ b/Torch/Managers/FilesystemManager.cs
@@ -22,9 +22,8 @@ namespace Torch.Managers
 
         public FilesystemManager(ITorchBase torchInstance) : base(torchInstance)
         {
-            var temp = Path.Combine(Path.GetTempPath(), "Torch");
-            TempDirectory = Directory.CreateDirectory(temp).FullName;
             var torch = new FileInfo(typeof(FilesystemManager).Assembly.Location).Directory.FullName;
+            TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;
             TorchDirectory = torch;
 
             ClearTemp();
@@ -39,13 +38,16 @@ namespace Torch.Managers
         /// <summary>
         /// Move the given file (if it exists) to a temporary directory that will be cleared the next time the application starts.
         /// </summary>
-        public void SoftDelete(string file)
+        public void SoftDelete(string path, string file)
         {
-            if (!File.Exists(file))
+            string source = Path.Combine(path, file);
+            if (!File.Exists(source))
                 return;
             var rand = Path.GetRandomFileName();
             var dest = Path.Combine(TempDirectory, rand);
-            File.Move(file, dest);
+            File.Move(source, rand);
+            string rsource = Path.Combine(path, rand);
+            File.Move(rsource, dest);
         }
     }
 }
diff --git a/Torch/Managers/UpdateManager.cs b/Torch/Managers/UpdateManager.cs
index bdaaf32..de2e73c 100644
--- a/Torch/Managers/UpdateManager.cs
+++ b/Torch/Managers/UpdateManager.cs
@@ -10,8 +10,8 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using NLog;
-using Octokit;
 using Torch.API;
+using Torch.API.WebAPI;
 
 namespace Torch.Managers
 {
@@ -21,12 +21,11 @@ namespace Torch.Managers
     public class UpdateManager : Manager
     {
         private Timer _updatePollTimer;
-        private GitHubClient _gitClient = new GitHubClient(new ProductHeaderValue("Torch"));
         private string _torchDir = new FileInfo(typeof(UpdateManager).Assembly.Location).DirectoryName;
         private Logger _log = LogManager.GetCurrentClassLogger();
         [Dependency]
         private FilesystemManager _fsManager;
-
+        
         public UpdateManager(ITorchBase torchInstance) : base(torchInstance)
         {
             //_updatePollTimer = new Timer(TimerElapsed, this, TimeSpan.Zero, TimeSpan.FromMinutes(5));
@@ -42,49 +41,36 @@ namespace Torch.Managers
         {
             CheckAndUpdateTorch();
         }
-
-        private async Task<Tuple<Version, string>> TryGetLatestArchiveUrl(string owner, string name)
-        {
-            try
-            {
-                var latest = await _gitClient.Repository.Release.GetLatest(owner, name).ConfigureAwait(false);
-                if (latest == null)
-                    return new Tuple<Version, string>(new Version(), null);
-
-                var zip = latest.Assets.FirstOrDefault(x => x.Name.Contains(".zip"));
-                if (zip == null)
-                    _log.Error($"Latest release of {owner}/{name} does not contain a zip archive.");
-                if (!latest.TagName.TryExtractVersion(out Version version))
-                    _log.Error($"Unable to parse version tag for {owner}/{name}");
-                return new Tuple<Version, string>(version, zip?.BrowserDownloadUrl);
-            }
-            catch (Exception e)
-            {
-                _log.Error($"An error occurred getting release information for '{owner}/{name}'");
-                _log.Error(e);
-                return default(Tuple<Version, string>);
-            }
-        }
-
+        
         private async void CheckAndUpdateTorch()
         {
-            // Doesn't work properly or reliably, TODO update when Jenkins is fully configured
-            return;
-
             if (!Torch.Config.GetTorchUpdates)
                 return;
 
             try
             {
-                var releaseInfo = await TryGetLatestArchiveUrl("TorchAPI", "Torch").ConfigureAwait(false);
-                if (releaseInfo.Item1 > Torch.TorchVersion)
+                var job = await JenkinsQuery.Instance.GetLatestVersion(Torch.TorchVersion.Branch);
+                if (job == null)
                 {
-                    _log.Warn($"Updating Torch from version {Torch.TorchVersion} to version {releaseInfo.Item1}");
+                    _log.Info("Failed to fetch latest version.");
+                    return;
+                }
+
+                _log.Info($"Clearing tmp directory at {_fsManager.TempDirectory}");
+                
+                if (job.Version > Torch.TorchVersion)
+                {
+                    _log.Warn($"Updating Torch from version {Torch.TorchVersion} to version {job.Version}");
                     var updateName = Path.Combine(_fsManager.TempDirectory, "torchupdate.zip");
-                    new WebClient().DownloadFile(new Uri(releaseInfo.Item2), updateName);
+                    //new WebClient().DownloadFile(new Uri(releaseInfo.Item2), updateName);
+                    if (!await JenkinsQuery.Instance.DownloadRelease(job, updateName))
+                    {
+                        _log.Warn("Failed to download new release!");
+                        return;
+                    }
                     UpdateFromZip(updateName, _torchDir);
                     File.Delete(updateName);
-                    _log.Warn($"Torch version {releaseInfo.Item1} has been installed, please restart Torch to finish the process.");
+                    _log.Warn($"Torch version {job.Version} has been installed, please restart Torch to finish the process.");
                 }
                 else
                 {
@@ -106,10 +92,11 @@ namespace Torch.Managers
                 {
                     _log.Debug($"Unzipping {file.FullName}");
                     var targetFile = Path.Combine(extractPath, file.FullName);
-                    _fsManager.SoftDelete(targetFile);
+                    _fsManager.SoftDelete(extractPath, file.FullName);
+                    file.ExtractToFile(targetFile, true);
                 }
 
-                zip.ExtractToDirectory(extractPath);
+                //zip.ExtractToDirectory(extractPath); //throws exceptions sometimes?
             }
         }
 
diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index df10ef2..85d00e9 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -10,7 +10,6 @@ using System.Reflection;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 using NLog;
-using Octokit;
 using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Plugins;
@@ -24,7 +23,6 @@ namespace Torch.Managers
     /// <inheritdoc />
     public class PluginManager : Manager, IPluginManager
     {
-        private GitHubClient _gitClient = new GitHubClient(new ProductHeaderValue("Torch"));
         private static Logger _log = LogManager.GetCurrentClassLogger();
         private const string MANIFEST_NAME = "manifest.xml";
         public readonly string PluginDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Plugins");
@@ -145,45 +143,45 @@ namespace Torch.Managers
             Parallel.ForEach(pluginItems, async item =>
             {
                 PluginManifest manifest = null;
-                try
-                {
-                    var path = Path.Combine(PluginDir, item);
-                    var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
-                    manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
-                    if (manifest == null)
-                    {
-                        _log.Warn($"Item '{item}' is missing a manifest, skipping update check.");
-                        return;
-                    }
+                //try
+                //{
+                //    var path = Path.Combine(PluginDir, item);
+                //    var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
+                //    manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
+                //    if (manifest == null)
+                //    {
+                //        _log.Warn($"Item '{item}' is missing a manifest, skipping update check.");
+                //        return;
+                //    }
 
-                    manifest.Version.TryExtractVersion(out Version currentVersion);
-                    var latest = await GetLatestArchiveAsync(manifest.Repository).ConfigureAwait(false);
+                //    manifest.Version.TryExtractVersion(out Version currentVersion);
+                //    var latest = await GetLatestArchiveAsync(manifest.Repository).ConfigureAwait(false);
 
-                    if (currentVersion == null || latest.Item1 == null)
-                    {
-                        _log.Error($"Error parsing version from manifest or GitHub for plugin '{manifest.Name}.'");
-                        return;
-                    }
+                //    if (currentVersion == null || latest.Item1 == null)
+                //    {
+                //        _log.Error($"Error parsing version from manifest or GitHub for plugin '{manifest.Name}.'");
+                //        return;
+                //    }
 
-                    if (latest.Item1 <= currentVersion)
-                    {
-                        _log.Debug($"{manifest.Name} {manifest.Version} is up to date.");
-                        return;
-                    }
+                //    if (latest.Item1 <= currentVersion)
+                //    {
+                //        _log.Debug($"{manifest.Name} {manifest.Version} is up to date.");
+                //        return;
+                //    }
 
-                    _log.Info($"Updating plugin '{manifest.Name}' from {currentVersion} to {latest.Item1}.");
-                    await UpdatePluginAsync(path, latest.Item2).ConfigureAwait(false);
-                    count++;
-                }
-                catch (NotFoundException)
-                {
-                    _log.Warn($"GitHub repository not found for {manifest.Name}");
-                }
-                catch (Exception e)
-                {
-                    _log.Warn($"An error occurred updating the plugin {manifest.Name}.");
-                    _log.Warn(e);
-                }
+                //    _log.Info($"Updating plugin '{manifest.Name}' from {currentVersion} to {latest.Item1}.");
+                //    await UpdatePluginAsync(path, latest.Item2).ConfigureAwait(false);
+                //    count++;
+                //}
+                //catch (NotFoundException)
+                //{
+                //    _log.Warn($"GitHub repository not found for {manifest.Name}");
+                //}
+                //catch (Exception e)
+                //{
+                //    _log.Warn($"An error occurred updating the plugin {manifest.Name}.");
+                //    _log.Warn(e);
+                //}
             });
 
             _log.Info($"Updated {count} plugins.");
@@ -193,20 +191,21 @@ namespace Torch.Managers
         {
             try
             {
-                var split = repository.Split('/');
-                var latest = await _gitClient.Repository.Release.GetLatest(split[0], split[1]).ConfigureAwait(false);
-                if (!latest.TagName.TryExtractVersion(out Version latestVersion))
-                {
-                    _log.Error($"Unable to parse version tag for the latest release of '{repository}.'");
-                }
+                //var split = repository.Split('/');
+                //var latest = await _gitClient.Repository.Release.GetLatest(split[0], split[1]).ConfigureAwait(false);
+                //if (!latest.TagName.TryExtractVersion(out Version latestVersion))
+                //{
+                //    _log.Error($"Unable to parse version tag for the latest release of '{repository}.'");
+                //}
 
-                var zipAsset = latest.Assets.FirstOrDefault(x => x.Name.Contains(".zip", StringComparison.CurrentCultureIgnoreCase));
-                if (zipAsset == null)
-                {
-                    _log.Error($"Unable to find archive for the latest release of '{repository}.'");
-                }
+                //var zipAsset = latest.Assets.FirstOrDefault(x => x.Name.Contains(".zip", StringComparison.CurrentCultureIgnoreCase));
+                //if (zipAsset == null)
+                //{
+                //    _log.Error($"Unable to find archive for the latest release of '{repository}.'");
+                //}
 
-                return new Tuple<Version, string>(latestVersion, zipAsset?.BrowserDownloadUrl);
+                //return new Tuple<Version, string>(latestVersion, zipAsset?.BrowserDownloadUrl);
+                return null;
             }
             catch (Exception e)
             {
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 6254956..928ddce 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -36,7 +36,9 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <!-- I don't know why this needs to exist -->
-  <ItemGroup> <Reference Include="netstandard" /> </ItemGroup>
+  <ItemGroup>
+    <Reference Include="netstandard" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
@@ -61,9 +63,6 @@
       <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Octokit, Version=0.24.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octokit.0.24.0\lib\net45\Octokit.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Sandbox.Common">
diff --git a/Torch/packages.config b/Torch/packages.config
index 3bc7aff..e77c03c 100644
--- a/Torch/packages.config
+++ b/Torch/packages.config
@@ -5,7 +5,6 @@
   <package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net461" />
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
-  <package id="Octokit" version="0.24.0" targetFramework="net461" />
   <package id="protobuf-net" version="2.1.0" targetFramework="net461" />
   <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
   <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />

From 2a64151f6774e1e386ec87da2ae276df42ab8975 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 17:44:26 -0500
Subject: [PATCH 063/170] There's a damn typo in the jenkins file

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 98d7c36..7481efd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ node {
 
 	stage('Build') {
 		currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim()
-		if (env.BRANCH_NAME == "master" || enb.BRANCH_NAME == "Patron") {
+		if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "Patron") {
 			buildMode = "Release"
 		} else {
 			buildMode = "Debug"

From 3d3769cf5a79613d7e26ae0c9ddd40d98e6025e5 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 18:46:11 -0500
Subject: [PATCH 064/170] Enable plugin updating from website

---
 Torch.API/WebAPI/PluginQuery.cs | 13 +++---
 Torch/Plugins/PluginManager.cs  | 72 +++++++++++++++------------------
 2 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/Torch.API/WebAPI/PluginQuery.cs b/Torch.API/WebAPI/PluginQuery.cs
index 74da68f..5faf600 100644
--- a/Torch.API/WebAPI/PluginQuery.cs
+++ b/Torch.API/WebAPI/PluginQuery.cs
@@ -79,21 +79,22 @@ namespace Torch.API.WebAPI
             return response;
         }
 
-        public async Task<bool> DownloadPlugin(Guid guid)
+        public async Task<bool> DownloadPlugin(Guid guid, string path = null)
         {
-            return await DownloadPlugin(guid.ToString());
+            return await DownloadPlugin(guid.ToString(), path);
         }
 
-        public async Task<bool> DownloadPlugin(string guid)
+        public async Task<bool> DownloadPlugin(string guid, string path = null)
         {
             var item = await QueryOne(guid);
-            return await DownloadPlugin(item);
+            return await DownloadPlugin(item, path);
         }
 
-        public async Task<bool> DownloadPlugin(PluginFullItem item)
+        public async Task<bool> DownloadPlugin(PluginFullItem item, string path = null)
         {
             try
             {
+                path = path ?? $"Plugins\\{item.Name}.zip";
                 var h = await _client.GetAsync(string.Format(PLUGIN_QUERY, item.ID));
                 string res = await h.Content.ReadAsStringAsync();
                 var response = JsonConvert.DeserializeObject<PluginFullItem>(res);
@@ -109,7 +110,7 @@ namespace Torch.API.WebAPI
                     return false;
                 }
                 var s = await _client.GetStreamAsync(version.URL);
-                using (var f = new FileStream($"Plugins\\{item.Name}.zip", FileMode.Create))
+                using (var f = new FileStream(path, FileMode.Create))
                 {
                     await s.CopyToAsync(f);
                     await f.FlushAsync();
diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 85d00e9..5f725cc 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -14,6 +14,7 @@ using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Plugins;
 using Torch.API.Session;
+using Torch.API.WebAPI;
 using Torch.Collections;
 using Torch.Commands;
 using Torch.Utils;
@@ -133,55 +134,48 @@ namespace Torch.Managers
 
         private void DownloadPluginUpdates()
         {
-            //TODO
-            _log.Warn("Automatic plugin updates are disabled in this build of Torch while the system is reworked.");
-            return;
-
             _log.Info("Checking for plugin updates...");
             var count = 0;
             var pluginItems = Directory.EnumerateFiles(PluginDir, "*.zip").Union(Directory.EnumerateDirectories(PluginDir));
             Parallel.ForEach(pluginItems, async item =>
             {
                 PluginManifest manifest = null;
-                //try
-                //{
-                //    var path = Path.Combine(PluginDir, item);
-                //    var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
-                //    manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
-                //    if (manifest == null)
-                //    {
-                //        _log.Warn($"Item '{item}' is missing a manifest, skipping update check.");
-                //        return;
-                //    }
+                try
+                {
+                    var path = Path.Combine(PluginDir, item);
+                    var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
+                    manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
+                    if (manifest == null)
+                    {
+                        _log.Warn($"Item '{item}' is missing a manifest, skipping update check.");
+                        return;
+                    }
 
-                //    manifest.Version.TryExtractVersion(out Version currentVersion);
-                //    var latest = await GetLatestArchiveAsync(manifest.Repository).ConfigureAwait(false);
+                    manifest.Version.TryExtractVersion(out Version currentVersion);
+                    var latest = await PluginQuery.Instance.QueryOne(manifest.Guid);
+                    latest.LatestVersion.TryExtractVersion(out Version newVersion);
 
-                //    if (currentVersion == null || latest.Item1 == null)
-                //    {
-                //        _log.Error($"Error parsing version from manifest or GitHub for plugin '{manifest.Name}.'");
-                //        return;
-                //    }
+                    if (currentVersion == null || newVersion == null)
+                    {
+                        _log.Error($"Error parsing version from manifest or website for plugin '{manifest.Name}.'");
+                        return;
+                    }
 
-                //    if (latest.Item1 <= currentVersion)
-                //    {
-                //        _log.Debug($"{manifest.Name} {manifest.Version} is up to date.");
-                //        return;
-                //    }
+                    if (newVersion <= currentVersion)
+                    {
+                        _log.Debug($"{manifest.Name} {manifest.Version} is up to date.");
+                        return;
+                    }
 
-                //    _log.Info($"Updating plugin '{manifest.Name}' from {currentVersion} to {latest.Item1}.");
-                //    await UpdatePluginAsync(path, latest.Item2).ConfigureAwait(false);
-                //    count++;
-                //}
-                //catch (NotFoundException)
-                //{
-                //    _log.Warn($"GitHub repository not found for {manifest.Name}");
-                //}
-                //catch (Exception e)
-                //{
-                //    _log.Warn($"An error occurred updating the plugin {manifest.Name}.");
-                //    _log.Warn(e);
-                //}
+                    _log.Info($"Updating plugin '{manifest.Name}' from {currentVersion} to {newVersion}.");
+                    await PluginQuery.Instance.DownloadPlugin(latest, path);
+                    count++;
+                }
+                catch (Exception e)
+                {
+                    _log.Warn($"An error occurred updating the plugin {manifest?.Name ?? item}.");
+                    _log.Warn(e);
+                }
             });
 
             _log.Info($"Updated {count} plugins.");

From 5eb6e9990ca7a4990b271b2bb50118ef26eb3476 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 3 Mar 2019 19:02:20 -0500
Subject: [PATCH 065/170] Don't die when updating plugins with no releases

---
 Torch/Plugins/PluginManager.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 5f725cc..7b8ca16 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -153,6 +153,13 @@ namespace Torch.Managers
 
                     manifest.Version.TryExtractVersion(out Version currentVersion);
                     var latest = await PluginQuery.Instance.QueryOne(manifest.Guid);
+
+                    if (latest?.LatestVersion == null)
+                    {
+                        _log.Warn($"Plugin {manifest.Name} does not have any releases on torchapi.net. Cannot update.");
+                        return;
+                    }
+
                     latest.LatestVersion.TryExtractVersion(out Version newVersion);
 
                     if (currentVersion == null || newVersion == null)

From 72ceeffdad78890912708c0193fd8ac80c3f9b51 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Tue, 5 Mar 2019 11:31:00 -0800
Subject: [PATCH 066/170] Update events/UI to reflect new chat

---
 Torch.API/Managers/IChatManagerClient.cs        |  6 +++---
 Torch.Server/Views/ChatControl.xaml.cs          | 11 +++++++++++
 Torch/Managers/ChatManager/ChatManagerClient.cs |  2 +-
 Torch/Managers/ChatManager/ChatManagerServer.cs |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Torch.API/Managers/IChatManagerClient.cs b/Torch.API/Managers/IChatManagerClient.cs
index f4ce06c..5d6adf7 100644
--- a/Torch.API/Managers/IChatManagerClient.cs
+++ b/Torch.API/Managers/IChatManagerClient.cs
@@ -58,14 +58,14 @@ namespace Torch.API.Managers
         /// <param name="authorSteamId">Author's steam ID</param>
         /// <param name="message">Message</param>
         /// <param name="font">Font</param>
-        public TorchChatMessage(ulong authorSteamId, string message, string font = MyFontEnum.Blue)
+        public TorchChatMessage(ulong authorSteamId, string message, ChatChannel channel, long target, string font = MyFontEnum.Blue)
         {
             Timestamp = DateTime.Now;
             AuthorSteamId = authorSteamId;
             Author = MyMultiplayer.Static?.GetMemberName(authorSteamId) ?? "Player";
             Message = message;
-            Channel = ChatChannel.Global;
-            Target = 0;
+            Channel = channel;
+            Target = target;
             Font = font;
         }
 
diff --git a/Torch.Server/Views/ChatControl.xaml.cs b/Torch.Server/Views/ChatControl.xaml.cs
index 242a8d1..65174f1 100644
--- a/Torch.Server/Views/ChatControl.xaml.cs
+++ b/Torch.Server/Views/ChatControl.xaml.cs
@@ -20,6 +20,8 @@ using NLog;
 using Torch;
 using Sandbox;
 using Sandbox.Engine.Multiplayer;
+using Sandbox.Game.Gui;
+using Sandbox.Game.Multiplayer;
 using Sandbox.Game.World;
 using Torch.API;
 using Torch.API.Managers;
@@ -131,6 +133,15 @@ namespace Torch.Server
                 bool atBottom = ChatScroller.VerticalOffset + 8 > ChatScroller.ScrollableHeight;
                 var span = new Span();
                 span.Inlines.Add($"{msg.Timestamp} ");
+                switch (msg.Channel)
+                {
+                    case ChatChannel.Faction:
+                        span.Inlines.Add(new Run($"[{MySession.Static.Factions.TryGetFactionById(msg.Target)?.Tag ?? "???"}] ") { Foreground = Brushes.Green });
+                        break;
+                    case ChatChannel.Private:
+                        span.Inlines.Add(new Run($"[to {MySession.Static.Players.TryGetIdentity(msg.Target)?.DisplayName ?? "???"}] ") { Foreground = Brushes.DeepPink });
+                        break;
+                }
                 span.Inlines.Add(new Run(msg.Author) { Foreground = LookupBrush(msg.Font) });
                 span.Inlines.Add($": {msg.Message}");
                 span.Inlines.Add(new LineBreak());
diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index 4b72e1c..9c55455 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -127,7 +127,7 @@ namespace Torch.Managers.ChatManager
 
         private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName)
         {
-            var torchMsg = new TorchChatMessage(steamUserId, messageText,
+            var torchMsg = new TorchChatMessage(steamUserId, messageText, channel, targetId,
                 (steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue);
             if (!RaiseMessageRecieved(torchMsg) && HasHud)
                 _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName);
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index a045095..5a351f1 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -61,7 +61,7 @@ namespace Torch.Managers.ChatManager
         {
             if (targetSteamId == Sync.MyId)
             {
-                RaiseMessageRecieved(new TorchChatMessage(authorId, message));
+                RaiseMessageRecieved(new TorchChatMessage(authorId, message, ChatChannel.Global, 0));
                 return;
             }
             if (MyMultiplayer.Static == null)
@@ -131,7 +131,7 @@ namespace Torch.Managers.ChatManager
             MessageProcessing?.Invoke(torchMsg, ref consumed);
 
             if (!consumed)
-                _chatLog.Info($"{torchMsg.Author}: {torchMsg.Message}");
+                _chatLog.Info($"[{torchMsg.Channel}:{torchMsg.Target}] {torchMsg.Author}: {torchMsg.Message}");
         }
 
         public static string GetMemberName(ulong steamId)

From 0e43eee2f30793c64d6202f25ded98a695f316e8 Mon Sep 17 00:00:00 2001
From: N1Ran <38772205+N1Ran@users.noreply.github.com>
Date: Sat, 9 Mar 2019 09:51:03 -0500
Subject: [PATCH 067/170] Fix for the GUI entity count.  Revert just the count
 from Sorted

---
 Torch.Server/Views/EntitiesControl.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Torch.Server/Views/EntitiesControl.xaml b/Torch.Server/Views/EntitiesControl.xaml
index db907d4..e75c507 100644
--- a/Torch.Server/Views/EntitiesControl.xaml
+++ b/Torch.Server/Views/EntitiesControl.xaml
@@ -52,12 +52,12 @@
                 </TreeView.Resources>
                 <TreeViewItem ItemsSource="{Binding Path=SortedGrids}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding SortedGrids.Count, StringFormat=Grids ({0})}" />
+                        <TextBlock Text="{Binding Grids.Count, StringFormat=Grids ({0})}" />
                     </TreeViewItem.Header>
                 </TreeViewItem>
                 <TreeViewItem ItemsSource="{Binding SortedCharacters}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding SortedCharacters.Count, StringFormat=Characters ({0})}" />
+                        <TextBlock Text="{Binding Characters.Count, StringFormat=Characters ({0})}" />
                     </TreeViewItem.Header>
                     <TreeViewItem.ItemTemplate>
                         <DataTemplate>
@@ -67,7 +67,7 @@
                 </TreeViewItem>
                 <TreeViewItem ItemsSource="{Binding SortedVoxelMaps}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding SortedVoxelMaps.Count, StringFormat=Voxel Maps ({0})}" />
+                        <TextBlock Text="{Binding VoxelMaps.Count, StringFormat=Voxel Maps ({0})}" />
                     </TreeViewItem.Header>
                     <TreeViewItem.ItemTemplate>
                         <DataTemplate>
@@ -77,7 +77,7 @@
                 </TreeViewItem>
                 <TreeViewItem ItemsSource="{Binding SortedFloatingObjects}">
                     <TreeViewItem.Header>
-                        <TextBlock Text="{Binding SortedFloatingObjects.Count, StringFormat=Floating Objects ({0})}" />
+                        <TextBlock Text="{Binding FloatingObjects.Count, StringFormat=Floating Objects ({0})}" />
                     </TreeViewItem.Header>
                     <TreeViewItem.ItemTemplate>
                         <DataTemplate>

From 369a3217f794eba11bc4cc29902c2659daf75798 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 10 Mar 2019 16:45:18 -0400
Subject: [PATCH 068/170] Change plugin update IO logic

---
 Torch.API/WebAPI/PluginQuery.cs | 10 +++++++++-
 Torch/Plugins/PluginManifest.cs |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Torch.API/WebAPI/PluginQuery.cs b/Torch.API/WebAPI/PluginQuery.cs
index 5faf600..a13e5a8 100644
--- a/Torch.API/WebAPI/PluginQuery.cs
+++ b/Torch.API/WebAPI/PluginQuery.cs
@@ -95,6 +95,10 @@ namespace Torch.API.WebAPI
             try
             {
                 path = path ?? $"Plugins\\{item.Name}.zip";
+                string relpath = Path.GetDirectoryName(path);
+
+                Directory.CreateDirectory(relpath);
+
                 var h = await _client.GetAsync(string.Format(PLUGIN_QUERY, item.ID));
                 string res = await h.Content.ReadAsStringAsync();
                 var response = JsonConvert.DeserializeObject<PluginFullItem>(res);
@@ -110,7 +114,11 @@ namespace Torch.API.WebAPI
                     return false;
                 }
                 var s = await _client.GetStreamAsync(version.URL);
-                using (var f = new FileStream(path, FileMode.Create))
+
+                if(File.Exists(path))
+                    File.Delete(path);
+
+                using (var f = File.Create(path))
                 {
                     await s.CopyToAsync(f);
                     await f.FlushAsync();
diff --git a/Torch/Plugins/PluginManifest.cs b/Torch/Plugins/PluginManifest.cs
index 13618a9..7d1cc89 100644
--- a/Torch/Plugins/PluginManifest.cs
+++ b/Torch/Plugins/PluginManifest.cs
@@ -23,8 +23,12 @@ namespace Torch
         /// <summary>
         /// A GitHub repository in the format of Author/Repository to retrieve plugin updates.
         /// </summary>
+        [Obsolete("Updates no longer check git. Updates are hosted only on torchapi.net")]
         public string Repository { get; set; }
 
+        //xml tomfoolery
+        public bool ShouldSerializeRepository() => false;
+
         /// <summary>
         /// The plugin version. This must include a string in the format of #[.#[.#]] for update checking purposes.
         /// </summary>

From 6422f7c5764681d5bf006a4bdb3c40f42b6e67bf Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Tue, 12 Mar 2019 20:49:45 -0400
Subject: [PATCH 069/170] Fail *gracefully* when Havok runs out of memory.

---
 Torch/Patches/PhysicsMemoryPatch.cs | 54 +++++++++++++++++++++++++++++
 Torch/Torch.csproj                  |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 Torch/Patches/PhysicsMemoryPatch.cs

diff --git a/Torch/Patches/PhysicsMemoryPatch.cs b/Torch/Patches/PhysicsMemoryPatch.cs
new file mode 100644
index 0000000..bf94ad9
--- /dev/null
+++ b/Torch/Patches/PhysicsMemoryPatch.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Havok;
+using Sandbox;
+using Sandbox.Engine.Physics;
+using Sandbox.Game.World;
+using Torch.Managers.PatchManager;
+using Torch.Mod;
+using Torch.Mod.Messages;
+using VRage.Game;
+
+namespace Torch.Patches
+{
+    [PatchShim]
+    public static class PhysicsMemoryPatch
+    {
+        public static void Patch(PatchContext ctx)
+        {
+            ctx.GetPattern(typeof(MyPhysics).GetMethod("StepWorldsInternal", BindingFlags.NonPublic | BindingFlags.Instance)).Prefixes.Add(typeof(PhysicsMemoryPatch).GetMethod(nameof(PrefixPhysics)));
+        }
+
+        public static bool NotifiedFailure { get; private set; }
+
+        public static bool PrefixPhysics()
+        {
+            if (!HkBaseSystem.IsOutOfMemory)
+                return true;
+
+            if (NotifiedFailure)
+                return false;
+
+            NotifiedFailure = true;
+            ModCommunication.SendMessageToClients(new NotificationMessage("Havok has run out of memory. Server will restart in 30 seconds!", 60000, MyFontEnum.Red));
+            //save the session NOW before anything moves due to weird physics.
+            MySession.Static.Save();
+            //pause the game, for funsies
+            MySandboxGame.IsPaused = true;
+            
+            //nasty hack
+            Task.Run(() =>
+                     {
+                         Thread.Sleep(TimeSpan.FromSeconds(30));
+                         TorchBase.Instance.Restart();
+                     });
+
+            return false;
+        }
+    }
+}
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 928ddce..edc2f53 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -224,6 +224,7 @@
     <Compile Include="Patches\GameAnalyticsPatch.cs" />
     <Compile Include="Patches\GameStatePatchShim.cs" />
     <Compile Include="Patches\ObjectFactoryInitPatch.cs" />
+    <Compile Include="Patches\PhysicsMemoryPatch.cs" />
     <Compile Include="Patches\SessionDownloadPatch.cs" />
     <Compile Include="Patches\TorchAsyncSaving.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

From 2c47cfd60ee272088ec4691e69662db1aa74d715 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 13 Mar 2019 14:41:25 -0400
Subject: [PATCH 070/170] Enable PatchShim for plugins

---
 Torch/TorchBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index 8f661f8..92f9964 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -485,6 +485,7 @@ namespace Torch
                 if (_registeredAuxAssemblies.Add(asm))
                 {
                     ReflectedManager.Process(asm);
+                    PatchManager.AddPatchShims(asm);
                 }
         }
     }

From 7d8838c0ee244c4d9504512765e8028b67b9a5d1 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 8 Apr 2019 19:46:58 -0700
Subject: [PATCH 071/170] Add customizable server chat name and color

---
 Torch.API/ITorchConfig.cs                       |  2 ++
 Torch.Server/TorchConfig.cs                     |  5 +++++
 Torch.Server/Views/ChatControl.xaml             |  4 ++--
 Torch/Commands/CommandContext.cs                | 13 ++++++++++---
 Torch/Managers/ChatManager/ChatManagerClient.cs | 12 ++++++++++--
 Torch/Utils/StringUtils.cs                      |  8 ++++++++
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/Torch.API/ITorchConfig.cs b/Torch.API/ITorchConfig.cs
index 2b41621..308ee6b 100644
--- a/Torch.API/ITorchConfig.cs
+++ b/Torch.API/ITorchConfig.cs
@@ -18,6 +18,8 @@ namespace Torch
         bool ShouldUpdateTorch { get; }
         int TickTimeout { get; set; }
         string WaitForPID { get; set; }
+        string ChatName { get; set; }
+        string ChatColor { get; set; }
 
         bool Save(string path = null);
     }
diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 25a2452..e051d1e 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -5,6 +5,7 @@ using System.Windows;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using NLog;
+using VRage.Game;
 
 namespace Torch.Server
 {
@@ -60,6 +61,10 @@ namespace Torch.Server
         /// <inheritdoc />
         public List<string> Plugins { get; set; } = new List<string>();
 
+        public string ChatName { get; set; } = "Server";
+
+        public string ChatColor { get; set; } = "Red";
+
         public bool EnableWhitelist { get; set; } = false;
         public HashSet<ulong> Whitelist { get; set; } = new HashSet<ulong>();
 
diff --git a/Torch.Server/Views/ChatControl.xaml b/Torch.Server/Views/ChatControl.xaml
index a5bc39a..79c1148 100644
--- a/Torch.Server/Views/ChatControl.xaml
+++ b/Torch.Server/Views/ChatControl.xaml
@@ -17,8 +17,8 @@
                 <ColumnDefinition/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="1" x:Name="Send" Content="Send" DockPanel.Dock="Right" Width="50" Margin="5,5,5,5" Click="SendButton_Click"></Button>
-            <TextBox Grid.Column="0" x:Name="Message" DockPanel.Dock="Left" Margin="5,5,5,5" KeyDown="Message_OnKeyDown"></TextBox>
+            <Button Grid.Column="1" Content="Send" DockPanel.Dock="Right" Width="50" Margin="5" Click="SendButton_Click"></Button>
+            <TextBox Grid.Column="0" x:Name="Message" Margin="5" KeyDown="Message_OnKeyDown"></TextBox>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Torch/Commands/CommandContext.cs b/Torch/Commands/CommandContext.cs
index 97a9203..c0c8532 100644
--- a/Torch/Commands/CommandContext.cs
+++ b/Torch/Commands/CommandContext.cs
@@ -55,10 +55,17 @@ namespace Torch.Commands
             Args = args ?? new List<string>();
         }
 
-        public virtual void Respond(string message, string sender = "Server", string font = MyFontEnum.Blue)
+        public virtual void Respond(string message, string sender = null, string font = MyFontEnum.Blue)
         {
-            Torch.CurrentSession.Managers.GetManager<IChatManagerServer>()
-                ?.SendMessageAsOther(sender, message, font, _steamIdSender);
+            var chat = Torch.CurrentSession.Managers.GetManager<IChatManagerServer>();
+            if (sender != null)
+            {
+                chat?.SendMessageAsOther(sender, message, font, _steamIdSender);   
+            }
+            else
+            {
+                chat?.SendMessageAsSelf(message);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index 9c55455..5b0fbe4 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -38,10 +38,18 @@ namespace Torch.Managers.ChatManager
             {
                 if (Sandbox.Engine.Platform.Game.IsDedicated)
                 {
+                    // Sending invalid color to clients will crash them. KEEEN
+                    var color = Torch.Config.ChatColor;
+                    if (!StringUtils.IsFontEnum(Torch.Config.ChatColor))
+                    {
+                        _log.Warn("Invalid chat font color! Defaulting to 'Red'");
+                        color = MyFontEnum.Red;
+                    }
+                    
                     var scripted = new ScriptedChatMsg()
                     {
-                        Author = "Server",
-                        Font = MyFontEnum.Red,
+                        Author = Torch.Config.ChatName,
+                        Font = color,
                         Text = message,
                         Target = 0
                     };
diff --git a/Torch/Utils/StringUtils.cs b/Torch/Utils/StringUtils.cs
index aade17e..167807a 100644
--- a/Torch/Utils/StringUtils.cs
+++ b/Torch/Utils/StringUtils.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using VRage.Game;
 
 namespace Torch.Utils
 {
@@ -60,5 +62,11 @@ namespace Torch.Utils
             }
             return builder?.ToString() ?? "";
         }
+
+        private static readonly string[] _fontEnumValues = typeof(MyFontEnum).GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => x.IsLiteral && !x.IsInitOnly).Select(x => (string)x.GetValue(null)).ToArray();
+        public static bool IsFontEnum(string str)
+        {
+            return _fontEnumValues.Contains(str);
+        }
     }
 }

From af9a31f4ad0d4f560526eee2fea2400563d7194e Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Tue, 9 Apr 2019 21:20:56 -0400
Subject: [PATCH 072/170] Keen broke network intercept. Disable it until we
 decide what to do.

---
 Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
index 5bfa3cc..1c2c580 100644
--- a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
+++ b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
@@ -68,6 +68,10 @@ namespace Torch.Managers
         /// <inheritdoc/>
         public override void Attach()
         {
+            //disable all this for now
+            _log.Warn("Network intercept disabled. Some plugins may not work correctly.");
+            return;
+
             if (_init)
                 return;
 
@@ -362,6 +366,9 @@ namespace Torch.Managers
         /// <inheritdoc />
         public void RegisterNetworkHandler(INetworkHandler handler)
         {
+            _log.Warn($"Plugin {handler.GetType().Assembly.FullName} registered a network handler. This system no longer works. Please alert the plugin author.");
+            return;
+
             var handlerType = handler.GetType().FullName;
             var toRemove = new List<INetworkHandler>();
             foreach (var item in _networkHandlers)

From b37cd74e56d53721d8ea8f7dc80a8a66933d2883 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 10 Apr 2019 14:28:13 -0400
Subject: [PATCH 073/170] Fix gross initializer error on first time
 installations

---
 Torch/Utils/StringUtils.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Torch/Utils/StringUtils.cs b/Torch/Utils/StringUtils.cs
index 167807a..2177009 100644
--- a/Torch/Utils/StringUtils.cs
+++ b/Torch/Utils/StringUtils.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using VRage.Game;
 
 namespace Torch.Utils
 {
@@ -63,10 +62,12 @@ namespace Torch.Utils
             return builder?.ToString() ?? "";
         }
 
-        private static readonly string[] _fontEnumValues = typeof(MyFontEnum).GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => x.IsLiteral && !x.IsInitOnly).Select(x => (string)x.GetValue(null)).ToArray();
+        private static string[] FontEnumValues => _fontEnumValues ?? (_fontEnumValues = typeof(VRage.Game.MyFontEnum).GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => x.IsLiteral && !x.IsInitOnly).Select(x => (string)x.GetValue(null)).ToArray());
+
+        private static string[] _fontEnumValues;
         public static bool IsFontEnum(string str)
         {
-            return _fontEnumValues.Contains(str);
+            return FontEnumValues.Contains(str);
         }
     }
 }

From 5c8a1f36771243b12fd0dc8c47266ea52071de1c Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 10 Apr 2019 16:29:41 -0400
Subject: [PATCH 074/170] Don't throw exceptions when saving is abnormal

---
 Torch/Patches/TorchAsyncSaving.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Patches/TorchAsyncSaving.cs b/Torch/Patches/TorchAsyncSaving.cs
index c20c59d..3c99e77 100644
--- a/Torch/Patches/TorchAsyncSaving.cs
+++ b/Torch/Patches/TorchAsyncSaving.cs
@@ -66,7 +66,7 @@ namespace Torch.Patches
                 {
                     if (!Game.IsDedicated && MySession.Static != null)
                         ShowWorldSaveResult(tmpSnapshot.SavingSuccess);
-                    saveTaskSource.SetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk);
+                    saveTaskSource.TrySetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk);
                 });
             });
             return saveTaskSource.Task;

From 60c0ae10499b61ad66c9949d49a11f64cb0bcc87 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 15 Apr 2019 15:38:34 -0700
Subject: [PATCH 075/170] Fix message target bug

---
 Torch/Commands/CommandContext.cs                | 11 ++---------
 Torch/Managers/ChatManager/ChatManagerServer.cs |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Torch/Commands/CommandContext.cs b/Torch/Commands/CommandContext.cs
index c0c8532..67383b0 100644
--- a/Torch/Commands/CommandContext.cs
+++ b/Torch/Commands/CommandContext.cs
@@ -55,17 +55,10 @@ namespace Torch.Commands
             Args = args ?? new List<string>();
         }
 
-        public virtual void Respond(string message, string sender = null, string font = MyFontEnum.Blue)
+        public virtual void Respond(string message, string sender = null, string font = null)
         {
             var chat = Torch.CurrentSession.Managers.GetManager<IChatManagerServer>();
-            if (sender != null)
-            {
-                chat?.SendMessageAsOther(sender, message, font, _steamIdSender);   
-            }
-            else
-            {
-                chat?.SendMessageAsSelf(message);
-            }
+            chat?.SendMessageAsOther(sender, message, font, _steamIdSender);
         }
     }
 }
\ No newline at end of file
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index 5a351f1..e46f7f4 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -106,9 +106,9 @@ namespace Torch.Managers.ChatManager
             }
             var scripted = new ScriptedChatMsg()
             {
-                Author = author,
+                Author = author ?? Torch.Config.ChatName,
                 Text = message,
-                Font = font,
+                Font = font ?? Torch.Config.ChatColor,
                 Target = Sync.Players.TryGetIdentityId(targetSteamId)
             };
             _chatLog.Info($"{author} (to {GetMemberName(targetSteamId)}): {message}");

From b4addcc125630378b910a2660c88a3ba2258c6d3 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 15 Apr 2019 15:41:13 -0700
Subject: [PATCH 076/170] Add nullchecks to player action buttons

---
 Torch.Server/Views/PlayerListControl.xaml.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Torch.Server/Views/PlayerListControl.xaml.cs b/Torch.Server/Views/PlayerListControl.xaml.cs
index f59f670..17268d6 100644
--- a/Torch.Server/Views/PlayerListControl.xaml.cs
+++ b/Torch.Server/Views/PlayerListControl.xaml.cs
@@ -80,6 +80,9 @@ namespace Torch.Server
 
         private void KickButton_Click(object sender, RoutedEventArgs e)
         {
+            if (PlayerList.SelectedItem == null)
+                return;
+            
             var player = (KeyValuePair<ulong, PlayerViewModel>)PlayerList.SelectedItem;
             try
             {
@@ -93,6 +96,9 @@ namespace Torch.Server
 
         private void BanButton_Click(object sender, RoutedEventArgs e)
         {
+            if (PlayerList.SelectedItem == null)
+                return;
+            
             var player = (KeyValuePair<ulong, PlayerViewModel>)PlayerList.SelectedItem;
             try
             {
@@ -106,6 +112,9 @@ namespace Torch.Server
 
         private void PromoteButton_OnClick(object sender, RoutedEventArgs e)
         {
+            if (PlayerList.SelectedItem == null)
+                return;
+            
             var player = (KeyValuePair<ulong, PlayerViewModel>)PlayerList.SelectedItem;
             try
             {
@@ -119,6 +128,9 @@ namespace Torch.Server
 
         private void DemoteButton_OnClick(object sender, RoutedEventArgs e)
         {
+            if (PlayerList.SelectedItem == null)
+                return;
+            
             var player = (KeyValuePair<ulong, PlayerViewModel>)PlayerList.SelectedItem;
             try
             {

From 819824342579400c033dc4c3dbdc52a6f1a3fb73 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Tue, 16 Apr 2019 10:20:13 -0700
Subject: [PATCH 077/170] Add backwards compatibility to CommandContext.Respond
 for plugins compiled against older Torch

---
 Torch/Commands/CommandContext.cs | 7 +++++++
 Torch/Commands/CommandManager.cs | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Torch/Commands/CommandContext.cs b/Torch/Commands/CommandContext.cs
index 67383b0..e2ed0db 100644
--- a/Torch/Commands/CommandContext.cs
+++ b/Torch/Commands/CommandContext.cs
@@ -57,6 +57,13 @@ namespace Torch.Commands
 
         public virtual void Respond(string message, string sender = null, string font = null)
         {
+            //hack: Backwards compatibility 20190416
+            if (sender == "Server")
+            {
+                sender = null;
+                font = null;
+            }
+            
             var chat = Torch.CurrentSession.Managers.GetManager<IChatManagerServer>();
             chat?.SendMessageAsOther(sender, message, font, _steamIdSender);
         }
diff --git a/Torch/Commands/CommandManager.cs b/Torch/Commands/CommandManager.cs
index a7912aa..a80ad07 100644
--- a/Torch/Commands/CommandManager.cs
+++ b/Torch/Commands/CommandManager.cs
@@ -130,7 +130,7 @@ namespace Torch.Commands
                 if (!HasPermission(steamId, command))
                 {
                     _log.Info($"{player.DisplayName} tried to use command {cmdPath} without permission");
-                    _chatManager.SendMessageAsOther("Server", $"You need to be a {command.MinimumPromoteLevel} or higher to use that command.", MyFontEnum.Red, steamId);
+                    _chatManager.SendMessageAsOther(Torch.Config.ChatName, $"You need to be a {command.MinimumPromoteLevel} or higher to use that command.", Torch.Config.ChatColor, steamId);
                     return;
                 }
 

From b974487fc4c1d77e475899d2fcf252e235ce4a50 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Tue, 16 Apr 2019 11:57:13 -0700
Subject: [PATCH 078/170] Fix for command response in UI. How did this ever
 work?

---
 Torch.Server/Views/ChatControl.xaml.cs  |  6 +++--
 Torch/Commands/CommandManager.cs        |  8 +++----
 Torch/Commands/ConsoleCommandContext.cs | 30 +++++++++++++++++++++++++
 Torch/Torch.csproj                      |  1 +
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 Torch/Commands/ConsoleCommandContext.cs

diff --git a/Torch.Server/Views/ChatControl.xaml.cs b/Torch.Server/Views/ChatControl.xaml.cs
index 65174f1..cc7536c 100644
--- a/Torch.Server/Views/ChatControl.xaml.cs
+++ b/Torch.Server/Views/ChatControl.xaml.cs
@@ -174,10 +174,12 @@ namespace Torch.Server
             var commands = _server.CurrentSession?.Managers.GetManager<Torch.Commands.CommandManager>();
             if (commands != null && commands.IsCommand(text))
             {
-                InsertMessage(new TorchChatMessage("Server", text, MyFontEnum.DarkBlue));
+                InsertMessage(new TorchChatMessage(TorchBase.Instance.Config.ChatName, text, TorchBase.Instance.Config.ChatColor));
                 _server.Invoke(() =>
                 {
-                    commands.HandleCommandFromServer(text);
+                    var responses = commands.HandleCommandFromServer(text);
+                    foreach (var response in responses)
+                        InsertMessage(response);
                 });
             }
             else
diff --git a/Torch/Commands/CommandManager.cs b/Torch/Commands/CommandManager.cs
index a80ad07..8482183 100644
--- a/Torch/Commands/CommandManager.cs
+++ b/Torch/Commands/CommandManager.cs
@@ -81,22 +81,22 @@ namespace Torch.Commands
             }
         }
 
-        public bool HandleCommandFromServer(string message)
+        public List<TorchChatMessage> HandleCommandFromServer(string message)
         {
             var cmdText = new string(message.Skip(1).ToArray());
             var command = Commands.GetCommand(cmdText, out string argText);
             if (command == null)
-                return false;
+                return null;
             var cmdPath = string.Join(".", command.Path);
 
             var splitArgs = Regex.Matches(argText, "(\"[^\"]+\"|\\S+)").Cast<Match>().Select(x => x.ToString().Replace("\"", "")).ToList();
             _log.Trace($"Invoking {cmdPath} for server.");
-            var context = new CommandContext(Torch, command.Plugin, Sync.MyId, argText, splitArgs);
+            var context = new ConsoleCommandContext(Torch, command.Plugin, Sync.MyId, argText, splitArgs);
             if (command.TryInvoke(context))
                 _log.Info($"Server ran command '{message}'");
             else
                 context.Respond($"Invalid Syntax: {command.SyntaxHelp}");
-            return true;
+            return context.Responses;
         }
 
         public void HandleCommand(TorchChatMessage msg, ref bool consumed)
diff --git a/Torch/Commands/ConsoleCommandContext.cs b/Torch/Commands/ConsoleCommandContext.cs
new file mode 100644
index 0000000..49fcfe1
--- /dev/null
+++ b/Torch/Commands/ConsoleCommandContext.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.Text;
+using Torch.API;
+using Torch.API.Managers;
+using Torch.API.Plugins;
+
+namespace Torch.Commands
+{
+    public class ConsoleCommandContext : CommandContext
+    {
+        public List<TorchChatMessage> Responses = new List<TorchChatMessage>();
+        private bool _flag;
+        
+        /// <inheritdoc />
+        public ConsoleCommandContext(ITorchBase torch, ITorchPlugin plugin, ulong steamIdSender, string rawArgs = null, List<string> args = null) 
+            : base(torch, plugin, steamIdSender, rawArgs, args) { }
+
+        /// <inheritdoc />
+        public override void Respond(string message, string sender = null, string font = null)
+        {
+            if (sender == "Server")
+            {
+                sender = null;
+                font = null;
+            }
+            
+            Responses.Add(new TorchChatMessage(sender ?? TorchBase.Instance.Config.ChatName, message, font ?? TorchBase.Instance.Config.ChatColor));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index edc2f53..814c916 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -187,6 +187,7 @@
     <Compile Include="Collections\SortedView.cs" />
     <Compile Include="Collections\TransformComparer.cs" />
     <Compile Include="Collections\TransformEnumerator.cs" />
+    <Compile Include="Commands\ConsoleCommandContext.cs" />
     <Compile Include="Event\EventShimAttribute.cs" />
     <Compile Include="Managers\ChatManager\ChatManagerClient.cs" />
     <Compile Include="Managers\ChatManager\ChatManagerServer.cs" />

From 93bb11c1353c06d074d3db685f201896970af615 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 19 Apr 2019 11:23:04 -0700
Subject: [PATCH 079/170] Fix crash on invalid command from UI

---
 Torch.Server/Views/ChatControl.xaml.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Torch.Server/Views/ChatControl.xaml.cs b/Torch.Server/Views/ChatControl.xaml.cs
index cc7536c..ac9f834 100644
--- a/Torch.Server/Views/ChatControl.xaml.cs
+++ b/Torch.Server/Views/ChatControl.xaml.cs
@@ -178,6 +178,12 @@ namespace Torch.Server
                 _server.Invoke(() =>
                 {
                     var responses = commands.HandleCommandFromServer(text);
+                    if (responses == null)
+                    {
+                        InsertMessage(new TorchChatMessage(TorchBase.Instance.Config.ChatName, "Invalid command.", TorchBase.Instance.Config.ChatColor));
+                        return;
+                    }
+                    
                     foreach (var response in responses)
                         InsertMessage(response);
                 });

From bb0ee3b861d1ad61714b7f834cdb47ef0a1e4285 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Fri, 19 Apr 2019 21:30:10 -0400
Subject: [PATCH 080/170] Add editor for player promotion levels. Resolves #280

---
 Torch.Server/Torch.Server.csproj         |   7 ++
 Torch.Server/Views/ConfigControl.xaml    |   1 +
 Torch.Server/Views/ConfigControl.xaml.cs |   9 ++
 Torch.Server/Views/RoleEditor.xaml       |  41 +++++++++
 Torch.Server/Views/RoleEditor.xaml.cs    | 110 +++++++++++++++++++++++
 5 files changed, 168 insertions(+)
 create mode 100644 Torch.Server/Views/RoleEditor.xaml
 create mode 100644 Torch.Server/Views/RoleEditor.xaml.cs

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 506686b..e81703b 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -278,6 +278,9 @@
     <Compile Include="Views\PluginBrowser.xaml.cs">
       <DependentUpon>PluginBrowser.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\RoleEditor.xaml.cs">
+      <DependentUpon>RoleEditor.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ThemeControl.xaml.cs">
       <DependentUpon>ThemeControl.xaml</DependentUpon>
     </Compile>
@@ -462,6 +465,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\RoleEditor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\SessionSettingsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index 8ab19d5..1b08a2a 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -99,6 +99,7 @@
                             <TextBox Text="{Binding Administrators, Converter={StaticResource ListConverterString}}"
                                      Margin="3"
                                      Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto" />
+                            <Button Content="Edit Roles" Click="RoleEdit_Onlick" Margin="3"/>
                             <Label Content="Reserved Players" />
                             <TextBox Margin="3" Height="100" AcceptsReturn="true" VerticalScrollBarVisibility="Auto"
                                      Style="{StaticResource ValidatedTextBox}">
diff --git a/Torch.Server/Views/ConfigControl.xaml.cs b/Torch.Server/Views/ConfigControl.xaml.cs
index 750906e..ee9de3c 100644
--- a/Torch.Server/Views/ConfigControl.xaml.cs
+++ b/Torch.Server/Views/ConfigControl.xaml.cs
@@ -12,6 +12,7 @@ using Torch.API.Managers;
 using Torch.Server.Annotations;
 using Torch.Server.Managers;
 using Torch.Server.ViewModels;
+using Torch.Views;
 
 namespace Torch.Server.Views
 {
@@ -122,5 +123,13 @@ namespace Torch.Server.Views
             var c  = new WorldGeneratorDialog(_instanceManager);
             c.Show();
         }
+
+        private void RoleEdit_Onlick(object sender, RoutedEventArgs e)
+        {
+            //var w = new RoleEditor(_instanceManager.DedicatedConfig.SelectedWorld);
+            //w.Show();
+            var d = new RoleEditor();
+            d.Edit(_instanceManager.DedicatedConfig.SelectedWorld.Checkpoint.PromotedUsers.Dictionary);
+        }
     }
 }
diff --git a/Torch.Server/Views/RoleEditor.xaml b/Torch.Server/Views/RoleEditor.xaml
new file mode 100644
index 0000000..10988f0
--- /dev/null
+++ b/Torch.Server/Views/RoleEditor.xaml
@@ -0,0 +1,41 @@
+<Window x:Class="Torch.Server.Views.RoleEditor"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Torch.Server.Views"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
+        xmlns:modApi="clr-namespace:VRage.Game.ModAPI;assembly=VRage.Game"
+        mc:Ignorable="d"
+        Title="RoleEditor" Height="300" Width="300">
+    <Window.Resources>
+    <ObjectDataProvider MethodName="GetValues" ObjectType="{x:Type sys:Enum}" x:Key="GetEnumValues">
+        <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="modApi:MyPromoteLevel"/>
+        </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+</Window.Resources>
+ <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <DataGrid x:Name="ItemGrid" AutoGenerateColumns="false" CanUserAddRows="true" Grid.Row="0">
+            <DataGrid.Columns>
+                <DataGridTextColumn Width="5*" Header="Key" Binding="{Binding Key}"/>
+                <DataGridComboBoxColumn Width ="5*" Header="Value" ItemsSource="{Binding Source={StaticResource GetEnumValues}}" SelectedValueBinding="{Binding Value, Mode=TwoWay}"/>
+            </DataGrid.Columns>
+        </DataGrid>
+        <Button Grid.Row="1" Content="Add New" Margin="5" Click="AddNew_OnClick"></Button>
+        <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Button Grid.Column="0" Content="Cancel" Margin="5" Click="Cancel_OnClick" />
+            <Button Grid.Column="1" Content="OK" Margin="5" Click="Ok_OnClick" />
+        </Grid>
+    </Grid>
+</Window>
+
diff --git a/Torch.Server/Views/RoleEditor.xaml.cs b/Torch.Server/Views/RoleEditor.xaml.cs
new file mode 100644
index 0000000..35cc111
--- /dev/null
+++ b/Torch.Server/Views/RoleEditor.xaml.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using Torch.Server.Managers;
+using Torch.Views;
+using VRage.Game.ModAPI;
+
+namespace Torch.Server.Views
+{
+    /// <summary>
+    /// Interaction logic for RoleEditor.xaml
+    /// </summary>
+    public partial class RoleEditor : Window
+    {
+        public RoleEditor()
+        {
+            InitializeComponent();
+            DataContext = Items;
+        }
+
+        public ObservableCollection<IDictionaryItem> Items { get; } = new ObservableCollection<IDictionaryItem>();
+        private Type _itemType;
+
+        private Action _commitChanges;
+
+        public void Edit(IDictionary dict)
+        {
+            Items.Clear();
+            var dictType = dict.GetType();
+            _itemType = typeof(DictionaryItem<,>).MakeGenericType(dictType.GenericTypeArguments[0], dictType.GenericTypeArguments[1]);
+
+            foreach (var key in dict.Keys)
+            {
+                Items.Add((IDictionaryItem)Activator.CreateInstance(_itemType, key, dict[key]));
+            }
+
+            ItemGrid.ItemsSource = Items;
+
+            _commitChanges = () =>
+            {
+                dict.Clear();
+                foreach (var item in Items)
+                {
+                    dict[item.Key] = item.Value;
+                }
+            };
+
+            Show();
+        }
+
+        private void Cancel_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void Ok_OnClick(object sender, RoutedEventArgs e)
+        {
+            _commitChanges?.Invoke();
+            Close();
+        }
+
+        public interface IDictionaryItem
+        {
+            object Key { get; set; }
+            object Value { get; set; }
+        }
+
+        public class DictionaryItem<TKey, TValue> : ViewModel, IDictionaryItem
+        {
+            private TKey _key;
+            private TValue _value;
+
+            object IDictionaryItem.Key { get => _key; set => SetValue(ref _key, (TKey)value); }
+            object IDictionaryItem.Value { get => _value; set => SetValue(ref _value, (TValue)value); }
+
+            public TKey Key { get => _key; set => SetValue(ref _key, value); }
+            public TValue Value { get => _value; set => SetValue(ref _value, value); }
+
+            public DictionaryItem()
+            {
+                _key = default(TKey);
+                _value = default(TValue);
+            }
+
+            public DictionaryItem(TKey key, TValue value)
+            {
+                _key = key;
+                _value = value;
+            }
+        }
+
+        private void AddNew_OnClick(object sender, RoutedEventArgs e)
+        {
+            Items.Add((IDictionaryItem)Activator.CreateInstance(_itemType));
+        }
+    }
+}

From 068b074de03393685cf123417f602eebeffa46f0 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 20 Apr 2019 09:02:21 -0400
Subject: [PATCH 081/170] Add player display to main UI window. Ref
 TorchAPI/Essentials#106

---
 Torch.Server/TorchServer.cs     | 6 ++++++
 Torch.Server/Views/TorchUI.xaml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index c4070cd..06e1402 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -45,6 +45,8 @@ namespace Torch.Server
         private ServerState _state;
         private Stopwatch _uptime;
         private Timer _watchdog;
+        private int _players;
+        private MultiplayerManagerDedicated _multiplayerManagerDedicated;
 
         /// <inheritdoc />
        public TorchServer(TorchConfig config = null)
@@ -92,6 +94,8 @@ namespace Torch.Server
         /// <inheritdoc />
         public string InstancePath => Config?.InstancePath;
 
+        public int OnlinePlayers { get => _players; private set => SetValue(ref _players, value); }
+
         /// <inheritdoc />
         public override void Init()
         {
@@ -186,6 +190,7 @@ namespace Torch.Server
 
             if (newState == TorchSessionState.Loaded)
             {
+                _multiplayerManagerDedicated = CurrentSession.Managers.GetManager<MultiplayerManagerDedicated>();
                 CurrentSession.Managers.GetManager<CommandManager>().RegisterCommandModule(typeof(WhitelistCommands));
                 ModCommunication.Register();
             }
@@ -209,6 +214,7 @@ namespace Torch.Server
             SimulationRatio = Math.Min(Sync.ServerSimulationRatio, 1);
             var elapsed = TimeSpan.FromSeconds(Math.Floor(_uptime.Elapsed.TotalSeconds));
             ElapsedPlayTime = elapsed;
+            OnlinePlayers = _multiplayerManagerDedicated?.Players.Count ?? 0;
 
             if (_watchdog == null && Config.TickTimeout > 0)
             {
diff --git a/Torch.Server/Views/TorchUI.xaml b/Torch.Server/Views/TorchUI.xaml
index a198cae..5c7e34f 100644
--- a/Torch.Server/Views/TorchUI.xaml
+++ b/Torch.Server/Views/TorchUI.xaml
@@ -57,7 +57,7 @@
             </Label>
             <Label x:Name="LabelPlayers">
                 <Label.Content>
-                    <TextBlock ></TextBlock>
+                    <TextBlock Text="{Binding OnlinePlayers, StringFormat=Players: {0}}"/>
                 </Label.Content>
             </Label>
         </StackPanel>

From 56f7578d130dc6e61689fe49c0af84e892d4b0c2 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 20 Apr 2019 11:43:55 -0400
Subject: [PATCH 082/170] Implement chat muting TorchAPI/Essentials#81

---
 Torch.API/Managers/IChatManagerServer.cs      | 20 ++++++++++++++++
 .../Managers/ChatManager/ChatManagerServer.cs | 24 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/Torch.API/Managers/IChatManagerServer.cs b/Torch.API/Managers/IChatManagerServer.cs
index 52bd75f..3803b58 100644
--- a/Torch.API/Managers/IChatManagerServer.cs
+++ b/Torch.API/Managers/IChatManagerServer.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using VRage.Collections;
 using VRage.Network;
 
 namespace Torch.API.Managers
@@ -41,5 +42,24 @@ namespace Torch.API.Managers
         /// <param name="font">Font to use</param>
         /// <param name="targetSteamId">Player to send the message to, or everyone by default</param>
         void SendMessageAsOther(string author, string message, string font, ulong targetSteamId = 0);
+
+        /// <summary>
+        /// Mute user from global chat.
+        /// </summary>
+        /// <param name="steamId"></param>
+        /// <returns></returns>
+        bool MuteUser(ulong steamId);
+
+        /// <summary>
+        /// Unmute user from global chat.
+        /// </summary>
+        /// <param name="steamId"></param>
+        /// <returns></returns>
+        bool UnmuteUser(ulong steamId);
+
+        /// <summary>
+        /// Users which are not allowed to chat.
+        /// </summary>
+        HashSetReader<ulong> MutedUsers { get; }
     }
 }
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index e46f7f4..02658ba 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -16,6 +16,7 @@ using Torch.API.Managers;
 using Torch.Managers.PatchManager;
 using Torch.Utils;
 using VRage;
+using VRage.Collections;
 using VRage.Library.Collections;
 using VRage.Network;
 
@@ -47,6 +48,10 @@ namespace Torch.Managers.ChatManager
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         private static readonly Logger _chatLog = LogManager.GetLogger("Chat");
 
+        private readonly HashSet<ulong> _muted = new HashSet<ulong>();
+        /// <inheritdoc />
+        public HashSetReader<ulong> MutedUsers => _muted;
+
         /// <inheritdoc />
         public ChatManagerServer(ITorchBase torchInstance) : base(torchInstance)
         {
@@ -56,6 +61,18 @@ namespace Torch.Managers.ChatManager
         /// <inheritdoc />
         public event MessageProcessingDel MessageProcessing;
 
+        /// <inheritdoc />
+        public bool MuteUser(ulong steamId)
+        {
+            return _muted.Add(steamId);
+        }
+
+        /// <inheritdoc />
+        public bool UnmuteUser(ulong steamId)
+        {
+            return _muted.Remove(steamId);
+        }
+
         /// <inheritdoc />
         public void SendMessageAsOther(ulong authorId, string message, ulong targetSteamId = 0)
         {
@@ -128,6 +145,13 @@ namespace Torch.Managers.ChatManager
         internal void RaiseMessageRecieved(ChatMsg message, ref bool consumed)
         {
             var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text, (ChatChannel)message.Channel, message.TargetId);
+            if (_muted.Contains(message.Author))
+            {
+                consumed = true;
+                _chatLog.Warn($"MUTED USER: [{torchMsg.Channel}:{torchMsg.Target}] {torchMsg.Author}: {torchMsg.Message}");
+                return;
+            }
+
             MessageProcessing?.Invoke(torchMsg, ref consumed);
 
             if (!consumed)

From 92406a051a00528a1277da46179240ac0b91276c Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 22 Apr 2019 15:44:34 -0400
Subject: [PATCH 083/170] Add bulk editing of roles

---
 Torch.Server/Views/RoleEditor.xaml    | 11 +++++++++++
 Torch.Server/Views/RoleEditor.xaml.cs | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/Torch.Server/Views/RoleEditor.xaml b/Torch.Server/Views/RoleEditor.xaml
index 10988f0..24d100e 100644
--- a/Torch.Server/Views/RoleEditor.xaml
+++ b/Torch.Server/Views/RoleEditor.xaml
@@ -20,6 +20,7 @@
             <RowDefinition />
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <DataGrid x:Name="ItemGrid" AutoGenerateColumns="false" CanUserAddRows="true" Grid.Row="0">
             <DataGrid.Columns>
@@ -36,6 +37,16 @@
             <Button Grid.Column="0" Content="Cancel" Margin="5" Click="Cancel_OnClick" />
             <Button Grid.Column="1" Content="OK" Margin="5" Click="Ok_OnClick" />
         </Grid>
+     <Grid Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+         <ComboBox Name="BulkSelect" ItemsSource="{Binding Source={StaticResource GetEnumValues}}" SelectedValue ="{Binding 
+             RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:RoleEditor}},
+             Path = BulkPromote, Mode=TwoWay}" Margin="5"/>
+         <Button Grid.Column="1" Content="Bulk edit" Margin ="5" Click="BulkEdit"/>
+     </Grid>
     </Grid>
 </Window>
 
diff --git a/Torch.Server/Views/RoleEditor.xaml.cs b/Torch.Server/Views/RoleEditor.xaml.cs
index 35cc111..d1106ce 100644
--- a/Torch.Server/Views/RoleEditor.xaml.cs
+++ b/Torch.Server/Views/RoleEditor.xaml.cs
@@ -35,6 +35,7 @@ namespace Torch.Server.Views
         private Type _itemType;
 
         private Action _commitChanges;
+        public MyPromoteLevel BulkPromote { get; set; } = MyPromoteLevel.Scripter;
 
         public void Edit(IDictionary dict)
         {
@@ -106,5 +107,17 @@ namespace Torch.Server.Views
         {
             Items.Add((IDictionaryItem)Activator.CreateInstance(_itemType));
         }
+
+        private void BulkEdit(object sender, RoutedEventArgs e)
+        {
+            List<ulong> l = Items.Where(i => i.Value.Equals(BulkPromote)).Select(i => (ulong)i.Key).ToList();
+            var w = new CollectionEditor();
+            w.Edit((ICollection<ulong>)l, "Bulk edit");
+            var r = Items.Where(j => j.Value.Equals(BulkPromote) || l.Contains((ulong)j.Key)).ToList();
+            foreach (var k in r)
+                Items.Remove(k);
+            foreach (var m in l)
+                Items.Add(new DictionaryItem<ulong, MyPromoteLevel>(m, BulkPromote));
+        }
     }
 }

From 8bc4c247e6c6a0b48cc6ecbd3981ec03c3148417 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 22 Apr 2019 15:55:02 -0400
Subject: [PATCH 084/170] Enable the scrollbar on the config page

---
 Torch.Server/Views/ConfigControl.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index 1b08a2a..79c856f 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -58,7 +58,7 @@
                     <RowDefinition />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <ScrollViewer VerticalScrollBarVisibility="Disabled">
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />

From 34211c4b3f2d7c0fe4885f809b412471459b0daa Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 28 Apr 2019 18:25:53 -0400
Subject: [PATCH 085/170] Filter help commands by promote level of requesting
 user. Closes #306

---
 Torch/Commands/TorchCommands.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index 30d1a6c..ced0505 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -57,10 +57,16 @@ namespace Torch.Commands
             if (node != null)
             {
                 var command = node.Command;
-                var children = node.Subcommands.Select(x => x.Key);
+                var children = node.Subcommands.Where(e => e.Value.Command?.MinimumPromoteLevel <= Context.Player.PromoteLevel).Select(x => x.Key);
 
                 var sb = new StringBuilder();
 
+                if (command?.MinimumPromoteLevel > Context.Player.PromoteLevel)
+                {
+                    Context.Respond("You are not authorized to use this command.");
+                    return;
+                }
+
                 if (command != null)
                 {
                     sb.AppendLine($"Syntax: {command.SyntaxHelp}");
@@ -94,11 +100,11 @@ namespace Torch.Commands
             if (node != null)
             {
                 var command = node.Command;
-                var children = node.Subcommands.Select(x => x.Key);
+                var children = node.Subcommands.Where(e => e.Value.Command?.MinimumPromoteLevel <= Context.Player.PromoteLevel).Select(x => x.Key);
 
                 var sb = new StringBuilder();
 
-                if (command != null)
+                if (command != null && command.MinimumPromoteLevel <= Context.Player.PromoteLevel)
                 {
                     sb.AppendLine($"Syntax: {command.SyntaxHelp}");
                     sb.Append(command.HelpText);
@@ -114,7 +120,7 @@ namespace Torch.Commands
                 var sb = new StringBuilder();
                 foreach (var command in commandManager.Commands.WalkTree())
                 {
-                    if (command.IsCommand)
+                    if (command.IsCommand && command.Command.MinimumPromoteLevel <= Context.Player.PromoteLevel)
                         sb.AppendLine($"{command.Command.SyntaxHelp}\n    {command.Command.HelpText}");
                 }
 

From c7651c9949167aa9b1ddc943ca2fc220979b3020 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 29 Apr 2019 11:43:19 -0700
Subject: [PATCH 086/170] Fix NRE if help command is used from server

---
 Torch/Commands/TorchCommands.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index ced0505..accb888 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -57,7 +57,7 @@ namespace Torch.Commands
             if (node != null)
             {
                 var command = node.Command;
-                var children = node.Subcommands.Where(e => e.Value.Command?.MinimumPromoteLevel <= Context.Player.PromoteLevel).Select(x => x.Key);
+                var children = node.Subcommands.Where(e => Context.Player == null || e.Value.Command?.MinimumPromoteLevel <= Context.Player.PromoteLevel).Select(x => x.Key);
 
                 var sb = new StringBuilder();
 
@@ -104,7 +104,7 @@ namespace Torch.Commands
 
                 var sb = new StringBuilder();
 
-                if (command != null && command.MinimumPromoteLevel <= Context.Player.PromoteLevel)
+                if (command != null && (Context.Player == null || command.MinimumPromoteLevel <= Context.Player.PromoteLevel))
                 {
                     sb.AppendLine($"Syntax: {command.SyntaxHelp}");
                     sb.Append(command.HelpText);
@@ -120,7 +120,7 @@ namespace Torch.Commands
                 var sb = new StringBuilder();
                 foreach (var command in commandManager.Commands.WalkTree())
                 {
-                    if (command.IsCommand && command.Command.MinimumPromoteLevel <= Context.Player.PromoteLevel)
+                    if (command.IsCommand && (Context.Player == null || command.Command.MinimumPromoteLevel <= Context.Player.PromoteLevel))
                         sb.AppendLine($"{command.Command.SyntaxHelp}\n    {command.Command.HelpText}");
                 }
 

From 9813d6946a7b8d0c1544193c28b4c25bcaecb8fd Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Fri, 3 May 2019 21:39:56 -0400
Subject: [PATCH 087/170] Refactor plugin loading. All active plugins must now
 be listed in torch.cfg

---
 Torch.API/ITorchConfig.cs                |   6 +-
 Torch.Server/Initializer.cs              |   1 +
 Torch.Server/TorchConfig.cs              |   6 +-
 Torch.Server/Views/PluginBrowser.xaml.cs |   1 +
 Torch/CommandLine.cs                     |  20 ++++
 Torch/Plugins/PluginManager.cs           | 135 +++++++++++++----------
 6 files changed, 109 insertions(+), 60 deletions(-)

diff --git a/Torch.API/ITorchConfig.cs b/Torch.API/ITorchConfig.cs
index 308ee6b..70cc019 100644
--- a/Torch.API/ITorchConfig.cs
+++ b/Torch.API/ITorchConfig.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Torch
 {
@@ -12,7 +13,8 @@ namespace Torch
         string InstancePath { get; set; }
         bool NoGui { get; set; }
         bool NoUpdate { get; set; }
-        List<string> Plugins { get; set; }
+        List<Guid> Plugins { get; set; }
+        bool LocalPlugins { get; set; }
         bool RestartOnCrash { get; set; }
         bool ShouldUpdatePlugins { get; }
         bool ShouldUpdateTorch { get; }
diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index dd32e75..a003531 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -69,6 +69,7 @@ quit";
             _config = InitConfig();
             if (!_config.Parse(args))
                 return false;
+            _config.Save();
 
             if (!string.IsNullOrEmpty(_config.WaitForPID))
             {
diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index e051d1e..2c2d635 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -59,7 +59,11 @@ namespace Torch.Server
         public int TickTimeout { get; set; } = 60;
 
         /// <inheritdoc />
-        public List<string> Plugins { get; set; } = new List<string>();
+        [Arg("plugins", "Starts Torch with the given plugin GUIDs (space delimited).")]
+        public List<Guid> Plugins { get; set; } = new List<Guid>();
+
+        [Arg("localplugins", "Loads all pluhins from disk, ignores the plugins defined in config.")]
+        public bool LocalPlugins { get; set; }
 
         public string ChatName { get; set; } = "Server";
 
diff --git a/Torch.Server/Views/PluginBrowser.xaml.cs b/Torch.Server/Views/PluginBrowser.xaml.cs
index 50c0f56..32865e4 100644
--- a/Torch.Server/Views/PluginBrowser.xaml.cs
+++ b/Torch.Server/Views/PluginBrowser.xaml.cs
@@ -90,6 +90,7 @@ namespace Torch.Server.Views
         private void DownloadButton_OnClick(object sender, RoutedEventArgs e)
         {
             var item = CurrentItem;
+            TorchBase.Instance.Config.Plugins.Add(new Guid(item.ID));
             Task.Run(async () =>
                      {
                          var result = await PluginQuery.Instance.DownloadPlugin(item.ID);
diff --git a/Torch/CommandLine.cs b/Torch/CommandLine.cs
index 505f235..c851427 100644
--- a/Torch/CommandLine.cs
+++ b/Torch/CommandLine.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
+using NLog;
 
 namespace Torch
 {
@@ -12,6 +13,7 @@ namespace Torch
     {
         private readonly string _argPrefix;
         private readonly Dictionary<ArgAttribute, PropertyInfo> _args = new Dictionary<ArgAttribute, PropertyInfo>();
+        private readonly Logger _log = LogManager.GetCurrentClassLogger();
 
         protected CommandLine(string argPrefix = "-")
         {
@@ -89,6 +91,24 @@ namespace Torch
 
                             if (property.Value.PropertyType == typeof(string))
                                 property.Value.SetValue(this, args[++i]);
+
+                            if (property.Value.PropertyType == typeof(List<Guid>))
+                            {
+                                i++;
+                                var l = new List<Guid>(16);
+                                while (i < args.Length && !args[i].StartsWith(_argPrefix))
+                                {
+                                    if (Guid.TryParse(args[i], out Guid g))
+                                    {
+                                        l.Add(g);
+                                        _log.Info($"added plugin {g}");
+                                    }
+                                    else
+                                        _log.Warn($"Failed to parse GUID {args[i]}");
+                                    i++;
+                                }
+                                property.Value.SetValue(this, l);
+                            }
                         }
                     }
                     catch
diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 7b8ca16..17f15cc 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -96,6 +96,8 @@ namespace Torch.Managers
 
         public void LoadPlugins()
         {
+            bool firstLoad = Torch.Config.Plugins.Count == 0;
+            List<Guid> foundPlugins = new List<Guid>();
             if (Torch.Config.ShouldUpdatePlugins)
                 DownloadPluginUpdates();
 
@@ -106,22 +108,55 @@ namespace Torch.Managers
                 var path = Path.Combine(PluginDir, item);
                 var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
                 var manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
-                if (manifest == null)
+                if (!Torch.Config.LocalPlugins)
                 {
-                    _log.Warn($"Item '{item}' is missing a manifest, skipping.");
-                    continue;
+                    if (isZip && !Torch.Config.Plugins.Contains(manifest.Guid))
+                    {
+                        if (!firstLoad)
+                        {
+                            _log.Warn($"Plugin {manifest.Name} ({item}) exists in the plugin directory, but is not listed in torch.cfg. Skipping load!");
+                            return;
+                        }
+                        _log.Info($"First-time load: Plugin {manifest.Name} added to torch.cfg.");
+                        Torch.Config.Plugins.Add(manifest.Guid);
+                    }
+                if(isZip)
+                    foundPlugins.Add(manifest.Guid);
                 }
 
-                if (_plugins.ContainsKey(manifest.Guid))
-                {
-                    _log.Error($"The GUID provided by {manifest.Name} ({item}) is already in use by {_plugins[manifest.Guid].Name}");
-                    continue;
-                }
+                LoadPlugin(item);
+            }
 
-                if (isZip)
-                    LoadPluginFromZip(path);
-                else
-                    LoadPluginFromFolder(path);
+
+            if (!Torch.Config.LocalPlugins)
+            {
+                List<string> toLoad = new List<string>();
+
+                //This is actually the easiest way to batch process async tasks and block until completion (????)
+                Task.WhenAll(Torch.Config.Plugins.Select(async g =>
+                                                         {
+                                                             try
+                                                             {
+                                                                 if (foundPlugins.Contains(g))
+                                                                 {
+                                                                     return;
+                                                                 }
+                                                                 var item = await PluginQuery.Instance.QueryOne(g);
+                                                                 string s = Path.Combine(PluginDir, item.Name + ".zip");
+                                                                 await PluginQuery.Instance.DownloadPlugin(item, s);
+                                                                 lock (toLoad)
+                                                                     toLoad.Add(s);
+                                                             }
+                                                             catch (Exception ex)
+                                                             {
+                                                                 _log.Error(ex);
+                                                             }
+                                                         }));
+
+                foreach (var l in toLoad)
+                {
+                    LoadPlugin(l);
+                }
             }
 
             foreach (var plugin in _plugins.Values)
@@ -132,11 +167,34 @@ namespace Torch.Managers
             PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
         }
 
+        private void LoadPlugin(string item)
+        {
+            var path = Path.Combine(PluginDir, item);
+            var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
+            var manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
+            if (manifest == null)
+            {
+                _log.Warn($"Item '{item}' is missing a manifest, skipping.");
+                return;
+            }
+
+            if (_plugins.ContainsKey(manifest.Guid))
+            {
+                _log.Error($"The GUID provided by {manifest.Name} ({item}) is already in use by {_plugins[manifest.Guid].Name}");
+                return;
+            }
+
+            if (isZip)
+                LoadPluginFromZip(path);
+            else
+                LoadPluginFromFolder(path);
+        }
+
         private void DownloadPluginUpdates()
         {
             _log.Info("Checking for plugin updates...");
             var count = 0;
-            var pluginItems = Directory.EnumerateFiles(PluginDir, "*.zip").Union(Directory.EnumerateDirectories(PluginDir));
+            var pluginItems = Directory.EnumerateFiles(PluginDir, "*.zip");
             Parallel.ForEach(pluginItems, async item =>
             {
                 PluginManifest manifest = null;
@@ -144,7 +202,12 @@ namespace Torch.Managers
                 {
                     var path = Path.Combine(PluginDir, item);
                     var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
-                    manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
+                    if (!isZip)
+                    {
+                        _log.Warn($"Unzipped plugins cannot be auto-updated. Skipping plugin {item}");
+                        return;
+                    }
+                    manifest = GetManifestFromZip(path);
                     if (manifest == null)
                     {
                         _log.Warn($"Item '{item}' is missing a manifest, skipping update check.");
@@ -187,49 +250,7 @@ namespace Torch.Managers
 
             _log.Info($"Updated {count} plugins.");
         }
-
-        private async Task<Tuple<Version, string>> GetLatestArchiveAsync(string repository)
-        {
-            try
-            {
-                //var split = repository.Split('/');
-                //var latest = await _gitClient.Repository.Release.GetLatest(split[0], split[1]).ConfigureAwait(false);
-                //if (!latest.TagName.TryExtractVersion(out Version latestVersion))
-                //{
-                //    _log.Error($"Unable to parse version tag for the latest release of '{repository}.'");
-                //}
-
-                //var zipAsset = latest.Assets.FirstOrDefault(x => x.Name.Contains(".zip", StringComparison.CurrentCultureIgnoreCase));
-                //if (zipAsset == null)
-                //{
-                //    _log.Error($"Unable to find archive for the latest release of '{repository}.'");
-                //}
-
-                //return new Tuple<Version, string>(latestVersion, zipAsset?.BrowserDownloadUrl);
-                return null;
-            }
-            catch (Exception e)
-            {
-                _log.Error($"Unable to get the latest release of '{repository}.'");
-                _log.Error(e);
-                return default(Tuple<Version, string>);
-            }
-        }
-
-        private Task UpdatePluginAsync(string localPath, string downloadUrl)
-        {
-            if (File.Exists(localPath))
-                File.Delete(localPath);
-
-            if (Directory.Exists(localPath))
-                Directory.Delete(localPath, true);
-
-            var fileName = downloadUrl.Split('/').Last();
-            var filePath = Path.Combine(PluginDir, fileName);
-
-            return new WebClient().DownloadFileTaskAsync(downloadUrl, filePath);
-        }
-
+        
         private void LoadPluginFromFolder(string directory)
         {
             var assemblies = new List<Assembly>();

From 53ae9bc42d47e52896a5f20eface227d606df7a6 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 4 May 2019 18:40:17 -0400
Subject: [PATCH 088/170] Remove debug code

---
 Torch.Server/Initializer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index a003531..dd32e75 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -69,7 +69,6 @@ quit";
             _config = InitConfig();
             if (!_config.Parse(args))
                 return false;
-            _config.Save();
 
             if (!string.IsNullOrEmpty(_config.WaitForPID))
             {

From 6cbcbc6f3f269dcfb033704f322f5a897d973845 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 4 May 2019 18:42:27 -0400
Subject: [PATCH 089/170] Save config on backwards-compatible load

---
 Torch/Plugins/PluginManager.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 17f15cc..395a5c6 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -126,8 +126,9 @@ namespace Torch.Managers
 
                 LoadPlugin(item);
             }
-
-
+            if (!Torch.Config.LocalPlugins && firstLoad)
+                Torch.Config.Save();
+            
             if (!Torch.Config.LocalPlugins)
             {
                 List<string> toLoad = new List<string>();

From 7f720a175347fc01636625ae46190cd7acbd92d7 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 6 May 2019 19:34:12 -0400
Subject: [PATCH 090/170] Implement user nlog configs, update updater to ignore
 user config. Resolves #309

Also changes FilesystemManager to use system temp directory when appropriate. (reduces clutter on disk)
---
 NLog-user.config                    | 21 +++++++++++++++++++++
 NLog.config                         |  3 +++
 Torch/Managers/FilesystemManager.cs | 17 ++++++++++++++---
 Torch/Managers/UpdateManager.cs     |  5 +++--
 4 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 NLog-user.config

diff --git a/NLog-user.config b/NLog-user.config
new file mode 100644
index 0000000..9b10655
--- /dev/null
+++ b/NLog-user.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <variable name="logStamp" value="${time} ${pad:padding=-8:inner=[${level:uppercase=true}]}" />
+  <variable name="logContent" value="${message:withException=true}"/>
+
+  <targets async="true">
+    <target xsi:type="Null" name="null" formatMessage="false"  />
+    <target xsi:type="File" name="keen" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Keen-${shortdate}.log" />
+    <target xsi:type="File" name="main" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Torch-${shortdate}.log" />
+    <target xsi:type="File" name="chat" layout="${longdate} ${message}" fileName="Logs\Chat.log" />
+    <target xsi:type="ColoredConsole" name="console" layout="${var:logStamp} ${logger:shortName=true}: ${var:logContent}" />
+    <target xsi:type="File" name="patch" layout="${var:logContent}" fileName="Logs\patch.log"/>
+    <target xsi:type="FlowDocument" name="wpf" layout="${var:logStamp} ${logger:shortName=true}: ${var:logContent}" />
+  </targets>
+
+  <rules>
+    <!-- Define custom rules below. The example line will pipe all debug output to log file, in-UI console, and independent console. -->
+    <!--<logger name="*" minlevel="Debug" writeTo="main, console, wpf" />-->
+  </rules>
+</nlog>
\ No newline at end of file
diff --git a/NLog.config b/NLog.config
index 2559bd8..350ac1f 100644
--- a/NLog.config
+++ b/NLog.config
@@ -4,6 +4,8 @@
   <variable name="logStamp" value="${time} ${pad:padding=-8:inner=[${level:uppercase=true}]}" />
   <variable name="logContent" value="${message:withException=true}"/>
 
+  <include file="NLog-user.config"/>
+  
   <targets async="true">
     <target xsi:type="Null" name="null" formatMessage="false"  />
     <target xsi:type="File" name="keen" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Keen-${shortdate}.log" />
@@ -15,6 +17,7 @@
   </targets>
 
   <rules>
+    <!-- Do not define custom rules here. Use NLog-user.config -->
     <logger name="Keen" minlevel="Warn" writeTo="main"/>
     <logger name="Keen" minlevel="Info" writeTo="console, wpf"/>
     <logger name="Keen" minlevel="Debug" writeTo="keen" final="true" />
diff --git a/Torch/Managers/FilesystemManager.cs b/Torch/Managers/FilesystemManager.cs
index 254c9a0..b51992e 100644
--- a/Torch/Managers/FilesystemManager.cs
+++ b/Torch/Managers/FilesystemManager.cs
@@ -4,12 +4,14 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using NLog;
 using Torch.API;
 
 namespace Torch.Managers
 {
     public class FilesystemManager : Manager
     {
+        private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         /// <summary>
         /// Temporary directory for Torch that is cleared every time the program is started.
         /// </summary>
@@ -22,11 +24,20 @@ namespace Torch.Managers
 
         public FilesystemManager(ITorchBase torchInstance) : base(torchInstance)
         {
+            var tmp = Path.Combine(Path.GetTempPath(), "Torch");
             var torch = new FileInfo(typeof(FilesystemManager).Assembly.Location).Directory.FullName;
-            TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;
-            TorchDirectory = torch;
+            if (Path.GetPathRoot(tmp) == Path.GetPathRoot(torch))
+            {
+                TempDirectory = tmp;
+            }
+            else
+            {
+                TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;
+                TorchDirectory = torch;
 
-            ClearTemp();
+                _log.Info($"Clearing tmp directory at {TempDirectory}");
+                ClearTemp();
+            }
         }
 
         private void ClearTemp()
diff --git a/Torch/Managers/UpdateManager.cs b/Torch/Managers/UpdateManager.cs
index de2e73c..700de86 100644
--- a/Torch/Managers/UpdateManager.cs
+++ b/Torch/Managers/UpdateManager.cs
@@ -55,8 +55,6 @@ namespace Torch.Managers
                     _log.Info("Failed to fetch latest version.");
                     return;
                 }
-
-                _log.Info($"Clearing tmp directory at {_fsManager.TempDirectory}");
                 
                 if (job.Version > Torch.TorchVersion)
                 {
@@ -90,6 +88,9 @@ namespace Torch.Managers
             {
                 foreach (var file in zip.Entries)
                 {
+                    if(file.Name == "NLog-user.config" && File.Exists(Path.Combine(extractPath, file.FullName)))
+                        continue;
+
                     _log.Debug($"Unzipping {file.FullName}");
                     var targetFile = Path.Combine(extractPath, file.FullName);
                     _fsManager.SoftDelete(extractPath, file.FullName);

From b0c1ccf9b4f3bc40fbf1c9ec2580262dd6d6abd2 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 6 May 2019 18:01:40 -0700
Subject: [PATCH 091/170] Add NLog-user.cfg to build output

---
 Torch.Server/Torch.Server.csproj | 1 +
 Torch.sln                        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 506686b..01efc70 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -506,5 +506,6 @@
   <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)"</PostBuildEvent>
+    <PostBuildEvent>copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Torch.sln b/Torch.sln
index f011ab3..2cca71d 100644
--- a/Torch.sln
+++ b/Torch.sln
@@ -14,6 +14,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7AD02A71-1D4C-48F9-A8C1-789A5512424F}"
 	ProjectSection(SolutionItems) = preProject
 		NLog.config = NLog.config
+		NLog-user.config = NLog-user.config
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Torch.Tests", "Torch.Tests\Torch.Tests.csproj", "{C3C8B671-6AD1-44AA-A8DA-E0C0DC0FEDF5}"

From 6f65b54883e53408ed94338960abd7df038ec218 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 6 May 2019 23:54:02 -0700
Subject: [PATCH 092/170] stop

---
 Torch.Server/Torch.Server.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 01efc70..57b3dc8 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -505,7 +505,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)"</PostBuildEvent>
-    <PostBuildEvent>copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
+    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From 91ceb0aa22d8641b104f73cb8d66de06972c2a57 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 8 May 2019 18:34:09 -0400
Subject: [PATCH 093/170] Implement ScrollContainerProperty to allow plugins to
 disable the default scrollviewer wrapper on their controls

---
 Torch.Server/Torch.Server.csproj          |  1 +
 Torch.Server/Views/Extensions.cs          | 24 +++++++++++++++++++++++
 Torch.Server/Views/PluginsControl.xaml.cs |  4 +++-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 Torch.Server/Views/Extensions.cs

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 84a1c64..f89e0b4 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -272,6 +272,7 @@
     <Compile Include="Views\Entities\CharacterView.xaml.cs">
       <DependentUpon>CharacterView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Extensions.cs" />
     <Compile Include="Views\ModListControl.xaml.cs">
       <DependentUpon>ModListControl.xaml</DependentUpon>
     </Compile>
diff --git a/Torch.Server/Views/Extensions.cs b/Torch.Server/Views/Extensions.cs
new file mode 100644
index 0000000..d9aea82
--- /dev/null
+++ b/Torch.Server/Views/Extensions.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Torch.Server.Views
+{
+    public static class Extensions
+    {
+        public static readonly DependencyProperty ScrollContainerProperty = DependencyProperty.RegisterAttached("ScrollContainer", typeof(bool), typeof(Extensions), new PropertyMetadata(true));
+
+        public static bool GetScrollContainer(this UIElement ui)
+        {
+            return (bool)ui.GetValue(ScrollContainerProperty);
+        }
+
+        public static void SetScrollContainer(this UIElement ui, bool value)
+        {
+            ui.SetValue(ScrollContainerProperty, value);
+        }
+    }
+}
diff --git a/Torch.Server/Views/PluginsControl.xaml.cs b/Torch.Server/Views/PluginsControl.xaml.cs
index 8e522c2..dbdc623 100644
--- a/Torch.Server/Views/PluginsControl.xaml.cs
+++ b/Torch.Server/Views/PluginsControl.xaml.cs
@@ -41,7 +41,9 @@ namespace Torch.Server.Views
         {
             if (propertyChangedEventArgs.PropertyName == nameof(PluginManagerViewModel.SelectedPlugin))
             {
-                if (((PluginManagerViewModel)DataContext).SelectedPlugin.Control is PropertyGrid)
+                var plugin = ((PluginManagerViewModel)DataContext).SelectedPlugin;
+               
+                if (plugin.Control is PropertyGrid || !plugin.Control.GetScrollContainer())
                     PScroll.VerticalScrollBarVisibility = ScrollBarVisibility.Disabled;
                 else
                     PScroll.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;

From 7036a4da8108852c511243eec48fe84226e24fbf Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 2 Jun 2019 11:15:16 -0400
Subject: [PATCH 094/170] Enable deleting characters when there is no
 controller attached. Increase !save timeout to 5 mintues

---
 .../ViewModels/Entities/CharacterViewModel.cs      | 14 ++++++++++++--
 .../ViewModels/Entities/EntityViewModel.cs         |  2 +-
 Torch/Commands/TorchCommands.cs                    |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Torch.Server/ViewModels/Entities/CharacterViewModel.cs b/Torch.Server/ViewModels/Entities/CharacterViewModel.cs
index e111666..fe55549 100644
--- a/Torch.Server/ViewModels/Entities/CharacterViewModel.cs
+++ b/Torch.Server/ViewModels/Entities/CharacterViewModel.cs
@@ -4,14 +4,24 @@ namespace Torch.Server.ViewModels.Entities
 {
     public class CharacterViewModel : EntityViewModel
     {
+        private MyCharacter _character;
         public CharacterViewModel(MyCharacter character, EntityTreeViewModel tree) : base(character, tree)
         {
-            character.ControllerInfo.ControlAcquired += (x) => { OnPropertyChanged(nameof(Name)); };
-            character.ControllerInfo.ControlReleased += (x) => { OnPropertyChanged(nameof(Name)); };
+            _character = character;
+            character.ControllerInfo.ControlAcquired += ControllerInfo_ControlAcquired;
+            character.ControllerInfo.ControlReleased += ControllerInfo_ControlAcquired;
+        }
+
+        private void ControllerInfo_ControlAcquired(Sandbox.Game.World.MyEntityController obj)
+        {
+            OnPropertyChanged(nameof(Name));
+            OnPropertyChanged(nameof(CanDelete));
         }
 
         public CharacterViewModel()
         {
         }
+
+        public override bool CanDelete => _character.ControllerInfo?.Controller?.Player == null;
     }
 }
diff --git a/Torch.Server/ViewModels/Entities/EntityViewModel.cs b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
index c1f7d0d..3a37720 100644
--- a/Torch.Server/ViewModels/Entities/EntityViewModel.cs
+++ b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
@@ -136,7 +136,7 @@ namespace Torch.Server.ViewModels.Entities
 
         public virtual bool CanStop => Entity.Physics?.Enabled ?? false;
 
-        public virtual bool CanDelete => !(Entity is IMyCharacter);
+        public virtual bool CanDelete => true;
 
         public virtual void Delete()
         {
diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index accb888..001e184 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -261,7 +261,7 @@ namespace Torch.Commands
 
         private Task DoSave()
         {
-            Task<GameSaveResult> task = Context.Torch.Save(60 * 1000, true);
+            Task<GameSaveResult> task = Context.Torch.Save(300 * 1000, true);
             if (task == null)
             {
                 Context.Respond("Save failed, a save is already in progress");

From bbaf1384baea92984fd5102c743de4b20910bd2e Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 3 Jun 2019 00:07:59 -0400
Subject: [PATCH 095/170] Allow property grid description field to resize

---
 Torch/Views/PropertyGrid.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Views/PropertyGrid.xaml b/Torch/Views/PropertyGrid.xaml
index 90ef44d..7e58592 100644
--- a/Torch/Views/PropertyGrid.xaml
+++ b/Torch/Views/PropertyGrid.xaml
@@ -9,7 +9,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition/>
-            <RowDefinition Height="52px"/>
+            <RowDefinition Height="Auto" MinHeight="52"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>

From ebef1edc09257fe8eebff43fb51a6a50831250c4 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 3 Jun 2019 16:16:25 -0400
Subject: [PATCH 096/170] Plugin loading, init, and update now actually catch
 and report errors.

---
 Torch/Plugins/PluginManager.cs | 60 ++++++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 395a5c6..c867563 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -7,6 +7,7 @@ using System.IO.Compression;
 using System.Linq;
 using System.Net;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 using NLog;
@@ -50,7 +51,16 @@ namespace Torch.Managers
         public void UpdatePlugins()
         {
             foreach (var plugin in _plugins.Values)
-                plugin.Update();
+            {
+                try
+                {
+                    plugin.Update();
+                }
+                catch (Exception ex)
+                {
+                    _log.Error(ex, $"Plugin {plugin.Name} threw an exception during update!");
+                }
+            }
         }
 
         /// <inheritdoc/>
@@ -60,20 +70,22 @@ namespace Torch.Managers
             _sessionManager.SessionStateChanged += SessionManagerOnSessionStateChanged;
         }
 
+        private CommandManager _mgr;
+
         private void SessionManagerOnSessionStateChanged(ITorchSession session, TorchSessionState newState)
         {
-            var mgr = session.Managers.GetManager<CommandManager>();
-            if (mgr == null)
+            _mgr = session.Managers.GetManager<CommandManager>();
+            if (_mgr == null)
                 return;
             switch (newState)
             {
                 case TorchSessionState.Loaded:
                     foreach (ITorchPlugin plugin in _plugins.Values)
-                        mgr.RegisterPluginCommands(plugin);
+                        _mgr.RegisterPluginCommands(plugin);
                     return;
                 case TorchSessionState.Unloading:
                     foreach (ITorchPlugin plugin in _plugins.Values)
-                        mgr.UnregisterPluginCommands(plugin);
+                        _mgr.UnregisterPluginCommands(plugin);
                     return;
                 case TorchSessionState.Loading:
                 case TorchSessionState.Unloaded:
@@ -160,10 +172,29 @@ namespace Torch.Managers
                 }
             }
 
+            //just reuse the list from earlier
+            foundPlugins.Clear();
             foreach (var plugin in _plugins.Values)
             {
-                plugin.Init(Torch);
+                try
+                {
+                    plugin.Init(Torch);
+                }
+                catch (Exception e)
+                {
+                    _log.Error(e, $"Plugin {plugin.Name} threw an exception during init! Unloading plugin!");
+                    foundPlugins.Add(plugin.Id);
+                }
             }
+
+            foreach (var id in foundPlugins)
+            {
+                var p = _plugins[id];
+                _plugins.Remove(id);
+                _mgr.UnregisterPluginCommands(p);
+                p.Dispose();
+            }
+
             _log.Info($"Loaded {_plugins.Count} plugins.");
             PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
         }
@@ -196,7 +227,7 @@ namespace Torch.Managers
             _log.Info("Checking for plugin updates...");
             var count = 0;
             var pluginItems = Directory.EnumerateFiles(PluginDir, "*.zip");
-            Parallel.ForEach(pluginItems, async item =>
+            Task.WhenAll(pluginItems.Select(async item =>
             {
                 PluginManifest manifest = null;
                 try
@@ -240,14 +271,14 @@ namespace Torch.Managers
 
                     _log.Info($"Updating plugin '{manifest.Name}' from {currentVersion} to {newVersion}.");
                     await PluginQuery.Instance.DownloadPlugin(latest, path);
-                    count++;
+                    Interlocked.Increment(ref count);
                 }
                 catch (Exception e)
                 {
                     _log.Warn($"An error occurred updating the plugin {manifest?.Name ?? item}.");
                     _log.Warn(e);
                 }
-            });
+            }));
 
             _log.Info($"Updated {count} plugins.");
         }
@@ -445,8 +476,17 @@ namespace Torch.Managers
             }
 
             _log.Info($"Loading plugin '{manifest.Name}' ({manifest.Version})");
-            var plugin = (TorchPluginBase)Activator.CreateInstance(pluginType);
 
+            TorchPluginBase plugin;
+            try
+            {
+                plugin = (TorchPluginBase)Activator.CreateInstance(pluginType);
+            }
+            catch (Exception ex)
+            {
+                _log.Error(ex, $"Plugin {manifest.Name} threw an exception during instantiation! Not loading!");
+                return;
+            }
             plugin.Manifest = manifest;
             plugin.StoragePath = Torch.Config.InstancePath;
             plugin.Torch = Torch;

From 121846eeaeaa202f22b7de104d9c861cb042524c Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 3 Jun 2019 19:56:29 -0400
Subject: [PATCH 097/170] Fix rare crash in entity view sorting

---
 Torch.Server/ViewModels/Entities/EntityViewModel.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Torch.Server/ViewModels/Entities/EntityViewModel.cs b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
index 3a37720..0f52e40 100644
--- a/Torch.Server/ViewModels/Entities/EntityViewModel.cs
+++ b/Torch.Server/ViewModels/Entities/EntityViewModel.cs
@@ -85,9 +85,20 @@ namespace Torch.Server.ViewModels.Entities
 
         public virtual int CompareToSort(EntityViewModel other, EntityTreeViewModel.SortEnum sort)
         {
+            if (other == null)
+                return -1;
+
             switch (sort)
             {
                 case EntityTreeViewModel.SortEnum.Name:
+                    if (Name == null)
+                    {
+                        if (other.Name == null)
+                            return 0;
+                        return 1;
+                    }
+                    if (other.Name == null)
+                        return -1;
                     return string.Compare(Name, other.Name, StringComparison.InvariantCultureIgnoreCase);
                 case EntityTreeViewModel.SortEnum.Size:
                     return Entity.WorldVolume.Radius.CompareTo(other.Entity.WorldVolume.Radius);

From d97a6a52a48568164a34ba69df01eaa7544fa880 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 5 Jun 2019 13:56:08 -0400
Subject: [PATCH 098/170] Handle xml errors in Persistent.Load gracefully

---
 Torch/Persistent.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Torch/Persistent.cs b/Torch/Persistent.cs
index cddc182..52b7a33 100644
--- a/Torch/Persistent.cs
+++ b/Torch/Persistent.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
+using NLog;
 
 namespace Torch
 {
@@ -17,6 +18,7 @@ namespace Torch
     /// <typeparam name="T">Data class type</typeparam>
     public sealed class Persistent<T> : IDisposable where T : new()
     {
+        private static Logger _log = LogManager.GetCurrentClassLogger();
         public string Path { get; set; }
         private T _data;
         public T Data
@@ -78,10 +80,18 @@ namespace Torch
 
             if (File.Exists(path))
             {
-                var ser = new XmlSerializer(typeof(T));
-                using (var f = File.OpenText(path))
+                try
                 {
-                    config = new Persistent<T>(path, (T)ser.Deserialize(f));
+                    var ser = new XmlSerializer(typeof(T));
+                    using (var f = File.OpenText(path))
+                    {
+                        config = new Persistent<T>(path, (T)ser.Deserialize(f));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _log.Error(ex);
+                    config = null;
                 }
             }
             if (config == null)

From a6fa1120507df6e9e79d90ca70e7083674b56b04 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 5 Jun 2019 13:56:28 -0400
Subject: [PATCH 099/170] Fix random MT error in SortedView

---
 Torch/Collections/SortedView.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Torch/Collections/SortedView.cs b/Torch/Collections/SortedView.cs
index bfa5953..db1476f 100644
--- a/Torch/Collections/SortedView.cs
+++ b/Torch/Collections/SortedView.cs
@@ -107,7 +107,10 @@ namespace Torch.Collections
         public void Refresh()
         {
             _store.Clear();
-            _store.AddRange(_backing);
+            //_store.AddRange(_backing);
+            _store.EnsureCapacity(_backing.Count);
+            foreach (var e in _backing)
+                _store.Add(e);
             Sort();
         }
 

From 3925c34610a727d64c3bd481ea186c316f6a8b94 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 6 Jun 2019 08:28:23 -0400
Subject: [PATCH 100/170] Remove return statement in plugin loader because I'm
 stupid

---
 Torch/Plugins/PluginManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index c867563..fb2ce18 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -127,7 +127,7 @@ namespace Torch.Managers
                         if (!firstLoad)
                         {
                             _log.Warn($"Plugin {manifest.Name} ({item}) exists in the plugin directory, but is not listed in torch.cfg. Skipping load!");
-                            return;
+                            continue;
                         }
                         _log.Info($"First-time load: Plugin {manifest.Name} added to torch.cfg.");
                         Torch.Config.Plugins.Add(manifest.Guid);

From ed298cdfb065bd93ff5ac25867e39b1b88a4df29 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 6 Jun 2019 15:11:39 -0400
Subject: [PATCH 101/170] Fix for update

---
 Torch.Server/Initializer.cs | 5 +++--
 Torch/Torch.csproj          | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index dd32e75..78167b1 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -230,8 +230,9 @@ quit";
             {
                 string path = Path.Combine(MyFileSystem.UserDataPath, "Minidump.dmp");
                 Log.Info($"Generating minidump at {path}");
-                MyMiniDump.Options options = MyMiniDump.Options.WithProcessThreadData | MyMiniDump.Options.WithThreadInfo;
-                MyMiniDump.Write(path, options, MyMiniDump.ExceptionInfo.Present);
+                Log.Error("Keen broke the minidump, sorry.");
+                //MyMiniDump.Options options = MyMiniDump.Options.WithProcessThreadData | MyMiniDump.Options.WithThreadInfo;
+                //MyMiniDump.Write(path, options, MyMiniDump.ExceptionInfo.Present);
             }
             LogManager.Flush();
             if (_config.RestartOnCrash)
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 814c916..b1ab8fe 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -65,6 +65,10 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\protobuf-net.dll</HintPath>
+    </Reference>
     <Reference Include="Sandbox.Common">
       <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
       <Private>False</Private>

From 0a852c49e8e8a435ea0f417feb5ca099812c0dc6 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 6 Jun 2019 15:35:54 -0400
Subject: [PATCH 102/170] Copy missing dll

---
 Torch.Server/Initializer.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 78167b1..f9af400 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -65,6 +65,12 @@ quit";
             
             if (!File.Exists(apiTarget))
                 File.Copy(apiSource, apiTarget);
+
+            var protoSource = Path.Combine(basePath, "DedicatedServer64", "protobuf-net.dll");
+            var protoTarget = Path.Combine(basePath, "protobuf-net.dll");
+
+            if(!File.Exists(protoTarget))
+                File.Copy(protoSource, protoTarget);
             
             _config = InitConfig();
             if (!_config.Parse(args))

From 19995eba1ac5e0b5c14b8f0ffa28adc1788e9b09 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 6 Jun 2019 15:54:05 -0400
Subject: [PATCH 103/170] Update protobuf to 2.4

---
 Torch.Client.Tests/Torch.Client.Tests.csproj |  1 +
 Torch.Client.Tests/app.config                | 11 +++++++++++
 Torch.Client/Torch.Client.csproj             |  1 +
 Torch.Client/TorchClientConfig.cs            |  2 ++
 Torch.Client/app.config                      | 11 +++++++++++
 Torch.Server.Tests/Torch.Server.Tests.csproj |  1 +
 Torch.Server.Tests/app.config                | 11 +++++++++++
 Torch.Server/Initializer.cs                  |  6 ------
 Torch.Server/Torch.Server.csproj             |  8 ++++++--
 Torch.Server/app.config                      | 11 +++++++++++
 Torch.Server/packages.config                 |  2 +-
 Torch.Tests/Torch.Tests.csproj               |  1 +
 Torch.Tests/app.config                       | 11 +++++++++++
 Torch/Torch.csproj                           |  9 ++++++---
 Torch/app.config                             | 11 +++++++++++
 Torch/packages.config                        |  2 +-
 16 files changed, 86 insertions(+), 13 deletions(-)
 create mode 100644 Torch.Client.Tests/app.config
 create mode 100644 Torch.Client/app.config
 create mode 100644 Torch.Server.Tests/app.config
 create mode 100644 Torch.Server/app.config
 create mode 100644 Torch.Tests/app.config
 create mode 100644 Torch/app.config

diff --git a/Torch.Client.Tests/Torch.Client.Tests.csproj b/Torch.Client.Tests/Torch.Client.Tests.csproj
index f57c10c..c1dc43a 100644
--- a/Torch.Client.Tests/Torch.Client.Tests.csproj
+++ b/Torch.Client.Tests/Torch.Client.Tests.csproj
@@ -86,6 +86,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch.Client.Tests/app.config b/Torch.Client.Tests/app.config
new file mode 100644
index 0000000..a73892d
--- /dev/null
+++ b/Torch.Client.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Torch.Client/Torch.Client.csproj b/Torch.Client/Torch.Client.csproj
index 82a74fa..1ecb37a 100644
--- a/Torch.Client/Torch.Client.csproj
+++ b/Torch.Client/Torch.Client.csproj
@@ -147,6 +147,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Torch.Client/TorchClientConfig.cs b/Torch.Client/TorchClientConfig.cs
index fda35e0..ba6e5b3 100644
--- a/Torch.Client/TorchClientConfig.cs
+++ b/Torch.Client/TorchClientConfig.cs
@@ -23,6 +23,8 @@ namespace Torch.Client
         public bool NoGui { get; set; } = false;
         public bool RestartOnCrash { get; set; } = false;
         public string WaitForPID { get; set; } = null;
+        public string ChatName { get; set; }
+        public string ChatColor { get; set; }
 
         public bool Save(string path = null)
         {
diff --git a/Torch.Client/app.config b/Torch.Client/app.config
new file mode 100644
index 0000000..a73892d
--- /dev/null
+++ b/Torch.Client/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Torch.Server.Tests/Torch.Server.Tests.csproj b/Torch.Server.Tests/Torch.Server.Tests.csproj
index 157bedf..cf95a9a 100644
--- a/Torch.Server.Tests/Torch.Server.Tests.csproj
+++ b/Torch.Server.Tests/Torch.Server.Tests.csproj
@@ -92,6 +92,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch.Server.Tests/app.config b/Torch.Server.Tests/app.config
new file mode 100644
index 0000000..a73892d
--- /dev/null
+++ b/Torch.Server.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index f9af400..78167b1 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -65,12 +65,6 @@ quit";
             
             if (!File.Exists(apiTarget))
                 File.Copy(apiSource, apiTarget);
-
-            var protoSource = Path.Combine(basePath, "DedicatedServer64", "protobuf-net.dll");
-            var protoTarget = Path.Combine(basePath, "protobuf-net.dll");
-
-            if(!File.Exists(protoTarget))
-                File.Copy(protoSource, protoTarget);
             
             _config = InitConfig();
             if (!_config.Parse(args))
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 57b3dc8..02606b0 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -93,8 +93,8 @@
       <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <HintPath>..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll</HintPath>
+    <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -131,16 +131,19 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security.AccessControl, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Principal.Windows, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
     </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -362,6 +365,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Torch.Server/app.config b/Torch.Server/app.config
new file mode 100644
index 0000000..a73892d
--- /dev/null
+++ b/Torch.Server/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config
index 11d6e4d..8429d70 100644
--- a/Torch.Server/packages.config
+++ b/Torch.Server/packages.config
@@ -7,7 +7,7 @@
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
-  <package id="protobuf-net" version="2.1.0" targetFramework="net461" />
+  <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
   <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
   <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
diff --git a/Torch.Tests/Torch.Tests.csproj b/Torch.Tests/Torch.Tests.csproj
index 50977de..f4cf215 100644
--- a/Torch.Tests/Torch.Tests.csproj
+++ b/Torch.Tests/Torch.Tests.csproj
@@ -82,6 +82,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch.Tests/app.config b/Torch.Tests/app.config
new file mode 100644
index 0000000..a73892d
--- /dev/null
+++ b/Torch.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index b1ab8fe..f499196 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -65,9 +65,8 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\protobuf-net.dll</HintPath>
+    <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="Sandbox.Common">
       <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
@@ -101,15 +100,18 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security.AccessControl, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Principal.Windows, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
     </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
@@ -320,6 +322,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch/app.config b/Torch/app.config
new file mode 100644
index 0000000..a73892d
--- /dev/null
+++ b/Torch/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Torch/packages.config b/Torch/packages.config
index e77c03c..702f58c 100644
--- a/Torch/packages.config
+++ b/Torch/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net461" />
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
-  <package id="protobuf-net" version="2.1.0" targetFramework="net461" />
+  <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
   <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
   <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />

From 5d19cc7cf13a121eac1f993de6767d6dd3406bbb Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 6 Jun 2019 15:48:29 -0700
Subject: [PATCH 104/170] I think I fixed it

---
 Torch.Server/Torch.Server.csproj |  8 ++++++--
 Torch.Server/app.config          | 11 -----------
 Torch.Server/packages.config     |  1 +
 Torch/Torch.csproj               |  8 ++++++++
 Torch/VRageGame.cs               |  2 ++
 Torch/packages.config            |  1 +
 6 files changed, 18 insertions(+), 13 deletions(-)
 delete mode 100644 Torch.Server/app.config

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 02606b0..c38317f 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -86,6 +86,7 @@
     <Reference Include="Microsoft.Win32.Registry, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
     </Reference>
+    <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -130,6 +131,10 @@
       <HintPath>..\GameBinaries\Steamworks.NET.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
@@ -365,7 +370,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -509,6 +513,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
+    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)" &amp; del "$(TargetDir)System.*"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Torch.Server/app.config b/Torch.Server/app.config
deleted file mode 100644
index a73892d..0000000
--- a/Torch.Server/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config
index 8429d70..24c621a 100644
--- a/Torch.Server/packages.config
+++ b/Torch.Server/packages.config
@@ -9,6 +9,7 @@
   <package id="NLog" version="4.4.12" targetFramework="net461" />
   <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
   <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
+  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
   <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index f499196..ca60249 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -37,6 +37,7 @@
   </PropertyGroup>
   <!-- I don't know why this needs to exist -->
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="netstandard" />
   </ItemGroup>
   <ItemGroup>
@@ -99,6 +100,10 @@
       <HintPath>..\GameBinaries\Steamworks.NET.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -163,6 +168,9 @@
       <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\bin\x64\Release\DedicatedServer64\VRage.Platform.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="VRage.Render">
       <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
       <Private>False</Private>
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index 1065f49..b3460a4 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -31,6 +31,7 @@ using VRage.Game.ObjectBuilder;
 using VRage.Game.SessionComponents;
 using VRage.GameServices;
 using VRage.Network;
+using VRage.Platform.Windows;
 using VRage.Plugins;
 using VRage.Steam;
 using VRage.Utils;
@@ -156,6 +157,7 @@ namespace Torch
             _tweakGameSettings();
 
             MyFileSystem.Reset();
+            MyVRageWindows.Init(MySandboxGame.Log, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated"));
             MyInitializer.InvokeBeforeRun(_appSteamId, _appName, _userDataPath);
             // MyInitializer.InitCheckSum();
 
diff --git a/Torch/packages.config b/Torch/packages.config
index 702f58c..7f9ae61 100644
--- a/Torch/packages.config
+++ b/Torch/packages.config
@@ -7,6 +7,7 @@
   <package id="NLog" version="4.4.12" targetFramework="net461" />
   <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
   <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
+  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
   <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file

From 3e5b29c84db18f6ce514e68ef842c6b545b076f2 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 6 Jun 2019 17:07:25 -0700
Subject: [PATCH 105/170] I think I actually fixed it

---
 Torch.Server/Program.cs          |  9 +++++++++
 Torch.Server/Torch.Server.csproj |  3 +++
 Torch.Server/TorchServer.cs      | 14 ++++++++------
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index 0bc4d7e..aca5ab4 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.ServiceProcess;
@@ -21,12 +22,20 @@ namespace Torch.Server
         [STAThread]
         public static void Main(string[] args)
         {
+            
+            
             Target.Register<FlowDocumentTarget>("FlowDocument");
             //Ensures that all the files are downloaded in the Torch directory.
             var workingDir = new FileInfo(typeof(Program).Assembly.Location).Directory.ToString();
             var binDir = Path.Combine(workingDir, "DedicatedServer64");
             Directory.SetCurrentDirectory(workingDir);
 
+            //HACK for block skins update
+            foreach (var f in Directory.EnumerateFiles(workingDir, "System.*", SearchOption.TopDirectoryOnly))
+            {
+                File.Delete(f);
+            }
+            
             if (!TorchLauncher.IsTorchWrapped())
             {
                 TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName, args, binDir);
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index c38317f..c6548df 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -87,6 +87,9 @@
       <HintPath>..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
+    <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\GameBinaries\netstandard.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index c4070cd..60c6268 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -123,12 +123,14 @@ namespace Torch.Server
             _hasRun = true;
             Log.Info("Starting server.");
             MySandboxGame.ConfigDedicated = DedicatedInstance.DedicatedConfig.Model;
-            if (MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
-            {
-                var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
-                Log.Info($"Remote API started on port {myRemoteServer.Port}");
-            }
-            
+            //Are you serious, Keen? This is going away until it stops hanging.
+            //if (MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
+            //{
+            //    var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
+            //    Log.Info($"Remote API started on port {myRemoteServer.Port}");
+            //}
+            Log.Warn("Remote API is disabled because it hangs the server start process. Blame Keen.");
+
             _uptime = Stopwatch.StartNew();
             base.Start();
         }

From 97f380fb7bc3cb1fb8af889f71184e1cbad5ad27 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 6 Jun 2019 18:03:58 -0700
Subject: [PATCH 106/170] Fix moar

---
 Torch.Server/Initializer.cs      |  3 ++-
 Torch.Server/Program.cs          | 12 +++++++++---
 Torch.Server/Torch.Server.csproj |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 78167b1..42325a4 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -171,9 +171,10 @@ quit";
                     File.Delete(STEAMCMD_ZIP);
                     log.Info("SteamCMD downloaded successfully!");
                 }
-                catch
+                catch (Exception e)
                 {
                     log.Error("Failed to download SteamCMD, unable to update the DS.");
+                    log.Error(e);
                     return;
                 }
             }
diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index aca5ab4..ea59df0 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -31,11 +31,17 @@ namespace Torch.Server
             Directory.SetCurrentDirectory(workingDir);
 
             //HACK for block skins update
-            foreach (var f in Directory.EnumerateFiles(workingDir, "System.*", SearchOption.TopDirectoryOnly))
+            var badDlls = new[]
             {
-                File.Delete(f);
-            }
+                "System.Security.Principal.Windows.dll"
+            };
             
+            foreach (var file in badDlls)
+            {
+                if (File.Exists(file))
+                    File.Delete(file);
+            }
+
             if (!TorchLauncher.IsTorchWrapped())
             {
                 TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName, args, binDir);
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index c6548df..fe9b5e6 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -516,6 +516,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)" &amp; del "$(TargetDir)System.*"</PostBuildEvent>
+    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From 0e6ac14b74ea74aef321eac06158a2c8390069ec Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 6 Jun 2019 18:06:28 -0700
Subject: [PATCH 107/170] Error handling

---
 Torch.Server/Program.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index ea59df0..731dd02 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -9,6 +9,7 @@ using System.ServiceProcess;
 using System.Text;
 using System.Threading;
 using NLog;
+using NLog.Fluent;
 using NLog.Targets;
 using Torch.Utils;
 
@@ -35,11 +36,19 @@ namespace Torch.Server
             {
                 "System.Security.Principal.Windows.dll"
             };
-            
-            foreach (var file in badDlls)
+
+            try
             {
-                if (File.Exists(file))
-                    File.Delete(file);
+                foreach (var file in badDlls)
+                {
+                    if (File.Exists(file))
+                        File.Delete(file);
+                }
+            }
+            catch
+            {
+                LogManager.GetCurrentClassLogger().Error($"Error updating. Please delete the following files from the Torch root folder manually:\r\n{string.Join("\r\n", badDlls)}");
+                return;
             }
 
             if (!TorchLauncher.IsTorchWrapped())

From a6e41b2a90649cadeb6a10094b1c14009c7e5a2d Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 6 Jun 2019 18:23:39 -0700
Subject: [PATCH 108/170] Fix native Havok.dll loading

---
 Torch.Server/Initializer.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 42325a4..b141d90 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -66,6 +66,12 @@ quit";
             if (!File.Exists(apiTarget))
                 File.Copy(apiSource, apiTarget);
             
+            var havokSource = Path.Combine(basePath, "DedicatedServer64", "Havok.dll");
+            var havokTarget = Path.Combine(basePath, "Havok.dll");
+            
+            if (!File.Exists(havokTarget))
+                File.Copy(havokSource, havokTarget);
+            
             _config = InitConfig();
             if (!_config.Parse(args))
                 return false;

From db283fad15610f685c3bdece7140194f5dc996ad Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 8 Jun 2019 09:33:35 -0400
Subject: [PATCH 109/170] Fix admin permission/logger errors. Probably.

---
 Torch/VRageGame.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index b3460a4..18d65fc 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -157,6 +157,7 @@ namespace Torch
             _tweakGameSettings();
 
             MyFileSystem.Reset();
+            VRage.Platform.Windows.MyVRageWindows.Init(MySandboxGame.Log,  Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated"));
             MyVRageWindows.Init(MySandboxGame.Log, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated"));
             MyInitializer.InvokeBeforeRun(_appSteamId, _appName, _userDataPath);
             // MyInitializer.InitCheckSum();

From 8015f8486c76bb70be72c47202d137b8f9f4f0a2 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 10 Jun 2019 21:04:40 -0400
Subject: [PATCH 110/170] Add error handling to world view loading

---
 Torch.Server/Managers/InstanceManager.cs | 45 ++++++++++++++++++------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index 4e0fae6..82ad278 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -71,8 +71,16 @@ namespace Torch.Server.Managers
 
             foreach (var f in worldFolders)
             {
-                if (!string.IsNullOrEmpty(f) && File.Exists(Path.Combine(f, "Sandbox.sbc")))
-                    DedicatedConfig.Worlds.Add(new WorldViewModel(f));
+                try
+                {
+                    if (!string.IsNullOrEmpty(f) && File.Exists(Path.Combine(f, "Sandbox.sbc")))
+                        DedicatedConfig.Worlds.Add(new WorldViewModel(f));
+                }
+                catch (Exception ex)
+                {
+                    Log.Error("Failed to load world at path: " + f);
+                    continue;
+                }
             }
 
             if (DedicatedConfig.Worlds.Count == 0)
@@ -91,10 +99,19 @@ namespace Torch.Server.Managers
             DedicatedConfig.LoadWorld = worldPath;
             
             var worldInfo = DedicatedConfig.Worlds.FirstOrDefault(x => x.WorldPath == worldPath);
-            if (worldInfo?.Checkpoint == null)
+            try
             {
-                worldInfo = new WorldViewModel(worldPath);
-                DedicatedConfig.Worlds.Add(worldInfo);
+                if (worldInfo?.Checkpoint == null)
+                {
+                    worldInfo = new WorldViewModel(worldPath);
+                    DedicatedConfig.Worlds.Add(worldInfo);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error("Failed to load world at path: " + worldPath);
+                DedicatedConfig.LoadWorld = null;
+                return;
             }
 
             DedicatedConfig.SelectedWorld = worldInfo;
@@ -256,11 +273,19 @@ namespace Torch.Server.Managers
 
         public WorldViewModel(string worldPath)
         {
-            WorldPath = worldPath;
-            WorldSizeKB = new DirectoryInfo(worldPath).GetFiles().Sum(x => x.Length) / 1024;
-            _checkpointPath = Path.Combine(WorldPath, "Sandbox.sbc");
-            FolderName = Path.GetFileName(worldPath);
-            BeginLoadCheckpoint();
+            try
+            {
+                WorldPath = worldPath;
+                WorldSizeKB = new DirectoryInfo(worldPath).GetFiles().Sum(x => x.Length) / 1024;
+                _checkpointPath = Path.Combine(WorldPath, "Sandbox.sbc");
+                FolderName = Path.GetFileName(worldPath);
+                BeginLoadCheckpoint();
+            }
+            catch (ArgumentException ex)
+            {
+                Log.Error($"World view model failed to load the path: {worldPath} Please ensure this is a valid path.");
+                throw; //rethrow to be handled further up the stack
+            }
         }
 
         public async Task SaveCheckpointAsync()

From fe7242f36ffdc5312b352389119dc07424ce09c7 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Tue, 11 Jun 2019 06:27:37 -0400
Subject: [PATCH 111/170] more error handling

---
 Torch/Managers/KeenLogPatch.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Torch/Managers/KeenLogPatch.cs b/Torch/Managers/KeenLogPatch.cs
index dfa9c2a..ce9d8a9 100644
--- a/Torch/Managers/KeenLogPatch.cs
+++ b/Torch/Managers/KeenLogPatch.cs
@@ -76,7 +76,21 @@ namespace Torch.Managers
 
         private static StringBuilder PrepareLog(MyLog log)
         {
-            return _tmpStringBuilder.Value.Clear().Append(' ', _getIndentByThread(log, _getThreadId(log)) * 3);
+            try
+            {
+                var v = _tmpStringBuilder.Value;
+                v.Clear();
+                var i = _getThreadId(log);
+                var t = _getIndentByThread(log, i);
+                v.Append(' ', t * 3);
+                return v;
+            }
+            catch (Exception e)
+            {
+                _log.Error(e);
+                return _tmpStringBuilder.Value.Clear();
+            }
+            //return _tmpStringBuilder.Value.Clear().Append(' ', _getIndentByThread(log, _getThreadId(log)) * 3);
         }
 
         private static bool PrefixWriteLine(MyLog __instance, string msg)

From 2fb9b4173a658629dd35f3629e722f81055eb24e Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 13 Jun 2019 08:05:03 -0400
Subject: [PATCH 112/170] Revert back to local temp folder

---
 Torch/Managers/FilesystemManager.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/Torch/Managers/FilesystemManager.cs b/Torch/Managers/FilesystemManager.cs
index b51992e..8963bc7 100644
--- a/Torch/Managers/FilesystemManager.cs
+++ b/Torch/Managers/FilesystemManager.cs
@@ -24,20 +24,12 @@ namespace Torch.Managers
 
         public FilesystemManager(ITorchBase torchInstance) : base(torchInstance)
         {
-            var tmp = Path.Combine(Path.GetTempPath(), "Torch");
             var torch = new FileInfo(typeof(FilesystemManager).Assembly.Location).Directory.FullName;
-            if (Path.GetPathRoot(tmp) == Path.GetPathRoot(torch))
-            {
-                TempDirectory = tmp;
-            }
-            else
-            {
-                TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;
-                TorchDirectory = torch;
+            TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;
+            TorchDirectory = torch;
 
-                _log.Info($"Clearing tmp directory at {TempDirectory}");
-                ClearTemp();
-            }
+            _log.Debug($"Clearing tmp directory at {TempDirectory}");
+            ClearTemp();
         }
 
         private void ClearTemp()

From 353746ec04b7e4390aea77ba5159c830a8f542b3 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 13 Jun 2019 09:53:09 -0400
Subject: [PATCH 113/170] Exclude abstract types from plugin scan

---
 Torch/Plugins/PluginManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 7b8ca16..f3510f5 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -385,6 +385,9 @@ namespace Torch.Managers
                     if (!type.GetInterfaces().Contains(typeof(ITorchPlugin)))
                         continue;
 
+                    if (type.IsAbstract)
+                        continue;
+
                     _log.Info($"Loading plugin at {type.FullName}");
 
                     if (pluginType != null)

From 649dcf40199542e5761db3c230b42bff5155acb6 Mon Sep 17 00:00:00 2001
From: asdfasdfa <ddffdsa@afdasda.com>
Date: Mon, 17 Jun 2019 21:17:00 -0700
Subject: [PATCH 114/170] Refactored PluginManager to accept load hints.

---
 Torch/Extensions/LinqExtensions.cs |  41 +++
 Torch/Plugins/PluginDependency.cs  |  17 +
 Torch/Plugins/PluginManager.cs     | 481 ++++++++++++++++-------------
 Torch/Plugins/PluginManifest.cs    |   2 +-
 Torch/Torch.csproj                 |   7 +-
 5 files changed, 323 insertions(+), 225 deletions(-)
 create mode 100644 Torch/Extensions/LinqExtensions.cs
 create mode 100644 Torch/Plugins/PluginDependency.cs

diff --git a/Torch/Extensions/LinqExtensions.cs b/Torch/Extensions/LinqExtensions.cs
new file mode 100644
index 0000000..4fc4c53
--- /dev/null
+++ b/Torch/Extensions/LinqExtensions.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+
+namespace Torch
+{
+    public static class LinqExtensions
+    {
+        public static IEnumerable<T> TSort<T>( this IEnumerable<T> source, Func<T, IEnumerable<T>> dependencies, bool throwOnCycle = false )
+        {
+            var sorted = new List<T>();
+            var visited = new HashSet<T>();
+
+            foreach( var item in source )
+                Visit( item, visited, sorted, dependencies, throwOnCycle );
+
+            return sorted;
+        }
+
+        private static void Visit<T>( T item, HashSet<T> visited, List<T> sorted, Func<T, IEnumerable<T>> dependencies, bool throwOnCycle )
+        {
+            if( !visited.Contains( item ) )
+            {
+                visited.Add( item );
+
+                var resolvedDependencies = dependencies(item);
+                if (resolvedDependencies != null)
+                {
+                    foreach (var dep in resolvedDependencies)
+                        Visit(dep, visited, sorted, dependencies, throwOnCycle);
+                }
+
+                sorted.Add( item );
+            }
+            else
+            {
+                if( throwOnCycle && !sorted.Contains( item ) )
+                    throw new Exception( "Cyclic dependency found" );
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Torch/Plugins/PluginDependency.cs b/Torch/Plugins/PluginDependency.cs
new file mode 100644
index 0000000..4727efe
--- /dev/null
+++ b/Torch/Plugins/PluginDependency.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Torch
+{
+    public class PluginDependency
+    {
+        /// <summary>
+        /// A unique identifier for the plugin that identifies the dependency.
+        /// </summary>
+        public Guid Plugin { get; set; } 
+        
+        /// <summary>
+        /// The plugin minimum version. This must include a string in the format of #[.#[.#]] for update checking purposes.
+        /// </summary>
+        public string MinVersion { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 613354d..3204a5a 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -25,26 +25,39 @@ namespace Torch.Managers
     /// <inheritdoc />
     public class PluginManager : Manager, IPluginManager
     {
+        private class PluginItem
+        {
+            public string Filename { get; set; }
+            public string Path { get; set; }
+            public PluginManifest Manifest { get; set; }
+            public bool IsZip { get; set; }
+            public List<PluginItem> ResolvedDependencies { get; set; }
+        }
+        
         private static Logger _log = LogManager.GetCurrentClassLogger();
+        
         private const string MANIFEST_NAME = "manifest.xml";
+        
         public readonly string PluginDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Plugins");
         private readonly MtObservableSortedDictionary<Guid, ITorchPlugin> _plugins = new MtObservableSortedDictionary<Guid, ITorchPlugin>();
+        private CommandManager _mgr;
+        
 #pragma warning disable 649
         [Dependency]
         private ITorchSessionManager _sessionManager;
 #pragma warning restore 649
-
+        
         /// <inheritdoc />
         public IReadOnlyDictionary<Guid, ITorchPlugin> Plugins => _plugins.AsReadOnlyObservable();
 
         public event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded;
-
+        
         public PluginManager(ITorchBase torchInstance) : base(torchInstance)
         {
             if (!Directory.Exists(PluginDir))
                 Directory.CreateDirectory(PluginDir);
         }
-
+        
         /// <summary>
         /// Updates loaded plugins in parallel.
         /// </summary>
@@ -62,7 +75,7 @@ namespace Torch.Managers
                 }
             }
         }
-
+        
         /// <inheritdoc/>
         public override void Attach()
         {
@@ -70,8 +83,6 @@ namespace Torch.Managers
             _sessionManager.SessionStateChanged += SessionManagerOnSessionStateChanged;
         }
 
-        private CommandManager _mgr;
-
         private void SessionManagerOnSessionStateChanged(ITorchSession session, TorchSessionState newState)
         {
             _mgr = session.Managers.GetManager<CommandManager>();
@@ -93,7 +104,7 @@ namespace Torch.Managers
                     return;
             }
         }
-
+        
         /// <summary>
         /// Unloads all plugins.
         /// </summary>
@@ -108,18 +119,95 @@ namespace Torch.Managers
 
         public void LoadPlugins()
         {
-            bool firstLoad = Torch.Config.Plugins.Count == 0;
-            List<Guid> foundPlugins = new List<Guid>();
-            if (Torch.Config.ShouldUpdatePlugins)
-                DownloadPluginUpdates();
-
             _log.Info("Loading plugins...");
-            var pluginItems = Directory.EnumerateFiles(PluginDir, "*.zip").Union(Directory.EnumerateDirectories(PluginDir));
+
+            var pluginItems = GetLocalPlugins(PluginDir);
+            var pluginsToLoad = new List<PluginItem>();
+            foreach (var item in pluginItems)
+            {
+                var pluginItem = item;
+                if (!TryValidatePluginDependencies(pluginItems, ref pluginItem, out var missingPlugins))
+                {
+                    // We have some missing dependencies.
+                    // Future fix would be to download them, but instead for now let's
+                    // just warn the user it's missing
+                    foreach(var missingPlugin in missingPlugins)
+                        _log.Warn($"{item.Manifest.Name} is missing dependency {missingPlugin}. Skipping plugin.");
+                    continue;
+                }
+                
+                pluginsToLoad.Add(pluginItem);
+            }
+
+            // Download any plugin updates.
+            bool updatesGotten = DownloadPluginUpdates(pluginsToLoad);
+
+            if (updatesGotten)
+            {
+                // Resort the plugins just in case updates changed load hints.
+                pluginItems = GetLocalPlugins(PluginDir);
+                pluginsToLoad.Clear();
+                foreach (var item in pluginItems)
+                {
+                    var pluginItem = item;
+                    if (!TryValidatePluginDependencies(pluginItems, ref pluginItem, out var missingPlugins))
+                    {
+                        foreach (var missingPlugin in missingPlugins)
+                            _log.Warn($"{item.Manifest.Name} is missing dependency {missingPlugin}. Skipping plugin.");
+                        continue;
+                    }
+
+                    pluginsToLoad.Add(pluginItem);
+                }
+            }
+
+            // Sort based on dependencies.
+            try
+            {
+                pluginsToLoad = pluginsToLoad.TSort(item => item.ResolvedDependencies)
+                    .ToList();
+                
+                // Actually load the plugins now.
+                foreach (var item in pluginsToLoad)
+                {
+                    LoadPlugin(item);
+                } 
+            }
+            catch (Exception e)
+            {
+                // This will happen on cylic dependencies.
+                _log.Error(e);
+            }
+        }
+
+        private List<PluginItem> GetLocalPlugins(string pluginDir)
+        {
+            var firstLoad = Torch.Config.Plugins.Count == 0;
+            
+            var pluginItems = Directory.EnumerateFiles(pluginDir, "*.zip")
+                .Union(Directory.EnumerateDirectories(PluginDir));
+            var results = new List<PluginItem>();
+
             foreach (var item in pluginItems)
             {
                 var path = Path.Combine(PluginDir, item);
                 var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
                 var manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
+
+                if (manifest == null)
+                {
+                    _log.Warn($"Item '{item}' is missing a manifest, skipping.");
+                    continue;
+                }
+
+                var duplicatePlugin = results.FirstOrDefault(r => r.Manifest.Guid == manifest.Guid);
+                if (duplicatePlugin != null)
+                {
+                    _log.Warn(
+                        $"The GUID provided by {manifest.Name} ({item}) is already in use by {duplicatePlugin.Manifest.Name}.");
+                    continue;
+                }
+                
                 if (!Torch.Config.LocalPlugins)
                 {
                     if (isZip && !Torch.Config.Plugins.Contains(manifest.Guid))
@@ -132,126 +220,39 @@ namespace Torch.Managers
                         _log.Info($"First-time load: Plugin {manifest.Name} added to torch.cfg.");
                         Torch.Config.Plugins.Add(manifest.Guid);
                     }
-                if(isZip)
-                    foundPlugins.Add(manifest.Guid);
                 }
-
-                LoadPlugin(item);
-            }
-            if (!Torch.Config.LocalPlugins && firstLoad)
-                Torch.Config.Save();
-            
-            if (!Torch.Config.LocalPlugins)
-            {
-                List<string> toLoad = new List<string>();
-
-                //This is actually the easiest way to batch process async tasks and block until completion (????)
-                Task.WhenAll(Torch.Config.Plugins.Select(async g =>
-                                                         {
-                                                             try
-                                                             {
-                                                                 if (foundPlugins.Contains(g))
-                                                                 {
-                                                                     return;
-                                                                 }
-                                                                 var item = await PluginQuery.Instance.QueryOne(g);
-                                                                 string s = Path.Combine(PluginDir, item.Name + ".zip");
-                                                                 await PluginQuery.Instance.DownloadPlugin(item, s);
-                                                                 lock (toLoad)
-                                                                     toLoad.Add(s);
-                                                             }
-                                                             catch (Exception ex)
-                                                             {
-                                                                 _log.Error(ex);
-                                                             }
-                                                         }));
-
-                foreach (var l in toLoad)
+                
+                results.Add(new PluginItem
                 {
-                    LoadPlugin(l);
-                }
+                    Filename = item,
+                    IsZip = isZip,
+                    Manifest = manifest,
+                    Path = path
+                });
             }
 
-            //just reuse the list from earlier
-            foundPlugins.Clear();
-            foreach (var plugin in _plugins.Values)
-            {
-                try
-                {
-                    plugin.Init(Torch);
-                }
-                catch (Exception e)
-                {
-                    _log.Error(e, $"Plugin {plugin.Name} threw an exception during init! Unloading plugin!");
-                    foundPlugins.Add(plugin.Id);
-                }
-            }
-
-            foreach (var id in foundPlugins)
-            {
-                var p = _plugins[id];
-                _plugins.Remove(id);
-                _mgr.UnregisterPluginCommands(p);
-                p.Dispose();
-            }
-
-            _log.Info($"Loaded {_plugins.Count} plugins.");
-            PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
-        }
-
-        private void LoadPlugin(string item)
-        {
-            var path = Path.Combine(PluginDir, item);
-            var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
-            var manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
-            if (manifest == null)
-            {
-                _log.Warn($"Item '{item}' is missing a manifest, skipping.");
-                return;
-            }
-
-            if (_plugins.ContainsKey(manifest.Guid))
-            {
-                _log.Error($"The GUID provided by {manifest.Name} ({item}) is already in use by {_plugins[manifest.Guid].Name}");
-                return;
-            }
-
-            if (isZip)
-                LoadPluginFromZip(path);
-            else
-                LoadPluginFromFolder(path);
-        }
-
-        private void DownloadPluginUpdates()
+            return results;
+        } 
+        
+        private bool DownloadPluginUpdates(List<PluginItem> plugins)
         {
             _log.Info("Checking for plugin updates...");
             var count = 0;
-            var pluginItems = Directory.EnumerateFiles(PluginDir, "*.zip");
-            Task.WhenAll(pluginItems.Select(async item =>
+            Task.WhenAll(plugins.Select(async item =>
             {
-                PluginManifest manifest = null;
                 try
                 {
-                    var path = Path.Combine(PluginDir, item);
-                    var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
-                    if (!isZip)
+                    if (!item.IsZip)
                     {
                         _log.Warn($"Unzipped plugins cannot be auto-updated. Skipping plugin {item}");
                         return;
                     }
-                    manifest = GetManifestFromZip(path);
-                    if (manifest == null)
-                    {
-                        _log.Warn($"Item '{item}' is missing a manifest, skipping update check.");
-                        return;
-                    }
-
-                    manifest.Version.TryExtractVersion(out Version currentVersion);
-                    var latest = await PluginQuery.Instance.QueryOne(manifest.Guid);
+                    item.Manifest.Version.TryExtractVersion(out Version currentVersion);
+                    var latest = await PluginQuery.Instance.QueryOne(item.Manifest.Guid);
 
                     if (latest?.LatestVersion == null)
                     {
-                        _log.Warn($"Plugin {manifest.Name} does not have any releases on torchapi.net. Cannot update.");
+                        _log.Warn($"Plugin {item.Manifest.Name} does not have any releases on torchapi.net. Cannot update.");
                         return;
                     }
 
@@ -259,115 +260,107 @@ namespace Torch.Managers
 
                     if (currentVersion == null || newVersion == null)
                     {
-                        _log.Error($"Error parsing version from manifest or website for plugin '{manifest.Name}.'");
+                        _log.Error($"Error parsing version from manifest or website for plugin '{item.Manifest.Name}.'");
                         return;
                     }
 
                     if (newVersion <= currentVersion)
                     {
-                        _log.Debug($"{manifest.Name} {manifest.Version} is up to date.");
+                        _log.Debug($"{item.Manifest.Name} {item.Manifest.Version} is up to date.");
                         return;
                     }
 
-                    _log.Info($"Updating plugin '{manifest.Name}' from {currentVersion} to {newVersion}.");
-                    await PluginQuery.Instance.DownloadPlugin(latest, path);
+                    _log.Info($"Updating plugin '{item.Manifest.Name}' from {currentVersion} to {newVersion}.");
+                    await PluginQuery.Instance.DownloadPlugin(latest, item.Path);
                     Interlocked.Increment(ref count);
                 }
                 catch (Exception e)
                 {
-                    _log.Warn($"An error occurred updating the plugin {manifest?.Name ?? item}.");
+                    _log.Warn($"An error occurred updating the plugin {item.Manifest.Name}.");
                     _log.Warn(e);
                 }
             }));
 
             _log.Info($"Updated {count} plugins.");
+            return count > 0;
         }
         
-        private void LoadPluginFromFolder(string directory)
+        private void LoadPlugin(PluginItem item)
         {
             var assemblies = new List<Assembly>();
-            var files = Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories).ToList();
-
-            var manifest = GetManifestFromDirectory(directory);
-            if (manifest == null)
+            
+            if (item.IsZip)
             {
-                _log.Warn($"Directory {directory} is missing a manifest, skipping load.");
-                return;
-            }
-
-            foreach (var file in files)
-            {
-                if (!file.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
-                    continue;
-
-                using (var stream = File.OpenRead(file))
+                using (var zipFile = ZipFile.OpenRead(item.Path))
                 {
-                    var data = stream.ReadToEnd();
-                    byte[] symbol = null;
-                    var symbolPath = Path.Combine(Path.GetDirectoryName(file) ?? ".",
-                        Path.GetFileNameWithoutExtension(file) + ".pdb");
-                    if (File.Exists(symbolPath))
-                        try
-                        {
-                            using (var symbolStream = File.OpenRead(symbolPath))
-                                symbol = symbolStream.ReadToEnd();
-                        }
-                        catch (Exception e)
-                        {
-                            _log.Warn(e, $"Failed to read debugging symbols from {symbolPath}");
-                        }
-                    assemblies.Add(symbol != null ? Assembly.Load(data, symbol) : Assembly.Load(data));
-                }
-            }
-
-            RegisterAllAssemblies(assemblies);
-            InstantiatePlugin(manifest, assemblies);
-        }
-
-        private void LoadPluginFromZip(string path)
-        {
-            PluginManifest manifest;
-            var assemblies = new List<Assembly>();
-            using (var zipFile = ZipFile.OpenRead(path))
-            {
-                manifest = GetManifestFromZip(path);
-                if (manifest == null)
-                {
-                    _log.Warn($"Zip file {path} is missing a manifest, skipping.");
-                    return;
-                }
-
-                foreach (var entry in zipFile.Entries)
-                {
-                    if (!entry.Name.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
-                        continue;
-
-
-                    using (var stream = entry.Open())
+                    foreach (var entry in zipFile.Entries)
                     {
-                        var data = stream.ReadToEnd((int)entry.Length);
-                        byte[] symbol = null;
-                        var symbolEntryName = entry.FullName.Substring(0, entry.FullName.Length - "dll".Length) + "pdb";
-                        var symbolEntry = zipFile.GetEntry(symbolEntryName);
-                        if (symbolEntry != null)
-                            try
-                            {
-                                using (var symbolStream = symbolEntry.Open())
-                                    symbol = symbolStream.ReadToEnd((int)symbolEntry.Length);
-                            }
-                            catch (Exception e)
-                            {
-                                _log.Warn(e, $"Failed to read debugging symbols from {path}:{symbolEntryName}");
-                            }
-                        assemblies.Add(symbol != null ? Assembly.Load(data, symbol) : Assembly.Load(data));
+                        if (!entry.Name.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
+                            continue;
+
+
+                        using (var stream = entry.Open())
+                        {
+                            var data = stream.ReadToEnd((int) entry.Length);
+                            byte[] symbol = null;
+                            var symbolEntryName =
+                                entry.FullName.Substring(0, entry.FullName.Length - "dll".Length) + "pdb";
+                            var symbolEntry = zipFile.GetEntry(symbolEntryName);
+                            if (symbolEntry != null)
+                                try
+                                {
+                                    using (var symbolStream = symbolEntry.Open())
+                                        symbol = symbolStream.ReadToEnd((int) symbolEntry.Length);
+                                }
+                                catch (Exception e)
+                                {
+                                    _log.Warn(e, $"Failed to read debugging symbols from {item.Filename}:{symbolEntryName}");
+                                }
+
+                            assemblies.Add(symbol != null ? Assembly.Load(data, symbol) : Assembly.Load(data));
+                        }
                     }
                 }
             }
+            else
+            {
+                var files = Directory
+                    .EnumerateFiles(item.Path, "*.*", SearchOption.AllDirectories)
+                    .ToList();
+                
+                foreach (var file in files)
+                {
+                    if (!file.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
+                        continue;
 
+                    using (var stream = File.OpenRead(file))
+                    {
+                        var data = stream.ReadToEnd();
+                        byte[] symbol = null;
+                        var symbolPath = Path.Combine(Path.GetDirectoryName(file) ?? ".",
+                            Path.GetFileNameWithoutExtension(file) + ".pdb");
+                        if (File.Exists(symbolPath))
+                            try
+                            {
+                                using (var symbolStream = File.OpenRead(symbolPath))
+                                    symbol = symbolStream.ReadToEnd();
+                            }
+                            catch (Exception e)
+                            {
+                                _log.Warn(e, $"Failed to read debugging symbols from {symbolPath}");
+                            }
+
+                        assemblies.Add(symbol != null ? Assembly.Load(data, symbol) : Assembly.Load(data));
+                    }
+                }
+
+                
+            }
+            
             RegisterAllAssemblies(assemblies);
-            InstantiatePlugin(manifest, assemblies);
+            InstantiatePlugin(item.Manifest, assemblies);
         }
-
+        
         private void RegisterAllAssemblies(IReadOnlyCollection<Assembly> assemblies)
         {
             Assembly ResolveDependentAssembly(object sender, ResolveEventArgs args)
@@ -395,38 +388,12 @@ namespace Torch.Managers
                 TorchBase.RegisterAuxAssembly(asm);
             }
         }
-
+        
         private static bool IsAssemblyCompatible(AssemblyName a, AssemblyName b)
         {
             return a.Name == b.Name && a.Version.Major == b.Version.Major && a.Version.Minor == b.Version.Minor;
         }
-
-
-        private PluginManifest GetManifestFromZip(string path)
-        {
-            using (var zipFile = ZipFile.OpenRead(path))
-            {
-                foreach (var entry in zipFile.Entries)
-                {
-                    if (!entry.Name.Equals(MANIFEST_NAME, StringComparison.CurrentCultureIgnoreCase))
-                        continue;
-
-                    using (var stream = new StreamReader(entry.Open()))
-                    {
-                        return PluginManifest.Load(stream);
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private PluginManifest GetManifestFromDirectory(string directory)
-        {
-            var path = Path.Combine(directory, MANIFEST_NAME);
-            return !File.Exists(path) ? null : PluginManifest.Load(path);
-        }
-
+        
         private void InstantiatePlugin(PluginManifest manifest, IEnumerable<Assembly> assemblies)
         {
             Type pluginType = null;
@@ -495,6 +462,74 @@ namespace Torch.Managers
             plugin.Torch = Torch;
             _plugins.Add(manifest.Guid, plugin);
         }
+        
+        private PluginManifest GetManifestFromZip(string path)
+        {
+            using (var zipFile = ZipFile.OpenRead(path))
+            {
+                foreach (var entry in zipFile.Entries)
+                {
+                    if (!entry.Name.Equals(MANIFEST_NAME, StringComparison.CurrentCultureIgnoreCase))
+                        continue;
+
+                    using (var stream = new StreamReader(entry.Open()))
+                    {
+                        return PluginManifest.Load(stream);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private bool TryValidatePluginDependencies(List<PluginItem> items, ref PluginItem item, out List<Guid> missingDependencies)
+        {
+            var dependencies = new List<PluginItem>();
+            missingDependencies = new List<Guid>();
+            
+            foreach (var pluginDependency in item.Manifest.Dependencies)
+            {
+                var dependency = items
+                    .FirstOrDefault(pi => pi?.Manifest.Guid == pluginDependency.Plugin);
+                if (dependency == null)
+                {
+                    missingDependencies.Add(pluginDependency.Plugin);
+                    continue;
+                }
+
+                if (!string.IsNullOrEmpty(pluginDependency.MinVersion)
+                    && dependency.Manifest.Version.TryExtractVersion(out var dependencyVersion)
+                    && pluginDependency.MinVersion.TryExtractVersion(out var minVersion))
+                {
+                    // really only care about version if it is defined.
+                    if (dependencyVersion < minVersion)
+                    {
+                        // If dependency version is too low, we can try to update. Otherwise
+                        // it's a missing dependency.
+                        
+                        // For now let's just warn the user. bitMuse is lazy.
+                        _log.Warn($"{dependency.Manifest.Name} is below the requested version for {item.Manifest.Name}."
+                        + Environment.NewLine
+                        + $" Desired version: {pluginDependency.MinVersion}, Available version: {dependency.Manifest.Version}");
+                        missingDependencies.Add(pluginDependency.Plugin);
+                        continue;
+                    }
+                }
+
+                dependencies.Add(dependency);
+            }
+
+            item.ResolvedDependencies = dependencies;
+            if (missingDependencies.Count > 0)
+                return false;
+            return true;
+        }
+
+        private PluginManifest GetManifestFromDirectory(string directory)
+        {
+            var path = Path.Combine(directory, MANIFEST_NAME);
+            return !File.Exists(path) ? null : PluginManifest.Load(path);
+        }
 
         /// <inheritdoc cref="IEnumerable.GetEnumerator"/>
         public IEnumerator<ITorchPlugin> GetEnumerator()
diff --git a/Torch/Plugins/PluginManifest.cs b/Torch/Plugins/PluginManifest.cs
index 7d1cc89..59ec853 100644
--- a/Torch/Plugins/PluginManifest.cs
+++ b/Torch/Plugins/PluginManifest.cs
@@ -37,7 +37,7 @@ namespace Torch
         /// <summary>
         /// A list of dependent plugin repositories. This may be updated to include GUIDs in the future.
         /// </summary>
-        public List<string> Dependencies { get; } = new List<string>();
+        public List<PluginDependency> Dependencies { get; } = new List<PluginDependency>();
 
         public void Save(string path)
         {
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index ca60249..e0cca17 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -168,9 +168,12 @@
       <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <Reference Include="VRage.Platform.Windows, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\bin\x64\Release\DedicatedServer64\VRage.Platform.Windows.dll</HintPath>
     </Reference>
+    <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="VRage.Render">
       <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
       <Private>False</Private>
@@ -203,6 +206,7 @@
     <Compile Include="Collections\TransformEnumerator.cs" />
     <Compile Include="Commands\ConsoleCommandContext.cs" />
     <Compile Include="Event\EventShimAttribute.cs" />
+    <Compile Include="Extensions\LinqExtensions.cs" />
     <Compile Include="Managers\ChatManager\ChatManagerClient.cs" />
     <Compile Include="Managers\ChatManager\ChatManagerServer.cs" />
     <Compile Include="Extensions\DispatcherExtensions.cs" />
@@ -242,6 +246,7 @@
     <Compile Include="Patches\PhysicsMemoryPatch.cs" />
     <Compile Include="Patches\SessionDownloadPatch.cs" />
     <Compile Include="Patches\TorchAsyncSaving.cs" />
+    <Compile Include="Plugins\PluginDependency.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Collections\KeyTree.cs" />
     <Compile Include="Collections\RollingAverage.cs" />

From 4a5e41b74717da709884ef4ffca9a1232e576392 Mon Sep 17 00:00:00 2001
From: asdfasdfa <ddffdsa@afdasda.com>
Date: Mon, 17 Jun 2019 21:19:51 -0700
Subject: [PATCH 115/170] Added code to finish registering the plugins.

---
 Torch/Plugins/PluginManager.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 3204a5a..43a7db7 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -166,18 +166,25 @@ namespace Torch.Managers
             {
                 pluginsToLoad = pluginsToLoad.TSort(item => item.ResolvedDependencies)
                     .ToList();
-                
-                // Actually load the plugins now.
-                foreach (var item in pluginsToLoad)
-                {
-                    LoadPlugin(item);
-                } 
             }
             catch (Exception e)
             {
                 // This will happen on cylic dependencies.
                 _log.Error(e);
             }
+            
+            // Actually load the plugins now.
+            foreach (var item in pluginsToLoad)
+            {
+                LoadPlugin(item);
+            } 
+            
+            foreach (var plugin in _plugins.Values)
+            {
+                plugin.Init(Torch);
+            }
+            _log.Info($"Loaded {_plugins.Count} plugins.");
+            PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
         }
 
         private List<PluginItem> GetLocalPlugins(string pluginDir)

From 6fc02edd1eb19129b447835f5735582a73a3bde4 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 20 Jun 2019 19:06:05 -0700
Subject: [PATCH 116/170] Add save plugin list on first load

---
 Torch/Plugins/PluginManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 43a7db7..b93db8d 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -238,6 +238,9 @@ namespace Torch.Managers
                 });
             }
 
+            if (!Torch.Config.LocalPlugins && firstLoad)
+                Torch.Config.Save();
+            
             return results;
         } 
         

From b79e970e6681b7660364b1239c2f92dd01beeca1 Mon Sep 17 00:00:00 2001
From: bitMuse <ddffdsa@afdasda.com>
Date: Fri, 21 Jun 2019 01:34:01 -0700
Subject: [PATCH 117/170] Added autoscroll disable for log window.. fuck wpf.

---
 Torch.Server/Views/TorchUI.xaml.cs | 58 +++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/Views/TorchUI.xaml.cs b/Torch.Server/Views/TorchUI.xaml.cs
index 26a7294..88c97a0 100644
--- a/Torch.Server/Views/TorchUI.xaml.cs
+++ b/Torch.Server/Views/TorchUI.xaml.cs
@@ -10,6 +10,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
@@ -31,6 +32,8 @@ namespace Torch.Server
         private TorchServer _server;
         private TorchConfig _config;
 
+        private bool _autoscrollLog = true;
+
         public TorchUI(TorchServer server)
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
@@ -57,6 +60,14 @@ namespace Torch.Server
             Themes.uiSource = this;
             Themes.SetConfig(_config);
             Title = $"{_config.InstanceName} - Torch {server.TorchVersion}, SE {server.GameVersion}";
+            
+            Loaded += TorchUI_Loaded;
+        }
+
+        private void TorchUI_Loaded(object sender, RoutedEventArgs e)
+        {
+            var scrollViewer = FindDescendant<ScrollViewer>(ConsoleText);
+            scrollViewer.ScrollChanged += ConsoleText_OnScrollChanged;
         }
 
         private void AttachConsole()
@@ -69,7 +80,52 @@ namespace Torch.Server
                 doc = (wrapped?.WrappedTarget as FlowDocumentTarget)?.Document;
             }
             ConsoleText.Document = doc ?? new FlowDocument(new Paragraph(new Run("No target!")));
-            ConsoleText.TextChanged += (sender, args) => ConsoleText.ScrollToEnd();
+            ConsoleText.TextChanged += ConsoleText_OnTextChanged;
+        }
+
+        public static T FindDescendant<T>(DependencyObject obj) where T : DependencyObject
+        {
+            if (obj == null) return default(T);
+            int numberChildren = VisualTreeHelper.GetChildrenCount(obj);
+            if (numberChildren == 0) return default(T);
+
+            for (int i = 0; i < numberChildren; i++)
+            {
+                DependencyObject child = VisualTreeHelper.GetChild(obj, i);
+                if (child is T)
+                {
+                    return (T)child;
+                }
+            }
+
+            for (int i = 0; i < numberChildren; i++)
+            {
+                DependencyObject child = VisualTreeHelper.GetChild(obj, i);
+                var potentialMatch = FindDescendant<T>(child);
+                if (potentialMatch != default(T))
+                {
+                    return potentialMatch;
+                }
+            }
+
+            return default(T);
+        }
+
+        private void ConsoleText_OnTextChanged(object sender, TextChangedEventArgs args)
+        {
+            var textBox = (RichTextBox) sender;
+            if (_autoscrollLog)
+                ConsoleText.ScrollToEnd();
+        }
+        
+        private void ConsoleText_OnScrollChanged(object sender, ScrollChangedEventArgs e)
+        {
+            var scrollViewer = (ScrollViewer) sender;
+            if (e.ExtentHeightChange == 0)
+            {
+                // User change.
+                _autoscrollLog = scrollViewer.VerticalOffset == scrollViewer.ScrollableHeight;
+            }
         }
 
         public void LoadConfig(TorchConfig config)

From d8ac3b23533e8b7bcc7bec098adc20f2e3b5e964 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 22 Jun 2019 23:36:57 -0400
Subject: [PATCH 118/170] Add debug info to InstancePath setter to track down a
 stupid bug

---
 Torch.Server/TorchConfig.cs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 2c2d635..8a7d322 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -21,9 +21,33 @@ namespace Torch.Server
         [Arg("instancename", "The name of the Torch instance.")]
         public string InstanceName { get; set; }
 
+
+        private string _instancePath;
+
         /// <inheritdoc />
         [Arg("instancepath", "Server data folder where saves and mods are stored.")]
-        public string InstancePath { get; set; }
+        public string InstancePath
+        {
+            get => _instancePath;
+            set
+            {
+                try
+                {
+                    if(value.Contains("\""))
+                        throw new InvalidOperationException();
+
+                    var s = Path.GetFullPath(value);
+                    Console.WriteLine(s); //prevent compiler opitmization - just in case
+                }
+                catch (Exception ex)
+                {
+                    _log.Error(ex, "Invalid path assigned to InstancePath! Please report this immediately!");
+                    throw;
+                }
+
+                _instancePath = value;
+            }
+        }
 
         /// <inheritdoc />
         [XmlIgnore, Arg("noupdate", "Disable automatically downloading game and plugin updates.")]

From 9293801037af71bc418b235f0b1110b2c80b678d Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 23 Jun 2019 08:42:53 -0400
Subject: [PATCH 119/170] Tweak debug output

---
 Torch.Server/TorchConfig.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 8a7d322..7fd5917 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -41,8 +41,8 @@ namespace Torch.Server
                 }
                 catch (Exception ex)
                 {
-                    _log.Error(ex, "Invalid path assigned to InstancePath! Please report this immediately!");
-                    throw;
+                    _log.Error(ex, "Invalid path assigned to InstancePath! Please report this immediately! Value: " + value);
+                    //throw;
                 }
 
                 _instancePath = value;

From dfb7314207629a3353c46fe51abb578db19d31ac Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 23 Jun 2019 19:33:22 -0400
Subject: [PATCH 120/170] Automatically delete and replace steam_api.dll to fix
 weirdness

---
 Torch.Server/Program.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index 731dd02..4e48a1e 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -34,7 +34,8 @@ namespace Torch.Server
             //HACK for block skins update
             var badDlls = new[]
             {
-                "System.Security.Principal.Windows.dll"
+                "System.Security.Principal.Windows.dll",
+                "steam_api64.dll"
             };
 
             try
@@ -71,4 +72,4 @@ namespace Torch.Server
             initializer.Run();
         }
     }
-}
\ No newline at end of file
+}

From 13f56489638772dae298ab16f59d6f2eec3499fa Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 23 Jun 2019 21:34:20 -0400
Subject: [PATCH 121/170] Remove false positive in debug code

---
 Torch.Server/TorchConfig.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 7fd5917..7c86e24 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -31,6 +31,11 @@ namespace Torch.Server
             get => _instancePath;
             set
             {
+                if(String.IsNullOrEmpty(value))
+                {
+                    _instancePath = value;
+                    return;
+                }
                 try
                 {
                     if(value.Contains("\""))

From ecbbd6fbf2a934285a91ac7f85017aa9938e8c0d Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Mon, 24 Jun 2019 19:47:08 -0700
Subject: [PATCH 122/170] Copy native DLLs if newer

---
 Torch.Server/Initializer.cs | 4 ++--
 Torch.Server/Program.cs     | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index b141d90..8c1c4d4 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -63,13 +63,13 @@ quit";
             var apiSource = Path.Combine(basePath, "DedicatedServer64", "steam_api64.dll");
             var apiTarget = Path.Combine(basePath, "steam_api64.dll");
             
-            if (!File.Exists(apiTarget))
+            if (!File.Exists(apiTarget) || File.GetLastWriteTime(apiTarget) < File.GetLastWriteTime(apiSource))
                 File.Copy(apiSource, apiTarget);
             
             var havokSource = Path.Combine(basePath, "DedicatedServer64", "Havok.dll");
             var havokTarget = Path.Combine(basePath, "Havok.dll");
             
-            if (!File.Exists(havokTarget))
+            if (!File.Exists(havokTarget) || File.GetLastWriteTime(havokTarget) < File.GetLastWriteTime(havokSource))
                 File.Copy(havokSource, havokTarget);
             
             _config = InitConfig();
diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index 4e48a1e..9abb67c 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -35,7 +35,6 @@ namespace Torch.Server
             var badDlls = new[]
             {
                 "System.Security.Principal.Windows.dll",
-                "steam_api64.dll"
             };
 
             try
@@ -46,9 +45,11 @@ namespace Torch.Server
                         File.Delete(file);
                 }
             }
-            catch
+            catch (Exception e)
             {
-                LogManager.GetCurrentClassLogger().Error($"Error updating. Please delete the following files from the Torch root folder manually:\r\n{string.Join("\r\n", badDlls)}");
+                var log = LogManager.GetCurrentClassLogger();
+                log.Error($"Error updating. Please delete the following files from the Torch root folder manually:\r\n{string.Join("\r\n", badDlls)}");
+                log.Error(e);
                 return;
             }
 

From 4f30a47c0763fa65222bbbe88162ddc20152c9ea Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Tue, 25 Jun 2019 16:11:13 -0400
Subject: [PATCH 123/170] Handle conflicting connection attempts gracefully

---
 Torch.Server/Managers/MultiplayerManagerDedicated.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Managers/MultiplayerManagerDedicated.cs b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
index 34fd09e..f5c52ba 100644
--- a/Torch.Server/Managers/MultiplayerManagerDedicated.cs
+++ b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
@@ -219,7 +219,12 @@ namespace Torch.Server.Managers
 
             _log.Info($"Connection attempt by {steamId} from {ip}");
             
-            if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
+            if (Players.ContainsKey(steamId))
+            {
+                _log.Warn($"Player {steamId} already has already joined!");
+                UserRejected(steamId, JoinResult.AlreadyJoined);
+            }
+            else if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
                      promoteLevel < MyPromoteLevel.Admin)
             {
                 _log.Warn($"Rejecting user {steamId}, world is set to offline and user is not admin.");
@@ -337,4 +342,4 @@ namespace Torch.Server.Managers
 
         #endregion
     }
-}
\ No newline at end of file
+}

From 3f7e95b502a992cabc9a83cc03bf2aff5a764b5b Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Tue, 25 Jun 2019 16:47:54 -0400
Subject: [PATCH 124/170] Log errors when a plugin's control throws exceptions
 instead of just letting WPF die. Also add some new types for Essentials

---
 Torch.Server/Initializer.cs                |   9 +
 Torch.Server/ViewModels/PluginViewModel.cs |  17 +-
 Torch/Collections/BinaryMinHeap.cs         | 272 +++++++++++++++++++++
 Torch/Collections/SortedView.cs            |  20 +-
 Torch/Collections/SystemSortedView.cs      | 134 ++++++++++
 Torch/Torch.csproj                         |   2 +
 6 files changed, 450 insertions(+), 4 deletions(-)
 create mode 100644 Torch/Collections/BinaryMinHeap.cs
 create mode 100644 Torch/Collections/SystemSortedView.cs

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index b141d90..9d794a1 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -55,6 +55,15 @@ quit";
             AppDomain.CurrentDomain.UnhandledException += HandleException;
 #endif
 
+#if DEBUG
+            //enables logging debug messages when built in debug mode. Amazing.
+            LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "main");
+            LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "console");
+            LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "wpf");
+            LogManager.ReconfigExistingLoggers();
+            Log.Debug("Debug logging enabled.");
+#endif
+
             // This is what happens when Keen is bad and puts extensions into the System namespace.
             if (!Enumerable.Contains(args, "-noupdate"))
                 RunSteamCmd();
diff --git a/Torch.Server/ViewModels/PluginViewModel.cs b/Torch.Server/ViewModels/PluginViewModel.cs
index 21fe310..dca7c27 100644
--- a/Torch.Server/ViewModels/PluginViewModel.cs
+++ b/Torch.Server/ViewModels/PluginViewModel.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using NLog;
 using Torch.API;
 using Torch.API.Plugins;
 using Torch.Server.Views;
@@ -17,13 +18,25 @@ namespace Torch.Server.ViewModels
         public string Name { get; }
         public ITorchPlugin Plugin { get; }
 
+        private static Logger _log = LogManager.GetCurrentClassLogger();
+
         public PluginViewModel(ITorchPlugin plugin)
         {
             Plugin = plugin;
 
             if (Plugin is IWpfPlugin p)
-                Control = p.GetControl();
-
+            {
+                try
+                {
+                    Control = p.GetControl();
+                }
+                catch (Exception ex)
+                {
+                    _log.Error(ex, $"Exception loading interface for plugin {Plugin.Name}! Plugin interface will not be available!");
+                    Control = null;
+                }
+            }
+            
             Name = $"{plugin.Name} ({plugin.Version})";
 
             ThemeControl.UpdateDynamicControls += UpdateResourceDict;
diff --git a/Torch/Collections/BinaryMinHeap.cs b/Torch/Collections/BinaryMinHeap.cs
new file mode 100644
index 0000000..78f0294
--- /dev/null
+++ b/Torch/Collections/BinaryMinHeap.cs
@@ -0,0 +1,272 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Torch.Collections
+{
+    public class BinaryMinHeap<TKey, TValue> where TKey : IComparable
+    {
+        private struct HeapItem
+        {
+            public TKey Key { get; }
+            public TValue Value { get; }
+
+            public HeapItem(TKey key, TValue value)
+            {
+                Key = key;
+                Value = value;
+            }
+        }
+
+        private HeapItem[] _store;
+        private readonly IComparer<TKey> _comparer;
+
+        public int Capacity { get; private set; }
+        public int Count { get; private set; }
+
+        public bool Full => Count == Capacity;
+
+        public BinaryMinHeap(int initialCapacity = 32, IComparer<TKey> comparer = null)
+        {
+            _store = new HeapItem[initialCapacity];
+            Count = 0;
+            Capacity = initialCapacity;
+            _comparer = comparer ?? Comparer<TKey>.Default;
+        }
+
+        public void Insert(TValue value, TKey key)
+        {
+            EnsureCapacity(Capacity + 1);
+
+            var item = new HeapItem(key, value);
+
+            _store[Count] = item;
+
+            Up(Count);
+            Count++;
+        }
+
+        public TValue Min()
+        {
+            return _store[0].Value;
+        }
+
+        public TKey MinKey()
+        {
+            return _store[0].Key;
+        }
+
+        public TValue RemoveMin()
+        {
+            TValue toReturn = _store[0].Value;
+
+            if (Count != 1)
+            {
+                SwapIndices(Count - 1, 0);
+                _store[Count - 1] = default(HeapItem);
+                Count--;
+                Down(0);
+            }
+            else
+            {
+                Count--;
+                _store[0] = default(HeapItem);
+            }
+
+            return toReturn;
+        }
+
+        public TValue RemoveMax()
+        {
+            Debug.Assert(Count > 0);
+
+            var maxIndex = 0;
+
+            var maxItem = _store[0];
+
+            for (var i = 1; i < Count; ++i)
+            {
+                var c = _store[i];
+                if (_comparer.Compare(maxItem.Key, c.Key) < 0)
+                {
+                    maxIndex = i;
+                    maxItem = c;
+                }
+            }
+            
+            if (maxIndex != Count)
+            {
+                SwapIndices(Count - 1, maxIndex);
+                Up(maxIndex);
+            }
+            Count--;
+
+            return maxItem.Value;
+        }
+
+        public TValue Remove(TValue value, IEqualityComparer<TValue> comparer = null)
+        {
+            if (Count == 0)
+                return default(TValue);
+
+            if (comparer == null)
+                comparer = EqualityComparer<TValue>.Default;
+
+            var itemIndex = -1;
+
+            for (var i = 0; i < Count; ++i)
+            {
+                if (comparer.Equals(value, _store[i].Value))
+                {
+                    itemIndex = i;
+                    break;
+                }
+            }
+
+            if (itemIndex != Count && itemIndex != -1)
+            {
+                TValue removed = _store[itemIndex].Value;
+
+                SwapIndices(Count - 1, itemIndex);
+                Up(itemIndex);
+                Down(itemIndex);
+
+                Count--;
+                return removed;
+            }
+            else
+                return default(TValue);
+        }
+
+        public TValue Remove(TKey key)
+        {
+            Debug.Assert(Count > 0);
+
+            var itemIndex = 0;
+
+            for (var i = 1; i < Count; ++i)
+            {
+                if (_comparer.Compare(key, _store[i].Key) == 0)
+                    itemIndex = i;
+            }
+
+            TValue removed;
+
+            if (itemIndex != Count)
+            {
+                removed = _store[itemIndex].Value;
+
+                SwapIndices(Count - 1, itemIndex);
+                Up(itemIndex);
+                Down(itemIndex);
+            }
+            else
+                removed = default(TValue);
+
+            Count--;
+
+            return removed;
+        }
+
+        public void Clear()
+        {
+            Array.Clear(_store, 0, Capacity);
+            Count = 0;
+        }
+
+        private void Up(int index)
+        {
+            if (index == 0)
+                return;
+            int parentIndex = (index - 1) / 2;
+            HeapItem swap = _store[index];
+            if (_comparer.Compare(_store[parentIndex].Key, swap.Key) <= 0)
+                return;
+
+            while (true)
+            {
+                SwapIndices(parentIndex, index);
+                index = parentIndex;
+
+                if (index == 0)
+                    break;
+                parentIndex = (index - 1) / 2;
+                if (_comparer.Compare(_store[parentIndex].Key, swap.Key) <= 0)
+                    break;
+            }
+
+            InsertItem(ref swap, index);
+        }
+
+        private void Down(int index)
+        {
+            if (Count == index + 1)
+                return;
+
+            int left = index * 2 + 1;
+            int right = left + 1;
+
+            HeapItem swap = _store[index];
+
+            while (right <= Count) // While the current node has children
+            {
+                var nLeft = _store[left];
+                var nRight = _store[right];
+
+                if (right == Count || _comparer.Compare(nLeft.Key, nRight.Key) < 0) // Only the left child exists or the left child is smaller
+                {
+                    if (_comparer.Compare(swap.Key, nLeft.Key) <= 0)
+                        break;
+
+                    SwapIndices(left, index);
+
+                    index = left;
+                    left = index * 2 + 1;
+                    right = left + 1;
+                }
+                else // Right child exists and is smaller
+                {
+                    if (_comparer.Compare(swap.Key, nRight.Key) <= 0)
+                        break;
+
+                    SwapIndices(right, index);
+
+                    index = right;
+                    left = index * 2 + 1;
+                    right = left + 1;
+                }
+            }
+
+            InsertItem(ref swap, index);
+        }
+
+        private void SwapIndices(int fromIndex, int toIndex)
+        {
+            _store[toIndex] = _store[fromIndex];
+        }
+
+        private void InsertItem(ref HeapItem fromItem, int toIndex)
+        {
+            _store[toIndex] = fromItem;
+        }
+
+        public void EnsureCapacity(int capacity)
+        {
+            if (_store.Length >= capacity)
+                return;
+
+            //double capacity until we reach the minimum requested capacity (or greater)
+            int newcap = Capacity * 2;
+            while (newcap < capacity)
+                newcap *= 2;
+
+            var newArray = new HeapItem[newcap];
+            Array.Copy(_store, newArray, Capacity);
+
+            _store = newArray;
+            Capacity = newcap;
+        }
+    }
+}
diff --git a/Torch/Collections/SortedView.cs b/Torch/Collections/SortedView.cs
index db1476f..2722eb9 100644
--- a/Torch/Collections/SortedView.cs
+++ b/Torch/Collections/SortedView.cs
@@ -2,13 +2,16 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+using Torch.Annotations;
 
 namespace Torch.Collections
 {
-    public class SortedView<T>: IReadOnlyCollection<T>, INotifyCollectionChanged
+    public class SortedView<T>: IReadOnlyCollection<T>, INotifyCollectionChanged, INotifyPropertyChanged
     {
         private readonly MtObservableCollectionBase<T> _backing;
         private IComparer<T> _comparer;
@@ -21,9 +24,15 @@ namespace Torch.Collections
             _store = new List<T>(_backing.Count);
             _store.AddRange(_backing);
             _backing.CollectionChanged += backing_CollectionChanged;
+            _backing.PropertyChanged += backing_PropertyChanged;
         }
 
-        private void backing_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        private void backing_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e.PropertyName);
+        }
+
+        private void backing_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             switch (e.Action)
             {
@@ -122,5 +131,12 @@ namespace Torch.Collections
         }
 
         public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }
diff --git a/Torch/Collections/SystemSortedView.cs b/Torch/Collections/SystemSortedView.cs
new file mode 100644
index 0000000..a02d54d
--- /dev/null
+++ b/Torch/Collections/SystemSortedView.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using Torch.Annotations;
+
+namespace Torch.Collections
+{
+    public class SystemSortedView<T> : IReadOnlyCollection<T>, INotifyCollectionChanged, INotifyPropertyChanged
+    {
+        private readonly ObservableCollection<T> _backing;
+        private IComparer<T> _comparer;
+        private readonly List<T> _store;
+
+        public SystemSortedView(ObservableCollection<T> backing, IComparer<T> comparer)
+        {
+            _comparer = comparer;
+            _backing = backing;
+            _store = new List<T>(_backing.Count);
+            _store.AddRange(_backing);
+            _backing.CollectionChanged += backing_CollectionChanged;
+        }
+
+        private void backing_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    InsertSorted(e.NewItems);
+                    CollectionChanged?.Invoke(this, e);
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    _store.RemoveAll(r => e.OldItems.Contains(r));
+                    CollectionChanged?.Invoke(this, e);
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                case NotifyCollectionChangedAction.Replace:
+                case NotifyCollectionChangedAction.Reset:
+                    Refresh();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return _store.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public int Count => _backing.Count;
+
+        private void InsertSorted(IEnumerable items)
+        {
+            foreach (var t in items)
+                InsertSorted((T)t);
+        }
+
+        private int InsertSorted(T item, IComparer<T> comparer = null)
+        {
+            if (comparer == null)
+                comparer = _comparer;
+
+            if (_store.Count == 0 || comparer == null)
+            {
+                _store.Add(item);
+                return 0;
+            }
+            if (comparer.Compare(_store[_store.Count - 1], item) <= 0)
+            {
+                _store.Add(item);
+                return _store.Count - 1;
+            }
+            if (comparer.Compare(_store[0], item) >= 0)
+            {
+                _store.Insert(0, item);
+                return 0;
+            }
+            int index = _store.BinarySearch(item);
+            if (index < 0)
+                index = ~index;
+            _store.Insert(index, item);
+            return index;
+        }
+
+        public void Sort(IComparer<T> comparer = null)
+        {
+            if (comparer == null)
+                comparer = _comparer;
+
+            if (comparer == null)
+                return;
+
+            _store.Sort(comparer);
+
+            CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+
+        public void Refresh()
+        {
+            _store.Clear();
+            _store.AddRange(_backing);
+            Sort();
+        }
+
+        public void SetComparer(IComparer<T> comparer, bool resort = true)
+        {
+            _comparer = comparer;
+            if (resort)
+                Sort();
+        }
+
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index ca60249..f7bc7b6 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -193,12 +193,14 @@
     <Compile Include="..\Versioning\AssemblyVersion.cs">
       <Link>Properties\AssemblyVersion.cs</Link>
     </Compile>
+    <Compile Include="Collections\BinaryMinHeap.cs" />
     <Compile Include="Collections\MtObservableCollection.cs" />
     <Compile Include="Collections\MtObservableCollectionBase.cs" />
     <Compile Include="Collections\MtObservableSortedDictionary.cs" />
     <Compile Include="Collections\MtObservableEvent.cs" />
     <Compile Include="Collections\MtObservableList.cs" />
     <Compile Include="Collections\SortedView.cs" />
+    <Compile Include="Collections\SystemSortedView.cs" />
     <Compile Include="Collections\TransformComparer.cs" />
     <Compile Include="Collections\TransformEnumerator.cs" />
     <Compile Include="Commands\ConsoleCommandContext.cs" />

From 8dca8bbe65ce3cedaec27e63c4965171c48fcbb2 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 26 Jun 2019 11:18:48 -0400
Subject: [PATCH 125/170] Fix build issues

---
 Torch/Collections/SortedView.cs       | 2 --
 Torch/Collections/SystemSortedView.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Torch/Collections/SortedView.cs b/Torch/Collections/SortedView.cs
index 2722eb9..ddf4a05 100644
--- a/Torch/Collections/SortedView.cs
+++ b/Torch/Collections/SortedView.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
-using Torch.Annotations;
 
 namespace Torch.Collections
 {
@@ -133,7 +132,6 @@ namespace Torch.Collections
         public event NotifyCollectionChangedEventHandler CollectionChanged;
         public event PropertyChangedEventHandler PropertyChanged;
 
-        [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/Torch/Collections/SystemSortedView.cs b/Torch/Collections/SystemSortedView.cs
index a02d54d..d1e3f14 100644
--- a/Torch/Collections/SystemSortedView.cs
+++ b/Torch/Collections/SystemSortedView.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
-using Torch.Annotations;
 
 namespace Torch.Collections
 {
@@ -125,7 +124,6 @@ namespace Torch.Collections
         public event NotifyCollectionChangedEventHandler CollectionChanged;
         public event PropertyChangedEventHandler PropertyChanged;
 
-        [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));

From 570bc83a6d37ba291c0ca96e0f087316d93e466c Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 6 Jul 2019 16:58:36 -0700
Subject: [PATCH 126/170] Fix remote API, file copying, entity manager sorting

---
 README.md                                 |  4 +---
 Torch.API/Torch.API.csproj                |  4 ++--
 Torch.API/packages.config                 |  2 +-
 Torch.Server/Initializer.cs               | 24 +++++++++++++++----
 Torch.Server/Managers/RemoteAPIManager.cs | 28 +++++++++++++++++++++++
 Torch.Server/Torch.Server.csproj          |  6 +++--
 Torch.Server/TorchServer.cs               |  8 +------
 Torch.Server/packages.config              |  2 +-
 Torch/Collections/SortedView.cs           | 20 +++++++++++++---
 9 files changed, 74 insertions(+), 24 deletions(-)
 create mode 100644 Torch.Server/Managers/RemoteAPIManager.cs

diff --git a/README.md b/README.md
index f553aaa..35ed4cd 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,5 @@ Torch is the successor to SE Server Extender and gives server admins the tools t
 # Building
 To build Torch you must first have a complete SE Dedicated installation somewhere. Before you open the solution, run the Setup batch file and enter the path of that installation's DedicatedServer64 folder. The script will make a symlink to that folder so the Torch solution can find the DLL references it needs.
 
-In both cases you will need to set the InstancePath in TorchConfig.xml to an existing dedicated server instance as Torch can't fully generate it on its own yet.
-
 If you have a more enjoyable server experience because of Torch, please consider supporting us on Patreon.
-[![Patreon](http://i.imgur.com/VzzIMgn.png)](https://www.patreon.com/bePatron?u=847269)!
+[![Patreon](http://i.imgur.com/VzzIMgn.png)](https://www.patreon.com/bePatron?u=847269)
diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj
index aa0dea8..028a6bb 100644
--- a/Torch.API/Torch.API.csproj
+++ b/Torch.API/Torch.API.csproj
@@ -39,8 +39,8 @@
       <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
diff --git a/Torch.API/packages.config b/Torch.API/packages.config
index 5221eb5..fbd3f14 100644
--- a/Torch.API/packages.config
+++ b/Torch.API/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 8c1c4d4..e152373 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -62,16 +62,30 @@ quit";
             var basePath = new FileInfo(typeof(Program).Assembly.Location).Directory.ToString();
             var apiSource = Path.Combine(basePath, "DedicatedServer64", "steam_api64.dll");
             var apiTarget = Path.Combine(basePath, "steam_api64.dll");
-            
-            if (!File.Exists(apiTarget) || File.GetLastWriteTime(apiTarget) < File.GetLastWriteTime(apiSource))
+
+            if (!File.Exists(apiTarget))
+            {
                 File.Copy(apiSource, apiTarget);
+            }
+            else if (File.GetLastWriteTime(apiTarget) < File.GetLastWriteTime(apiSource))
+            {
+                File.Delete(apiTarget);
+                File.Copy(apiSource, apiTarget);
+            }
             
             var havokSource = Path.Combine(basePath, "DedicatedServer64", "Havok.dll");
             var havokTarget = Path.Combine(basePath, "Havok.dll");
-            
-            if (!File.Exists(havokTarget) || File.GetLastWriteTime(havokTarget) < File.GetLastWriteTime(havokSource))
+
+            if (!File.Exists(havokTarget))
+            {
+                File.Copy(havokSource, havokTarget);   
+            }
+            else if (File.GetLastWriteTime(havokTarget) < File.GetLastWriteTime(havokSource))
+            {   
+                File.Delete(havokTarget);
                 File.Copy(havokSource, havokTarget);
-            
+            }
+
             _config = InitConfig();
             if (!_config.Parse(args))
                 return false;
diff --git a/Torch.Server/Managers/RemoteAPIManager.cs b/Torch.Server/Managers/RemoteAPIManager.cs
new file mode 100644
index 0000000..4d7fe1c
--- /dev/null
+++ b/Torch.Server/Managers/RemoteAPIManager.cs
@@ -0,0 +1,28 @@
+using NLog;
+using Sandbox;
+using Torch.API;
+using Torch.Managers;
+using VRage.Dedicated.RemoteAPI;
+
+namespace Torch.Server.Managers
+{
+    public class RemoteAPIManager : Manager
+    {
+        /// <inheritdoc />
+        public RemoteAPIManager(ITorchBase torchInstance) : base(torchInstance)
+        {
+            
+        }
+        
+        /// <inheritdoc />
+        public override void Attach()
+        {
+            if (MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
+            {
+                var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
+                LogManager.GetCurrentClassLogger().Info($"Remote API started on port {myRemoteServer.Port}");
+            }
+            base.Attach();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 798c6a8..2265911 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -90,8 +90,9 @@
     <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
       <HintPath>..\GameBinaries\netstandard.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
@@ -251,6 +252,7 @@
     <Compile Include="Managers\InstanceManager.cs" />
     <Compile Include="Managers\MultiplayerManagerDedicatedEventShim.cs" />
     <Compile Include="Managers\MultiplayerManagerDedicatedPatchShim.cs" />
+    <Compile Include="Managers\RemoteAPIManager.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="Initializer.cs" />
     <Compile Include="Patches\PromotePatch.cs" />
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 30c177d..7835f39 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -54,6 +54,7 @@ namespace Torch.Server
             DedicatedInstance = new InstanceManager(this);
             AddManager(DedicatedInstance);
             AddManager(new EntityControlManager(this));
+            AddManager(new RemoteAPIManager(this));
             Config = config ?? new TorchConfig();
 
             var sessionManager = Managers.GetManager<ITorchSessionManager>();
@@ -127,13 +128,6 @@ namespace Torch.Server
             _hasRun = true;
             Log.Info("Starting server.");
             MySandboxGame.ConfigDedicated = DedicatedInstance.DedicatedConfig.Model;
-            //Are you serious, Keen? This is going away until it stops hanging.
-            //if (MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
-            //{
-            //    var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
-            //    Log.Info($"Remote API started on port {myRemoteServer.Port}");
-            //}
-            Log.Warn("Remote API is disabled because it hangs the server start process. Blame Keen.");
 
             _uptime = Stopwatch.StartNew();
             base.Start();
diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config
index 24c621a..b1ff266 100644
--- a/Torch.Server/packages.config
+++ b/Torch.Server/packages.config
@@ -5,7 +5,7 @@
   <package id="Markdown.Xaml" version="1.0.0" targetFramework="net461" />
   <package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net461" />
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
   <package id="NLog" version="4.4.12" targetFramework="net461" />
   <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
   <package id="SteamKit2" version="2.1.0" targetFramework="net461" />
diff --git a/Torch/Collections/SortedView.cs b/Torch/Collections/SortedView.cs
index bfa5953..d76fa5e 100644
--- a/Torch/Collections/SortedView.cs
+++ b/Torch/Collections/SortedView.cs
@@ -4,12 +4,16 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
+using Havok;
+using NLog;
 
 namespace Torch.Collections
 {
     public class SortedView<T>: IReadOnlyCollection<T>, INotifyCollectionChanged
     {
+        private readonly Logger _log = LogManager.GetCurrentClassLogger();
         private readonly MtObservableCollectionBase<T> _backing;
         private IComparer<T> _comparer;
         private readonly List<T> _store;
@@ -106,9 +110,19 @@ namespace Torch.Collections
 
         public void Refresh()
         {
-            _store.Clear();
-            _store.AddRange(_backing);
-            Sort();
+            //HACK, fix the multithreading
+            try
+            {
+                _store.Clear();
+                _store.AddRange(_backing);
+                Sort();
+            }
+            catch (IndexOutOfRangeException e)
+            {
+                _log.Error(e);
+                Thread.Sleep(10);
+                Refresh();
+            }
         }
 
         public void SetComparer(IComparer<T> comparer, bool resort = true)

From e77d53fd418c14bfc9323a3fba1f45f93740b171 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 6 Jul 2019 17:18:15 -0700
Subject: [PATCH 127/170] Better SortedView fix

---
 Torch/Collections/SortedView.cs | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/Torch/Collections/SortedView.cs b/Torch/Collections/SortedView.cs
index d76fa5e..3a8484c 100644
--- a/Torch/Collections/SortedView.cs
+++ b/Torch/Collections/SortedView.cs
@@ -110,19 +110,12 @@ namespace Torch.Collections
 
         public void Refresh()
         {
-            //HACK, fix the multithreading
-            try
-            {
-                _store.Clear();
-                _store.AddRange(_backing);
-                Sort();
-            }
-            catch (IndexOutOfRangeException e)
-            {
-                _log.Error(e);
-                Thread.Sleep(10);
-                Refresh();
-            }
+            _store.Clear();
+            //_store.AddRange(_backing);
+            _store.EnsureCapacity(_backing.Count);
+            foreach (var e in _backing)
+                _store.Add(e);
+            Sort();
         }
 
         public void SetComparer(IComparer<T> comparer, bool resort = true)

From c831df74d0d8cffb90650afb25b199f6e90f7a7a Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 10 Jul 2019 14:12:04 -0400
Subject: [PATCH 128/170] Fix regression in PluginManager.

Closes #321
---
 Torch/Plugins/PluginManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index a385b63..692986c 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -115,7 +115,7 @@ namespace Torch.Managers
                         if (!firstLoad)
                         {
                             _log.Warn($"Plugin {manifest.Name} ({item}) exists in the plugin directory, but is not listed in torch.cfg. Skipping load!");
-                            return;
+                            continue;
                         }
                         _log.Info($"First-time load: Plugin {manifest.Name} added to torch.cfg.");
                         Torch.Config.Plugins.Add(manifest.Guid);

From 496a276524fbb89093d455b4d906721474d6d2d1 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Wed, 10 Jul 2019 18:43:32 -0700
Subject: [PATCH 129/170] Disable starting as service to fix compatibility with
 Windows Server 2019

---
 Torch.Server/Program.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index 9abb67c..f20fd8e 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -59,12 +59,13 @@ namespace Torch.Server
                 return;
             }
 
+            /* Breaks on Windows Server 2019 and we don't fully support services anyway
             if (!Environment.UserInteractive)
             {
                 using (var service = new TorchService())
                     ServiceBase.Run(service);
                 return;
-            }
+            }*/
 
             var initializer = new Initializer(workingDir);
             if (!initializer.Initialize(args))

From fd4b49e0d5ab086d24225ce69b1a2a267ab4a4d5 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 11 Jul 2019 13:26:43 -0700
Subject: [PATCH 130/170] Fix remote API load order

---
 Torch.Server/Managers/RemoteAPIManager.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/Managers/RemoteAPIManager.cs b/Torch.Server/Managers/RemoteAPIManager.cs
index 4d7fe1c..645a426 100644
--- a/Torch.Server/Managers/RemoteAPIManager.cs
+++ b/Torch.Server/Managers/RemoteAPIManager.cs
@@ -17,12 +17,24 @@ namespace Torch.Server.Managers
         /// <inheritdoc />
         public override void Attach()
         {
-            if (MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
+            Torch.GameStateChanged += TorchOnGameStateChanged;
+            base.Attach();
+        }
+
+        /// <inheritdoc />
+        public override void Detach()
+        {
+            Torch.GameStateChanged -= TorchOnGameStateChanged;
+            base.Detach();
+        }
+
+        private void TorchOnGameStateChanged(MySandboxGame game, TorchGameState newstate)
+        {
+            if (newstate == TorchGameState.Loading && MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
             {
                 var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
                 LogManager.GetCurrentClassLogger().Info($"Remote API started on port {myRemoteServer.Port}");
             }
-            base.Attach();
         }
     }
 }
\ No newline at end of file

From f4399d441d51069034b99764429acab38dafe0f6 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 11 Jul 2019 23:35:24 -0700
Subject: [PATCH 131/170] Only disable service mode on Windows Server 2019

---
 Torch.Server/Program.cs          | 7 ++++---
 Torch.Server/Torch.Server.csproj | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index f20fd8e..3e10b1e 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 using System.ServiceProcess;
 using System.Text;
 using System.Threading;
+using Microsoft.VisualBasic.Devices;
 using NLog;
 using NLog.Fluent;
 using NLog.Targets;
@@ -59,13 +60,13 @@ namespace Torch.Server
                 return;
             }
 
-            /* Breaks on Windows Server 2019 and we don't fully support services anyway
-            if (!Environment.UserInteractive)
+            // Breaks on Windows Server 2019
+            if (!new ComputerInfo().OSFullName.Contains("Server 2019") && !Environment.UserInteractive)
             {
                 using (var service = new TorchService())
                     ServiceBase.Run(service);
                 return;
-            }*/
+            }
 
             var initializer = new Initializer(workingDir);
             if (!initializer.Initialize(args))
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 2265911..1ebb566 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -83,6 +83,7 @@
       <HintPath>..\GameBinaries\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Microsoft.Win32.Registry, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
     </Reference>

From f15139e907f3052678f915793e9c4ce658de37c3 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 15 Jul 2019 11:10:10 -0400
Subject: [PATCH 132/170] Add -testplugin commandline switch

---
 Torch.API/ITorchConfig.cs      |  1 +
 Torch.Server/TorchConfig.cs    |  4 ++++
 Torch/Plugins/PluginManager.cs | 42 +++++++++++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/Torch.API/ITorchConfig.cs b/Torch.API/ITorchConfig.cs
index 70cc019..84d4121 100644
--- a/Torch.API/ITorchConfig.cs
+++ b/Torch.API/ITorchConfig.cs
@@ -22,6 +22,7 @@ namespace Torch
         string WaitForPID { get; set; }
         string ChatName { get; set; }
         string ChatColor { get; set; }
+        string TestPlugin { get; set; }
 
         bool Save(string path = null);
     }
diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 7c86e24..1172b9b 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -117,6 +117,10 @@ namespace Torch.Server
         [Arg("console", "Keeps a separate console window open after the main UI loads.")]
         public bool IndependentConsole { get; set; } = false;
 
+        [XmlIgnore]
+        [Arg("testplugin", "Path to a plugin to debug. For development use only.")]
+        public string TestPlugin { get; set; }
+
         [XmlIgnore]
         private string _path;
 
diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index b93db8d..28b017e 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -121,6 +121,25 @@ namespace Torch.Managers
         {
             _log.Info("Loading plugins...");
 
+            if (!string.IsNullOrEmpty(Torch.Config.TestPlugin))
+            {
+                _log.Info($"Loading plugin for debug at {Torch.Config.TestPlugin}");
+                
+                foreach (var item in GetLocalPlugins(Torch.Config.TestPlugin, true))
+                {
+                    _log.Info(item.Path);
+                    LoadPlugin(item);
+                }
+
+                foreach (var plugin in _plugins.Values)
+                {
+                    plugin.Init(Torch);
+                }
+                _log.Info($"Loaded {_plugins.Count} plugins.");
+                PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
+                return;
+            }
+
             var pluginItems = GetLocalPlugins(PluginDir);
             var pluginsToLoad = new List<PluginItem>();
             foreach (var item in pluginItems)
@@ -187,24 +206,35 @@ namespace Torch.Managers
             PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
         }
 
-        private List<PluginItem> GetLocalPlugins(string pluginDir)
+        private List<PluginItem> GetLocalPlugins(string pluginDir, bool debug = false)
         {
             var firstLoad = Torch.Config.Plugins.Count == 0;
             
             var pluginItems = Directory.EnumerateFiles(pluginDir, "*.zip")
-                .Union(Directory.EnumerateDirectories(PluginDir));
+                .Union(Directory.EnumerateDirectories(pluginDir));
+            if (debug)
+                pluginItems = pluginItems.Union(new List<string> {pluginDir});
             var results = new List<PluginItem>();
 
             foreach (var item in pluginItems)
             {
-                var path = Path.Combine(PluginDir, item);
+                var path = Path.Combine(pluginDir, item);
                 var isZip = item.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase);
                 var manifest = isZip ? GetManifestFromZip(path) : GetManifestFromDirectory(path);
 
                 if (manifest == null)
                 {
-                    _log.Warn($"Item '{item}' is missing a manifest, skipping.");
-                    continue;
+                    if (!debug)
+                    {
+                        _log.Warn($"Item '{item}' is missing a manifest, skipping.");
+                        continue;
+                    }
+                    manifest = new PluginManifest()
+                               {
+                                   Guid = new Guid(),
+                                   Version = "0",
+                                   Name = "TEST"
+                               };
                 }
 
                 var duplicatePlugin = results.FirstOrDefault(r => r.Manifest.Guid == manifest.Guid);
@@ -215,7 +245,7 @@ namespace Torch.Managers
                     continue;
                 }
                 
-                if (!Torch.Config.LocalPlugins)
+                if (!Torch.Config.LocalPlugins && !debug)
                 {
                     if (isZip && !Torch.Config.Plugins.Contains(manifest.Guid))
                     {

From a42f5ab2732fcfa8d49ed32bfec3a239a0fe818b Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 8 Aug 2019 21:58:12 -0400
Subject: [PATCH 133/170] Fix editing admins with role editor

---
 Torch.Server/Views/ConfigControl.xaml.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/Views/ConfigControl.xaml.cs b/Torch.Server/Views/ConfigControl.xaml.cs
index ee9de3c..486c4e6 100644
--- a/Torch.Server/Views/ConfigControl.xaml.cs
+++ b/Torch.Server/Views/ConfigControl.xaml.cs
@@ -13,6 +13,7 @@ using Torch.Server.Annotations;
 using Torch.Server.Managers;
 using Torch.Server.ViewModels;
 using Torch.Views;
+using VRage.Game.ModAPI;
 
 namespace Torch.Server.Views
 {
@@ -129,7 +130,9 @@ namespace Torch.Server.Views
             //var w = new RoleEditor(_instanceManager.DedicatedConfig.SelectedWorld);
             //w.Show();
             var d = new RoleEditor();
-            d.Edit(_instanceManager.DedicatedConfig.SelectedWorld.Checkpoint.PromotedUsers.Dictionary);
+            var w = _instanceManager.DedicatedConfig.SelectedWorld;
+            d.Edit(w.Checkpoint.PromotedUsers.Dictionary);
+            _instanceManager.DedicatedConfig.Administrators = w.Checkpoint.PromotedUsers.Dictionary.Where(k => k.Value >= MyPromoteLevel.Admin).Select(k => k.Key.ToString()).ToList();
         }
     }
 }

From f1616f6532f64dae72f238e9418f4ba961e451cf Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Fri, 16 Aug 2019 12:48:16 -0400
Subject: [PATCH 134/170] Implement kick on restart

---
 Torch.API/ITorchConfig.cs               |  1 +
 Torch.Mod/Messages/JoinServerMessage.cs | 57 ++++++++++++++++
 Torch.Mod/Messages/MessageBase.cs       |  3 +-
 Torch.Mod/ModCommunication.cs           | 91 +++++++++++++++----------
 Torch.Mod/Torch.Mod.projitems           |  1 +
 Torch.Mod/TorchModCore.cs               | 13 ++++
 Torch.Server/TorchConfig.cs             |  3 +
 Torch.Server/TorchServer.cs             |  6 ++
 8 files changed, 138 insertions(+), 37 deletions(-)
 create mode 100644 Torch.Mod/Messages/JoinServerMessage.cs

diff --git a/Torch.API/ITorchConfig.cs b/Torch.API/ITorchConfig.cs
index 70cc019..1fa9c4f 100644
--- a/Torch.API/ITorchConfig.cs
+++ b/Torch.API/ITorchConfig.cs
@@ -22,6 +22,7 @@ namespace Torch
         string WaitForPID { get; set; }
         string ChatName { get; set; }
         string ChatColor { get; set; }
+        bool DisconnectOnRestart { get; set; }
 
         bool Save(string path = null);
     }
diff --git a/Torch.Mod/Messages/JoinServerMessage.cs b/Torch.Mod/Messages/JoinServerMessage.cs
new file mode 100644
index 0000000..ffc8ab0
--- /dev/null
+++ b/Torch.Mod/Messages/JoinServerMessage.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ProtoBuf;
+using Sandbox.ModAPI;
+
+namespace Torch.Mod.Messages
+{
+    [ProtoContract]
+    public class JoinServerMessage : MessageBase
+    {
+        [ProtoMember(201)]
+        public int Delay;
+        [ProtoMember(202)]
+        public string Address;
+
+        private JoinServerMessage()
+        {
+
+        }
+
+        public JoinServerMessage(string address)
+        {
+            Address = address;
+        }
+
+        public JoinServerMessage(string address, int delay)
+        {
+            Address = address;
+            Delay = delay;
+        }
+
+        public override void ProcessClient()
+        {
+            if (TorchModCore.Debug)
+            {
+                MyAPIGateway.Utilities.ShowMessage("Torch", $"Joining server {Address} with delay {Delay}");
+            }
+
+            if (Delay <= 0)
+            {
+                MyAPIGateway.Multiplayer.JoinServer(Address);
+                return;
+            }
+
+            MyAPIGateway.Parallel.StartBackground(() =>
+                                                  {
+                                                      MyAPIGateway.Parallel.Sleep(Delay);
+                                                      MyAPIGateway.Multiplayer.JoinServer(Address);
+                                                  });
+        }
+
+        public override void ProcessServer()
+        {
+        }
+    }
+}
diff --git a/Torch.Mod/Messages/MessageBase.cs b/Torch.Mod/Messages/MessageBase.cs
index 3a00738..55bc140 100644
--- a/Torch.Mod/Messages/MessageBase.cs
+++ b/Torch.Mod/Messages/MessageBase.cs
@@ -11,6 +11,7 @@ namespace Torch.Mod.Messages
     [ProtoInclude(1, typeof(DialogMessage))]
     [ProtoInclude(2, typeof(NotificationMessage))]
     [ProtoInclude(3, typeof(VoxelResetMessage))]
+    [ProtoInclude(4, typeof(JoinServerMessage))]
     #endregion
 
     [ProtoContract]
@@ -28,7 +29,7 @@ namespace Torch.Mod.Messages
         internal ulong[] Ignore;
         internal byte[] CompressedData;
     }
-
+    
     public enum MessageTarget
     {
         /// <summary>
diff --git a/Torch.Mod/ModCommunication.cs b/Torch.Mod/ModCommunication.cs
index 2c7b492..76be249 100644
--- a/Torch.Mod/ModCommunication.cs
+++ b/Torch.Mod/ModCommunication.cs
@@ -10,6 +10,7 @@ using Torch.Mod.Messages;
 using VRage;
 using VRage.Collections;
 using VRage.Game.ModAPI;
+using VRage.Network;
 using VRage.Utils;
 using Task = ParallelTasks.Task;
 
@@ -50,6 +51,10 @@ namespace Torch.Mod
         {
             var m = _messagePool.Get();
             m.CompressedData = bytes;
+#if TORCH
+            m.SenderId = MyEventContext.Current.Sender.Value;
+#endif
+
             _processing.Add(m);
         }
 
@@ -59,10 +64,19 @@ namespace Torch.Mod
             {
                 try
                 {
-                    var m = _processing.Take();
+                    MessageBase m;
+                    try
+                    {
+                        m = _processing.Take();
+                    }
+                    catch
+                    {
+                        continue;
+                    }
+
                     MyLog.Default.WriteLineAndConsole($"Processing message: {m.GetType().Name}");
 
-                    if (m is IncomingMessage)
+                    if (m is IncomingMessage) //process incoming messages
                     {
                         MessageBase i;
                         try
@@ -78,50 +92,55 @@ namespace Torch.Mod
                             continue;
                         }
 
+                        if (TorchModCore.Debug)
+                            MyAPIGateway.Utilities.ShowMessage("Torch", $"Received message of type {i.GetType().Name}");
+
                         if (MyAPIGateway.Multiplayer.IsServer)
                             i.ProcessServer();
                         else
                             i.ProcessClient();
                     }
-                    else
+                    else //process outgoing messages
                     {
+                        if (TorchModCore.Debug)
+                            MyAPIGateway.Utilities.ShowMessage("Torch", $"Sending message of type {m.GetType().Name}");
+
                         var b = MyAPIGateway.Utilities.SerializeToBinary(m);
                         m.CompressedData = MyCompression.Compress(b);
 
-                        MyAPIGateway.Utilities.InvokeOnGameThread(() =>
+                        switch (m.TargetType)
                         {
+                            case MessageTarget.Single:
+                                MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, m.Target);
+                                break;
+                            case MessageTarget.Server:
+                                MyAPIGateway.Multiplayer.SendMessageToServer(NET_ID, m.CompressedData);
+                                break;
+                            case MessageTarget.AllClients:
+                                MyAPIGateway.Players.GetPlayers(_playerCache);
+                                foreach (var p in _playerCache)
+                                {
+                                    if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId)
+                                        continue;
+                                    MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
+                                }
 
-                            switch (m.TargetType)
-                            {
-                                case MessageTarget.Single:
-                                    MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, m.Target);
-                                    break;
-                                case MessageTarget.Server:
-                                    MyAPIGateway.Multiplayer.SendMessageToServer(NET_ID, m.CompressedData);
-                                    break;
-                                case MessageTarget.AllClients:
-                                    MyAPIGateway.Players.GetPlayers(_playerCache);
-                                    foreach (var p in _playerCache)
-                                    {
-                                        if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId)
-                                            continue;
-                                        MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
-                                    }
-                                    break;
-                                case MessageTarget.AllExcept:
-                                    MyAPIGateway.Players.GetPlayers(_playerCache);
-                                    foreach (var p in _playerCache)
-                                    {
-                                        if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId || m.Ignore.Contains(p.SteamUserId))
-                                            continue;
-                                        MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
-                                    }
-                                    break;
-                                default:
-                                    throw new Exception();
-                            }
-                            _playerCache.Clear();
-                        });
+                                break;
+                            case MessageTarget.AllExcept:
+                                MyAPIGateway.Players.GetPlayers(_playerCache);
+                                foreach (var p in _playerCache)
+                                {
+                                    if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId || m.Ignore.Contains(p.SteamUserId))
+                                        continue;
+                                    MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
+                                }
+
+                                break;
+                            default:
+                                throw new Exception();
+                        }
+
+                        _playerCache.Clear();
                     }
                 }
                 catch (Exception ex)
@@ -130,7 +149,7 @@ namespace Torch.Mod
                 }
             }
 
-            MyLog.Default.WriteLineAndConsole("TORCH MOD: COMMUNICATION THREAD: EXIT SIGNAL RECEIVED!");
+            MyLog.Default.WriteLineAndConsole("TORCH MOD: INFO: Communication thread shut down successfully! THIS IS NOT AN ERROR");
             //exit signal received. Clean everything and GTFO
             _processing?.Dispose();
             _processing = null;
diff --git a/Torch.Mod/Torch.Mod.projitems b/Torch.Mod/Torch.Mod.projitems
index 632d99a..8ab2e95 100644
--- a/Torch.Mod/Torch.Mod.projitems
+++ b/Torch.Mod/Torch.Mod.projitems
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Messages\IncomingMessage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Messages\JoinServerMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\NotificationMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\DialogMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\MessageBase.cs" />
diff --git a/Torch.Mod/TorchModCore.cs b/Torch.Mod/TorchModCore.cs
index 83f3a33..9ccddf6 100644
--- a/Torch.Mod/TorchModCore.cs
+++ b/Torch.Mod/TorchModCore.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Sandbox.ModAPI;
 using VRage.Game.Components;
 
 namespace Torch.Mod
@@ -12,6 +13,7 @@ namespace Torch.Mod
     {
         public const ulong MOD_ID = 1406994352;
         private static bool _init;
+        public static bool Debug;
 
         public override void UpdateAfterSimulation()
         {
@@ -20,6 +22,17 @@ namespace Torch.Mod
 
             _init = true;
             ModCommunication.Register();
+            MyAPIGateway.Utilities.MessageEntered += Utilities_MessageEntered;
+        }
+
+        private void Utilities_MessageEntered(string messageText, ref bool sendToOthers)
+        {
+            if (messageText == "@!debug")
+            {
+                Debug = !Debug;
+                MyAPIGateway.Utilities.ShowMessage("Torch", $"Debug: {Debug}");
+                sendToOthers = false;
+            }
         }
 
         protected override void UnloadData()
diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 7c86e24..7b3717b 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -94,6 +94,9 @@ namespace Torch.Server
         [Arg("localplugins", "Loads all pluhins from disk, ignores the plugins defined in config.")]
         public bool LocalPlugins { get; set; }
 
+        [Arg("disconnect", "When server restarts, all clients are rejected to main menu to prevent auto rejoin")]
+        public bool DisconnectOnRestart { get; set; }
+
         public string ChatName { get; set; } = "Server";
 
         public string ChatColor { get; set; } = "Red";
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 7835f39..d017354 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -19,6 +19,7 @@ using Torch.API.Managers;
 using Torch.API.Session;
 using Torch.Commands;
 using Torch.Mod;
+using Torch.Mod.Messages;
 using Torch.Server.Commands;
 using Torch.Server.Managers;
 using Torch.Utils;
@@ -152,6 +153,11 @@ namespace Torch.Server
         /// </summary>
         public override void Restart()
         {
+            if (Config.DisconnectOnRestart)
+            {
+                ModCommunication.SendMessageToClients(new JoinServerMessage("0.0.0.0:25555"));
+            }
+
             if (IsRunning)
                 Save().ContinueWith(DoRestart, this, TaskContinuationOptions.RunContinuationsAsynchronously);
             else

From 1a1f8b223500d5186b962fc94abbeab1d8441c9e Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Fri, 16 Aug 2019 12:51:51 -0400
Subject: [PATCH 135/170] Fix dumb in torch mod

---
 Torch.Mod/TorchModCore.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Torch.Mod/TorchModCore.cs b/Torch.Mod/TorchModCore.cs
index 9ccddf6..877ca8c 100644
--- a/Torch.Mod/TorchModCore.cs
+++ b/Torch.Mod/TorchModCore.cs
@@ -39,6 +39,7 @@ namespace Torch.Mod
         {
             try
             {
+                MyAPIGateway.Utilities.MessageEntered -= Utilities_MessageEntered;
                 ModCommunication.Unregister();
             }
             catch

From 43adecaf990718c5f211aa194fdd4da4fbfc614d Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 22 Aug 2019 13:25:53 -0400
Subject: [PATCH 136/170] Publictest (#335)

* Fix compiler errors

* Fix Jenkins

* Build public test as Release

* Fix more things

* Oops

* Remove obsolete code

* Fix GameStatePatchShim
---
 Jenkins/jenkins-grab-se.ps1                   |   4 +-
 Jenkinsfile                                   |   4 +-
 Torch.API/WebAPI/JenkinsQuery.cs              |   3 -
 Torch.Server/Initializer.cs                   |   2 +-
 Torch.Server/Managers/InstanceManager.cs      |  10 -
 .../Patches/WorldLoadExceptionPatch.cs        |  48 +++
 Torch.Server/Torch.Server.csproj              |  12 +-
 Torch.Server/TorchConfig.cs                   |   4 -
 Torch.Server/TorchServer.cs                   |   1 +
 .../NetworkManager/NetworkHandlerBase.cs      | 254 -----------
 .../Managers/NetworkManager/NetworkManager.cs |  10 +-
 .../NetworkManager_Deprecated.cs              | 407 ------------------
 .../Managers/PatchManager/DecoratedMethod.cs  |   2 +-
 Torch/Managers/ScriptingManager.cs            |  54 ---
 Torch/Managers/UpdateManager.cs               |   2 +-
 Torch/Patches/GameAnalyticsPatch.cs           |   6 +-
 Torch/Patches/GameStatePatchShim.cs           |   2 +-
 Torch/Patches/TorchAsyncSaving.cs             |   1 +
 Torch/Torch.csproj                            |   3 -
 Torch/TorchBase.cs                            |   3 +-
 Torch/VRageGame.cs                            |   4 -
 Torch/Views/PropertyGrid.xaml.cs              |   1 -
 22 files changed, 68 insertions(+), 769 deletions(-)
 create mode 100644 Torch.Server/Patches/WorldLoadExceptionPatch.cs
 delete mode 100644 Torch/Managers/NetworkManager/NetworkHandlerBase.cs
 delete mode 100644 Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
 delete mode 100644 Torch/Managers/ScriptingManager.cs

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 10d4105..5699e3d 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -1,6 +1,6 @@
 pushd
 
-$steamData = "C:/Steam/Data/"
+$steamData = "C:/Steam/Data-playtest/"
 $steamCMDPath = "C:/Steam/steamcmd/"
 $steamCMDZip = "C:/Steam/steamcmd.zip"
 
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta publictest -betapassword nt8WuDw9kdvE validate" "+quit"
 
 popd
diff --git a/Jenkinsfile b/Jenkinsfile
index 7481efd..14b2267 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@ node {
 	stage('Acquire SE') {
 		bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
 		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
-		bat 'mklink /J GameBinaries "C:/Steam/Data/DedicatedServer64/"'		
+		bat 'mklink /J GameBinaries "C:/Steam/Data-playtest/DedicatedServer64/"'		
 	}
 
 	stage('Acquire NuGet Packages') {
@@ -31,7 +31,7 @@ node {
 
 	stage('Build') {
 		currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim()
-		if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "Patron") {
+		if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "Patron" || env.BRANCH_NAME == "publictest") {
 			buildMode = "Release"
 		} else {
 			buildMode = "Debug"
diff --git a/Torch.API/WebAPI/JenkinsQuery.cs b/Torch.API/WebAPI/JenkinsQuery.cs
index 5c9ea1c..d4620e5 100644
--- a/Torch.API/WebAPI/JenkinsQuery.cs
+++ b/Torch.API/WebAPI/JenkinsQuery.cs
@@ -30,9 +30,6 @@ namespace Torch.API.WebAPI
 
         public async Task<Job> GetLatestVersion(string branch)
         {
-#if DEBUG
-            branch = "master";
-#endif
             var h = await _client.GetAsync(string.Format(BRANCH_QUERY, branch));
             if (!h.IsSuccessStatusCode)
             {
diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index e152373..23d89e0 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -31,7 +31,7 @@ namespace Torch.Server
 
         private const string RUNSCRIPT = @"force_install_dir ../
 login anonymous
-app_update 298740
+app_update 298740 -beta publictest -betapassword nt8WuDw9kdvE validate
 quit";
 
         private TorchConfig _config;
diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index 82ad278..01ff765 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -198,16 +198,6 @@ namespace Torch.Server.Managers
 
         public void SaveConfig()
         {
-            var cf = Torch.Config as TorchConfig;
-            if (cf?.ReservedPlayers?.Count > 0)
-            {
-                foreach (var res in cf.ReservedPlayers)
-                {
-                    if (!DedicatedConfig.Reserved.Contains(res))
-                        DedicatedConfig.Reserved.Add(res);
-                }
-            }
-
             DedicatedConfig.Save(Path.Combine(Torch.Config.InstancePath, CONFIG_NAME));
             Log.Info("Saved dedicated config.");
 
diff --git a/Torch.Server/Patches/WorldLoadExceptionPatch.cs b/Torch.Server/Patches/WorldLoadExceptionPatch.cs
new file mode 100644
index 0000000..a1cbcaf
--- /dev/null
+++ b/Torch.Server/Patches/WorldLoadExceptionPatch.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using NLog;
+using Sandbox;
+using Torch.Managers.PatchManager;
+using Torch.Managers.PatchManager.MSIL;
+
+namespace Torch.Patches
+{
+    /// <summary>
+    /// Patches MySandboxGame.InitQuickLaunch to rethrow exceptions caught during session load.
+    /// </summary>
+    [PatchShim]
+    public static class WorldLoadExceptionPatch
+    {
+        private static readonly ILogger _log = LogManager.GetCurrentClassLogger();
+        
+        public static void Patch(PatchContext ctx)
+        {
+            ctx.GetPattern(typeof(MySandboxGame).GetMethod("InitQuickLaunch", BindingFlags.Instance | BindingFlags.NonPublic))
+               .Transpilers.Add(typeof(WorldLoadExceptionPatch).GetMethod(nameof(Transpile), BindingFlags.Static | BindingFlags.NonPublic));
+        }
+
+        private static IEnumerable<MsilInstruction> Transpile(IEnumerable<MsilInstruction> method)
+        {
+            var msil = method.ToList();
+            for (var i = 0; i < msil.Count; i++)
+            {
+                if (msil[i].TryCatchOperations.All(x => x.Type != MsilTryCatchOperationType.BeginClauseBlock))
+                    continue;
+
+                for (; i < msil.Count; i++)
+                {
+                    if (msil[i].OpCode != OpCodes.Leave)
+                        continue;
+
+                    msil[i] = new MsilInstruction(OpCodes.Rethrow);
+                    break;
+                }
+            }
+            return msil;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 1ebb566..6695434 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -208,15 +208,8 @@
       <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -257,6 +250,7 @@
     <Compile Include="NativeMethods.cs" />
     <Compile Include="Initializer.cs" />
     <Compile Include="Patches\PromotePatch.cs" />
+    <Compile Include="Patches\WorldLoadExceptionPatch.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TorchConfig.cs" />
diff --git a/Torch.Server/TorchConfig.cs b/Torch.Server/TorchConfig.cs
index 7b3717b..a985589 100644
--- a/Torch.Server/TorchConfig.cs
+++ b/Torch.Server/TorchConfig.cs
@@ -109,10 +109,6 @@ namespace Torch.Server
 
         public string LastUsedTheme { get; set; } = "Torch Theme";
 
-        //TODO: REMOVE ME BY JULY 2019
-        [Obsolete("Use vanilla reserved slot config")]
-        public HashSet<ulong> ReservedPlayers { get; set; } = new HashSet<ulong>();
-
         //Prevent reserved players being written to disk, but allow it to be read
         //remove this when ReservedPlayers is removed
         private bool ShouldSerializeReservedPlayers() => false;
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index d017354..0f593f3 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -27,6 +27,7 @@ using VRage;
 using VRage.Dedicated;
 using VRage.Dedicated.RemoteAPI;
 using VRage.GameServices;
+using VRage.Scripting;
 using VRage.Steam;
 using Timer = System.Threading.Timer;
 
diff --git a/Torch/Managers/NetworkManager/NetworkHandlerBase.cs b/Torch/Managers/NetworkManager/NetworkHandlerBase.cs
deleted file mode 100644
index 3add688..0000000
--- a/Torch/Managers/NetworkManager/NetworkHandlerBase.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using VRage;
-using VRage.Library.Collections;
-using VRage.Network;
-using VRage.Serialization;
-
-namespace Torch.Managers
-{
-    [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-    public abstract class NetworkHandlerBase
-    {
-        /// <summary>
-        /// Check the method name and do unit tests on parameters in here.
-        /// </summary>
-        /// <param name="site"></param>
-        /// <returns></returns>
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public abstract bool CanHandle(CallSite site);
-
-        /// <summary>
-        /// Performs action on network packet. Return value of true means the packet has been handled, and will not be passed on to the game server.
-        /// </summary>
-        /// <param name="remoteUserId"></param>
-        /// <param name="site"></param>
-        /// <param name="stream"></param>
-        /// <param name="obj"></param>
-        /// <param name="packet"></param>
-        /// <returns></returns>
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public abstract bool Handle(ulong remoteUserId, CallSite site, BitStream stream, object obj, MyPacket packet);
-
-        /// <summary>
-        /// Extracts method arguments from the bitstream or packs them back in, depending on stream read mode.
-        /// </summary>
-        /// <typeparam name="T1"></typeparam>
-        /// <param name="info"></param>
-        /// <param name="stream"></param>
-        /// <param name="arg1"></param>
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public void Serialize<T1>(MethodInfo info, BitStream stream, ref T1 arg1)
-        {
-            var s1 = MyFactory.GetSerializer<T1>();
-
-            var args = info.GetParameters();
-            var info1 = MySerializeInfo.CreateForParameter(args, 0);
-
-            if (stream.Reading)
-            {
-                MySerializationHelpers.CreateAndRead(stream, out arg1, s1, info1);
-            }
-            else
-            {
-                MySerializationHelpers.Write(stream, ref arg1, s1, info1);
-            }
-        }
-
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public void Serialize<T1, T2>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2)
-        {
-            var s1 = MyFactory.GetSerializer<T1>();
-            var s2 = MyFactory.GetSerializer<T2>();
-
-            var args = info.GetParameters();
-            var info1 = MySerializeInfo.CreateForParameter(args, 0);
-            var info2 = MySerializeInfo.CreateForParameter(args, 1);
-           
-            if (stream.Reading)
-            {
-                MySerializationHelpers.CreateAndRead(stream, out arg1, s1, info1);
-                MySerializationHelpers.CreateAndRead(stream, out arg2, s2, info2);
-            }
-            else
-            {
-                MySerializationHelpers.Write(stream, ref arg1, s1, info1);
-                MySerializationHelpers.Write(stream, ref arg2, s2, info2);
-            }
-        }
-
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public void Serialize<T1, T2, T3>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3)
-        {
-            var s1 = MyFactory.GetSerializer<T1>();
-            var s2 = MyFactory.GetSerializer<T2>();
-            var s3 = MyFactory.GetSerializer<T3>();
-
-            var args = info.GetParameters();
-            var info1 = MySerializeInfo.CreateForParameter(args, 0);
-            var info2 = MySerializeInfo.CreateForParameter(args, 1);
-            var info3 = MySerializeInfo.CreateForParameter(args, 2);
-
-            if (stream.Reading)
-            {
-                MySerializationHelpers.CreateAndRead(stream, out arg1, s1, info1);
-                MySerializationHelpers.CreateAndRead(stream, out arg2, s2, info2);
-                MySerializationHelpers.CreateAndRead(stream, out arg3, s3, info3);
-            }
-            else
-            {
-                MySerializationHelpers.Write(stream, ref arg1, s1, info1);
-                MySerializationHelpers.Write(stream, ref arg2, s2, info2);
-                MySerializationHelpers.Write(stream, ref arg3, s3, info3);
-            }
-        }
-
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public void Serialize<T1, T2, T3, T4>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4)
-        {
-            var s1 = MyFactory.GetSerializer<T1>();
-            var s2 = MyFactory.GetSerializer<T2>();
-            var s3 = MyFactory.GetSerializer<T3>();
-            var s4 = MyFactory.GetSerializer<T4>();
-
-            var args = info.GetParameters();
-            var info1 = MySerializeInfo.CreateForParameter(args, 0);
-            var info2 = MySerializeInfo.CreateForParameter(args, 1);
-            var info3 = MySerializeInfo.CreateForParameter(args, 2);
-            var info4 = MySerializeInfo.CreateForParameter(args, 3);
-
-            if (stream.Reading)
-            {
-                MySerializationHelpers.CreateAndRead(stream, out arg1, s1, info1);
-                MySerializationHelpers.CreateAndRead(stream, out arg2, s2, info2);
-                MySerializationHelpers.CreateAndRead(stream, out arg3, s3, info3);
-                MySerializationHelpers.CreateAndRead(stream, out arg4, s4, info4);
-            }
-            else
-            {
-                MySerializationHelpers.Write(stream, ref arg1, s1, info1);
-                MySerializationHelpers.Write(stream, ref arg2, s2, info2);
-                MySerializationHelpers.Write(stream, ref arg3, s3, info3);
-                MySerializationHelpers.Write(stream, ref arg4, s4, info4);
-            }
-        }
-
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public void Serialize<T1, T2, T3, T4, T5>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4, ref T5 arg5)
-        {
-            var s1 = MyFactory.GetSerializer<T1>();
-            var s2 = MyFactory.GetSerializer<T2>();
-            var s3 = MyFactory.GetSerializer<T3>();
-            var s4 = MyFactory.GetSerializer<T4>();
-            var s5 = MyFactory.GetSerializer<T5>();
-
-            var args = info.GetParameters();
-            var info1 = MySerializeInfo.CreateForParameter(args, 0);
-            var info2 = MySerializeInfo.CreateForParameter(args, 1);
-            var info3 = MySerializeInfo.CreateForParameter(args, 2);
-            var info4 = MySerializeInfo.CreateForParameter(args, 3);
-            var info5 = MySerializeInfo.CreateForParameter(args, 4);
-
-            if (stream.Reading)
-            {
-                MySerializationHelpers.CreateAndRead(stream, out arg1, s1, info1);
-                MySerializationHelpers.CreateAndRead(stream, out arg2, s2, info2);
-                MySerializationHelpers.CreateAndRead(stream, out arg3, s3, info3);
-                MySerializationHelpers.CreateAndRead(stream, out arg4, s4, info4);
-                MySerializationHelpers.CreateAndRead(stream, out arg5, s5, info5);
-            }
-            else
-            {
-                MySerializationHelpers.Write(stream, ref arg1, s1, info1);
-                MySerializationHelpers.Write(stream, ref arg2, s2, info2);
-                MySerializationHelpers.Write(stream, ref arg3, s3, info3);
-                MySerializationHelpers.Write(stream, ref arg4, s4, info4);
-                MySerializationHelpers.Write(stream, ref arg5, s5, info5);
-            }
-        }
-
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public void Serialize<T1, T2, T3, T4, T5, T6>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4, ref T5 arg5, ref T6 arg6)
-        {
-            var s1 = MyFactory.GetSerializer<T1>();
-            var s2 = MyFactory.GetSerializer<T2>();
-            var s3 = MyFactory.GetSerializer<T3>();
-            var s4 = MyFactory.GetSerializer<T4>();
-            var s5 = MyFactory.GetSerializer<T5>();
-            var s6 = MyFactory.GetSerializer<T6>();
-
-            var args = info.GetParameters();
-            var info1 = MySerializeInfo.CreateForParameter(args, 0);
-            var info2 = MySerializeInfo.CreateForParameter(args, 1);
-            var info3 = MySerializeInfo.CreateForParameter(args, 2);
-            var info4 = MySerializeInfo.CreateForParameter(args, 3);
-            var info5 = MySerializeInfo.CreateForParameter(args, 4);
-            var info6 = MySerializeInfo.CreateForParameter(args, 5);
-
-            if (stream.Reading)
-            {
-                MySerializationHelpers.CreateAndRead(stream, out arg1, s1, info1);
-                MySerializationHelpers.CreateAndRead(stream, out arg2, s2, info2);
-                MySerializationHelpers.CreateAndRead(stream, out arg3, s3, info3);
-                MySerializationHelpers.CreateAndRead(stream, out arg4, s4, info4);
-                MySerializationHelpers.CreateAndRead(stream, out arg5, s5, info5);
-                MySerializationHelpers.CreateAndRead(stream, out arg6, s6, info6);
-            }
-            else
-            {
-                MySerializationHelpers.Write(stream, ref arg1, s1, info1);
-                MySerializationHelpers.Write(stream, ref arg2, s2, info2);
-                MySerializationHelpers.Write(stream, ref arg3, s3, info3);
-                MySerializationHelpers.Write(stream, ref arg4, s4, info4);
-                MySerializationHelpers.Write(stream, ref arg5, s5, info5);
-                MySerializationHelpers.Write(stream, ref arg6, s6, info6);
-            }
-        }
-
-        [Obsolete("The entire network intercept system is deprecated. Please use method patches instead.")]
-        public void Serialize<T1, T2, T3, T4, T5, T6, T7>(MethodInfo info, BitStream stream, ref T1 arg1, ref T2 arg2, ref T3 arg3, ref T4 arg4, ref T5 arg5, ref T6 arg6, ref T7 arg7)
-        {
-            var s1 = MyFactory.GetSerializer<T1>();
-            var s2 = MyFactory.GetSerializer<T2>();
-            var s3 = MyFactory.GetSerializer<T3>();
-            var s4 = MyFactory.GetSerializer<T4>();
-            var s5 = MyFactory.GetSerializer<T5>();
-            var s6 = MyFactory.GetSerializer<T6>();
-            var s7 = MyFactory.GetSerializer<T7>();
-
-            var args = info.GetParameters();
-            var info1 = MySerializeInfo.CreateForParameter(args, 0);
-            var info2 = MySerializeInfo.CreateForParameter(args, 1);
-            var info3 = MySerializeInfo.CreateForParameter(args, 2);
-            var info4 = MySerializeInfo.CreateForParameter(args, 3);
-            var info5 = MySerializeInfo.CreateForParameter(args, 4);
-            var info6 = MySerializeInfo.CreateForParameter(args, 5);
-            var info7 = MySerializeInfo.CreateForParameter(args, 6);
-
-            if ( stream.Reading )
-            {
-                MySerializationHelpers.CreateAndRead(stream, out arg1, s1, info1);
-                MySerializationHelpers.CreateAndRead(stream, out arg2, s2, info2);
-                MySerializationHelpers.CreateAndRead(stream, out arg3, s3, info3);
-                MySerializationHelpers.CreateAndRead(stream, out arg4, s4, info4);
-                MySerializationHelpers.CreateAndRead(stream, out arg5, s5, info5);
-                MySerializationHelpers.CreateAndRead(stream, out arg6, s6, info6);
-                MySerializationHelpers.CreateAndRead(stream, out arg7, s7, info7);
-            }
-            else
-            {
-                MySerializationHelpers.Write(stream, ref arg1, s1, info1);
-                MySerializationHelpers.Write(stream, ref arg2, s2, info2);
-                MySerializationHelpers.Write(stream, ref arg3, s3, info3);
-                MySerializationHelpers.Write(stream, ref arg4, s4, info4);
-                MySerializationHelpers.Write(stream, ref arg5, s5, info5);
-                MySerializationHelpers.Write(stream, ref arg6, s6, info6);
-                MySerializationHelpers.Write(stream, ref arg7, s7, info7);
-            }
-        }
-    }
-}
diff --git a/Torch/Managers/NetworkManager/NetworkManager.cs b/Torch/Managers/NetworkManager/NetworkManager.cs
index a054835..1bb9a95 100644
--- a/Torch/Managers/NetworkManager/NetworkManager.cs
+++ b/Torch/Managers/NetworkManager/NetworkManager.cs
@@ -10,16 +10,10 @@ using VRageMath;
 
 namespace Torch.Managers
 {
-    //TOOD: Make this not a manager, and instead just a static class?
-    public partial class NetworkManager : Manager, INetworkManager
+    public static class NetworkManager
     {
         private static Logger _log = LogManager.GetCurrentClassLogger();
-
-        public NetworkManager(ITorchBase torchInstance) : base(torchInstance)
-        {
-
-        }
-
+        
         #region Network Injection
 
         private static Dictionary<MethodInfo, Delegate> _delegateCache = new Dictionary<MethodInfo, Delegate>();
diff --git a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
deleted file mode 100644
index 1c2c580..0000000
--- a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
+++ /dev/null
@@ -1,407 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Engine.Multiplayer;
-using Sandbox.Game.Multiplayer;
-using Torch.API.Managers;
-using Torch.Utils;
-using VRage;
-using VRage.Library.Collections;
-using VRage.Network;
-using VRageMath;
-
-namespace Torch.Managers
-{
-    //Everything in this file is deprecated and should be deleted Eventually(tm)
-    public partial class NetworkManager
-    {
-        [ReflectedGetter(Name = "m_methodInfoLookup")]
-        private static Func<MyEventTable, Dictionary<MethodInfo, CallSite>> _methodInfoLookupGetter;
-        private const int MAX_ARGUMENT = 6;
-        private const int GENERIC_PARAMETERS = 8;
-        private const int DISPATCH_PARAMETERS = 11;
-        private static readonly DBNull DbNull = DBNull.Value;
-        private static MethodInfo _dispatchInfo;
-
-        private static MethodInfo DispatchEventInfo => _dispatchInfo ?? (_dispatchInfo = typeof(MyReplicationLayerBase).GetMethod("DispatchEvent", BindingFlags.NonPublic | BindingFlags.Instance));
-        
-        private const string _myTransportLayerField = "TransportLayer";
-        private const string _transportHandlersField = "m_handlers";
-        private readonly HashSet<INetworkHandler> _networkHandlers = new HashSet<INetworkHandler>();
-        private bool _init;
-
-        [ReflectedGetter(Name = "m_typeTable")]
-        private static Func<MyReplicationLayerBase, MyTypeTable> _typeTableGetter;
-        [ReflectedMethod(Type = typeof(MyReplicationLayer), Name = "GetObjectByNetworkId")]
-        private static Func<MyReplicationLayer, NetworkId, IMyNetObject> _getObjectByNetworkId;
-
-        private static bool ReflectionUnitTest(bool suppress = false)
-        {
-            try
-            {
-                var syncLayerType = typeof(MySyncLayer);
-                var transportLayerField = syncLayerType.GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance);
-
-                if (transportLayerField == null)
-                    throw new TypeLoadException("Could not find internal type for TransportLayer");
-
-                var transportLayerType = transportLayerField.FieldType;
-
-                if (!Reflection.HasField(transportLayerType, _transportHandlersField))
-                    throw new TypeLoadException("Could not find Handlers field");
-
-                return true;
-            }
-            catch (TypeLoadException ex)
-            {
-                _log.Error(ex);
-                if (suppress)
-                    return false;
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Attach()
-        {
-            //disable all this for now
-            _log.Warn("Network intercept disabled. Some plugins may not work correctly.");
-            return;
-
-            if (_init)
-                return;
-
-            _init = true;
-
-            if (!ReflectionUnitTest())
-                throw new InvalidOperationException("Reflection unit test failed.");
-
-            //don't bother with nullchecks here, it was all handled in ReflectionUnitTest
-            var transportType = typeof(MySyncLayer).GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance).FieldType;
-            var transportInstance = typeof(MySyncLayer).GetField(_myTransportLayerField, BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(MyMultiplayer.Static.SyncLayer);
-            var handlers = (IDictionary)transportType.GetField(_transportHandlersField, BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(transportInstance);
-            var handlerTypeField = handlers.GetType().GenericTypeArguments[0].GetField("messageId"); //Should be MyTransportLayer.HandlerId
-            object id = null;
-            foreach (var key in handlers.Keys)
-            {
-                if ((MyMessageId)handlerTypeField.GetValue(key) != MyMessageId.RPC)
-                    continue;
-
-                id = key;
-                break;
-            }
-            if (id == null)
-                throw new InvalidOperationException("RPC handler not found.");
-
-            //remove Keen's network listener
-            handlers.Remove(id);
-            //replace it with our own
-            handlers.Add(id, new Action<MyPacket>(OnEvent));
-
-            //PrintDebug();
-
-            _log.Debug("Initialized network intercept");
-        }
-
-        /// <inheritdoc/>
-        public override void Detach()
-        {
-            // TODO reverse what was done in Attach
-        }
-
-        #region Network Injection
-
-
-        /// <summary>
-        /// Broadcasts an event to all connected clients
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="obj"></param>
-        /// <param name="args"></param>
-        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
-        public void RaiseEvent(MethodInfo method, object obj, params object[] args)
-        {
-            //default(EndpointId) tells the network to broadcast the message
-            RaiseEvent(method, obj, default(EndpointId), args);
-        }
-
-        /// <summary>
-        /// Sends an event to one client by SteamId
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="obj"></param>
-        /// <param name="steamId"></param>
-        /// <param name="args"></param>
-        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
-	    public void RaiseEvent(MethodInfo method, object obj, ulong steamId, params object[] args)
-        {
-            RaiseEvent(method, obj, new EndpointId(steamId), args);
-        }
-
-        /// <summary>
-        /// Sends an event to one client
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="obj"></param>
-        /// <param name="endpoint"></param>
-        /// <param name="args"></param>
-        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
-        public void RaiseEvent(MethodInfo method, object obj, EndpointId endpoint, params object[] args)
-        {
-            if (method == null)
-                throw new ArgumentNullException(nameof(method), "MethodInfo cannot be null!");
-
-            if (args.Length > MAX_ARGUMENT)
-                throw new ArgumentOutOfRangeException(nameof(args), $"Cannot pass more than {MAX_ARGUMENT} arguments!");
-
-            var owner = obj as IMyEventOwner;
-            if (obj != null && owner == null)
-                throw new InvalidCastException("Provided event target is not of type IMyEventOwner!");
-
-            if (!method.HasAttribute<EventAttribute>())
-                throw new CustomAttributeFormatException("Provided event target does not have the Event attribute! Replication will not succeed!");
-
-            //array to hold arguments to pass into DispatchEvent
-            object[] arguments = new object[DISPATCH_PARAMETERS];
-            
-
-            arguments[0] = obj == null ? TryGetStaticCallSite(method) : TryGetCallSite(method, obj);
-            arguments[1] = endpoint;
-            arguments[2] = new Vector3D?();
-            arguments[3] = owner;
-
-            //copy supplied arguments into the reflection arguments
-            for (var i = 0; i < args.Length; i++)
-                arguments[i + 4] = args[i];
-
-            //pad the array out with DBNull, skip last element
-            //last element should stay null (this is for blocking events -- not used?)
-            for (var j = args.Length + 4; j < arguments.Length - 1; j++)
-                arguments[j] = DbNull;
-            
-            //create an array of Types so we can create a generic method
-            var argTypes = new Type[GENERIC_PARAMETERS];
-
-            //any null arguments (not DBNull) must be of type IMyEventOwner
-            for (var k = 2; k < arguments.Length; k++)
-                argTypes[k - 2] = arguments[k]?.GetType() ?? typeof(IMyEventOwner);
-
-            var parameters = method.GetParameters();
-            for (var i = 0; i < parameters.Length; i++)
-            {
-                if (argTypes[i + 1] != parameters[i].ParameterType)
-                    throw new TypeLoadException($"Type mismatch on method parameters. Expected {string.Join(", ", parameters.Select(p => p.ParameterType.ToString()))} got {string.Join(", ", argTypes.Select(t => t.ToString()))}");
-            }
-
-            //create a generic method of DispatchEvent and invoke to inject our data into the network
-            var dispatch = DispatchEventInfo.MakeGenericMethod(argTypes);
-            dispatch.Invoke(MyMultiplayer.ReplicationLayer, arguments);
-        }
-
-        /// <summary>
-        /// Broadcasts a static event to all connected clients
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="args"></param>
-        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
-	    public void RaiseStaticEvent(MethodInfo method, params object[] args)
-        {
-            //default(EndpointId) tells the network to broadcast the message
-            RaiseStaticEvent(method, default(EndpointId), args);
-        }
-
-        /// <summary>
-        /// Sends a static event to one client by SteamId
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="steamId"></param>
-        /// <param name="args"></param>
-        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
-	    public void RaiseStaticEvent(MethodInfo method, ulong steamId, params object[] args)
-        {
-            RaiseEvent(method, (object)null, new EndpointId(steamId), args);
-        }
-
-        /// <summary>
-        /// Sends a static event to one client
-        /// </summary>
-        /// <param name="method"></param>
-        /// <param name="endpoint"></param>
-        /// <param name="args"></param>
-        [Obsolete("Old injection system deprecated. Use the generic methods instead.")]
-        public void RaiseStaticEvent(MethodInfo method, EndpointId endpoint, params object[] args)
-        {
-            RaiseEvent(method, (object)null, endpoint, args);
-        }
-
-        private CallSite TryGetStaticCallSite(MethodInfo method)
-        {
-            MyTypeTable typeTable = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer);
-            if (!_methodInfoLookupGetter.Invoke(typeTable.StaticEventTable).TryGetValue(method, out CallSite result))
-                throw new MissingMemberException("Provided event target not found!");
-            return result;
-        }
-
-        private CallSite TryGetCallSite(MethodInfo method, object arg)
-        {
-            MySynchronizedTypeInfo typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(arg.GetType());
-            if (!_methodInfoLookupGetter.Invoke(typeInfo.EventTable).TryGetValue(method, out CallSite result))
-                throw new MissingMemberException("Provided event target not found!");
-            return result;
-        }
-
-        #endregion
-    
-        #region Network Intercept
-        
-        [Obsolete]
-        //TODO: Change this to a method patch so I don't have to try to keep up with Keen.
-        /// <summary>
-        /// This is the main body of the network intercept system. When messages come in from clients, they are processed here
-        /// before being passed on to the game server.
-        /// 
-        /// DO NOT modify this method unless you're absolutely sure of what you're doing. This can very easily destabilize the game!
-        /// </summary>
-        /// <param name="packet"></param>
-        private void OnEvent(MyPacket packet)
-        {
-            if (_networkHandlers.Count == 0)
-            {
-                //pass the message back to the game server
-                try
-                {
-                    ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).OnEvent(packet);
-                }
-                catch (Exception ex)
-                {
-                    _log.Error(ex);
-                    //crash after logging, bad things could happen if we continue on with bad data
-                    throw;
-                }
-                return;
-            }
-
-            var stream = new BitStream();
-            stream.ResetRead(packet.BitStream);
-
-            var networkId = stream.ReadNetworkId();
-            //this value is unused, but removing this line corrupts the rest of the stream
-            var blockedNetworkId = stream.ReadNetworkId();
-            var eventId = (uint)stream.ReadUInt16();
-            bool flag = stream.ReadBool();
-            Vector3D? position = new Vector3D?();
-            if (flag)
-                position = new Vector3D?(stream.ReadVector3D());
-
-            CallSite site;
-            object obj;
-            if (networkId.IsInvalid) // Static event
-            {
-                site = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).StaticEventTable.Get(eventId);
-                obj = null;
-            }
-            else // Instance event
-            {
-                //var sendAs = ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).GetObjectByNetworkId(networkId);
-                var sendAs = _getObjectByNetworkId((MyReplicationLayer)MyMultiplayer.ReplicationLayer, networkId);
-                if (sendAs == null)
-                {
-                    return;
-                }
-                var typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(sendAs.GetType());
-                var eventCount = typeInfo.EventTable.Count;
-                if (eventId < eventCount) // Directly
-                {
-                    obj = sendAs;
-                    site = typeInfo.EventTable.Get(eventId);
-                }
-                else // Through proxy
-                {
-                    obj = ((IMyProxyTarget)sendAs).Target;
-                    typeInfo = _typeTableGetter.Invoke(MyMultiplayer.ReplicationLayer).Get(obj.GetType());
-                    site = typeInfo.EventTable.Get(eventId - (uint)eventCount); // Subtract max id of Proxy
-                }
-            }
-
-            //we're handling the network live in the game thread, this needs to go as fast as possible
-            var discard = false;
-            foreach (var handler in _networkHandlers)
-            //Parallel.ForEach(_networkHandlers, handler =>
-            {
-                try
-                {
-                    if (handler.CanHandle(site))
-                        discard |= handler.Handle(packet.Sender.Id.Value, site, stream, obj, packet);
-                }
-                catch (Exception ex)
-                {
-                    //ApplicationLog.Error(ex.ToString());
-                    _log.Error(ex);
-                }
-            }
-
-            //one of the handlers wants us to discard this packet
-            if (discard)
-                return;
-
-            //pass the message back to the game server
-            try
-            {
-                ((MyReplicationLayer)MyMultiplayer.ReplicationLayer).OnEvent(packet);
-            }
-            catch (Exception ex)
-            {
-                _log.Error(ex, "Error processing network event!");
-                _log.Error(ex);
-                //crash after logging, bad things could happen if we continue on with bad data
-                throw;
-            }
-        }
-
-        [Obsolete("Deprecated. Use a method patch instead.")]
-        /// <inheritdoc />
-        public void RegisterNetworkHandler(INetworkHandler handler)
-        {
-            _log.Warn($"Plugin {handler.GetType().Assembly.FullName} registered a network handler. This system no longer works. Please alert the plugin author.");
-            return;
-
-            var handlerType = handler.GetType().FullName;
-            var toRemove = new List<INetworkHandler>();
-            foreach (var item in _networkHandlers)
-            {
-                if (item.GetType().FullName == handlerType)
-                {
-                    //if (ExtenderOptions.IsDebugging)
-                    _log.Error("Network handler already registered! " + handlerType);
-                    toRemove.Add(item);
-                }
-            }
-
-            foreach (var oldHandler in toRemove)
-                _networkHandlers.Remove(oldHandler);
-
-            _networkHandlers.Add(handler);
-        }
-
-        [Obsolete("Deprecated. Use a method patch instead.")]
-        /// <inheritdoc />
-        public bool UnregisterNetworkHandler(INetworkHandler handler)
-        {
-            return _networkHandlers.Remove(handler);
-        }
-
-        [Obsolete("Deprecated. Use a method patch instead.")]
-        public void RegisterNetworkHandlers(params INetworkHandler[] handlers)
-        {
-            foreach (var handler in handlers)
-                RegisterNetworkHandler(handler);
-        }
-
-        #endregion
-
-    }
-}
diff --git a/Torch/Managers/PatchManager/DecoratedMethod.cs b/Torch/Managers/PatchManager/DecoratedMethod.cs
index 010a315..8c2e120 100644
--- a/Torch/Managers/PatchManager/DecoratedMethod.cs
+++ b/Torch/Managers/PatchManager/DecoratedMethod.cs
@@ -83,7 +83,7 @@ namespace Torch.Managers.PatchManager
         private DynamicMethod AllocatePatchMethod()
         {
             Debug.Assert(_method.DeclaringType != null);
-            var methodName = _method.Name + $"_{_patchSalt++}";
+            var methodName = "Patched_" + _method.DeclaringType.FullName + _method.Name + $"_{_patchSalt++}";
             var returnType = _method is MethodInfo meth ? meth.ReturnType : typeof(void);
             var parameters = _method.GetParameters();
             var parameterTypes = (_method.IsStatic ? Enumerable.Empty<Type>() : new[] {typeof(object)})
diff --git a/Torch/Managers/ScriptingManager.cs b/Torch/Managers/ScriptingManager.cs
deleted file mode 100644
index 11f73df..0000000
--- a/Torch/Managers/ScriptingManager.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.ModAPI;
-using Torch.API;
-using Torch.API.Managers;
-using Torch.API.ModAPI;
-using Torch.API.ModAPI.Ingame;
-using VRage.Scripting;
-
-namespace Torch.Managers
-{
-    public class ScriptingManager : IManager
-    {
-        private MyScriptWhitelist _whitelist;
-
-        public void Attach()
-        {
-            _whitelist = MyScriptCompiler.Static.Whitelist;
-            MyScriptCompiler.Static.AddConditionalCompilationSymbols("TORCH");
-            MyScriptCompiler.Static.AddReferencedAssemblies(typeof(ITorchBase).Assembly.Location);
-            MyScriptCompiler.Static.AddImplicitIngameNamespacesFromTypes(typeof(GridExtensions));
-
-            using (var whitelist = _whitelist.OpenBatch())
-            {
-                whitelist.AllowNamespaceOfTypes(MyWhitelistTarget.ModApi, typeof(TorchAPI));
-                whitelist.AllowNamespaceOfTypes(MyWhitelistTarget.Both, typeof(GridExtensions));
-            }
-
-            /*
-            //dump whitelist
-            var whitelist = new StringBuilder();
-            foreach (var pair in MyScriptCompiler.Static.Whitelist.GetWhitelist())
-            {
-                var split = pair.Key.Split(',');
-                whitelist.AppendLine("|-");
-                whitelist.AppendLine($"|{pair.Value} || {split[0]} || {split[1]}");
-            }
-            Log.Info(whitelist);*/
-        }
-
-        public void Detach()
-        {
-            // TODO unregister whitelist patches
-        }
-
-        public void UnwhitelistType(Type t)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Torch/Managers/UpdateManager.cs b/Torch/Managers/UpdateManager.cs
index 700de86..30ec6ce 100644
--- a/Torch/Managers/UpdateManager.cs
+++ b/Torch/Managers/UpdateManager.cs
@@ -44,7 +44,7 @@ namespace Torch.Managers
         
         private async void CheckAndUpdateTorch()
         {
-            if (!Torch.Config.GetTorchUpdates)
+            if (Torch.Config.NoUpdate || !Torch.Config.GetTorchUpdates)
                 return;
 
             try
diff --git a/Torch/Patches/GameAnalyticsPatch.cs b/Torch/Patches/GameAnalyticsPatch.cs
index 66bcf72..2a38d91 100644
--- a/Torch/Patches/GameAnalyticsPatch.cs
+++ b/Torch/Patches/GameAnalyticsPatch.cs
@@ -12,7 +12,7 @@ namespace Torch.Patches
     public static class GameAnalyticsPatch
     {
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
-        private static Action<ILogger> _setLogger;
+        private static Action<ILogger, ILogger> _setLogger;
 
         public static void Patch(PatchContext ctx)
         {
@@ -27,7 +27,7 @@ namespace Torch.Patches
                 return;
             }
             RuntimeHelpers.RunClassConstructor(type.TypeHandle);
-            _setLogger = loggerField?.CreateSetter<ILogger>();
+            _setLogger = loggerField?.CreateSetter<ILogger, ILogger>();
             FixLogging();
 
             ConstructorInfo ctor = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, new Type[0], new ParameterModifier[0]);
@@ -42,7 +42,7 @@ namespace Torch.Patches
 
         private static void FixLogging()
         {
-            _setLogger(LogManager.GetLogger("GameAnalytics"));
+            _setLogger(null, LogManager.GetLogger("GameAnalytics"));
             if (!(LogManager.Configuration is XmlLoggingConfiguration))
                 LogManager.Configuration = new XmlLoggingConfiguration(Path.Combine(
                     Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) ?? Environment.CurrentDirectory, "NLog.config"));
diff --git a/Torch/Patches/GameStatePatchShim.cs b/Torch/Patches/GameStatePatchShim.cs
index b2af4a7..f939189 100644
--- a/Torch/Patches/GameStatePatchShim.cs
+++ b/Torch/Patches/GameStatePatchShim.cs
@@ -19,7 +19,7 @@ namespace Torch.Patches
 
         internal static void Patch(PatchContext target)
         {
-            ConstructorInfo ctor = typeof(MySandboxGame).GetConstructor(new[] { typeof(string[]) });
+            ConstructorInfo ctor = typeof(MySandboxGame).GetConstructor(new[] { typeof(string[]), typeof(IntPtr) });
             if (ctor == null)
                 throw new ArgumentException("Can't find constructor MySandboxGame(string[])");
             target.GetPattern(ctor).Prefixes.Add(MethodRef(PrefixConstructor));
diff --git a/Torch/Patches/TorchAsyncSaving.cs b/Torch/Patches/TorchAsyncSaving.cs
index 3c99e77..7c1eedc 100644
--- a/Torch/Patches/TorchAsyncSaving.cs
+++ b/Torch/Patches/TorchAsyncSaving.cs
@@ -67,6 +67,7 @@ namespace Torch.Patches
                     if (!Game.IsDedicated && MySession.Static != null)
                         ShowWorldSaveResult(tmpSnapshot.SavingSuccess);
                     saveTaskSource.TrySetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk);
+                    return false;
                 });
             });
             return saveTaskSource.Task;
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index ca60249..bf4beb9 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -212,7 +212,6 @@
     <Compile Include="Event\EventManager.cs" />
     <Compile Include="Event\IEventList.cs" />
     <Compile Include="Managers\KeenLogPatch.cs" />
-    <Compile Include="Managers\NetworkManager\NetworkManager_Deprecated.cs" />
     <Compile Include="Managers\PatchManager\AssemblyMemory.cs" />
     <Compile Include="Managers\PatchManager\DecoratedMethod.cs" />
     <Compile Include="Managers\PatchManager\EmitExtensions.cs" />
@@ -259,7 +258,6 @@
     <Compile Include="Managers\EntityManager.cs" />
     <Compile Include="Managers\FilesystemManager.cs" />
     <Compile Include="Managers\Manager.cs" />
-    <Compile Include="Managers\NetworkManager\NetworkHandlerBase.cs" />
     <Compile Include="Managers\NetworkManager\NetworkManager.cs" />
     <Compile Include="Managers\MultiplayerManagerBase.cs" />
     <Compile Include="Managers\UpdateManager.cs" />
@@ -279,7 +277,6 @@
     <Compile Include="Utils\Reflected\ReflectedSetterAttribute.cs" />
     <Compile Include="Utils\Reflected\ReflectedStaticMethodAttribute.cs" />
     <Compile Include="Utils\Reflection.cs" />
-    <Compile Include="Managers\ScriptingManager.cs" />
     <Compile Include="Utils\SteamWorkshopTools\WebAPI.cs" />
     <Compile Include="Utils\StringUtils.cs" />
     <Compile Include="Utils\SynchronizationExtensions.cs" />
diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index 92f9964..063d34c 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -49,6 +49,7 @@ using VRage.Game.SessionComponents;
 using VRage.GameServices;
 using VRage.Library;
 using VRage.ObjectBuilders;
+using VRage.Platform.Windows;
 using VRage.Plugins;
 using VRage.Scripting;
 using VRage.Steam;
@@ -64,6 +65,7 @@ namespace Torch
     {
         static TorchBase()
         {
+            MyVRageWindows.Init("SpaceEngineersDedicated", MySandboxGame.Log, null, false);
             ReflectedManager.Process(typeof(TorchBase).Assembly);
             ReflectedManager.Process(typeof(ITorchBase).Assembly);
             PatchManager.AddPatchShim(typeof(GameStatePatchShim));
@@ -153,7 +155,6 @@ namespace Torch
             Plugins = new PluginManager(this);
 
             var sessionManager = new TorchSessionManager(this);
-            sessionManager.AddFactory((x) => MyMultiplayer.Static?.SyncLayer != null ? new NetworkManager(this) : null);
             sessionManager.AddFactory((x) => Sync.IsServer ? new ChatManagerServer(this) : new ChatManagerClient(this));
             sessionManager.AddFactory((x) => Sync.IsServer ? new CommandManager(this) : null);
             sessionManager.AddFactory((x) => new EntityManager(this));
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index 18d65fc..0f0530f 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -30,8 +30,6 @@ using VRage.Game;
 using VRage.Game.ObjectBuilder;
 using VRage.Game.SessionComponents;
 using VRage.GameServices;
-using VRage.Network;
-using VRage.Platform.Windows;
 using VRage.Plugins;
 using VRage.Steam;
 using VRage.Utils;
@@ -157,8 +155,6 @@ namespace Torch
             _tweakGameSettings();
 
             MyFileSystem.Reset();
-            VRage.Platform.Windows.MyVRageWindows.Init(MySandboxGame.Log,  Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated"));
-            MyVRageWindows.Init(MySandboxGame.Log, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated"));
             MyInitializer.InvokeBeforeRun(_appSteamId, _appName, _userDataPath);
             // MyInitializer.InitCheckSum();
 
diff --git a/Torch/Views/PropertyGrid.xaml.cs b/Torch/Views/PropertyGrid.xaml.cs
index b0e78b2..ede4714 100644
--- a/Torch/Views/PropertyGrid.xaml.cs
+++ b/Torch/Views/PropertyGrid.xaml.cs
@@ -221,7 +221,6 @@ namespace Torch.Views
 
                         var gt = propertyType.GetGenericArguments()[0];
 
-                        //TODO: Is this the best option? Probably not
                         if (gt.IsPrimitive || gt == typeof(string))
                         {
                             button.Click += (sender, args) => EditPrimitiveCollection(((Button)sender).DataContext);

From 036f21de81d98e3a2fecfeb5883e38924965b3cc Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 22 Aug 2019 11:24:19 -0700
Subject: [PATCH 137/170] Fixy fix time, Keen touched the chat system

---
 Torch.Server/Initializer.cs                     | 2 +-
 Torch/Managers/ChatManager/ChatManagerClient.cs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 23d89e0..e152373 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -31,7 +31,7 @@ namespace Torch.Server
 
         private const string RUNSCRIPT = @"force_install_dir ../
 login anonymous
-app_update 298740 -beta publictest -betapassword nt8WuDw9kdvE validate
+app_update 298740
 quit";
 
         private TorchConfig _config;
diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index 5b0fbe4..ecdf1dc 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -15,6 +15,7 @@ using Torch.API;
 using Torch.API.Managers;
 using Torch.Utils;
 using VRage.Game;
+using VRageMath;
 
 namespace Torch.Managers.ChatManager
 {
@@ -82,7 +83,7 @@ namespace Torch.Managers.ChatManager
                 _chatMessageRecievedReplacer.Replace(new Action<ulong, string, ChatChannel, long, string>(Multiplayer_ChatMessageReceived),
                     MyMultiplayer.Static);
                 _scriptedChatMessageRecievedReplacer.Replace(
-                    new Action<string, string, string>(Multiplayer_ScriptedChatMessageReceived), MyMultiplayer.Static);
+                    new Action<string, string, string, Color>(Multiplayer_ScriptedChatMessageReceived), MyMultiplayer.Static);
             }
             else
             {
@@ -141,7 +142,7 @@ namespace Torch.Managers.ChatManager
                 _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName);
         }
 
-        private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font)
+        private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font, Color color)
         {
             var torchMsg = new TorchChatMessage(author, message, font);
             if (!RaiseMessageRecieved(torchMsg) && HasHud)

From 28037e11dfbeb835cdc055a242fc608800b2f7fd Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 22 Aug 2019 12:36:35 -0700
Subject: [PATCH 138/170] Fix more chat, add missing config UI

---
 .../ViewModels/SessionSettingsViewModel.cs    | 33 +++++++++++++++++++
 .../Managers/ChatManager/ChatManagerClient.cs |  4 +--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/ViewModels/SessionSettingsViewModel.cs b/Torch.Server/ViewModels/SessionSettingsViewModel.cs
index cdb4833..6037485 100644
--- a/Torch.Server/ViewModels/SessionSettingsViewModel.cs
+++ b/Torch.Server/ViewModels/SessionSettingsViewModel.cs
@@ -269,7 +269,40 @@ namespace Torch.Server.ViewModels
 
         [Torch.Views.Display(Description = "Enables automatic respawn at nearest available respawn point.", Name = "Enable Auto Respawn", GroupName = "Players")]
         public bool EnableAutoRespawn { get => _settings.EnableAutorespawn; set => SetValue(ref _settings.EnableAutorespawn, value); }
+        
+        [Torch.Views.Display(Description = "The number of NPC factions generated on the start of the world.", Name = "NPC Factions Count", GroupName = "NPCs")]
+        public int TradeFactionsCount { get => _settings.TradeFactionsCount; set => SetValue(ref _settings.TradeFactionsCount, value); }
+        
+        [Torch.Views.Display(Description = "The inner radius [m] (center is in 0,0,0), where stations can spawn. Does not affect planet-bound stations (surface Outposts and Orbital stations).", Name = "Stations Inner Radius", GroupName = "NPCs")]
+        public double StationsDistanceInnerRadius { get => _settings.StationsDistanceInnerRadius; set => SetValue(ref _settings.StationsDistanceInnerRadius, value); }
 
+        [Torch.Views.Display(Description = "The outer radius [m] (center is in 0,0,0), where stations can spawn. Does not affect planet-bound stations (surface Outposts and Orbital stations).", Name = "Stations Outer Radius Start", GroupName = "NPCs")]
+        public double StationsDistanceOuterRadiusStart { get => _settings.StationsDistanceOuterRadiusStart; set => SetValue(ref _settings.StationsDistanceOuterRadiusStart, value); }
+        
+        [Torch.Views.Display(Description = "The outer radius [m] (center is in 0,0,0), where stations can spawn. Does not affect planet-bound stations (surface Outposts and Orbital stations).", Name = "Stations Outer Radius End", GroupName = "NPCs")]
+        public double StationsDistanceOuterRadiusEnd { get => _settings.StationsDistanceOuterRadiusEnd; set => SetValue(ref _settings.StationsDistanceOuterRadiusEnd, value); }
+        
+        [Torch.Views.Display(Description = "Time period between two economy updates in seconds.", Name = "Economy tick time", GroupName = "NPCs")]
+        public int EconomyTickInSeconds { get => _settings.EconomyTickInSeconds; set => SetValue(ref _settings.EconomyTickInSeconds, value); }
+        
+        [Torch.Views.Display(Description = "If enabled bounty contracts will be available on stations.", Name = "Enable Bounty Contracts", GroupName = "Players")]
+        public bool EnableBountyContracts { get => _settings.EnableBountyContracts; set => SetValue(ref _settings.EnableBountyContracts, value); }
+        
+        [Torch.Views.Display(Description = "Resource deposits count coefficient for generated world content (voxel generator version > 2).", Name = "Deposits Count Coefficient", GroupName = "Environment")]
+        public float DepositsCountCoefficient { get => _settings.DepositsCountCoefficient; set => SetValue(ref _settings.DepositsCountCoefficient, value); }
+        
+        [Torch.Views.Display(Description = "Resource deposit size denominator for generated world content (voxel generator version > 2).", Name = "Deposit Size Denominator", GroupName = "Environment")]
+        public float DepositSideDenominator { get => _settings.DepositSizeDenominator; set => SetValue(ref _settings.DepositSizeDenominator, value); }
+        
+        [Torch.Views.Display(Description = "Enables economy features.", Name = "Enable Economy", GroupName = "NPCs")]
+        public bool EnableEconomy { get => _settings.EnableEconomy; set => SetValue(ref _settings.EnableEconomy, value); }
+        
+        [Torch.Views.Display(Description = "Enables system for voxel reverting.", Name = "Enable Voxel Reverting", GroupName = "Trash Removal")]
+        public bool VoxelTrashRemovalEnabled { get => _settings.VoxelTrashRemovalEnabled; set => SetValue(ref _settings.VoxelTrashRemovalEnabled, value); }
+        
+        [Torch.Views.Display(Description = "Allows super gridding exploit to be used.", Name = "Enable Supergridding", GroupName = "Others")]
+        public bool EnableSupergridding { get => _settings.EnableSupergridding; set => SetValue(ref _settings.EnableSupergridding, value); }
+        
         public SessionSettingsViewModel(MyObjectBuilder_SessionSettings settings)
         {
             _settings = settings;
diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs
index ecdf1dc..94c6646 100644
--- a/Torch/Managers/ChatManager/ChatManagerClient.cs
+++ b/Torch/Managers/ChatManager/ChatManagerClient.cs
@@ -146,7 +146,7 @@ namespace Torch.Managers.ChatManager
         {
             var torchMsg = new TorchChatMessage(author, message, font);
             if (!RaiseMessageRecieved(torchMsg) && HasHud)
-                _hudChatScriptedMessageReceived.Invoke(MyHud.Chat, author, message, font);
+                _hudChatScriptedMessageReceived.Invoke(MyHud.Chat, author, message, font, color);
         }
 
         protected bool RaiseMessageRecieved(TorchChatMessage msg)
@@ -164,7 +164,7 @@ namespace Torch.Managers.ChatManager
         [ReflectedMethod(Name = _hudChatMessageReceivedName)]
         private static Action<MyHudChat, ulong, string, ChatChannel, long, string> _hudChatMessageReceived;
         [ReflectedMethod(Name = _hudChatScriptedMessageReceivedName)]
-        private static Action<MyHudChat, string, string, string> _hudChatScriptedMessageReceived;
+        private static Action<MyHudChat, string, string, string, Color> _hudChatScriptedMessageReceived;
 
         [ReflectedEventReplace(typeof(MyMultiplayerBase), nameof(MyMultiplayerBase.ChatMessageReceived), typeof(MyHudChat), _hudChatMessageReceivedName)]
         private static Func<ReflectedEventReplacer> _chatMessageReceivedFactory;

From 1b4c5ace61b30f76b90f8f18fae5eed9e34e9c74 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 22 Aug 2019 15:46:40 -0700
Subject: [PATCH 139/170] Fix saving

---
 Torch/Patches/TorchAsyncSaving.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Torch/Patches/TorchAsyncSaving.cs b/Torch/Patches/TorchAsyncSaving.cs
index 7c1eedc..4d4a23e 100644
--- a/Torch/Patches/TorchAsyncSaving.cs
+++ b/Torch/Patches/TorchAsyncSaving.cs
@@ -62,12 +62,11 @@ namespace Torch.Patches
 
                 if (!Game.IsDedicated)
                     TakeSaveScreenshot();
-                tmpSnapshot.SaveParallel(() =>
+                tmpSnapshot.SaveParallel(() => true, () =>
                 {
                     if (!Game.IsDedicated && MySession.Static != null)
                         ShowWorldSaveResult(tmpSnapshot.SavingSuccess);
                     saveTaskSource.TrySetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk);
-                    return false;
                 });
             });
             return saveTaskSource.Task;

From 1e19f9aedf7a04a2a72c5144290fd91382df19e0 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 22 Aug 2019 20:38:35 -0700
Subject: [PATCH 140/170] Fix save tracking desync

---
 Torch/TorchBase.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index 063d34c..8128711 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -383,12 +383,14 @@ namespace Torch
         {
             if (exclusive)
             {
-                if (MyAsyncSaving.InProgress || Interlocked.Increment(ref _inProgressSaves) != 1)
+                if (MyAsyncSaving.InProgress || _inProgressSaves >= 0)
                 {
                     Log.Error("Failed to save game, game is already saving");
                     return null;
                 }
             }
+            
+            Interlocked.Increment(ref _inProgressSaves);
             return TorchAsyncSaving.Save(this, timeoutMs).ContinueWith((task, torchO) =>
             {
                 var torch = (TorchBase) torchO;

From 624bd5a2a49cfa3336f04158e10bfccc1dee5fce Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 25 Aug 2019 11:03:24 -0400
Subject: [PATCH 141/170] Fix references

---
 Torch/Torch.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index bf4beb9..abab057 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -169,7 +169,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\bin\x64\Release\DedicatedServer64\VRage.Platform.Windows.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Render">
       <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>

From 7bfc6077b92193ac9f52c015f3462340fa411e0c Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 25 Aug 2019 11:04:08 -0400
Subject: [PATCH 142/170] Set game thread locale to English. Should give
 English exceptions now.

---
 Torch/TorchBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index 8128711..b8d0c30 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -414,6 +414,7 @@ namespace Torch
             Game.SignalStart();
             if (!Game.WaitFor(VRageGame.GameState.Running))
                 Log.Warn("Failed to wait for the game to be started");
+            Invoke(() => Thread.CurrentThread.CurrentUICulture = new CultureInfo("en-US"));
         }
 
         /// <inheritdoc />

From ef444730b756d38e43a04fbd80fbbfcce86e3bed Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 25 Aug 2019 11:20:35 -0400
Subject: [PATCH 143/170] Fix dumb arithmetic error breaking saves. Closes #336

---
 Torch/TorchBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index b8d0c30..edf8277 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -383,7 +383,7 @@ namespace Torch
         {
             if (exclusive)
             {
-                if (MyAsyncSaving.InProgress || _inProgressSaves >= 0)
+                if (MyAsyncSaving.InProgress || _inProgressSaves > 0)
                 {
                     Log.Error("Failed to save game, game is already saving");
                     return null;

From 997a3ca31c5a2bc91d2998ed275d8d2015d836a1 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 25 Aug 2019 11:55:14 -0400
Subject: [PATCH 144/170] Adjust behavior of restarts. Closes #337

---
 Torch.API/ITorchBase.cs         |  2 +-
 Torch.Server/TorchServer.cs     |  5 +++--
 Torch/Commands/TorchCommands.cs | 16 +++++++++++-----
 Torch/TorchBase.cs              |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Torch.API/ITorchBase.cs b/Torch.API/ITorchBase.cs
index 779d004..9b1a335 100644
--- a/Torch.API/ITorchBase.cs
+++ b/Torch.API/ITorchBase.cs
@@ -104,7 +104,7 @@ namespace Torch.API
         /// <summary>
         /// Restart the Torch instance, blocking until the restart has been performed.
         /// </summary>
-        void Restart();
+        void Restart(bool save = true);
 
         /// <summary>
         /// Initializes a save of the game.
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 0f593f3..503a277 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -152,14 +152,15 @@ namespace Torch.Server
         /// <summary>
         ///     Restart the program.
         /// </summary>
-        public override void Restart()
+        public override void Restart(bool save = true)
         {
             if (Config.DisconnectOnRestart)
             {
                 ModCommunication.SendMessageToClients(new JoinServerMessage("0.0.0.0:25555"));
+                Log.Info("Ejected all players from server for restart.");
             }
 
-            if (IsRunning)
+            if (IsRunning && save)
                 Save().ContinueWith(DoRestart, this, TaskContinuationOptions.RunContinuationsAsynchronously);
             else
                 DoRestart(null, this);
diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index accb888..05c6867 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
+using NLog;
 using Sandbox.Game.Multiplayer;
 using Sandbox.ModAPI;
 using Steamworks;
@@ -28,6 +29,7 @@ namespace Torch.Commands
     {
         private static bool _restartPending = false;
         private static bool _cancelRestart = false;
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
         
         [Command("whatsmyip")]
         [Permission(MyPromoteLevel.None)]
@@ -176,6 +178,7 @@ namespace Torch.Commands
             }
         
             _restartPending = true;
+            
             Task.Run(() =>
             {
                 var countdown = RestartCountdown(countdownSeconds, save).GetEnumerator();
@@ -232,15 +235,18 @@ namespace Torch.Commands
                 else
                 {
                     if (save)
-                        Context.Torch.Save().ContinueWith(x => Restart());
-                    else
-                        Restart();
+                    {
+                        Log.Info("Savin game before restart.");
+                        Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
+                           .SendMessageAsSelf($"Saving game before restart.");
+                    }
+
+                    Log.Info("Restarting server.");
+                    Context.Torch.Invoke(() => Context.Torch.Restart(save));
                         
                     yield break;
                 }
             }
-
-            void Restart() => Context.Torch.Invoke(() => Context.Torch.Restart());
         }
 
         private string Pluralize(int num)
diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index edf8277..8ad7f16 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -427,7 +427,7 @@ namespace Torch
         }
 
         /// <inheritdoc />
-        public abstract void Restart();
+        public abstract void Restart(bool save = true);
 
         /// <inheritdoc />
         public virtual void Init(object gameInstance)

From ff0d881273b8ca3b4c20eb865fa4dc97d9323205 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Tue, 27 Aug 2019 16:43:31 -0400
Subject: [PATCH 145/170] Gracefully handle corrupt plugin zips

---
 Torch/Plugins/PluginManager.cs | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index 86c68c2..f1097e0 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -206,6 +206,8 @@ namespace Torch.Managers
             PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
         }
 
+        //debug flag is set when the user asks us to run with a specific plugin for plugin development debug
+        //please do not change references to this arg unless you are very sure you know what you're doing
         private List<PluginItem> GetLocalPlugins(string pluginDir, bool debug = false)
         {
             var firstLoad = Torch.Config.Plugins.Count == 0;
@@ -505,19 +507,27 @@ namespace Torch.Managers
         
         private PluginManifest GetManifestFromZip(string path)
         {
-            using (var zipFile = ZipFile.OpenRead(path))
+            try
             {
-                foreach (var entry in zipFile.Entries)
+                using (var zipFile = ZipFile.OpenRead(path))
                 {
-                    if (!entry.Name.Equals(MANIFEST_NAME, StringComparison.CurrentCultureIgnoreCase))
-                        continue;
-
-                    using (var stream = new StreamReader(entry.Open()))
+                    foreach (var entry in zipFile.Entries)
                     {
-                        return PluginManifest.Load(stream);
+                        if (!entry.Name.Equals(MANIFEST_NAME, StringComparison.CurrentCultureIgnoreCase))
+                            continue;
+
+                        using (var stream = new StreamReader(entry.Open()))
+                        {
+                            return PluginManifest.Load(stream);
+                        }
                     }
                 }
             }
+            catch (Exception ex)
+            {
+                _log.Error(ex, $"Error opening zip! File is likely corrupt. File at {path} will be deleted and re-acquired on the next restart!");
+                File.Delete(path);
+            }
 
             return null;
         }

From 6680b0adb2de5f63a8c86396c51cb53b32281dc0 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 31 Aug 2019 23:25:05 -0700
Subject: [PATCH 146/170] Fix services?

---
 Torch.Server/Program.cs      |  2 +-
 Torch.Server/TorchService.cs | 10 ++++++----
 Torch/VRageGame.cs           |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index 3e10b1e..2e36d46 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -63,7 +63,7 @@ namespace Torch.Server
             // Breaks on Windows Server 2019
             if (!new ComputerInfo().OSFullName.Contains("Server 2019") && !Environment.UserInteractive)
             {
-                using (var service = new TorchService())
+                using (var service = new TorchService(args))
                     ServiceBase.Run(service);
                 return;
             }
diff --git a/Torch.Server/TorchService.cs b/Torch.Server/TorchService.cs
index e33fda3..b43064e 100644
--- a/Torch.Server/TorchService.cs
+++ b/Torch.Server/TorchService.cs
@@ -15,9 +15,11 @@ namespace Torch.Server
         public const string Name = "Torch (SEDS)";
         private TorchServer _server;
         private Initializer _initializer;
+        private string[] _args;
 
-        public TorchService()
+        public TorchService(string[] args)
         {
+            _args = args;
             var workingDir = new FileInfo(typeof(TorchService).Assembly.Location).Directory.ToString();
             Directory.SetCurrentDirectory(workingDir);
             _initializer = new Initializer(workingDir);
@@ -29,11 +31,11 @@ namespace Torch.Server
         }
 
         /// <inheritdoc />
-        protected override void OnStart(string[] args)
+        protected override void OnStart(string[] _)
         {
-            base.OnStart(args);
+            base.OnStart(_args);
 
-            _initializer.Initialize(args);
+            _initializer.Initialize(_args);
             _initializer.Run();
         }
 
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index 0f0530f..4f95c4d 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -199,7 +199,8 @@ namespace Torch
                 }
                 MyRenderProxy.Initialize(renderer);
                 MyRenderProfiler.SetAutocommit(false);
-                MyRenderProfiler.InitMemoryHack("MainEntryPoint");
+                //This broke services?
+                //MyRenderProfiler.InitMemoryHack("MainEntryPoint");
             }
 
             // Loads object builder serializers. Intuitive, right?

From 5630eb14c2d2a08e426c7c496fd24dbd40c6b865 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sun, 1 Sep 2019 10:22:42 -0700
Subject: [PATCH 147/170] Stop service "properly"

---
 Torch.Server/TorchService.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Torch.Server/TorchService.cs b/Torch.Server/TorchService.cs
index b43064e..1a659b8 100644
--- a/Torch.Server/TorchService.cs
+++ b/Torch.Server/TorchService.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.ServiceProcess;
+using System.Threading;
 using NLog;
 using Torch.API;
 
@@ -12,8 +14,8 @@ namespace Torch.Server
 {
     class TorchService : ServiceBase
     {
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
         public const string Name = "Torch (SEDS)";
-        private TorchServer _server;
         private Initializer _initializer;
         private string[] _args;
 
@@ -42,8 +44,10 @@ namespace Torch.Server
         /// <inheritdoc />
         protected override void OnStop()
         {
-            _server.Stop();
-            base.OnStop();
+            var mre = new ManualResetEvent(false);
+            Task.Run(() => _initializer.Server.Stop());
+            if (!mre.WaitOne(TimeSpan.FromMinutes(1)))
+                Process.GetCurrentProcess().Kill();
         }
     }
 }

From aec03840cc4c0cd1954fd853caf404935e8f39da Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sat, 7 Sep 2019 12:10:08 -0400
Subject: [PATCH 148/170] Nothing to see here, move along

---
 Torch.API/Plugins/ITorchPlugin.cs           | 17 +++++++
 Torch.Server/ViewModels/PluginViewModel.cs  | 51 +++++++++++++++++++++
 Torch.Server/Views/PluginsControl.xaml      |  2 +-
 Torch/Managers/PatchManager/PatchContext.cs |  2 +
 Torch/TorchPluginBase.cs                    |  1 +
 5 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/Torch.API/Plugins/ITorchPlugin.cs b/Torch.API/Plugins/ITorchPlugin.cs
index 35a34df..fd7c83f 100644
--- a/Torch.API/Plugins/ITorchPlugin.cs
+++ b/Torch.API/Plugins/ITorchPlugin.cs
@@ -34,5 +34,22 @@ namespace Torch.API.Plugins
         /// This is called on the game thread after each tick.
         /// </summary>
         void Update();
+
+        /// <summary>
+        /// Plugin's enabled state. Mainly for UI niceness
+        /// </summary>
+        PluginState State { get; }
+    }
+
+    public enum PluginState
+    {
+         NotInitialized,
+         DisabledError,
+         DisabledUser,
+         UpdateRequired,
+         UninstallRequested,
+         NotInstalled,
+         MissingDependency,
+         Enabled
     }
 }
diff --git a/Torch.Server/ViewModels/PluginViewModel.cs b/Torch.Server/ViewModels/PluginViewModel.cs
index dca7c27..561bfce 100644
--- a/Torch.Server/ViewModels/PluginViewModel.cs
+++ b/Torch.Server/ViewModels/PluginViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -51,5 +52,55 @@ namespace Torch.Server.ViewModels
             this.Control.Resources.MergedDictionaries.Clear();
             this.Control.Resources.MergedDictionaries.Add(dictionary);
         }
+
+        public Brush Color
+        {
+            get {
+                switch (Plugin.State)
+                {
+                    case PluginState.NotInitialized:
+                    case PluginState.MissingDependency:
+                    case PluginState.DisabledError:
+                        return Brushes.Red;
+                    case PluginState.UpdateRequired:
+                        return Brushes.DodgerBlue;
+                    case PluginState.UninstallRequested:
+                        return Brushes.Gold;
+                    case PluginState.NotInstalled:
+                    case PluginState.DisabledUser:
+                        return Brushes.Gray;
+                    case PluginState.Enabled:
+                        return Brushes.Transparent;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+        }
+
+        public string ToolTip
+        {
+            get { switch (Plugin.State)
+                {
+                    case PluginState.NotInitialized:
+                        return "Error during load.";
+                    case PluginState.DisabledError:
+                        return "Disabled due to error on load.";
+                    case PluginState.DisabledUser:
+                        return "Disabled.";
+                    case PluginState.UpdateRequired:
+                        return "Update required.";
+                    case PluginState.UninstallRequested:
+                        return "Marked for uninstall.";
+                    case PluginState.NotInstalled:
+                        return "Not installed. Click 'Enable'";
+                    case PluginState.Enabled:
+                        return string.Empty;
+                    case PluginState.MissingDependency:
+                        return "Dependency missing. Check the log.";
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+        }
     }
 }
diff --git a/Torch.Server/Views/PluginsControl.xaml b/Torch.Server/Views/PluginsControl.xaml
index 8885eba..3232454 100644
--- a/Torch.Server/Views/PluginsControl.xaml
+++ b/Torch.Server/Views/PluginsControl.xaml
@@ -22,7 +22,7 @@
             <ListView Grid.Row="0" ItemsSource="{Binding Plugins}" SelectedItem="{Binding SelectedPlugin}" Margin="3">
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <TextBlock Text="{Binding Name}"/>
+                        <TextBlock Text="{Binding Name}" Background="{Binding Color}" ToolTip="{Binding ToolTip}"/>
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>
diff --git a/Torch/Managers/PatchManager/PatchContext.cs b/Torch/Managers/PatchManager/PatchContext.cs
index a36225a..354c217 100644
--- a/Torch/Managers/PatchManager/PatchContext.cs
+++ b/Torch/Managers/PatchManager/PatchContext.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using NLog;
 
 namespace Torch.Managers.PatchManager
 {
@@ -10,6 +11,7 @@ namespace Torch.Managers.PatchManager
     public sealed class PatchContext
     {
         private readonly Dictionary<MethodBase, MethodRewritePattern> _rewritePatterns = new Dictionary<MethodBase, MethodRewritePattern>();
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
 
         internal PatchContext()
         {
diff --git a/Torch/TorchPluginBase.cs b/Torch/TorchPluginBase.cs
index 64859d9..5e0b59f 100644
--- a/Torch/TorchPluginBase.cs
+++ b/Torch/TorchPluginBase.cs
@@ -28,6 +28,7 @@ namespace Torch
         }
 
         public virtual void Update() { }
+        public PluginState State { get; }
 
         public virtual void Dispose() { }
     }

From ca99404b42db49ff7c698595d77ce41e5bae09bc Mon Sep 17 00:00:00 2001
From: N1Ran <38772205+N1Ran@users.noreply.github.com>
Date: Tue, 10 Sep 2019 17:58:50 -0400
Subject: [PATCH 149/170] Stop command countdown (#343)

Hopefully this works
---
 Torch/Commands/TorchCommands.cs | 85 ++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 2 deletions(-)

diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index 05c6867..f91f928 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -29,6 +29,8 @@ namespace Torch.Commands
     {
         private static bool _restartPending = false;
         private static bool _cancelRestart = false;
+        private bool _stopPending = false;
+        private bool _cancelStop = false;
         private static readonly Logger Log = LogManager.GetCurrentClassLogger();
         
         [Command("whatsmyip")]
@@ -156,7 +158,23 @@ namespace Torch.Commands
         [Command("stop", "Stops the server.")]
         public void Stop(bool save = true)
         {
-            Context.Respond("Stopping server.");
+            if (_stopPending)
+            {
+                Context.Respond("A stop is already pending.");
+                return;
+            }
+        
+            _stopPending = true;
+            Task.Run(() =>
+            {
+                var countdown = StopCountdown(countdownSeconds, save).GetEnumerator();
+                while (countdown.MoveNext())
+                {
+                    Thread.Sleep(1000);
+                }
+            });
+
+           /*Context.Respond("Stopping server.");
             if (save)
                 DoSave()?.ContinueWith((a, mod) =>
                 {
@@ -165,7 +183,7 @@ namespace Torch.Commands
                     torch.Stop();
                 }, this, TaskContinuationOptions.RunContinuationsAsynchronously);
             else
-                Context.Torch.Stop();
+                Context.Torch.Stop();*/
         }
 
         [Command("restart", "Restarts the server.")]
@@ -204,6 +222,69 @@ namespace Torch.Commands
             else
                 Context.Respond("A restart is not pending.");
         }
+        
+        [Command("stop cancel", "Cancel a pending stop.")]
+        public void CancelStop()
+        {
+            if (_restartPending)
+                _cancelStop = true;
+            else
+                Context.Respond("Server Stop is not pending.");
+        }
+
+        private IEnumerable StopCountdown(int countdown, bool save)
+        {
+            for (var i = countdown; i >= 0; i--)
+            {
+                if (_cancelStop)
+                {
+                    Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
+                        .SendMessageAsSelf($"Stop cancelled.");
+
+                    _stopPending = false;
+                    _cancelStop = false;
+                    yield break;
+                }
+                    
+                if (i >= 60 && i % 60 == 0)
+                {
+                    Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
+                        .SendMessageAsSelf($"Stopping server in {i / 60} minute{Pluralize(i / 60)}.");
+                    yield return null;
+                }
+                else if (i > 0)
+                {
+                    if (i < 11)
+                        Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
+                            .SendMessageAsSelf($"Stopping server in {i} second{Pluralize(i)}.");
+                    yield return null;
+                }
+                else
+                {
+                    if (save)
+                    {
+                        Log.Info("Saving game before stop.");
+                        Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
+                            .SendMessageAsSelf($"Saving game before stop.");
+                        DoSave()?.ContinueWith((a, mod) =>
+                        {
+                            ITorchBase torch = (mod as CommandModule)?.Context?.Torch;
+                            Debug.Assert(torch != null);
+                            torch.Stop();
+                        }, this, TaskContinuationOptions.RunContinuationsAsynchronously);
+
+                    }
+                    else
+                    {
+                        Log.Info("Stopping server.");
+                        Context.Torch.Invoke(() => Context.Torch.Stop());
+                    }
+
+                        
+                    yield break;
+                }
+            }
+        }
 
         private IEnumerable RestartCountdown(int countdown, bool save)
         {

From d661c893d5783a5aef4ebdf4811dc652e259df58 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Tue, 10 Sep 2019 18:17:45 -0400
Subject: [PATCH 150/170] Fix a dumb

---
 Torch/Commands/TorchCommands.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index f91f928..6dd3959 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -156,7 +156,7 @@ namespace Torch.Commands
         }
 
         [Command("stop", "Stops the server.")]
-        public void Stop(bool save = true)
+        public void Stop(bool save = true, int countdownSeconds = 0)
         {
             if (_stopPending)
             {

From 79368aa6ddd05071fab28f3aaccf3673188f33f7 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 13 Sep 2019 11:46:35 -0700
Subject: [PATCH 151/170] Fix MessageBox spam if Torch crashes with UI enabled
 and autorestart disabled

---
 Torch.Server/Initializer.cs |  1 +
 Torch.Server/TorchServer.cs | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index e152373..7dfa5b9 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -245,6 +245,7 @@ quit";
 
         private void HandleException(object sender, UnhandledExceptionEventArgs e)
         {
+            _server.FatalException = true;
             var ex = (Exception)e.ExceptionObject;
             LogException(ex);
             if (MyFakes.ENABLE_MINIDUMP_SENDING)
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 503a277..389e2f8 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -49,6 +49,8 @@ namespace Torch.Server
         private Timer _watchdog;
         private int _players;
         private MultiplayerManagerDedicated _multiplayerManagerDedicated;
+        
+        internal bool FatalException { get; set; }
 
         /// <inheritdoc />
        public TorchServer(TorchConfig config = null)
@@ -232,10 +234,16 @@ namespace Torch.Server
 
         private static void CheckServerResponding(object state)
         {
+            var server = (TorchServer)state;
             var mre = new ManualResetEvent(false);
-            ((TorchServer)state).Invoke(() => mre.Set());
+            server.Invoke(() => mre.Set());
             if (!mre.WaitOne(TimeSpan.FromSeconds(Instance.Config.TickTimeout)))
             {
+                if (server.FatalException)
+                {
+                    server._watchdog.Dispose();
+                    return;
+                }
 #if DEBUG
                 Log.Error(
                     $"Server watchdog detected that the server was frozen for at least {((TorchServer) state).Config.TickTimeout} seconds.");

From dbcd6969364577e8bf1bff314ca05b4745b1dadb Mon Sep 17 00:00:00 2001
From: Jimmacle <mindstorms11@cox.net>
Date: Thu, 19 Sep 2019 11:10:52 -0700
Subject: [PATCH 152/170] How did this get here

---
 Jenkins/jenkins-grab-se.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1
index 5699e3d..f94193c 100644
--- a/Jenkins/jenkins-grab-se.ps1
+++ b/Jenkins/jenkins-grab-se.ps1
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta publictest -betapassword nt8WuDw9kdvE validate" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 validate" "+quit"
 
 popd

From 9f22b63227ed764c37c734b27d63c469e8fe453e Mon Sep 17 00:00:00 2001
From: N1Ran <38772205+N1Ran@users.noreply.github.com>
Date: Sat, 21 Sep 2019 10:24:30 -0400
Subject: [PATCH 153/170] This fixed it (#346)

Let's get this help back online
---
 Torch/Commands/TorchCommands.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index 6dd3959..0b7645c 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -65,7 +65,7 @@ namespace Torch.Commands
 
                 var sb = new StringBuilder();
 
-                if (command?.MinimumPromoteLevel > Context.Player.PromoteLevel)
+                if (Context.Player != null && command?.MinimumPromoteLevel > Context.Player.PromoteLevel)
                 {
                     Context.Respond("You are not authorized to use this command.");
                     return;

From 562a4554f3da2f0f6cbf1845066a99bfe7195aef Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 21 Sep 2019 12:19:14 -0700
Subject: [PATCH 154/170] Update instance manager for new config format

---
 Torch.Server/Managers/InstanceManager.cs      | 79 +++++++++++--------
 .../ViewModels/CheckpointViewModel.cs         | 24 +++---
 .../ViewModels/WorldConfigurationViewModel.cs | 34 ++++++++
 Torch.Server/Views/ConfigControl.xaml.cs      |  7 ++
 4 files changed, 99 insertions(+), 45 deletions(-)
 create mode 100644 Torch.Server/ViewModels/WorldConfigurationViewModel.cs

diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index 01ff765..d52197b 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -119,8 +119,8 @@ namespace Torch.Server.Managers
             {
                 DedicatedConfig.Mods.Clear();
                 //remove the Torch mod to avoid running multiple copies of it
-                DedicatedConfig.SelectedWorld.Checkpoint.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
-                foreach (var m in DedicatedConfig.SelectedWorld.Checkpoint.Mods)
+                DedicatedConfig.SelectedWorld.WorldConfiguration.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
+                foreach (var m in DedicatedConfig.SelectedWorld.WorldConfiguration.Mods)
                     DedicatedConfig.Mods.Add(new ModItemInfo(m));
                 Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
             }
@@ -134,8 +134,8 @@ namespace Torch.Server.Managers
             {
                 DedicatedConfig.Mods.Clear();
                 //remove the Torch mod to avoid running multiple copies of it
-                DedicatedConfig.SelectedWorld.Checkpoint.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
-                foreach (var m in DedicatedConfig.SelectedWorld.Checkpoint.Mods)
+                DedicatedConfig.SelectedWorld.WorldConfiguration.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
+                foreach (var m in DedicatedConfig.SelectedWorld.WorldConfiguration.Mods)
                     DedicatedConfig.Mods.Add(new ModItemInfo(m));
                 Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
             }
@@ -149,7 +149,7 @@ namespace Torch.Server.Managers
         private void ImportWorldConfig(WorldViewModel world, bool modsOnly = true)
         {
             var mods = new MtObservableList<ModItemInfo>();
-            foreach (var mod in world.Checkpoint.Mods)
+            foreach (var mod in world.WorldConfiguration.Mods)
                 mods.Add(new ModItemInfo(mod));
             DedicatedConfig.Mods = mods;
 
@@ -157,7 +157,7 @@ namespace Torch.Server.Managers
             Log.Debug("Loaded mod list from world");
 
             if (!modsOnly)
-                DedicatedConfig.SessionSettings = world.Checkpoint.Settings;
+                DedicatedConfig.SessionSettings = world.WorldConfiguration.Settings;
         }
 
         private void ImportWorldConfig(bool modsOnly = true)
@@ -203,29 +203,22 @@ namespace Torch.Server.Managers
 
             try
             {
-                var sandboxPath = Path.Combine(DedicatedConfig.LoadWorld, "Sandbox.sbc");
-                MyObjectBuilderSerializer.DeserializeXML(sandboxPath, out MyObjectBuilder_Checkpoint checkpoint, out ulong sizeInBytes);
-                if (checkpoint == null)
-                {
-                    Log.Error($"Failed to load {DedicatedConfig.LoadWorld}, checkpoint null ({sizeInBytes} bytes, instance {Torch.Config.InstancePath})");
-                    return;
-                }
+                var world = DedicatedConfig.Worlds.FirstOrDefault(x => x.WorldPath == DedicatedConfig.LoadWorld) ?? new WorldViewModel(DedicatedConfig.LoadWorld);
 
-                checkpoint.SessionName = DedicatedConfig.WorldName;
-                checkpoint.Settings = DedicatedConfig.SessionSettings;
-                checkpoint.Mods.Clear();
+                world.Checkpoint.SessionName = DedicatedConfig.WorldName;
+                world.WorldConfiguration.Settings = DedicatedConfig.SessionSettings;
+                world.WorldConfiguration.Mods.Clear();
 
                 foreach (var mod in DedicatedConfig.Mods)
                 {
                     var savedMod = new MyObjectBuilder_Checkpoint.ModItem(mod.Name, mod.PublishedFileId, mod.FriendlyName);
                     savedMod.IsDependency = mod.IsDependency;
-                    checkpoint.Mods.Add(savedMod);
+                    world.WorldConfiguration.Mods.Add(savedMod);
                 }
                 Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
 
-                MyObjectBuilderSerializer.SerializeXML(sandboxPath, false, checkpoint);
+                world.SaveSandbox();
 
-                //MyLocalCache.SaveCheckpoint(checkpoint, DedicatedConfig.LoadWorld);
                 Log.Info("Saved world config.");
             }
             catch (Exception e)
@@ -259,7 +252,10 @@ namespace Torch.Server.Managers
         public string WorldPath { get; }
         public long WorldSizeKB { get; }
         private string _checkpointPath;
+        private string _worldConfigPath;
         public CheckpointViewModel Checkpoint { get; private set; }
+        
+        public WorldConfigurationViewModel WorldConfiguration { get; private set; }
 
         public WorldViewModel(string worldPath)
         {
@@ -268,8 +264,9 @@ namespace Torch.Server.Managers
                 WorldPath = worldPath;
                 WorldSizeKB = new DirectoryInfo(worldPath).GetFiles().Sum(x => x.Length) / 1024;
                 _checkpointPath = Path.Combine(WorldPath, "Sandbox.sbc");
+                _worldConfigPath = Path.Combine(WorldPath, "Sandbox_config.sbc");
                 FolderName = Path.GetFileName(worldPath);
-                BeginLoadCheckpoint();
+                LoadSandbox();
             }
             catch (ArgumentException ex)
             {
@@ -278,24 +275,40 @@ namespace Torch.Server.Managers
             }
         }
 
-        public async Task SaveCheckpointAsync()
+        public void SaveSandbox()
         {
-            await Task.Run(() =>
-            {
-                using (var f = File.Open(_checkpointPath, FileMode.Create))
-                    MyObjectBuilderSerializer.SerializeXML(f, Checkpoint);
-            });
+            using (var f = File.Open(_checkpointPath, FileMode.Create))
+                MyObjectBuilderSerializer.SerializeXML(f, Checkpoint);
+
+            using (var f = File.Open(_worldConfigPath, FileMode.Create))
+                MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration);
         }
 
-        private void BeginLoadCheckpoint()
+        private void LoadSandbox()
         {
-            //Task.Run(() =>
+            MyObjectBuilderSerializer.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint);
+            Checkpoint = new CheckpointViewModel(checkpoint);
+            
+            // migrate old saves
+            if (File.Exists(_worldConfigPath))
             {
-                Log.Info($"Preloading checkpoint {_checkpointPath}");
-                MyObjectBuilderSerializer.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint);
-                Checkpoint = new CheckpointViewModel(checkpoint);
-                OnPropertyChanged(nameof(Checkpoint));
-            }//);
+                MyObjectBuilderSerializer.DeserializeXML(_worldConfigPath, out MyObjectBuilder_WorldConfiguration worldConfig);
+                WorldConfiguration = new WorldConfigurationViewModel(worldConfig);
+            }
+            else
+            {
+                WorldConfiguration = new WorldConfigurationViewModel(new MyObjectBuilder_WorldConfiguration
+                {
+                    Mods = checkpoint.Mods,
+                    Settings = checkpoint.Settings
+                });
+
+                checkpoint.Mods = null;
+                checkpoint.Settings = null;
+            }
+            
+            OnPropertyChanged(nameof(Checkpoint));
+            OnPropertyChanged(nameof(WorldConfiguration));  
         }
     }
 }
diff --git a/Torch.Server/ViewModels/CheckpointViewModel.cs b/Torch.Server/ViewModels/CheckpointViewModel.cs
index 2d5643f..d1882b6 100644
--- a/Torch.Server/ViewModels/CheckpointViewModel.cs
+++ b/Torch.Server/ViewModels/CheckpointViewModel.cs
@@ -16,12 +16,12 @@ namespace Torch.Server.ViewModels
     public class CheckpointViewModel : ViewModel
     {
         private MyObjectBuilder_Checkpoint _checkpoint;
-        private SessionSettingsViewModel _sessionSettings;
+        //private SessionSettingsViewModel _sessionSettings;
 
         public CheckpointViewModel(MyObjectBuilder_Checkpoint checkpoint)
         {
             _checkpoint = checkpoint;
-            _sessionSettings = new SessionSettingsViewModel(_checkpoint.Settings);
+            //_sessionSettings = new SessionSettingsViewModel(_checkpoint.Settings);
         }
 
         public static implicit operator MyObjectBuilder_Checkpoint(CheckpointViewModel model)
@@ -59,15 +59,15 @@ namespace Torch.Server.ViewModels
 
         public SerializableDictionary<long, MyObjectBuilder_Checkpoint.PlayerId> ControlledEntities { get => _checkpoint.ControlledEntities; set => SetValue(ref _checkpoint.ControlledEntities, value); }
 
-        public SessionSettingsViewModel Settings
-        {
-            get => _sessionSettings;
-            set
-            {
-                SetValue(ref _sessionSettings, value);
-                _checkpoint.Settings = _sessionSettings;
-            }
-        }
+        //public SessionSettingsViewModel Settings
+        //{
+        //    get => _sessionSettings;
+        //    set
+        //    {
+        //        SetValue(ref _sessionSettings, value);
+        //        _checkpoint.Settings = _sessionSettings;
+        //    }
+        //}
 
         public MyObjectBuilder_ScriptManager ScriptManagerData => throw new NotImplementedException();
 
@@ -75,7 +75,7 @@ namespace Torch.Server.ViewModels
 
         public MyObjectBuilder_FactionCollection Factions => throw new NotImplementedException();
 
-        public List<MyObjectBuilder_Checkpoint.ModItem> Mods { get => _checkpoint.Mods; set => SetValue(ref _checkpoint.Mods, value); }
+        //public List<MyObjectBuilder_Checkpoint.ModItem> Mods { get => _checkpoint.Mods; set => SetValue(ref _checkpoint.Mods, value); }
 
         public SerializableDictionary<ulong, MyPromoteLevel> PromotedUsers { get => _checkpoint.PromotedUsers; set => SetValue(ref _checkpoint.PromotedUsers, value); }
 
diff --git a/Torch.Server/ViewModels/WorldConfigurationViewModel.cs b/Torch.Server/ViewModels/WorldConfigurationViewModel.cs
new file mode 100644
index 0000000..40f704e
--- /dev/null
+++ b/Torch.Server/ViewModels/WorldConfigurationViewModel.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using VRage.Game;
+
+namespace Torch.Server.ViewModels
+{
+    public class WorldConfigurationViewModel : ViewModel
+    {
+        private readonly MyObjectBuilder_WorldConfiguration _worldConfiguration;
+        private SessionSettingsViewModel _sessionSettings;
+
+        public WorldConfigurationViewModel(MyObjectBuilder_WorldConfiguration worldConfiguration)
+        {
+            _worldConfiguration = worldConfiguration;
+            _sessionSettings = new SessionSettingsViewModel(worldConfiguration.Settings);
+        }
+
+        public static implicit operator MyObjectBuilder_WorldConfiguration(WorldConfigurationViewModel model)
+        {
+            return model._worldConfiguration;
+        }
+        
+        public List<MyObjectBuilder_Checkpoint.ModItem> Mods { get => _worldConfiguration.Mods; set => SetValue(ref _worldConfiguration.Mods, value); }
+        
+        public SessionSettingsViewModel Settings
+        {
+            get => _sessionSettings;
+            set
+            {
+                SetValue(ref _sessionSettings, value);
+                _worldConfiguration.Settings = _sessionSettings;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Torch.Server/Views/ConfigControl.xaml.cs b/Torch.Server/Views/ConfigControl.xaml.cs
index 486c4e6..69cc551 100644
--- a/Torch.Server/Views/ConfigControl.xaml.cs
+++ b/Torch.Server/Views/ConfigControl.xaml.cs
@@ -131,6 +131,13 @@ namespace Torch.Server.Views
             //w.Show();
             var d = new RoleEditor();
             var w = _instanceManager.DedicatedConfig.SelectedWorld;
+
+            if (w == null)
+            {
+                MessageBox.Show("A world is not selected.");
+                return;
+            }
+            
             d.Edit(w.Checkpoint.PromotedUsers.Dictionary);
             _instanceManager.DedicatedConfig.Administrators = w.Checkpoint.PromotedUsers.Dictionary.Where(k => k.Value >= MyPromoteLevel.Admin).Select(k => k.Key.ToString()).ToList();
         }

From 30c1f07207c09f98ec6514940260767581e4fc42 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 21 Sep 2019 12:28:15 -0700
Subject: [PATCH 155/170] Add file to project

---
 Torch.Server/Torch.Server.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 6695434..000951b 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -270,6 +270,7 @@
     <Compile Include="ViewModels\Entities\EntityControlViewModel.cs" />
     <Compile Include="ViewModels\ModItemInfo.cs" />
     <Compile Include="ViewModels\SessionSettingsViewModel.cs" />
+    <Compile Include="ViewModels\WorldConfigurationViewModel.cs" />
     <Compile Include="Views\Converters\DefinitionToIdConverter.cs" />
     <Compile Include="Views\Converters\BooleanAndConverter.cs" />
     <Compile Include="Views\Converters\ListConverter.cs" />

From 792151a8b7aec29b981edfed12e9c424c90cbfbd Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 25 Sep 2019 17:22:53 -0400
Subject: [PATCH 156/170] Set default tab to chat because of spookyness

---
 Torch.Server/Views/TorchUI.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Torch.Server/Views/TorchUI.xaml.cs b/Torch.Server/Views/TorchUI.xaml.cs
index 88c97a0..e3a6212 100644
--- a/Torch.Server/Views/TorchUI.xaml.cs
+++ b/Torch.Server/Views/TorchUI.xaml.cs
@@ -68,6 +68,7 @@ namespace Torch.Server
         {
             var scrollViewer = FindDescendant<ScrollViewer>(ConsoleText);
             scrollViewer.ScrollChanged += ConsoleText_OnScrollChanged;
+            TabControl.SelectedIndex = 3;
         }
 
         private void AttachConsole()

From e4ad517cb1f51a0f1872905ac14a287b24386611 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 25 Sep 2019 17:36:16 -0400
Subject: [PATCH 157/170] Handle exceptions when clearing temp files BECAUSE NO
 ONE REPORTED IT

---
 Torch/Managers/FilesystemManager.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Torch/Managers/FilesystemManager.cs b/Torch/Managers/FilesystemManager.cs
index 8963bc7..4ea665f 100644
--- a/Torch/Managers/FilesystemManager.cs
+++ b/Torch/Managers/FilesystemManager.cs
@@ -35,7 +35,20 @@ namespace Torch.Managers
         private void ClearTemp()
         {
             foreach (var file in Directory.GetFiles(TempDirectory, "*", SearchOption.AllDirectories))
-                File.Delete(file);
+            {
+                try
+                {
+                    File.Delete(file);
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    _log.Debug($"Failed to delete file {file}, it's probably in use by another process'");
+                }
+                catch (Exception ex)
+                {
+                    _log.Warn($"Unhandled exception when clearing temp files. You may ignore this. {ex}");
+                }
+            }
         }
 
         /// <summary>

From 0220f467413aade35dbac9cb62e740bb3ace13db Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 25 Sep 2019 17:44:11 -0400
Subject: [PATCH 158/170] Save changes to config when using plugin browser

---
 Torch.Server/Views/PluginBrowser.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Torch.Server/Views/PluginBrowser.xaml.cs b/Torch.Server/Views/PluginBrowser.xaml.cs
index 32865e4..8c97be8 100644
--- a/Torch.Server/Views/PluginBrowser.xaml.cs
+++ b/Torch.Server/Views/PluginBrowser.xaml.cs
@@ -91,6 +91,7 @@ namespace Torch.Server.Views
         {
             var item = CurrentItem;
             TorchBase.Instance.Config.Plugins.Add(new Guid(item.ID));
+            TorchBase.Instance.Config.Save();
             Task.Run(async () =>
                      {
                          var result = await PluginQuery.Instance.DownloadPlugin(item.ID);

From 8107bf131b72824fdd9016c9007137037d0cb2e7 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Sun, 29 Sep 2019 18:16:26 -0400
Subject: [PATCH 159/170] Revert "Set default tab to chat because of
 spookyness"

This reverts commit 792151a8b7aec29b981edfed12e9c424c90cbfbd.
---
 Torch.Server/Views/TorchUI.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Torch.Server/Views/TorchUI.xaml.cs b/Torch.Server/Views/TorchUI.xaml.cs
index e3a6212..88c97a0 100644
--- a/Torch.Server/Views/TorchUI.xaml.cs
+++ b/Torch.Server/Views/TorchUI.xaml.cs
@@ -68,7 +68,6 @@ namespace Torch.Server
         {
             var scrollViewer = FindDescendant<ScrollViewer>(ConsoleText);
             scrollViewer.ScrollChanged += ConsoleText_OnScrollChanged;
-            TabControl.SelectedIndex = 3;
         }
 
         private void AttachConsole()

From 9c2dc69e3c3127ac0bda9054255c78eb9c2901c1 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Wed, 23 Oct 2019 20:36:15 -0400
Subject: [PATCH 160/170] patch prep

---
 Torch.Server/Initializer.cs                         |  1 -
 .../Managers/MultiplayerManagerDedicated.cs         |  5 +++--
 Torch/Commands/TorchCommands.cs                     | 13 +++++++------
 Torch/Managers/ChatManager/ChatManagerServer.cs     |  2 +-
 Torch/VRageGame.cs                                  |  6 ++++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 94d2072..43c7b1c 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -16,7 +16,6 @@ using NLog.Targets;
 using Sandbox.Engine.Utils;
 using Torch.Utils;
 using VRage.FileSystem;
-using VRage.Library.Exceptions;
 
 namespace Torch.Server
 {
diff --git a/Torch.Server/Managers/MultiplayerManagerDedicated.cs b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
index f5c52ba..f336f36 100644
--- a/Torch.Server/Managers/MultiplayerManagerDedicated.cs
+++ b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
@@ -210,8 +210,9 @@ namespace Torch.Server.Managers
         private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner)
         {
             var state = new MyP2PSessionState();
-            MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
-            var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
+            //MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
+            //var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
+            string ip = "Can't acquire IP because Keen did a stupid";
 
             Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel);
 
diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index a79be3c..63c259d 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -37,13 +37,14 @@ namespace Torch.Commands
         [Permission(MyPromoteLevel.None)]
         public void GetIP(ulong steamId = 0)
         {
-            if (steamId == 0)
-                steamId = Context.Player.SteamUserId;
+            Context.Respond("Keen broke this command. Fix coming Soon(tm)");
+            //if (steamId == 0)
+            //    steamId = Context.Player.SteamUserId;
 
-            VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
-            VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
-            var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
-            Context.Respond($"Your IP is {ip}");
+            //VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
+            //VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
+            //var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
+            //Context.Respond($"Your IP is {ip}");
         }
 
         [Command("help", "Displays help for a command")]
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index 02658ba..452e9e0 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -22,7 +22,7 @@ using VRage.Network;
 
 namespace Torch.Managers.ChatManager
 {
-    [PatchShim]
+    //[PatchShim]
     internal static class ChatInterceptPatch
     {
         private static ChatManagerServer _chatManager;
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index 4f95c4d..e5c06a3 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -136,7 +136,9 @@ namespace Torch
         {
             bool dedicated = Sandbox.Engine.Platform.Game.IsDedicated;
             Environment.SetEnvironmentVariable("SteamAppId", _appSteamId.ToString());
-            MyServiceManager.Instance.AddService<IMyGameService>(new MySteamService(dedicated, _appSteamId));
+            //KEEN WHY
+            var service = Activator.CreateInstance(Type.GetType("VRage.Steam.MySteamService, VRage.Steam"), new object[] {dedicated, _appSteamId});
+            MyServiceManager.Instance.AddService<IMyGameService>((IMyGameService)service);
             if (dedicated && !MyGameService.HasGameServer)
             {
                 _log.Warn("Steam service is not running! Please reinstall dedicated server.");
@@ -176,7 +178,7 @@ namespace Torch
                 else
                 {
                     MyPerformanceSettings preset = MyGuiScreenOptionsGraphics.GetPreset(MyRenderQualityEnum.NORMAL);
-                    MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset)
+                    MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset, false)
                         .PerformanceSettings.RenderSettings;
                     MyStringId graphicsRenderer = MySandboxGame.Config.GraphicsRenderer;
                     if (graphicsRenderer == MySandboxGame.DirectX11RendererKey)

From 52ef0b4d6df5cae4af392647569e89c8e4a2c0f7 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Thu, 24 Oct 2019 14:35:06 -0700
Subject: [PATCH 161/170] Add MySteamService wrapper, add UGC service to init,
 fix chat intercept

---
 .../Managers/MultiplayerManagerDedicated.cs   |  5 ++--
 Torch/Commands/TorchCommands.cs               | 15 ++++++------
 .../Managers/ChatManager/ChatManagerServer.cs |  4 ++--
 Torch/MySteamServiceWrapper.cs                | 24 +++++++++++++++++++
 Torch/Torch.csproj                            |  1 +
 Torch/VRageGame.cs                            |  8 +++++--
 6 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 Torch/MySteamServiceWrapper.cs

diff --git a/Torch.Server/Managers/MultiplayerManagerDedicated.cs b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
index f336f36..8a380c5 100644
--- a/Torch.Server/Managers/MultiplayerManagerDedicated.cs
+++ b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
@@ -210,9 +210,8 @@ namespace Torch.Server.Managers
         private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner)
         {
             var state = new MyP2PSessionState();
-            //MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
-            //var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
-            string ip = "Can't acquire IP because Keen did a stupid";
+            MySteamServiceWrapper.Static.Peer2Peer.GetSessionState(steamId, ref state);
+            var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
 
             Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel);
 
diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index 63c259d..52d52ed 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -37,14 +37,13 @@ namespace Torch.Commands
         [Permission(MyPromoteLevel.None)]
         public void GetIP(ulong steamId = 0)
         {
-            Context.Respond("Keen broke this command. Fix coming Soon(tm)");
-            //if (steamId == 0)
-            //    steamId = Context.Player.SteamUserId;
-
-            //VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
-            //VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
-            //var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
-            //Context.Respond($"Your IP is {ip}");
+            if (steamId == 0)
+                steamId = Context.Player.SteamUserId;
+            
+            VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
+            MySteamServiceWrapper.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
+            var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
+            Context.Respond($"Your IP is {ip}");
         }
 
         [Command("help", "Displays help for a command")]
diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs
index 452e9e0..253d928 100644
--- a/Torch/Managers/ChatManager/ChatManagerServer.cs
+++ b/Torch/Managers/ChatManager/ChatManagerServer.cs
@@ -22,7 +22,7 @@ using VRage.Network;
 
 namespace Torch.Managers.ChatManager
 {
-    //[PatchShim]
+    [PatchShim]
     internal static class ChatInterceptPatch
     {
         private static ChatManagerServer _chatManager;
@@ -30,7 +30,7 @@ namespace Torch.Managers.ChatManager
             
         internal static void Patch(PatchContext context)
         {
-            var target = typeof(MyMultiplayerBase).GetMethod("OnChatMessageRecieved_Server", BindingFlags.Static | BindingFlags.NonPublic);
+            var target = typeof(MyMultiplayerBase).GetMethod("OnChatMessageReceived_Server", BindingFlags.Static | BindingFlags.NonPublic);
             var patchMethod = typeof(ChatInterceptPatch).GetMethod(nameof(PrefixMessageProcessing), BindingFlags.Static | BindingFlags.NonPublic);
             context.GetPattern(target).Prefixes.Add(patchMethod);
         }
diff --git a/Torch/MySteamServiceWrapper.cs b/Torch/MySteamServiceWrapper.cs
new file mode 100644
index 0000000..c1ba92f
--- /dev/null
+++ b/Torch/MySteamServiceWrapper.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Reflection;
+using System.Windows.Data;
+using VRage.GameServices;
+
+namespace Torch
+{
+    /// <summary>
+    /// Provides static accessor for MySteamService because Keen made it internal
+    /// </summary>
+    public class MySteamServiceWrapper
+    {
+        private static readonly MethodInfo _getGameService;
+
+        public static IMyGameService Static => (IMyGameService)_getGameService.Invoke(null, null);
+
+        static MySteamServiceWrapper()
+        {
+            var type = Type.GetType("VRage.Steam.MySteamService, VRage.Steam");
+            var prop = type.GetProperty("Static", BindingFlags.Static | BindingFlags.Public);
+            _getGameService = prop.GetGetMethod();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 54ca7d7..c25afce 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -241,6 +241,7 @@
     <Compile Include="Managers\PatchManager\Transpile\LoggingILGenerator.cs" />
     <Compile Include="Managers\PatchManager\Transpile\MethodContext.cs" />
     <Compile Include="Managers\PatchManager\Transpile\MethodTranspiler.cs" />
+    <Compile Include="MySteamServiceWrapper.cs" />
     <Compile Include="Patches\GameAnalyticsPatch.cs" />
     <Compile Include="Patches\GameStatePatchShim.cs" />
     <Compile Include="Patches\ObjectFactoryInitPatch.cs" />
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index e5c06a3..7d45453 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -25,6 +25,7 @@ using SpaceEngineers.Game.GUI;
 using Torch.Utils;
 using VRage;
 using VRage.Audio;
+using VRage.Dedicated;
 using VRage.FileSystem;
 using VRage.Game;
 using VRage.Game.ObjectBuilder;
@@ -137,8 +138,11 @@ namespace Torch
             bool dedicated = Sandbox.Engine.Platform.Game.IsDedicated;
             Environment.SetEnvironmentVariable("SteamAppId", _appSteamId.ToString());
             //KEEN WHY
-            var service = Activator.CreateInstance(Type.GetType("VRage.Steam.MySteamService, VRage.Steam"), new object[] {dedicated, _appSteamId});
-            MyServiceManager.Instance.AddService<IMyGameService>((IMyGameService)service);
+            Activator.CreateInstance(Type.GetType("VRage.Steam.MySteamService, VRage.Steam"), new object[] {dedicated, _appSteamId});
+            var service = MySteamServiceWrapper.Static;
+            MyServiceManager.Instance.AddService<IMyGameService>(service);
+            var serviceInstance = MySteamUgcService.Create(MyPerServerSettings.AppId, service);
+            MyServiceManager.Instance.AddService<IMyUGCService>(serviceInstance);
             if (dedicated && !MyGameService.HasGameServer)
             {
                 _log.Warn("Steam service is not running! Please reinstall dedicated server.");

From cc91fa36539d4f8f4c1efde48f66ec769a5dff1f Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 26 Oct 2019 11:38:38 -0700
Subject: [PATCH 162/170] Fix mod downloading, more descriptive sandbox error
 message

---
 Torch.Server/Initializer.cs                          | 4 ++--
 Torch.Server/Managers/MultiplayerManagerDedicated.cs | 2 +-
 Torch/MySteamServiceWrapper.cs                       | 7 ++++++-
 Torch/VRageGame.cs                                   | 8 +++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 43c7b1c..6ea29a2 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -216,11 +216,11 @@ quit";
                 StandardOutputEncoding = Encoding.ASCII
             };
             var cmd = Process.Start(steamCmdProc);
-
+            
             // ReSharper disable once PossibleNullReferenceException
             while (!cmd.HasExited)
             {
-                log.Info(cmd.StandardOutput.ReadLine());
+                log.Info(cmd.StandardOutput.ReadToEnd());
                 Thread.Sleep(100);
             }
         }
diff --git a/Torch.Server/Managers/MultiplayerManagerDedicated.cs b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
index 8a380c5..58616a1 100644
--- a/Torch.Server/Managers/MultiplayerManagerDedicated.cs
+++ b/Torch.Server/Managers/MultiplayerManagerDedicated.cs
@@ -221,7 +221,7 @@ namespace Torch.Server.Managers
             
             if (Players.ContainsKey(steamId))
             {
-                _log.Warn($"Player {steamId} already has already joined!");
+                _log.Warn($"Player {steamId} has already joined!");
                 UserRejected(steamId, JoinResult.AlreadyJoined);
             }
             else if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
diff --git a/Torch/MySteamServiceWrapper.cs b/Torch/MySteamServiceWrapper.cs
index c1ba92f..c74995a 100644
--- a/Torch/MySteamServiceWrapper.cs
+++ b/Torch/MySteamServiceWrapper.cs
@@ -8,7 +8,7 @@ namespace Torch
     /// <summary>
     /// Provides static accessor for MySteamService because Keen made it internal
     /// </summary>
-    public class MySteamServiceWrapper
+    public static class MySteamServiceWrapper
     {
         private static readonly MethodInfo _getGameService;
 
@@ -20,5 +20,10 @@ namespace Torch
             var prop = type.GetProperty("Static", BindingFlags.Static | BindingFlags.Public);
             _getGameService = prop.GetGetMethod();
         }
+
+        public static IMyGameService Init(bool dedicated, uint appId)
+        {
+            return (IMyGameService)Activator.CreateInstance(Type.GetType("VRage.Steam.MySteamService, VRage.Steam"), dedicated, appId);
+        }
     }
 }
\ No newline at end of file
diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs
index 7d45453..a972643 100644
--- a/Torch/VRageGame.cs
+++ b/Torch/VRageGame.cs
@@ -137,11 +137,9 @@ namespace Torch
         {
             bool dedicated = Sandbox.Engine.Platform.Game.IsDedicated;
             Environment.SetEnvironmentVariable("SteamAppId", _appSteamId.ToString());
-            //KEEN WHY
-            Activator.CreateInstance(Type.GetType("VRage.Steam.MySteamService, VRage.Steam"), new object[] {dedicated, _appSteamId});
-            var service = MySteamServiceWrapper.Static;
+            var service = MySteamServiceWrapper.Init(dedicated, _appSteamId);
             MyServiceManager.Instance.AddService<IMyGameService>(service);
-            var serviceInstance = MySteamUgcService.Create(MyPerServerSettings.AppId, service);
+            var serviceInstance = MySteamUgcService.Create(_appSteamId, service);
             MyServiceManager.Instance.AddService<IMyUGCService>(serviceInstance);
             if (dedicated && !MyGameService.HasGameServer)
             {
@@ -239,7 +237,7 @@ namespace Torch
 
             if (MySandboxGame.FatalErrorDuringInit)
             {
-                throw new InvalidOperationException("Failed to start sandbox game: fatal error during init");
+                throw new InvalidOperationException("Failed to start sandbox game: see Keen log for details");
             }
             try
             {

From 5780cf7c95de533b9b51ac300266c61ea40d10a0 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Thu, 31 Oct 2019 18:18:19 -0400
Subject: [PATCH 163/170] Quick and dirty hack to resolve dll conflicts

---
 Torch/Plugins/PluginManager.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index f1097e0..f81f1ba 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -330,6 +330,8 @@ namespace Torch.Managers
         private void LoadPlugin(PluginItem item)
         {
             var assemblies = new List<Assembly>();
+
+            var loaded = AppDomain.CurrentDomain.GetAssemblies();
             
             if (item.IsZip)
             {
@@ -340,6 +342,9 @@ namespace Torch.Managers
                         if (!entry.Name.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
                             continue;
 
+                        if (loaded.Any(a => entry.Name.Contains(a.GetName().Name)))
+                            continue;
+
 
                         using (var stream = entry.Open())
                         {
@@ -375,6 +380,9 @@ namespace Torch.Managers
                     if (!file.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
                         continue;
 
+                    if (loaded.Any(a => file.Contains(a.GetName().Name)))
+                        continue;
+
                     using (var stream = File.OpenRead(file))
                     {
                         var data = stream.ReadToEnd();
@@ -391,7 +399,7 @@ namespace Torch.Managers
                             {
                                 _log.Warn(e, $"Failed to read debugging symbols from {symbolPath}");
                             }
-
+                        
                         assemblies.Add(symbol != null ? Assembly.Load(data, symbol) : Assembly.Load(data));
                     }
                 }

From c18d6d479581610b4b9423ba76579e2c1fae0968 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Fri, 1 Nov 2019 12:18:21 -0400
Subject: [PATCH 164/170] Unhack the hack

---
 Torch/Plugins/PluginManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index f81f1ba..6ac9445 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -342,8 +342,8 @@ namespace Torch.Managers
                         if (!entry.Name.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
                             continue;
 
-                        if (loaded.Any(a => entry.Name.Contains(a.GetName().Name)))
-                            continue;
+                        //if (loaded.Any(a => entry.Name.Contains(a.GetName().Name)))
+                        //    continue;
 
 
                         using (var stream = entry.Open())
@@ -380,8 +380,8 @@ namespace Torch.Managers
                     if (!file.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
                         continue;
 
-                    if (loaded.Any(a => file.Contains(a.GetName().Name)))
-                        continue;
+                    //if (loaded.Any(a => file.Contains(a.GetName().Name)))
+                    //    continue;
 
                     using (var stream = File.OpenRead(file))
                     {

From b02d613a28bcedc0ac53eb8b990ef4ed35ed41e5 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Tue, 5 Nov 2019 10:19:16 -0800
Subject: [PATCH 165/170] Fix crash when logging pre-formatted messages

---
 Torch/Managers/KeenLogPatch.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Torch/Managers/KeenLogPatch.cs b/Torch/Managers/KeenLogPatch.cs
index ce9d8a9..08e70c8 100644
--- a/Torch/Managers/KeenLogPatch.cs
+++ b/Torch/Managers/KeenLogPatch.cs
@@ -131,7 +131,15 @@ namespace Torch.Managers
 
         private static bool PrefixLogFormatted(MyLog __instance, MyLogSeverity severity, string format, object[] args)
         {
-            _log.Log(LogLevelFor(severity), PrepareLog(__instance).AppendFormat(format, args));
+            // Sometimes this is called with a pre-formatted string and no args
+            // and causes a crash when the format string contains braces
+            var sb = PrepareLog(__instance);
+            if (args != null && args.Length > 0)
+                sb.AppendFormat(format, args);
+            else
+                sb.Append(format);
+
+            _log.Log(LogLevelFor(severity), sb);
             return false;
         }
 

From 5727e3b1b8064f5815e6c7f15721b3fe3c68cfb4 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sun, 10 Nov 2019 15:59:30 -0800
Subject: [PATCH 166/170] Rewrite Initializer.Run so it doesn't look like a
 toddler made it

---
 Torch.Server/Initializer.cs | 39 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
index 6ea29a2..a63d20b 100644
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -125,21 +125,14 @@ quit";
         public void Run()
         {
             _server = new TorchServer(_config);
-            var init = Task.Run(() => _server.Init()).ContinueWith(x =>
+
+            if (_config.NoGui)
             {
-                if (!x.IsFaulted)
-                    return;
-
-                Log.Error("Error initializing server.");
-                LogException(x.Exception);
-            });
-            if (!_config.NoGui)
+                _server.Init();
+                _server.Start();
+            }
+            else
             {
-                if (_config.Autostart)
-                    init.ContinueWith(x => _server.Start());
-
-                Log.Info("Showing UI");
-
 #if !DEBUG
                 if (!_config.IndependentConsole)
                 {
@@ -147,13 +140,19 @@ quit";
                     NativeMethods.FreeConsole();
                 }
 #endif
-
-                new TorchUI(_server).ShowDialog();
-            }
-            else
-            {
-                init.Wait();
-                _server.Start();
+                
+                var gameThread = new Thread(() =>
+                {
+                    _server.Init();
+                    
+                    if (_config.Autostart)
+                        _server.Start();
+                });
+                
+                gameThread.Start();
+                
+                var ui = new TorchUI(_server);
+                ui.ShowDialog();
             }
         }
 

From 23b0318591d50aa8e849b29b4dda22948ef0a782 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 29 Nov 2019 15:58:44 -0800
Subject: [PATCH 167/170] Disable forcing IgnoreLastSession true

---
 Torch.Server/ViewModels/ConfigDedicatedViewModel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
index abe4c33..a417eef 100644
--- a/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
+++ b/Torch.Server/ViewModels/ConfigDedicatedViewModel.cs
@@ -29,7 +29,7 @@ namespace Torch.Server.ViewModels
         public ConfigDedicatedViewModel(MyConfigDedicated<MyObjectBuilder_SessionSettings> configDedicated)
         {
             _config = configDedicated;
-            _config.IgnoreLastSession = true;
+            //_config.IgnoreLastSession = true;
             SessionSettings = new SessionSettingsViewModel(_config.SessionSettings);
             Task.Run(() => UpdateAllModInfosAsync());
         }
@@ -40,7 +40,7 @@ namespace Torch.Server.ViewModels
 
             _config.SessionSettings = _sessionSettings;
             // Never ever
-            _config.IgnoreLastSession = true;
+            //_config.IgnoreLastSession = true;
             _config.Save(path);
         }
 

From 21fd997554969ad915026ba4b5aecc6ebee2ff06 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 7 Dec 2019 14:11:27 -0800
Subject: [PATCH 168/170] Support NPC identities in GetGridOwnerName

---
 Torch/Utils/MiscExtensions.cs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Torch/Utils/MiscExtensions.cs b/Torch/Utils/MiscExtensions.cs
index 2ab227e..46078dc 100644
--- a/Torch/Utils/MiscExtensions.cs
+++ b/Torch/Utils/MiscExtensions.cs
@@ -1,17 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using Sandbox;
 using Sandbox.Engine.Multiplayer;
 using Sandbox.Game.Entities;
 using Sandbox.Game.World;
 using Steamworks;
-using VRage.Game.ModAPI;
 
 namespace Torch.Utils
 {
@@ -49,8 +44,10 @@ namespace Torch.Utils
                 int count = stream.Read(buffer, streamPosition, buffer.Length - streamPosition);
                 if (count == 0)
                     break;
+
                 streamPosition += count;
             }
+
             var result = new byte[streamPosition];
             Array.Copy(buffer, 0, result, 0, result.Length);
             _streamBuffer.Value.SetTarget(buffer);
@@ -67,7 +64,18 @@ namespace Torch.Utils
         {
             if (grid.BigOwners.Count == 0 || grid.BigOwners[0] == 0)
                 return "nobody";
-            return MyMultiplayer.Static.GetMemberName(MySession.Static.Players.TryGetSteamId(grid.BigOwners[0]));
+
+            var identityId = grid.BigOwners[0];
+
+            if (MySession.Static.Players.IdentityIsNpc(identityId))
+            {
+                var identity = MySession.Static.Players.TryGetIdentity(identityId);
+                return identity.DisplayName;
+            }
+            else
+            {
+                return MyMultiplayer.Static.GetMemberName(MySession.Static.Players.TryGetSteamId(identityId));
+            }
         }
     }
-}
+}
\ No newline at end of file

From 540b17448a8b2af63b57a843a382355526e1ddf0 Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 7 Dec 2019 18:15:48 -0800
Subject: [PATCH 169/170] Fix overwriting Sandbox with stale cached version

---
 Torch.Server/Managers/InstanceManager.cs | 8 +++++++-
 Torch.Server/TorchServer.cs              | 7 ++++---
 Torch/Commands/TorchCommands.cs          | 1 -
 Torch/TorchBase.cs                       | 1 -
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs
index d52197b..92f14e9 100644
--- a/Torch.Server/Managers/InstanceManager.cs
+++ b/Torch.Server/Managers/InstanceManager.cs
@@ -198,6 +198,12 @@ namespace Torch.Server.Managers
 
         public void SaveConfig()
         {
+            if (((TorchServer)Torch).HasRun)
+            {
+                Log.Warn("Checkpoint cache is stale, not saving dedicated config.");
+                return;
+            }
+            
             DedicatedConfig.Save(Path.Combine(Torch.Config.InstancePath, CONFIG_NAME));
             Log.Info("Saved dedicated config.");
 
@@ -308,7 +314,7 @@ namespace Torch.Server.Managers
             }
             
             OnPropertyChanged(nameof(Checkpoint));
-            OnPropertyChanged(nameof(WorldConfiguration));  
+            OnPropertyChanged(nameof(WorldConfiguration));
         }
     }
 }
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 389e2f8..5cd83ce 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -41,7 +41,6 @@ namespace Torch.Server
     {
         private bool _canRun;
         private TimeSpan _elapsedPlayTime;
-        private bool _hasRun;
         private bool _isRunning;
         private float _simRatio;
         private ServerState _state;
@@ -65,6 +64,8 @@ namespace Torch.Server
             sessionManager.AddFactory(x => new MultiplayerManagerDedicated(this));
         }
 
+        public bool HasRun { get; private set; }
+        
         /// <inheritdoc />
         public float SimulationRatio { get => _simRatio; set => SetValue(ref _simRatio, value); }
 
@@ -120,7 +121,7 @@ namespace Torch.Server
             if (State != ServerState.Stopped)
                 return;
 
-            if (_hasRun)
+            if (IsRunning || HasRun)
             {
                 Restart();
                 return;
@@ -129,7 +130,6 @@ namespace Torch.Server
             State = ServerState.Starting;
             IsRunning = true;
             CanRun = false;
-            _hasRun = true;
             Log.Info("Starting server.");
             MySandboxGame.ConfigDedicated = DedicatedInstance.DedicatedConfig.Model;
 
@@ -144,6 +144,7 @@ namespace Torch.Server
                 Log.Error("Server is already stopped");
             Log.Info("Stopping server.");
             base.Stop();
+            HasRun = true;
             Log.Info("Server stopped.");
 
             State = ServerState.Stopped;
diff --git a/Torch/Commands/TorchCommands.cs b/Torch/Commands/TorchCommands.cs
index 52d52ed..2e4ee66 100644
--- a/Torch/Commands/TorchCommands.cs
+++ b/Torch/Commands/TorchCommands.cs
@@ -272,7 +272,6 @@ namespace Torch.Commands
                             Debug.Assert(torch != null);
                             torch.Stop();
                         }, this, TaskContinuationOptions.RunContinuationsAsynchronously);
-
                     }
                     else
                     {
diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index 8ad7f16..0658a60 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -230,7 +230,6 @@ namespace Torch
             MySandboxGame.Static.Invoke(action, caller);
         }
 
-
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void InvokeBlocking(Action action, int timeoutMs = -1, [CallerMemberName] string caller = "")

From a1f397f9bfef8efdb10894580236d82e5e6baddd Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Sat, 21 Dec 2019 12:22:29 -0800
Subject: [PATCH 170/170] Keep config disabled after stopping server

---
 Torch.Server/TorchServer.cs     | 7 ++++---
 Torch.Server/Views/TorchUI.xaml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 5cd83ce..76cd9b8 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -39,6 +39,7 @@ namespace Torch.Server
 {
     public class TorchServer : TorchBase, ITorchServer
     {
+        private bool _hasRun;
         private bool _canRun;
         private TimeSpan _elapsedPlayTime;
         private bool _isRunning;
@@ -63,8 +64,8 @@ namespace Torch.Server
             var sessionManager = Managers.GetManager<ITorchSessionManager>();
             sessionManager.AddFactory(x => new MultiplayerManagerDedicated(this));
         }
-
-        public bool HasRun { get; private set; }
+        
+        public bool HasRun { get => _hasRun; set => SetValue(ref _hasRun, value); }
         
         /// <inheritdoc />
         public float SimulationRatio { get => _simRatio; set => SetValue(ref _simRatio, value); }
@@ -129,6 +130,7 @@ namespace Torch.Server
 
             State = ServerState.Starting;
             IsRunning = true;
+            HasRun = true;
             CanRun = false;
             Log.Info("Starting server.");
             MySandboxGame.ConfigDedicated = DedicatedInstance.DedicatedConfig.Model;
@@ -144,7 +146,6 @@ namespace Torch.Server
                 Log.Error("Server is already stopped");
             Log.Info("Stopping server.");
             base.Stop();
-            HasRun = true;
             Log.Info("Server stopped.");
 
             State = ServerState.Stopped;
diff --git a/Torch.Server/Views/TorchUI.xaml b/Torch.Server/Views/TorchUI.xaml
index 5c7e34f..6a402d0 100644
--- a/Torch.Server/Views/TorchUI.xaml
+++ b/Torch.Server/Views/TorchUI.xaml
@@ -66,7 +66,7 @@
                 <RichTextBox x:Name="ConsoleText" VerticalScrollBarVisibility="Visible" FontFamily="Consolas" IsReadOnly="True"/>
             </TabItem>
             <TabItem Header="Configuration">
-                <Grid IsEnabled="{Binding CanRun}">
+                <Grid IsEnabled="{Binding Path=HasRun, Converter={StaticResource InverseBool}}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition/>