Terraria - Allow changing steamcmd beta branch (#335)

* Allow changing steamcmd beta branch
Use more readable update sources

* Update tmodloaderconfig.json

* Update tmodloader14config.json

* Update tmodloaderconfig.json

* Update tmodloader14config.json

---------

Co-authored-by: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com>
This commit is contained in:
Jasper Borsboom 2023-04-28 20:03:03 +02:00 committed by GitHub
parent 1b631c7e51
commit aabfb433d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 136 additions and 6 deletions

View File

@ -37,7 +37,7 @@ App.ApplicationPort2=0
App.ApplicationPort3=0 App.ApplicationPort3=0
App.RemoteAdminPort=0 App.RemoteAdminPort=0
App.MaxUsers=8 App.MaxUsers=8
App.UpdateSources=[{"UpdateStageName": "Config Template Download","UpdateSourcePlatform": "All","UpdateSource": "FetchURL","UpdateSourceData": "https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/tmodloaderserverconfig.txt","UpdateSourceTarget": "serverfiles","OverwriteExistingFiles": false},{"UpdateStageName": "SteamCMD tModLoader","UpdateSourcePlatform": "All","UpdateSource": "SteamCMD","UpdateSourceData": "1281930","UpdateSourceArgs":"1281930","UpdateSourceTarget": "serverfiles","UpdateSourceConditionSetting":"Source","UpdateSourceConditionValue":"Steam","UpdateSourceVersion": "1.3-legacy"},{"UpdateStageName": "GitHub tModLoader Windows","UpdateSourcePlatform": "Windows","UpdateSource": "FetchURL","UpdateSourceData": "https://github.com/tModLoader/tModLoader/releases/download/v0.11.8.9/tModLoader.Windows.v0.11.8.9.zip","UnzipUpdateSource": true,"OverwriteExistingFiles": true,"UpdateSourceConditionSetting": "Source","UpdateSourceConditionValue": "GitHub","UpdateSourceTarget": "serverfiles"},{"UpdateStageName": "GitHub tModLoader Linux","UpdateSourcePlatform": "Linux","UpdateSource": "FetchURL","UpdateSourceData": "https://github.com/tModLoader/tModLoader/releases/download/v0.11.8.9/tModLoader.Linux.v0.11.8.9.tar.gz","UnzipUpdateSource": true,"OverwriteExistingFiles": true,"UpdateSourceConditionSetting": "Source","UpdateSourceConditionValue": "GitHub","UpdateSourceTarget": "serverfiles"}] App.UpdateSources=@IncludeJson[tmodloaderupdates.json]
App.Compatibility=None App.Compatibility=None
App.SteamUpdateAnonymousLogin=False App.SteamUpdateAnonymousLogin=False
App.SteamForceLoginPrompt=False App.SteamForceLoginPrompt=False

View File

@ -37,7 +37,7 @@ App.ApplicationPort2=0
App.ApplicationPort3=0 App.ApplicationPort3=0
App.RemoteAdminPort=0 App.RemoteAdminPort=0
App.MaxUsers=8 App.MaxUsers=8
App.UpdateSources=[{"UpdateStageName":"Config Template Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://github.com/CubeCoders/AMPTemplates/raw/main/tmodloader14serverconfig.txt","UpdateSourceTarget":"serverfiles","UnzipUpdateSource":false,"OverwriteExistingFiles":false},{"UpdateStageName":"SteamCMD tModLoader","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1281930","UpdateSourceArgs":"1281930","UpdateSourceTarget":"serverfiles","UpdateSourceConditionSetting":"Source","UpdateSourceConditionValue":"Steam"},{"UpdateStageName":"GitHub tModLoader","UpdateSourcePlatform":"All","UpdateSource":"GithubRelease","UpdateSourceData":"tModLoader.zip","UpdateSourceArgs":"tModLoader/tModLoader","UpdateSourceTarget":"serverfiles","UnzipUpdateSource":true,"OverwriteExistingFiles":true,"UpdateSourceConditionSetting":"Source","UpdateSourceConditionValue":"GitHub","DeleteAfterExtract":false},{"UpdateStageName":"Create Dotnet Directory","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"{{$FullBaseDir}}/dotnet/6.0.0"},{"UpdateStageName":"Dotnet download Windows","UpdateSourcePlatform":"Windows","UpdateSource":"FetchURL","UpdateSourceData":"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.0/dotnet-runtime-6.0.0-win-x64.zip","UpdateSourceTarget":"{{$FullBaseDir}}/dotnet/6.0.0/","UnzipUpdateSource":true,"OverwriteExistingFiles":true,"DeleteAfterExtract":true},{"UpdateStageName":"Dotnet download Linux","UpdateSourcePlatform":"Linux","UpdateSource":"FetchURL","UpdateSourceData":"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.0/dotnet-runtime-6.0.0-linux-x64.tar.gz","UpdateSourceTarget":"{{$FullBaseDir}}/dotnet/6.0.0/","UnzipUpdateSource":true,"OverwriteExistingFiles":true,"DeleteAfterExtract":true}] App.UpdateSources=@IncludeJson[tmodloader14updates.json]
App.Compatibility=None App.Compatibility=None
App.SteamUpdateAnonymousLogin=False App.SteamUpdateAnonymousLogin=False
App.SteamForceLoginPrompt=False App.SteamForceLoginPrompt=False

View File

@ -96,7 +96,7 @@
}, },
{ {
"DisplayName": "Update Source", "DisplayName": "Update Source",
"Category": "Terraria ModLoader Settings", "Category": "SteamCMD and Updates",
"Keywords": "download,source,steam,github,tmodloader", "Keywords": "download,source,steam,github,tmodloader",
"Description": "Select where to obtain tModLoader. Steam requires you to own [Terraria](https://store.steampowered.com/app/105600/Terraria/) & [tModLoader](https://store.steampowered.com/app/1281930/tModLoader/) on your account and accept tModLoader's ToS by installing it as a game to a device you can login from.", "Description": "Select where to obtain tModLoader. Steam requires you to own [Terraria](https://store.steampowered.com/app/105600/Terraria/) & [tModLoader](https://store.steampowered.com/app/1281930/tModLoader/) on your account and accept tModLoader's ToS by installing it as a game to a device you can login from.",
"FieldName": "Source", "FieldName": "Source",
@ -108,6 +108,19 @@
}, },
"DefaultValue": "GitHub" "DefaultValue": "GitHub"
}, },
{
"DisplayName":"Server Branch",
"Category":"SteamCMD and Updates",
"Description":"Sets the beta branch to install. NOTE: Update Source MUST be Steam. Press update AFTER changing this setting.",
"Keywords":"branch,depot,beta,steam,version",
"FieldName":"BetaBranch",
"InputType":"text",
"IsFlagArgument":false,
"ParamFieldName":"BetaBranch",
"IncludeInCommandLine":false,
"DefaultValue":"public",
"placeholder": "1.4.4-preview"
},
{ {
"DisplayName": "World Path", "DisplayName": "World Path",
"Category": "Terraria Server Settings", "Category": "Terraria Server Settings",

61
tmodloader14updates.json Normal file
View File

@ -0,0 +1,61 @@
[
{
"UpdateStageName": "Config Template Download",
"UpdateSourcePlatform": "All",
"UpdateSource": "FetchURL",
"UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/tmodloader14serverconfig.txt",
"UpdateSourceTarget": "serverfiles",
"UnzipUpdateSource": false,
"OverwriteExistingFiles": false
},
{
"UpdateStageName": "SteamCMD tModLoader",
"UpdateSourcePlatform": "All",
"UpdateSource": "SteamCMD",
"UpdateSourceData": "1281930",
"UpdateSourceArgs": "1281930",
"UpdateSourceTarget": "serverfiles",
"UpdateSourceConditionSetting": "Source",
"UpdateSourceConditionValue": "Steam",
"UpdateSourceVersion": "{{BetaBranch}}"
},
{
"UpdateStageName": "GitHub tModLoader",
"UpdateSourcePlatform": "All",
"UpdateSource": "GithubRelease",
"UpdateSourceData": "tModLoader.zip",
"UpdateSourceArgs": "tModLoader/tModLoader",
"UpdateSourceTarget": "serverfiles",
"UnzipUpdateSource": true,
"OverwriteExistingFiles": true,
"UpdateSourceConditionSetting": "Source",
"UpdateSourceConditionValue": "GitHub",
"DeleteAfterExtract": false
},
{
"UpdateStageName": "Create Dotnet Directory",
"UpdateSourcePlatform": "All",
"UpdateSource": "CreateDirectory",
"UpdateSourceArgs": "{{$FullBaseDir}}/dotnet/6.0.0"
},
{
"UpdateStageName": "Dotnet download Windows",
"UpdateSourcePlatform": "Windows",
"UpdateSource": "FetchURL",
"UpdateSourceData": "https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.0/dotnet-runtime-6.0.0-win-x64.zip",
"UpdateSourceTarget": "{{$FullBaseDir}}/dotnet/6.0.0/",
"UnzipUpdateSource": true,
"OverwriteExistingFiles": true,
"DeleteAfterExtract": true
},
{
"UpdateStageName": "Dotnet download Linux",
"UpdateSourcePlatform": "Linux",
"UpdateSource": "FetchURL",
"UpdateSourceData": "https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.0/dotnet-runtime-6.0.0-linux-x64.tar.gz",
"UpdateSourceTarget": "{{$FullBaseDir}}/dotnet/6.0.0/",
"UnzipUpdateSource": true,
"OverwriteExistingFiles": true,
"DeleteAfterExtract": true
}
]

View File

@ -94,7 +94,7 @@
}, },
{ {
"DisplayName": "Update Source", "DisplayName": "Update Source",
"Category": "Terraria ModLoader Settings", "Category": "SteamCMD and Updates",
"Keywords": "download,source,steam,github,tmodloader", "Keywords": "download,source,steam,github,tmodloader",
"Description": "Select where to obtain tModLoader. Steam requires you to own [Terraria](https://store.steampowered.com/app/105600/Terraria/) & [tModLoader](https://store.steampowered.com/app/1281930/tModLoader/) on your account and accept tModLoader's ToS by installing it as a game to a device you can login from.", "Description": "Select where to obtain tModLoader. Steam requires you to own [Terraria](https://store.steampowered.com/app/105600/Terraria/) & [tModLoader](https://store.steampowered.com/app/1281930/tModLoader/) on your account and accept tModLoader's ToS by installing it as a game to a device you can login from.",
"FieldName": "Source", "FieldName": "Source",
@ -106,6 +106,19 @@
}, },
"DefaultValue": "GitHub" "DefaultValue": "GitHub"
}, },
{
"DisplayName":"Server Branch",
"Category":"SteamCMD and Updates",
"Description":"Sets the beta branch to install. NOTE: Update Source MUST be Steam. Press update AFTER changing this setting.",
"Keywords":"branch,depot,beta,steam,version",
"FieldName":"BetaBranch",
"InputType":"text",
"IsFlagArgument":false,
"ParamFieldName":"BetaBranch",
"IncludeInCommandLine":false,
"DefaultValue":"1.3-legacy",
"placeholder": "1.3-legacy"
},
{ {
"DisplayName": "World Path", "DisplayName": "World Path",
"Category": "Terraria Server Settings", "Category": "Terraria Server Settings",

43
tmodloaderupdates.json Normal file
View File

@ -0,0 +1,43 @@
[
{
"UpdateStageName": "Config Template Download",
"UpdateSourcePlatform": "All",
"UpdateSource": "FetchURL",
"UpdateSourceData": "https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/tmodloaderserverconfig.txt",
"UpdateSourceTarget": "serverfiles",
"OverwriteExistingFiles": false
},
{
"UpdateStageName": "SteamCMD tModLoader",
"UpdateSourcePlatform": "All",
"UpdateSource": "SteamCMD",
"UpdateSourceData": "1281930",
"UpdateSourceArgs": "1281930",
"UpdateSourceTarget": "serverfiles",
"UpdateSourceConditionSetting": "Source",
"UpdateSourceConditionValue": "Steam",
"UpdateSourceVersion": "{{BetaBranch}}"
},
{
"UpdateStageName": "GitHub tModLoader Windows",
"UpdateSourcePlatform": "Windows",
"UpdateSource": "FetchURL",
"UpdateSourceData": "https://github.com/tModLoader/tModLoader/releases/download/v0.11.8.9/tModLoader.Windows.v0.11.8.9.zip",
"UnzipUpdateSource": true,
"OverwriteExistingFiles": true,
"UpdateSourceConditionSetting": "Source",
"UpdateSourceConditionValue": "GitHub",
"UpdateSourceTarget": "serverfiles"
},
{
"UpdateStageName": "GitHub tModLoader Linux",
"UpdateSourcePlatform": "Linux",
"UpdateSource": "FetchURL",
"UpdateSourceData": "https://github.com/tModLoader/tModLoader/releases/download/v0.11.8.9/tModLoader.Linux.v0.11.8.9.tar.gz",
"UnzipUpdateSource": true,
"OverwriteExistingFiles": true,
"UpdateSourceConditionSetting": "Source",
"UpdateSourceConditionValue": "GitHub",
"UpdateSourceTarget": "serverfiles"
}
]