Merged Valheim and Valheim Plus templates. (#241)

* Merged Valheim and Valheim Plus templates.

* Updated Config.

* Changed the saves dir to Saves from Data.

* Updated Authors

* fixed a typo

* Added move Data to Saves command on update

* Copy Pasta problems

* Updated user Join and Leave regex.

* Added BepInEx download option.

* Added Valheim Plus config options. First pass.

* Clarified BepInEx Description

* fixed typo

* added Valheim Meta config

* Fixed typo

* Fixes

* Fixed category formatting

* Resolved issues

* Added Min/Max value

* Fixed more capitalizations.

* More fixes

* more fixes

valheim.kvp

@@ -6,6 +6,7 @@ Meta.URL=https://www.valheimgame.com/
 Meta.DisplayImageSource=steam:892970
 Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.ApplicationPort2}
 Meta.ConfigManifest=valheimconfig.json
+Meta.MetaConfigManifest=valheimmetaconfig.json
 Meta.ConfigRoot=valheim.kvp
 Meta.MinAMPVersion=2.2.2.0
 App.DisplayName=Valheim
@@ -14,8 +15,8 @@ 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" {{crossplay}}
-App.EnvironmentVariables={"LD_LIBRARY_PATH": "./linux64:%LD_LIBRARY_PATH%", "SteamAppId": "892970"}
+App.CommandLineArgs=-port {{$ApplicationPort1}} {{$FormattedArgs}} -savedir "Saves" {{crossplay}}
+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}"
 App.ExitMethod=OS_CLOSE
 App.HasWriteableConsole=False
@@ -25,11 +26,10 @@ App.ApplicationPort1=2456
 App.ApplicationPort2=2457
 App.ApplicationPort3=0
 App.RemoteAdminPort=0
-App.MaxUsers=10
 App.UseRandomAdminPassword=False
 App.RemoteAdminPassword=Password123
 App.AdminMethod=STDIO
-App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "896660", "UpdateSourceVersion": "{{Stream}}"}]
+App.UpdateSources=@IncludeJSON[valheimupdates.json]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceWindowsVersion=False

valheimmetaconfig.json

@@ -0,0 +1,9 @@
+[	
+    {
+        "ConfigFile":"./BepInEx/config/valheim_plus.cfg", 
+        "AutoMap":true,
+        "ConfigType":"ini",
+        "ConfigFormat": "{0} = {1}",
+        "ConfigFormatRegex":"^(?<key>.+?) = (?<value>.*?)$"
+    }
+]

valheimplus.kvp

@@ -1,51 +0,0 @@
-Meta.DisplayName=ValheimPlus
-Meta.Description=Valheim with the 3rd party Valheim Plus mod pre-installed.
-Meta.OS=Windows, Linux
-Meta.Author=CubeCoders Limited
-Meta.URL=https://github.com/valheimPlus/ValheimPlus
-Meta.DisplayImageSource=url:https://raw.githubusercontent.com/nxPublic/ValheimPlus/master/logo.png
-Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.ApplicationPort2}
-Meta.ConfigManifest=valheimconfig.json
-Meta.ConfigRoot=valheimplus.kvp
-Meta.MinAMPVersion=2.2.2.0
-App.DisplayName=Valheim
-App.RootDir=./Valheim/
-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" {{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}"
-App.ExitMethod=OS_CLOSE
-App.HasWriteableConsole=False
-App.HasReadableConsole=True
-App.ApplicationIPBinding=0.0.0.0
-App.ApplicationPort1=2456
-App.ApplicationPort2=2457
-App.ApplicationPort3=0
-App.RemoteAdminPort=0
-App.MaxUsers=10
-App.UseRandomAdminPassword=False
-App.RemoteAdminPassword=Password123
-App.AdminMethod=STDIO
-App.UpdateSource=Multi
-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
-App.UpdateSourceData=896660
-App.UpdateSourceArgs=
-App.UpdateSourceVersion=
-App.UnzipUpdateSource=False
-App.OverwriteExistingFiles=False
-App.ApplicationReadyMode=RegexMatch
-Console.FilterMatchRegex=^\d\d\/\d\d\/\d{4} \d\d:\d\d:\d\d: 
-Console.FilterMatchReplacement=
-Console.ThrowawayMessageRegex=^\(Filename: .*? Line: \d+\)$
-Console.AppReadyRegex=^Game server connected$
-Console.UserJoinRegex=^Got character ZDOID from (?<username>.+?) : (?<userid>-?\d+):\d+$
-Console.UserLeaveRegex=^Destroying abandoned non persistent zdo -?\d+:\d+ owner (?<userid>-?\d+)$
-Console.UserChatRegex=
-Console.UserActions={}

