Unturned: add ServerID option (#1572)

Author: Greelan

unturned.kvp

@@ -21,7 +21,7 @@ Meta.Prerequisites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
 Meta.NoCommercialUsage=False
-Meta.ConfigVersion=1.6
+Meta.ConfigVersion=7
 Meta.ReleaseNotes=
 Meta.BreakingReleaseNotes=
 Meta.AppConfigId=1f00f476-2adf-4a4f-a748-846c40fa4f31
@@ -35,7 +35,7 @@ App.ExecutableLinux=1110390/Unturned_Headless.x86_64
 App.WorkingDir=1110390
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{$PlatformArgs}} -batchmode -nographics {{$FormattedArgs}} +{{ServerType}}/Unturned
+App.CommandLineArgs={{$PlatformArgs}} -batchmode -nographics {{$FormattedArgs}} +{{ServerType}}/{{ServerID}}
 App.UseLinuxIOREDIR=False
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"304930"}

unturnedconfig.json

@@ -11,6 +11,7 @@
         "Hidden": true,
         "ParamFieldName": "Port",
         "IncludeInCommandLine": false,
+        "ExcludeFromImport": true,
         "EnumValues": {}
     },
     {
@@ -26,6 +27,7 @@
         "ParamFieldName": "/RocketSettings/RCON/@Enabled",
         "IncludeInCommandLine": false,
         "DefaultValue": "true",
+        "ExcludeFromImport": true,
         "EnumValues": {}
     },
     {
@@ -40,6 +42,7 @@
         "Hidden": true,
         "ParamFieldName": "/RocketSettings/RCON/@Port",
         "IncludeInCommandLine": false,
+        "ExcludeFromImport": true,
         "EnumValues": {}
     },
     {
@@ -55,6 +58,7 @@
         "ParamFieldName": "permissionSystem",
         "IncludeInCommandLine": false,
         "DefaultValue": "OpenMod",
+        "ExcludeFromImport": true,
         "EnumValues": {}
     },
     {
@@ -362,6 +366,22 @@
         "Placeholder": "2",
         "EnumValues": {}
     },
+    {
+        "DisplayName": "Server ID",
+        "Category": "Unturned:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Server ID for the directory where savedata and configuration files are stored. WARNING: Do not change unless you know what you are doing! Make sure you update the server if this is changed, and you may also need to reconfigure config files, including for RocketMod and OpenMod, as applicable",
+        "Keywords": "server,id,serverid",
+        "FieldName": "ServerID",
+        "InputType": "text",
+        "IsFlagArgument": false,
+        "ParamFieldName": "ServerID",
+        "IncludeInCommandLine": false,
+        "DefaultValue": "Unturned",
+        "Placeholder": "Unturned",
+        "Required": true,
+        "EnumValues": {}
+    },
     {
         "DisplayName": "Install OpenMod",
         "Category": "Updates",

unturnedmetaconfig.json

@@ -1,24 +1,26 @@
 [
     {
-        "ConfigFile": "Servers/Unturned/Server/Commands.dat",
+        "ConfigFile": "Servers/{{ServerID}}/Server/Commands.dat",
         "AutoMap": true,
+        "Importable": true,
         "ConfigType": "kvp",
         "ConfigFormat": "{0} {1}",
         "ConfigFormatRegex": "^(?<key>.+?) (?<value>.*?)$"
     },
     {
-        "ConfigFile": "Servers/Unturned/WorkshopDownloadConfig.json",
+        "ConfigFile": "Servers/{{ServerID}}/WorkshopDownloadConfig.json",
         "AutoMap": true,
+        "Importable": true,
         "ConfigType": "template",
         "ConfigFileTemplate": "unturnedworkshopconfig.json"
     },
     {
-        "ConfigFile": "Servers/Unturned/Rocket/Rocket.config.xml",
+        "ConfigFile": "Servers/{{ServerID}}/Rocket/Rocket.config.xml",
         "AutoMap": true,
         "ConfigType": "xml"
     },
     {
-        "ConfigFile": "Servers/Unturned/OpenMod/openmod.unturned.yaml",
+        "ConfigFile": "Servers/{{ServerID}}/OpenMod/openmod.unturned.yaml",
         "AutoMap": true,
         "ConfigType": "kvp",
         "ConfigFormat": "  {0}: {1}",

unturnedupdates.json

@@ -4,7 +4,7 @@
         "UpdateSourcePlatform": "Linux",
         "UpdateSource": "Executable",
         "UpdateSourceData": "/bin/bash",
-        "UpdateSourceArgs": "-c \"cd U3DS/1110390 && rm -rf Modules/OpenMod.Unturned Servers/Unturned/OpenMod >/dev/null 2>&1\"",
+        "UpdateSourceArgs": "-c \"cd U3DS/1110390 && rm -rf Modules/OpenMod.Unturned \\\"Servers/{{ServerID}}/OpenMod\\\" >/dev/null 2>&1\"",
         "UpdateSourceConditionSetting": "OpenMod",
         "UpdateSourceConditionValue": "false",
         "SkipOnFailure": true
@@ -14,7 +14,7 @@
         "UpdateSourcePlatform": "Windows",
         "UpdateSource": "Executable",
         "UpdateSourceData": "cmd.exe",
-        "UpdateSourceArgs": "/C cd U3DS\\1110390 && rd /S /Q Modules\\OpenMod.Unturned Servers\\Unturned\\OpenMod > NUL 2>&1",
+        "UpdateSourceArgs": "/C cd U3DS\\1110390 && rd /S /Q Modules\\OpenMod.Unturned \"Servers\\{{ServerID}}\\OpenMod\" > NUL 2>&1",
         "UpdateSourceConditionSetting": "OpenMod",
         "UpdateSourceConditionValue": "false",
         "SkipOnFailure": true
@@ -31,7 +31,7 @@
         "UpdateStageName": "Config Directory Creation",
         "UpdateSourcePlatform": "All",
         "UpdateSource": "CreateDirectory",
-        "UpdateSourceArgs": "{{$FullBaseDir}}Servers/Unturned/Server",
+        "UpdateSourceArgs": "{{$FullBaseDir}}Servers/{{ServerID}}/Server",
         "SkipOnFailure": false
     },
     {
@@ -40,7 +40,7 @@
         "UpdateSource": "FetchURL",
         "UpdateSourceData": "https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/unturnedconfigfile.dat",
         "UpdateSourceArgs": "Commands.dat",
-        "UpdateSourceTarget": "{{$FullBaseDir}}Servers/Unturned/Server/",
+        "UpdateSourceTarget": "{{$FullBaseDir}}Servers/{{ServerID}}/Server/",
         "OverwriteExistingFiles": false,
         "SkipOnFailure": false
     },