From a03d6393f7e086ab903dfed3b68fc996b1dad2d5 Mon Sep 17 00:00:00 2001
From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com>
Date: Wed, 28 Sep 2022 20:16:10 -0500
Subject: [PATCH] Update Valheim and ValheimPlus (#201)

* Update Valheim and ValheimPlus

This adds the release stream option to allow for "default_old" that was recently added. This also enable crossplay functionality.

* Update valheimconfig.json
---
 valheim.kvp        |  4 ++--
 valheimconfig.json | 27 +++++++++++++++++++++++++++
 valheimplus.kvp    |  4 ++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/valheim.kvp b/valheim.kvp
index 2139edc..9270b47 100644
--- a/valheim.kvp
+++ b/valheim.kvp
@@ -14,7 +14,7 @@ App.BaseDirectory=./Valheim/896660/
 App.ExecutableWin=896660\valheim_server.exe
 App.ExecutableLinux=896660/valheim_server.x86_64
 App.WorkingDir=896660
-App.CommandLineArgs=-port {{$ApplicationPort1}} {{$FormattedArgs}} -savedir "Data"
+App.CommandLineArgs=-port {{$ApplicationPort1}} {{$FormattedArgs}} -savedir "Data" {{crossplay}}
 App.EnvironmentVariables={"LD_LIBRARY_PATH": "./linux64:%LD_LIBRARY_PATH%", "SteamAppId": "892970"}
 App.CommandLineParameterFormat=-{0} "{1}"
 App.ExitMethod=OS_CLOSE
@@ -29,7 +29,7 @@ App.MaxUsers=10
 App.UseRandomAdminPassword=False
 App.RemoteAdminPassword=Password123
 App.AdminMethod=STDIO
-App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "896660"}]
+App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "896660", "UpdateSourceVersion": "{{Stream}}"}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceWindowsVersion=False
diff --git a/valheimconfig.json b/valheimconfig.json
index 2482207..06e0752 100644
--- a/valheimconfig.json
+++ b/valheimconfig.json
@@ -44,6 +44,20 @@
     },
     "DefaultValue": "1"
   },
+  {
+    "DisplayName": "Enable Crossplay",
+    "Description": "When enabled, the backend will be running Playfab instead of Steamworks. A \"Join code\" will appear when you join a Dedicated server supporting crossplay. Players can use this code to join the server. This Join code is regenerated whenever the server is restarted.",
+    "FieldName": "crossplay",
+    "Category": "Server",
+    "ParamFieldName": "crossplay",
+    "IncludeInCommandLine": false,
+    "InputType": "checkbox",
+    "EnumValues": {
+      "True": "-crossplay",
+      "False": ""
+    },
+    "DefaultValue": ""
+  },
   {
     "DisplayName": "Admin Players",
     "Description": "A list of Steam64 IDs for players that are in-game admins. [Find your Steam64 ID](https://steamidfinder.com/)",
@@ -67,5 +81,18 @@
     "Category": "Server",
     "InputType": "list",
     "Special": "listfile:./Valheim/896660/Data/bannedlist.txt"
+  },{
+    "DisplayName":"Release Stream",
+    "Category":"SteamCMD and Updates",
+    "Description":"\"public\" is default. Choose a custom release on [SteamDB](https://steamdb.info/app/896660/depots/).",
+    "Keywords":"use,experimental,release,stream",
+    "FieldName":"Stream",
+    "InputType":"text",
+    "IsFlagArgument":false,
+    "ParamFieldName":"Stream",
+    "IncludeInCommandLine":false,
+    "DefaultValue":"public",
+    "Placeholder":"public",
+    "EnumValues":{}
   }
 ]
\ No newline at end of file
diff --git a/valheimplus.kvp b/valheimplus.kvp
index f9ada5e..31c4100 100644
--- a/valheimplus.kvp
+++ b/valheimplus.kvp
@@ -14,7 +14,7 @@ App.BaseDirectory=./Valheim/896660/
 App.ExecutableWin=896660\valheim_server.exe
 App.ExecutableLinux=896660/valheim_server.x86_64
 App.WorkingDir=896660
-App.CommandLineArgs=-port {{$ApplicationPort1}} {{$FormattedArgs}} -savedir "Data"
+App.CommandLineArgs=-port {{$ApplicationPort1}} {{$FormattedArgs}} -savedir "Data" {{crossplay}}
 App.CommandLineVars={"ServerName": "My Valheim Server - Powered by AMP", "WorldName": "PoweredByAMP", "ServerPassword": "12345"}
 App.EnvironmentVariables={"DOORSTOP_ENABLE": "TRUE", "DOORSTOP_INVOKE_DLL_PATH": "./BepInEx/core/BepInEx.Preloader.dll", "DOORSTOP_CORLIB_OVERRIDE_PATH": "./unstripped_corlib" , "LD_LIBRARY_PATH":"./doorstop_libs:./linux64:%LD_LIBRARY_PATH%", "LD_PRELOAD": "libdoorstop_x64.so","SteamAppId":"892970"}
 App.CommandLineParameterFormat=-{0} "{1}"
@@ -31,7 +31,7 @@ App.UseRandomAdminPassword=False
 App.RemoteAdminPassword=Password123
 App.AdminMethod=STDIO
 App.UpdateSource=Multi
-App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "896660"},{"UpdateStageName": "Fetch ValheimPlus from Github","UpdateSourcePlatform": "Windows", "UpdateSource": "GithubRelease", "UpdateSourceArgs": "valheimPlus/ValheimPlus", "UpdateSourceData": "WindowsServer.zip", "UnzipUpdateSource": true, "OverwriteExistingFiles": true},{"UpdateSourcePlatform": "Linux", "UpdateSource": "GithubRelease", "UpdateSourceArgs": "valheimPlus/ValheimPlus", "UpdateSourceData": "UnixServer.zip", "UnzipUpdateSource": true, "OverwriteExistingFiles": true}]
+App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "896660", "UpdateSourceVersion": "{{Stream}}"},{"UpdateStageName": "Fetch ValheimPlus from Github","UpdateSourcePlatform": "Windows", "UpdateSource": "GithubRelease", "UpdateSourceArgs": "valheimPlus/ValheimPlus", "UpdateSourceData": "WindowsServer.zip", "UnzipUpdateSource": true, "OverwriteExistingFiles": true},{"UpdateSourcePlatform": "Linux", "UpdateSource": "GithubRelease", "UpdateSourceArgs": "valheimPlus/ValheimPlus", "UpdateSourceData": "UnixServer.zip", "UnzipUpdateSource": true, "OverwriteExistingFiles": true}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceWindowsVersion=False