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 1/2] 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 2/2] 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}">