valheimupdates.json

@@ -0,0 +1,77 @@
+[
+  {
+    "UpdateStageName": "SteamCMD Download",
+    "UpdateSourcePlatform": "All", 
+    "UpdateSource": "SteamCMD", 
+    "UpdateSourceData": "896660", 
+    "UpdateSourceVersion": "{{Stream}}"
+  },
+  {
+    "UpdateStageName": "Update Saves Directory - Windows",
+    "UpdateSourcePlatform": "Windows",
+    "UpdateSource": "Executable",
+    "UpdateSourceData": "cmd.exe",
+    "UpdateSourceArgs": "/C move {{$FullBaseDir}}\\Data {{$FullBaseDir}}\\Saves"
+  },
+  {
+    "UpdateStageName": "Update Saves Directory - Linux",
+    "UpdateSourcePlatform": "Linux",
+    "UpdateSource": "Executable",
+    "UpdateSourceData": "/bin/bash",
+    "UpdateSourceArgs": "-c \"mv {{$FullBaseDir}}/Data/ {{$FullBaseDir}}/Saves/\""
+  },
+  {
+    "UpdateStageName": "Fetch BepInEx from Github - Windows",
+    "UpdateSourcePlatform": "Windows",
+    "UpdateSource": "GithubRelease",
+    "UpdateSourceArgs": "BepInEx/BepInEx",
+    "UpdateSourceData": "BepInEx_x64_5.4.21.0.zip",
+    "UpdateSourceConditionSetting": "bepinex_install",
+    "UpdateSourceConditionValue": "true",
+    "UnzipUpdateSource": true,
+    "OverwriteExistingFiles": true
+  },
+  {
+    "UpdateStageName": "Fetch BepInEx from Github - Linux",
+    "UpdateSourcePlatform": "Linux",
+    "UpdateSource": "GithubRelease",
+    "UpdateSourceArgs": "BepInEx/BepInEx",
+    "UpdateSourceData": "BepInEx_unix_5.4.21.0.zip",
+    "UpdateSourceConditionSetting": "bepinex_install",
+    "UpdateSourceConditionValue": "true",
+    "UnzipUpdateSource": true,
+    "OverwriteExistingFiles": true
+  },
+  {
+    "UpdateStageName": "Fetch ValheimPlus from Github - Windows",
+    "UpdateSourcePlatform": "Windows",
+    "UpdateSource": "GithubRelease",
+    "UpdateSourceArgs": "valheimPlus/ValheimPlus",
+    "UpdateSourceData": "WindowsServer.zip",
+    "UpdateSourceConditionSetting": "valheim_plus_install",
+    "UpdateSourceConditionValue": "true",
+    "UnzipUpdateSource": true,
+    "OverwriteExistingFiles": true
+  },
+  {
+    "UpdateStageName": "Fetch ValheimPlus from Github - Linux",
+    "UpdateSourcePlatform": "Linux",
+    "UpdateSource": "GithubRelease",
+    "UpdateSourceArgs": "valheimPlus/ValheimPlus",
+    "UpdateSourceData": "UnixServer.zip",
+    "UpdateSourceConditionSetting": "valheim_plus_install",
+    "UpdateSourceConditionValue": "true",
+    "UnzipUpdateSource": true,
+    "OverwriteExistingFiles": true
+  },
+  {
+    "UpdateStageName": "Settings File Download",
+    "UpdateSourcePlatform": "All",
+    "UpdateSource": "FetchURL",
+    "UpdateSourceData": "https://raw.githubusercontent.com/valheimPlus/ValheimPlus/development/valheim_plus.cfg",
+    "UpdateSourceTarget": "{{$FullBaseDir}}/BepInEx/config",
+    "OverwriteExistingFiles": false,
+    "UpdateSourceConditionSetting": "valheim_plus_install",
+    "UpdateSourceConditionValue": "true"
+  }
+]