From 1b631c7e5100e057e24a17b0737d7dcdafcc2f9f Mon Sep 17 00:00:00 2001
From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com>
Date: Fri, 28 Apr 2023 13:02:12 -0500
Subject: [PATCH] Terraria Updates (#326)

* Terraria Updates

This updates the ports to the new method, changes the child process for Linux, displays a suggestion for Docker on Windows, and includes a default .backupExclude file.

* Whoopsies
---
 exclusions/.backupExclusionsTerraria | 35 ++++++++++++++++++++++++++++
 terraria.kvp                         | 16 +++++++------
 terrariaconfig.json                  | 16 +++++++++++++
 3 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 exclusions/.backupExclusionsTerraria

diff --git a/exclusions/.backupExclusionsTerraria b/exclusions/.backupExclusionsTerraria
new file mode 100644
index 0000000..2ced99c
--- /dev/null
+++ b/exclusions/.backupExclusionsTerraria
@@ -0,0 +1,35 @@
+Content
+lib64
+steamapps
+changelog.txt
+FNA.dll
+FNA.dll.config
+installscript.vdf
+Mono.Posix.dll
+Mono.Security.dll
+monoconfig
+monomachineconfig
+mscorlib.dll
+open-folder
+steam_appid.txt
+SteelSeriesEngineWrapper.dll
+System.Configuration.dll
+System.Core.dll
+System.Data.dll
+System.dll
+System.Drawing.dll
+System.Numerics.dll
+System.Runtime.Serialization.dll
+System.Security.dll
+System.Windows.Forms.dll
+System.Windows.Forms.dll.config
+System.Xml.dll
+System.Xml.Linq.dll
+Terraria
+Terraria.bin.x86_64
+Terraria.exe
+Terraria.png
+TerrariaServer
+TerrariaServer.bin.x86_64
+TerrariaServer.exe
+WindowsBase.dll
diff --git a/terraria.kvp b/terraria.kvp
index 41ac12d..404beed 100644
--- a/terraria.kvp
+++ b/terraria.kvp
@@ -6,9 +6,11 @@ Meta.ConfigRoot=terraria.kvp
 Meta.ConfigManifest=terrariaconfig.json
 Meta.DisplayImageSource=steam:105600
 Meta.EndpointURIFormat=steam://connect/{0}
-Meta.OS=3
+Meta.OS=Windows, Linux
 Meta.URL=https://store.steampowered.com/app/105600/Terraria/
-Meta.MinAMPVersion=
+Meta.MinAMPVersion=2.4.3.2
+Meta.ContainerPolicy=SupportedOnLinux, RecommendedOnWindows
+Meta.ContainerPolicyReason=AMP's console is unable to provide console input on Windows for the Terraria server. It is able to do so on Linux, therefore Docker is recommended on Windows.
 App.DisplayName=Terraria
 App.RootDir=./Terraria/
 App.BaseDirectory=./Terraria/serverfiles
@@ -32,16 +34,16 @@ App.AdminMethod=STDIO
 App.SupportsLiveSettingsChanges=False
 App.LiveSettingChangeCommandFormat=set {0} "{1}"
 App.ApplicationIPBinding=0.0.0.0
-App.ApplicationPort1=7777
-App.ApplicationPort2=0
-App.ApplicationPort3=0
-App.RemoteAdminPort=0
+App.Ports=[{"Protocol":"TCP","Port":7777,"Offset":0,"Range":1,"Ref":"ApplicationPort1","Name":"Main Game Port","Description":"","ChildPorts":null}]
 App.MaxUsers=8
-App.UpdateSources=[{"UpdateStageName": "Config Template Download","UpdateSourcePlatform": "All","UpdateSource": "FetchURL","UpdateSourceData": "https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/terrariaserverconfig.txt","UpdateSourceTarget": "serverfiles","OverwriteExistingFiles": false},{"UpdateStageName": "SteamCMD Terraria","UpdateSourcePlatform": "All","UpdateSource": "SteamCMD","UpdateSourceData": "105600","UpdateSourceTarget": "serverfiles"}]
+App.UpdateSources=[{"UpdateStageName":"Config Template Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/terrariaserverconfig.txt","UpdateSourceTarget":"serverfiles","OverwriteExistingFiles":false},{"UpdateStageName":"SteamCMD Terraria","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"105600","UpdateSourceTarget":"serverfiles"},{"UpdateStageName":"Backup Exclusions Download 1","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://github.com/CubeCoders/AMPTemplates/raw/main/exclusions/.backupExclusionsTerraria","UpdateSourceArgs":".backupExclude","UpdateSourceTarget":"{{$FullBaseDir}}","UpdateSourceConditionSetting":"backupExclude","UpdateSourceConditionValue":"true","OverwriteExistingFiles":false}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=False
 App.SteamForceLoginPrompt=False
 App.RapidStartup=False
+App.MonitorChildProcess=True
+App.MonitorChildProcessWaitMs=1000
+App.MonitorChildProcessName=TerrariaServer.bin.x86_64
 App.SupportsUniversalSleep=False
 App.WakeupMode=Any
 App.ApplicationReadyMode=RegexMatch
diff --git a/terrariaconfig.json b/terrariaconfig.json
index 8b8caff..50c3f6e 100644
--- a/terrariaconfig.json
+++ b/terrariaconfig.json
@@ -485,5 +485,21 @@
         },
         "IncludeInCommandLine": false,
         "DefaultValue": "2"
+    },
+    {
+        "DisplayName":"Download Backup Exclude File",
+        "Category":"SteamCMD and Updates",
+        "Description":"This downloads a default backup exclude file to save space on backups by only saving specific directories. If this is disabled, you will need to manually delete the .backupExclude file it downloads.",
+        "Keywords":"download,backup,exclude,file",
+        "FieldName":"backupExclude",
+        "InputType":"checkbox",
+        "IsFlagArgument":false,
+        "ParamFieldName":"backupExclude",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"true",
+        "EnumValues":{
+            "False": "false",
+            "True": "true"
+        }
     }
 ]