mirror of
https://github.com/tribufu/ServerManagers
synced 2026-05-06 15:17:34 +00:00
Added prefix launcher option to launcher arguments.
This commit is contained in:
Brett Hewitson
parent
dd69808b24
commit
09938ce932
11 changed files with 122 additions and 228 deletions
|
|
@ -1153,6 +1153,8 @@
|
|||
<sys:String x:Key="ServerSettings_LauncherArgsTooltip">Additional command-line args for the server launcher. Use this with caution! For more information search 'Microsoft Start Command' on the internet.</sys:String>
|
||||
<sys:String x:Key="ServerSettings_LauncherArgsOverrideLabel">Override Launcher</sys:String>
|
||||
<sys:String x:Key="ServerSettings_LauncherArgsOverrideTooltip">If enabled, the RunServer.cmd file will only contain what is included in the Launcher Args field.</sys:String>
|
||||
<sys:String x:Key="ServerSettings_LauncherArgsPrefixLabel">Prefix Launcher</sys:String>
|
||||
<sys:String x:Key="ServerSettings_LauncherArgsPrefixTooltip">If enabled, the RunServer.cmd file will include the Launcher Args field before the server start (will allow other files to be executed before the server is started).</sys:String>
|
||||
<sys:String x:Key="ServerSettings_ServerArgsLabel">Server Args:</sys:String>
|
||||
<sys:String x:Key="ServerSettings_ServerArgsTooltip">Additional command-line args for the server. If you specify this, add the args which start with ?'s first, followed by any other args. For example: ?MaxPlayers=5?QueryPort=9999 -nosteamclient</sys:String>
|
||||
<sys:String x:Key="ServerSettings_ShowCommandButtonLabel">Show Command...</sys:String>
|
||||
|
|
|
|||
|
|
@ -436,6 +436,14 @@ namespace ServerManagerTool.Lib
|
|||
set { SetValue(AdditionalArgsProperty, value); }
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty LauncherArgsProperty = DependencyProperty.Register(nameof(LauncherArgs), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty));
|
||||
[DataMember]
|
||||
public string LauncherArgs
|
||||
{
|
||||
get { return (string)GetValue(LauncherArgsProperty); }
|
||||
set { SetValue(LauncherArgsProperty, value); }
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty LauncherArgsOverrideProperty = DependencyProperty.Register(nameof(LauncherArgsOverride), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
|
||||
[DataMember]
|
||||
public bool LauncherArgsOverride
|
||||
|
|
@ -444,12 +452,12 @@ namespace ServerManagerTool.Lib
|
|||
set { SetValue(LauncherArgsOverrideProperty, value); }
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty LauncherArgsProperty = DependencyProperty.Register(nameof(LauncherArgs), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty));
|
||||
public static readonly DependencyProperty LauncherArgsPrefixProperty = DependencyProperty.Register(nameof(LauncherArgsPrefix), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
|
||||
[DataMember]
|
||||
public string LauncherArgs
|
||||
public bool LauncherArgsPrefix
|
||||
{
|
||||
get { return (string)GetValue(LauncherArgsProperty); }
|
||||
set { SetValue(LauncherArgsProperty, value); }
|
||||
get { return (bool)GetValue(LauncherArgsPrefixProperty); }
|
||||
set { SetValue(LauncherArgsPrefixProperty, value); }
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -703,7 +711,7 @@ namespace ServerManagerTool.Lib
|
|||
private void CheckLauncherArgs()
|
||||
{
|
||||
// do not process if overriding the launcher args
|
||||
if (this.LauncherArgsOverride)
|
||||
if (this.LauncherArgsOverride || this.LauncherArgsPrefix)
|
||||
return;
|
||||
|
||||
var launcherArgs = LauncherArgs?.ToLower() ?? string.Empty;
|
||||
|
|
@ -1078,9 +1086,10 @@ namespace ServerManagerTool.Lib
|
|||
}
|
||||
else
|
||||
{
|
||||
var drive = Path.GetPathRoot(this.InstallDirectory);
|
||||
drive = drive.Replace(Path.DirectorySeparatorChar.ToString(), string.Empty);
|
||||
drive = drive.Replace(Path.AltDirectorySeparatorChar.ToString(), string.Empty);
|
||||
if (this.LauncherArgsPrefix && !string.IsNullOrWhiteSpace(this.LauncherArgs))
|
||||
{
|
||||
commandArgs.AppendLine(this.LauncherArgs);
|
||||
}
|
||||
|
||||
commandArgs.Append("start");
|
||||
commandArgs.Append($" \"{this.ProfileName}\"");
|
||||
|
|
@ -1093,7 +1102,7 @@ namespace ServerManagerTool.Lib
|
|||
commandArgs.Append($" /{ProcessPriority}");
|
||||
if (ProcessAffinity > 0 && ProcessUtils.IsProcessorAffinityValid(ProcessAffinity))
|
||||
{
|
||||
commandArgs.Append($" /affinity {ProcessAffinity.ToString("X")}");
|
||||
commandArgs.Append($" /affinity {ProcessAffinity:X}");
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(this.LauncherArgs))
|
||||
|
|
|
|||
|
|
@ -857,6 +857,7 @@
|
|||
<RowDefinition/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" MinWidth="100"/>
|
||||
|
|
@ -875,11 +876,13 @@
|
|||
|
||||
<Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_LauncherArgsLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsTooltip}"/>
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Margin="1" VerticalContentAlignment="Center" Text="{Binding LauncherArgs}" ToolTip="{DynamicResource ServerSettings_LauncherArgsTooltip}"/>
|
||||
<CheckBox Grid.Row="1" Grid.Column="4" Margin="1" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding LauncherArgsOverride}" Content="{DynamicResource ServerSettings_LauncherArgsOverrideLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsOverrideTooltip}"/>
|
||||
|
||||
<Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_ServerArgsLabel}" ToolTip="{DynamicResource ServerSettings_ServerArgsTooltip}"/>
|
||||
<TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Margin="1" VerticalContentAlignment="Center" Text="{Binding AdditionalArgs}" ToolTip="{DynamicResource ServerSettings_ServerArgsTooltip}"/>
|
||||
<Button Grid.Row="2" Grid.Column="4" Margin="1" Click="ShowCmd_Click" Content="{StaticResource ShowCmdButtonContent}" ToolTip="{DynamicResource ServerSettings_ShowCommandButtonTooltip}"/>
|
||||
<CheckBox Grid.Row="2" Grid.Column="1" Margin="1" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding LauncherArgsOverride}" Content="{DynamicResource ServerSettings_LauncherArgsOverrideLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsOverrideTooltip}"/>
|
||||
<CheckBox Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="1" IsChecked="{Binding LauncherArgsPrefix}" IsEnabled="{Binding LauncherArgsOverride, Converter={StaticResource InvertBooleanConverter}}" Content="{DynamicResource ServerSettings_LauncherArgsPrefixLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsPrefixTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
||||
|
||||
<Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_ServerArgsLabel}" ToolTip="{DynamicResource ServerSettings_ServerArgsTooltip}"/>
|
||||
<TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Margin="1" VerticalContentAlignment="Center" Text="{Binding AdditionalArgs}" ToolTip="{DynamicResource ServerSettings_ServerArgsTooltip}"/>
|
||||
<Button Grid.Row="3" Grid.Column="4" Margin="1" Click="ShowCmd_Click" Content="{StaticResource ShowCmdButtonContent}" ToolTip="{DynamicResource ServerSettings_ShowCommandButtonTooltip}"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,30 @@
|
|||
<title>Conan Server Manager Version Feed</title>
|
||||
<subtitle>This is the Conan Server Manager release version feed.</subtitle>
|
||||
<link href="http://servermanagers.freeforums.net/" />
|
||||
<updated>2022-01-14T00:00:00Z</updated>
|
||||
<updated>2022-01-25T00:00:00Z</updated>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:6F91598E-D62C-4F48-A205-C9C4A66BBB65</id>
|
||||
<title>1.1.62 (1.1.62.1)</title>
|
||||
<summary>1.1.62.1</summary>
|
||||
<link href="" />
|
||||
<updated>2022-01-25T00:00:00Z</updated>
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
|
||||
<p>
|
||||
<u style="font-size: .9em;">CHANGE</u>
|
||||
<br/>
|
||||
<ul>
|
||||
<li>Added prefix launcher option to launcher arguments.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:189B95FA-8ACA-4E37-9A34-443B6C5E27EE</id>
|
||||
|
|
|
|||
|
|
@ -5,90 +5,21 @@
|
|||
<title>Conan Server Manager Version Feed</title>
|
||||
<subtitle>This is the Conan Server Manager beta version feed.</subtitle>
|
||||
<link href="http://servermanagers.freeforums.net/" />
|
||||
<updated>2022-01-20T00:00:00Z</updated>
|
||||
<updated>2022-01-25T00:00:00Z</updated>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:1BA6E671-7784-48FF-B463-D0962084277B</id>
|
||||
<title>1.1.61 (1.1.61.4)</title>
|
||||
<summary>1.1.61.4</summary>
|
||||
<id>urn:uuid:6F91598E-D62C-4F48-A205-C9C4A66BBB65</id>
|
||||
<title>1.1.62 (1.1.62.1)</title>
|
||||
<summary>1.1.62.1</summary>
|
||||
<link href="" />
|
||||
<updated>2022-01-20T00:00:00Z</updated>
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
|
||||
<p>
|
||||
<u style="font-size: .9em;">BUGFIX</u>
|
||||
<br/>
|
||||
<ul>
|
||||
<li>Fixed bug when pasting ini config into paste window, resulting in blank record.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:BF3FA549-5DC9-4576-B225-6D8519ED3B98</id>
|
||||
<title>1.1.61 (1.1.61.3)</title>
|
||||
<summary>1.1.61.3</summary>
|
||||
<link href="" />
|
||||
<updated>2022-01-14T00:00:00Z</updated>
|
||||
<updated>2022-01-25T00:00:00Z</updated>
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
|
||||
<p>
|
||||
<u style="font-size: .9em;">CHANGE</u>
|
||||
<br/>
|
||||
<ul>
|
||||
<li>Global Settings - Server Startup Options - Added new option to start the server windows minimzed.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:16704347-28FE-41BD-9913-465982E6C3C3</id>
|
||||
<title>1.1.61 (1.1.61.2)</title>
|
||||
<summary>1.1.61.2</summary>
|
||||
<link href="" />
|
||||
<updated>2022-01-14T00:00:00Z</updated>
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
|
||||
<p>
|
||||
<u style="font-size: .9em;">CHANGE</u>
|
||||
<br/>
|
||||
<ul>
|
||||
<li>Server manager language will default to the computers language setting on first start, if possible.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:189B95FA-8ACA-4E37-9A34-443B6C5E27EE</id>
|
||||
<title>1.1.61 (1.1.61.1)</title>
|
||||
<summary>1.1.61.1</summary>
|
||||
<link href="" />
|
||||
<updated>2022-01-05T00:00:00Z</updated>
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
|
||||
<p>
|
||||
<u style="font-size: .9em;">CHANGE</u>
|
||||
<br/>
|
||||
<ul>
|
||||
<li>Minor tweaks to the Auto-Update process to help prevent intermittent exceptions.</li>
|
||||
<li>Added prefix launcher option to launcher arguments.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue