Merge branch 'unturned' of https://github.com/Greelan/AMPTemplates into unturned

unturned.kvp

@@ -43,7 +43,7 @@ App.RemoteAdminPassword=Password123
 App.AdminMethod=TelnetRCON
 App.RCONConnectDelaySeconds=5
 App.RCONConnectRetrySeconds=5
-App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1110390"},{"UpdateStageName":"Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/Greelan/AMPTemplates/unturned/unturnedconfigfile.dat","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Servers/{{ServerName}}/Server"},{"UpdateStageName":"Config File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Servers/{{ServerName}}/Server/Commands.dat","UpdateSourceArgs":"./unturnedconfigfile.dat","OverwriteExistingFiles":false},{"UpdateStageName":"Rocket Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Modules/Rocket.Unturned"},{"UpdateStageName":"First Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/English.dat","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/English.dat","OverwriteExistingFiles":true},{"UpdateStageName":"Second Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.API.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.API.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Third Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Core.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Core.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fourth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fifth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.module","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.module","OverwriteExistingFiles":true},{"UpdateStageName":"Steam Directory Creation","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64"},{"UpdateStageName":"Steamclient Copy","UpdateSourcePlatform":"Linux","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64/steamclient.so","UpdateSourceArgs":"./U3DS/1110390/linux64/steamclient.so","OverwriteExistingFiles":true}]
+App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1110390"},{"UpdateStageName":"Main Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/unturnedconfigfile.dat","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Workshop Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/unturnedworkshopconfig.json","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Servers/{{ServerName}}/Server"},{"UpdateStageName":"Config File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Servers/{{ServerName}}/Server/Commands.dat","UpdateSourceArgs":"./unturnedconfigfile.dat","OverwriteExistingFiles":false},{"UpdateStageName":"Rocket Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Modules/Rocket.Unturned"},{"UpdateStageName":"First Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/English.dat","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/English.dat","OverwriteExistingFiles":true},{"UpdateStageName":"Second Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.API.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.API.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Third Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Core.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Core.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fourth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fifth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.module","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.module","OverwriteExistingFiles":true},{"UpdateStageName":"Steam Directory Creation","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64"},{"UpdateStageName":"Steamclient Copy","UpdateSourcePlatform":"Linux","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64/steamclient.so","UpdateSourceArgs":"./U3DS/1110390/linux64/steamclient.so","OverwriteExistingFiles":true}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceLoginPrompt=False

unturnedconfig.json

@@ -72,7 +72,7 @@
         "Description": "Password to connect to the server. Change this after installing the server",
         "Keywords": "password",
         "FieldName": "Password",
-        "InputType": "password",
+        "InputType": "RandomPassword",
         "IsFlagArgument": false,
         "ParamFieldName": "Password",
         "IncludeInCommandLine": false,
@@ -84,7 +84,7 @@
         "Description": "Password to connect to RCON. Change this after installing the server",
         "Keywords": "RCON,password",
         "FieldName": "$RemoteAdminPassword",
-        "InputType": "number",
+        "InputType": "RandomPassword",
         "IsFlagArgument": false,
         "ParamFieldName": "/RocketSettings/RCON/@Password",
         "IncludeInCommandLine": false,
@@ -241,5 +241,43 @@
         "IncludeInCommandLine": false,
         "DefaultValue": "500",
         "suffix": "milliseconds"
+    },
+    {
+        "DisplayName":"Workshop Items",
+        "Category":"Server Settings",
+        "Description":"Comma separated list of IDs of workshop items to install on the server",
+        "Keywords":"workshop,items",
+        "FieldName":"FileIDs",
+        "InputType":"text",
+        "IsFlagArgument":false,
+        "ParamFieldName":"FileIDs",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"",
+        "placeholder":"2478247379,2566953935"
+    },
+    {
+        "DisplayName":"Excluded Workshop Items",
+        "Category":"Server Settings",
+        "Description":"Comma separated list of IDs of children items to ignore when installing workshop items",
+        "Keywords":"workshop,children,items",
+        "FieldName":"ChildrenFileIDs",
+        "InputType":"text",
+        "IsFlagArgument":false,
+        "ParamFieldName":"ChildrenFileIDs",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"",
+        "placeholder":"5685656858,7697679654"
+    },
+    {
+        "DisplayName": "Maximum Workshop Retries",
+        "Category": "Server Settings",
+        "Description": "Sets the maximum number of retries to download workshop items",
+        "Keywords": "retries",
+        "FieldName": "MaxRetries",
+        "InputType": "number",
+        "IsFlagArgument": false,
+        "ParamFieldName": "MaxRetries",
+        "IncludeInCommandLine": false,
+        "DefaultValue": "2"
     }    
 ]

unturnedmetaconfig.json

@@ -6,6 +6,12 @@
         "ConfigFormat": "{0} {1}",
         "ConfigFormatRegex": "^(?<key>.+?) (?<value>.*?)$"
     },
+    {
+        "ConfigFile": "Servers/{{ServerName}}/WorkshopDownloadConfig.json", 
+        "AutoMap": true,
+        "ConfigType": "template",
+        "ConfigFileTemplate": "unturnedworkshopconfig.json"
+    },
     {
         "ConfigFile": "Servers/{{ServerName}}/Rocket/Rocket.config.xml", 
         "AutoMap": true,

unturnedworkshopconfig.json

@@ -0,0 +1,11 @@
+{
+  "File_IDs": [{{FileIDs}}],
+  "Ignore_Children_File_IDs": [{{ChildrenFileIDs}}],
+  "Query_Cache_Max_Age_Seconds": 600,
+  "Max_Query_Retries": {{MaxRetries}},
+  "Use_Cached_Downloads": true,
+  "Should_Monitor_Updates": true,
+  "Shutdown_Update_Detected_Timer": 600,
+  "Shutdown_Update_Detected_Message": "Workshop file update detected, shutdown in: {0}",
+  "Shutdown_Kick_Message": "Shutdown for Workshop file update."
+}