From 9109b57a846178c956047fc98ad947df2dfe3960 Mon Sep 17 00:00:00 2001 From: Greelan <53196309+Greelan@users.noreply.github.com> Date: Sun, 13 Feb 2022 12:14:39 +1100 Subject: [PATCH] Various updates - Switch to automap - Add manifest settings - Fix Proton (even though not currently usable with server) --- astroneer.kvp | 103 ++++++++++++----- astroneerconfig.json | 239 ++++++++++++++++++++++++--------------- astroneermetaconfig.json | 44 ++----- 3 files changed, 230 insertions(+), 156 deletions(-) diff --git a/astroneer.kvp b/astroneer.kvp index cd689b1..b626030 100644 --- a/astroneer.kvp +++ b/astroneer.kvp @@ -1,33 +1,76 @@ -App.AdminMethod=STDIO -App.ApplicationReadyMode=Immediate -App.BaseDirectory=./astroneer/728470/ -App.CommandLineArgs= -App.CommandLineParameterDelimiter= -App.CommandLineParameterFormat= -App.DisplayName=Astroneer -App.EnvironmentVariables={"LD_LIBRARY_PATH": "./linux64:%LD_LIBRARY_PATH%", "SteamAppId": "728470"} -App.ExecutableLinux= -App.ExecutableWin=728470/Astro/Binaries/Win64/AstroServer-Win64-Shipping.exe -App.ExitMethod=Kill -App.ExitString= -App.HasReadableConsole=true -App.HasWritableConsole=false -App.RapidStartup=false -App.RootDir=./astroneer/ -App.UpdateSource=Multi -App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "728470"}] -App.WorkingDir=728470 -Console.AppReadyRegex= -Console.ThrowawayMessageRegex= -Console.UserChatRegex= -Console.UserJoinRegex= -Console.UserLeaveRegex= -Meta.Author=Tueem +Meta.DisplayName=Astroneer +Meta.Description=Astroneer Dedicated Server +Meta.OS=Windows +Meta.Arch=x86_64 +Meta.Author=Greelan, Tueem +Meta.URL=https://store.steampowered.com/app/361420/ASTRONEER/ +Meta.DisplayImageSource=steam:361420 +Meta.EndpointURIFormat= Meta.ConfigManifest=astroneerconfig.json Meta.MetaConfigManifest=astroneermetaconfig.json Meta.ConfigRoot=astroneer.kvp -Meta.Description=Astroneer Dedicated Server -Meta.DisplayImageSource=steam:361420 -Meta.DisplayName=Astroneer -Meta.OS=1 -Meta.URL=https://store.steampowered.com/app/361420/ASTRONEER/ \ No newline at end of file +Meta.MinAMPVersion=2.3.2.0 +Meta.SpecificDockerImage= +Meta.ContainerPolicy=Supported +Meta.Prerequsites=[] +Meta.ConfigReleaseState=NotSpecified +App.DisplayName=Astroneer +App.RootDir=./astroneer/ +App.BaseDirectory=./astroneer/728470/ +App.ExecutableWin=728470/Astro/Binaries/Win64/AstroServer-Win64-Shipping.exe +App.ExecutableLinux=1580130/proton +App.WorkingDir=728470/Astro/Binaries/Win64 +App.LinuxCommandLineArgs=run ./Astro/Binaries/Win64/AstroServer-Win64-Shipping.exe +App.WindowsCommandLineArgs= +App.CommandLineArgs={{$PlatformArgs}} -Port={{$ApplicationPort1}} -ConsolePort={{$RemoteAdminPort}} {{$FormattedArgs}} +App.AppSettings={} +App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%","SteamAppId":"361420","STEAM_COMPAT_DATA_PATH":"{{$FullRootDir}}1580130","STEAM_COMPAT_CLIENT_INSTALL_PATH":"{{$FullRootDir}}1580130"} +App.CommandLineParameterFormat=-{0}={1} +App.CommandLineParameterDelimiter= +App.ExitMethod=Kill +App.ExitTimeout=30 +App.ExitString=DSServerShutdown +App.ExitFile=app_exit.lck +App.HasWriteableConsole=True +App.HasReadableConsole=True +App.SupportsLiveSettingsChanges=False +App.LiveSettingChangeCommandFormat=set {0} "{1}" +App.ApplicationIPBinding=0.0.0.0 +App.ApplicationPort1=8777 +App.ApplicationPort2=0 +App.ApplicationPort3=0 +App.RemoteAdminPort=8778 +App.MaxUsers=8 +App.UseRandomAdminPassword=False +App.RemoteAdminPassword=Password123 +App.AdminMethod=STDIO +App.AdminLoginTransform=None +App.RCONConnectDelaySeconds=5 +App.RCONConnectRetrySeconds=5 +App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"728470","ForceDownloadPlatform":"Windows"},{"UpdateStageName": "Proton Compatibility Layer","UpdateSourcePlatform":"Linux","UpdateSource":"SteamCMD","UpdateSourceData":"1580130"}] +App.Compatibility=None +App.SteamUpdateAnonymousLogin=True +App.SteamForceLoginPrompt=False +App.RapidStartup=False +App.SupportsUniversalSleep=False +App.UniversalSleepApplicationUDPPort=27015 +App.UniversalSleepSteamQueryPort=27016 +App.WakeupMode=Any +App.ApplicationReadyMode=Immediate +App.TemplateMatchRegex={{(\$?[\w]+)}} +Console.FilterMatchRegex= +Console.FilterMatchReplacement= +Console.ThrowawayMessageRegex= +Console.AppReadyRegex=^\[\d\d:\d\d:\d\d\] \[INFO\] Ready.$ +Console.UserJoinRegex=^\[\d\d:\d\d:\d\d\] \[INFO\] "(?.+?)" \((?.+?)\) connected from \[(?.+?)\]$ +Console.UserLeaveRegex=^\[\d\d:\d\d:\d\d\] \[INFO\] "(?.+?)" \((?.+?)\) disconnected \(Reason: (?.+?)\)$ +Console.UserChatRegex=^\[\d\d:\d\d:\d\d\] \[CHAT\] <(?.+?)> (?.+)$ +Console.UpdateAvailableRegex=^\[\d\d:\d\d:\d\d\] \[INFO\] A new server update is available! v[\d\.]+.$ +Console.SuppressLogAtStart=False +Console.ActivateLogRegex= +Console.UserActions={} +Limits.SleepMode=True +Limits.SleepOnStart=False +Limits.SleepDelayMinutes=5 +Limits.DozeDelay=2 +Limits.AutoRetryCount=5 diff --git a/astroneerconfig.json b/astroneerconfig.json index b01574b..b8cf38c 100644 --- a/astroneerconfig.json +++ b/astroneerconfig.json @@ -1,108 +1,167 @@ [ - - { - "DisplayName": "Server name", - "Category": "Server Settings", - "Description": "The name of the Server", - "Keywords": "name", - "FieldName": "servername", - "InputType": "text", - "IsFlagArgument": false, - "ParamFieldName": "servername", - "IncludeInCommandLine": false, - "DefaultValue": "Powered by AMP", - "EnumValues": {} + "DisplayName":"Public IP", + "Category":"Server Settings", + "Description":"", + "Keywords":"", + "FieldName":"$ExternalIP", + "InputType":"text", + "Hidden":true, + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.PublicIP", + "IncludeInCommandLine":false }, { - "DisplayName": "Password", - "Category": "Server Settings", - "Description": "The Password for the Server", - "Keywords": "password", - "FieldName": "serverpassword", - "InputType": "password", - "IsFlagArgument": false, - "ParamFieldName": "serverpassword", - "IncludeInCommandLine": false, - "DefaultValue": "", - "EnumValues": {} + "DisplayName":"Server Port", + "Category":"Server Settings", + "Description":"", + "Keywords":"", + "FieldName":"$ApplicationPort1", + "InputType":"number", + "Hidden":true, + "IsFlagArgument":false, + "ParamFieldName":"URL.Port", + "IncludeInCommandLine":false }, { - "DisplayName": "Auto Save Interval", - "Category": "Server Settings", - "Description": "The Interval in which Auto saves are made (in seconds))", - "Keywords": "autosave", - "FieldName": "autosaveinterval", - "InputType": "number", - "IsFlagArgument": false, - "ParamFieldName": "autosaveinterval", - "IncludeInCommandLine": false, - "DefaultValue": "900", - "EnumValues": {} + "DisplayName":"Console Port", + "Category":"Server Settings", + "Description":"", + "Keywords":"", + "FieldName":"$RemoteAdminPort", + "InputType":"number", + "Hidden":true, + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.ConsolePort", + "IncludeInCommandLine":false }, { - "DisplayName": "MaxServerFramerate", - "Category": "Server Settings", - "Description": "The max framerate the server will allow for clients", - "Keywords": "fps", - "FieldName": "maxfps", - "InputType": "text", - "IsFlagArgument": false, - "ParamFieldName": "maxfps", - "IncludeInCommandLine": false, - "DefaultValue": "34", - "EnumValues": {} + "DisplayName":"Server Name", + "Category":"Server Settings", + "Description":"The name of the server as it appears publicly", + "Keywords":"name", + "FieldName":"ServerName", + "InputType":"text", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.ServerName", + "IncludeInCommandLine":false, + "DefaultValue":"Astroneer Server - Powered by AMP" }, { - "DisplayName": "Max Players", - "Category": "Server Settings", - "Description": "The Maximum Player Count", - "Keywords": "max players", - "FieldName": "maxplayers", - "InputType": "number", - "IsFlagArgument": false, - "ParamFieldName": "maxplayers", - "IncludeInCommandLine": false, - "DefaultValue": "8", - "EnumValues": {} + "DisplayName":"Server Password", + "Category":"Server Settings", + "Description":"Password required to connect to the server. Default is no password", + "Keywords":"password", + "FieldName":"ServerPassword", + "InputType":"password", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.ServerPassword", + "IncludeInCommandLine":false, + "DefaultValue":"" }, { - "DisplayName": "Public IP", - "Category": "Server Settings", - "Description": "Input your public server IP in here otherwise the server won't work.", - "Keywords": "Public IP", - "FieldName": "publicip", - "InputType": "text", - "IsFlagArgument": false, - "ParamFieldName": "publicip", - "IncludeInCommandLine": false, - "DefaultValue": "INSERT YOUR PUBLIC IP HERE", - "EnumValues": {} + "DisplayName":"Console Password", + "Category":"Server Settings", + "Description":"Password required for remote console (admin) connections. NOTE: Change this after first installing the server!", + "Keywords":"console,admin,password", + "FieldName":"$RemoteAdminPassword", + "InputType":"RandomPassword", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.ConsolePassword", + "IncludeInCommandLine":false, + "DefaultValue":"Password123" }, { - "DisplayName": "Owner Name", - "Category": "Server Settings", - "Description": "Input your Account name.", - "Keywords": "Owner Name", - "FieldName": "ownername", - "InputType": "text", - "IsFlagArgument": false, - "ParamFieldName": "ownername", - "IncludeInCommandLine": false, - "DefaultValue": "", - "EnumValues": {} + "DisplayName":"Owner Name", + "Category":"Server Settings", + "Description":"Steam name of the server owner (admin)", + "Keywords":"owner,name", + "FieldName":"OwnerName", + "InputType":"text", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.OwnerName", + "IncludeInCommandLine":false, + "DefaultValue":"" }, { - "DisplayName": "Owner GUID", - "Category": "Server Settings", - "Description": "Enter your GUID", - "Keywords": "Owner GUID", - "FieldName": "ownerguid", - "InputType": "text", - "IsFlagArgument": false, - "ParamFieldName": "ownerguid", - "IncludeInCommandLine": false, - "DefaultValue": "", - "EnumValues": {} + "DisplayName":"Player Limit", + "Category":"Server Settings", + "Description":"Maximum number of players that may connect to the server. Cannot exceed 8", + "Keywords":"players,limit", + "FieldName":"$MaxUsers", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroGameUserSettings.MaxPlayers", + "IncludeInCommandLine":false, + "DefaultValue":"8", + "Suffix":"players" + }, + { + "DisplayName":"Game Save Interval", + "Category":"Server Settings", + "Description":"The interval between automatic server saves", + "Keywords":"autosave,save,interval", + "FieldName":"AutoSaveGameInterval", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.AutoSaveGameInterval", + "IncludeInCommandLine":false, + "DefaultValue":"900", + "Suffix":"seconds" + }, + { + "DisplayName":"Backup Save Interval", + "Category":"Server Settings", + "Description":"The interval between automatic server backups", + "Keywords":"backup,interval", + "FieldName":"BackupSaveGamesInterval", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.BackupSaveGamesInterval", + "IncludeInCommandLine":false, + "DefaultValue":"7200", + "Suffix":"seconds" + }, + { + "DisplayName":"Enable Whitelist", + "Category":"Server Settings", + "Description":"If enabled, unlisted players will not be able to connect", + "Keywords":"deny,unlisted", + "FieldName":"DenyUnlistedPlayers", + "InputType":"checkbox", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.DenyUnlistedPlayers", + "IncludeInCommandLine":false, + "DefaultValue":"False", + "EnumValues":{ + "False":"False", + "True":"True" + } + }, + { + "DisplayName":"Maximum Active Server Framerate", + "Category":"Server Settings", + "Description":"The maximum framerate that the server will allow when active", + "Keywords":"fps,framerate,active", + "FieldName":"MaxServerFramerate", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.MaxServerFramerate", + "IncludeInCommandLine":false, + "DefaultValue":"30.000000", + "Suffix":"fps" + }, + { + "DisplayName":"Maximum Idle Server Framerate", + "Category":"Server Settings", + "Description":"The maximum framerate that the server will allow when idle", + "Keywords":"fps,framerate,idle", + "FieldName":"MaxServerIdleFramerate", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/Script/Astro.AstroServerSettings.MaxServerIdleFramerate", + "IncludeInCommandLine":false, + "DefaultValue":"3.000000", + "Suffix":"fps" } ] \ No newline at end of file diff --git a/astroneermetaconfig.json b/astroneermetaconfig.json index 4e789d4..791f850 100644 --- a/astroneermetaconfig.json +++ b/astroneermetaconfig.json @@ -1,48 +1,20 @@ [ { "ConfigFile": "Astro/Saved/Config/WindowsServer/AstroServerSettings.ini", + "AutoMap": true, "ConfigType": "ini", - "ConfigSeparator": "=", - "Subsections": [ - { - "Heading": "/Script/Astro.AstroServerSettings", - "SettingMappings": { - "PublicIP": "publicip", - "ServerName": "servername", - "ServerPassword": "serverpassword", - "AutoSaveGameInterval": "autosaveinterval", - "MaxServerFramerate": "maxfps", - "OwnerName": "ownername", - "OwnerGuid": "ownerguid" - } - } - - ] + "ConfigFormatRegex": "^(?.+?)=(?.*?)$" }, { - "ConfigFile": "Astro/Saved/Config/WindowsServer/Engine.ini", + "ConfigFile": "Astro/Saved/Config/WindowsServer/GameUserSettings.ini", + "AutoMap": true, "ConfigType": "ini", - "ConfigSeparator": "=", - "Subsections": [ - { - "Heading": "URL", - "SettingMappings": { - "Port": "$ApplicationPort2" - } - } - ] + "ConfigFormatRegex": "^(?.+?)=(?.*?)$" }, { - "ConfigFile": "Astro/Saved/Config/WindowsServer/GameUserSettings.ini", + "ConfigFile": "Astro/Saved/Config/WindowsServer/Engine.ini", + "AutoMap": true, "ConfigType": "ini", - "ConfigSeparator": "=", - "Subsections": [ - { - "Heading": "/Script/Astro.AstroGameUserSettings", - "SettingMappings": { - "MaxPlayers": "maxplayers" - } - } - ] + "ConfigFormatRegex": "^(?.+?)=(?.*?)$" } ] \ No newline at end of file