From 8954357a9df678114d17a12ff8f4f3ddfda5b7df Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Fri, 15 Apr 2022 22:28:53 +1000
Subject: [PATCH] RCON config updates

Updates for Eco, Pavlov, Project Zomboid and Unturned. RCON is not used by AMP for Project Zomboid so the approach is different
---
 eco.kvp                    |  4 ++--
 ecoconfig.json             | 26 +++++++++++++-------------
 pavlov-vr.kvp              |  4 ++--
 pavlov-vrconfig.json       | 13 -------------
 project-zomboidconfig.json |  2 +-
 unturned.kvp               |  4 ++--
 unturnedconfig.json        | 26 +++++++++++++-------------
 7 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/eco.kvp b/eco.kvp
index 4e1c62e..2000dca 100644
--- a/eco.kvp
+++ b/eco.kvp
@@ -41,8 +41,8 @@ App.ApplicationPort2=3001
 App.ApplicationPort3=0
 App.RemoteAdminPort=3002
 App.MaxUsers=-1
-App.UseRandomAdminPassword=False
-App.RemoteAdminPassword=Password123
+App.UseRandomAdminPassword=True
+App.RemoteAdminPassword=
 App.AdminMethod=SourceRCON
 App.AdminLoginTransform=None
 App.RCONConnectDelaySeconds=5
diff --git a/ecoconfig.json b/ecoconfig.json
index 22064f9..f812269 100644
--- a/ecoconfig.json
+++ b/ecoconfig.json
@@ -38,6 +38,19 @@
         "IncludeInCommandLine":false,
         "EnumValues":{}
     },
+    {
+        "DisplayName":"RCON Password",
+        "Category":"Server Settings",
+        "Description":"",
+        "Keywords":"",
+        "FieldName":"$RemoteAdminPassword",
+        "InputType":"text",
+        "Hidden":true,
+        "IsFlagArgument":false,
+        "ParamFieldName":"RconPassword",
+        "IncludeInCommandLine":false,
+        "EnumValues":{}
+    },
     {
         "DisplayName":"Server Version",
         "Category":"Server Settings",
@@ -107,19 +120,6 @@
         "DefaultValue":"",
         "EnumValues":{}
     },
-    {
-        "DisplayName":"RCON Password",
-        "Category":"Server Settings",
-        "Description":"Password required to connect to RCON. NOTE: Change this after first installing the server",
-        "Keywords":"rcon,password",
-        "FieldName":"$RemoteAdminPassword",
-        "InputType":"RandomPassword",
-        "IsFlagArgument":false,
-        "ParamFieldName":"RconPassword",
-        "IncludeInCommandLine":false,
-        "DefaultValue":"",
-        "EnumValues":{}
-    },
     {
         "DisplayName":"Server Category",
         "Category":"Server Settings",
diff --git a/pavlov-vr.kvp b/pavlov-vr.kvp
index f56c3ae..af428b4 100755
--- a/pavlov-vr.kvp
+++ b/pavlov-vr.kvp
@@ -39,8 +39,8 @@ App.ApplicationPort2=8177
 App.ApplicationPort3=0
 App.RemoteAdminPort=9100
 App.MaxUsers=10
-App.UseRandomAdminPassword=False
-App.RemoteAdminPassword=Password123
+App.UseRandomAdminPassword=True
+App.RemoteAdminPassword=
 App.AdminMethod=TelnetRCON
 App.AdminLoginTransform=MD5_Lower
 App.RCONConnectDelaySeconds=0
diff --git a/pavlov-vrconfig.json b/pavlov-vrconfig.json
index 4135a33..67c1a8b 100755
--- a/pavlov-vrconfig.json
+++ b/pavlov-vrconfig.json
@@ -70,19 +70,6 @@
         "DefaultValue": "0000",
         "EnumValues": {}
     },
-    {
-        "DisplayName": "RCON Password",
-        "Category": "Server Settings",
-        "Description": "Password to connect to RCON. Change this after installing the server",
-        "Keywords": "password,RCON",
-        "FieldName": "$RemoteAdminPassword",
-        "InputType": "RandomPassword",
-        "IsFlagArgument": false,
-        "ParamFieldName": "",
-        "IncludeInCommandLine": false,
-        "DefaultValue": "Password123",
-        "EnumValues": {}
-    },
     {
         "DisplayName": "Enable Valve Anti-Cheat (Steam VAC)",
         "Category": "Server Settings",
diff --git a/project-zomboidconfig.json b/project-zomboidconfig.json
index c8699f9..7d4b928 100755
--- a/project-zomboidconfig.json
+++ b/project-zomboidconfig.json
@@ -129,7 +129,7 @@
         "Category":"Server Settings",
         "Description":"Password to connect to RCON. NOTE: You should change this after first installing the server",
         "Keywords":"rcon,password",
-        "FieldName":"$RemoteAdminPassword",
+        "FieldName":"RCONPassword",
         "InputType":"RandomPassword",
         "IsFlagArgument":false,
         "ParamFieldName":"RCONPassword",
diff --git a/unturned.kvp b/unturned.kvp
index 294cf23..18d585c 100644
--- a/unturned.kvp
+++ b/unturned.kvp
@@ -38,8 +38,8 @@ App.ApplicationPort2=27016
 App.ApplicationPort3=0
 App.RemoteAdminPort=27115
 App.MaxUsers=10
-App.UseRandomAdminPassword=False
-App.RemoteAdminPassword=Password123
+App.UseRandomAdminPassword=True
+App.RemoteAdminPassword=
 App.AdminMethod=TelnetRCON
 App.RCONConnectDelaySeconds=5
 App.RCONConnectRetrySeconds=5
diff --git a/unturnedconfig.json b/unturnedconfig.json
index 5ef5314..f0ff65c 100644
--- a/unturnedconfig.json
+++ b/unturnedconfig.json
@@ -41,6 +41,19 @@
         "DefaultValue": "27115",
         "EnumValues":{}
     },
+    {
+        "DisplayName": "RCON Password",
+        "Category": "Server Settings",
+        "Description": "",
+        "Keywords": "",
+        "FieldName": "$RemoteAdminPassword",
+        "InputType": "text",
+        "IsFlagArgument": false,
+        "Hidden":true,
+        "ParamFieldName": "/RocketSettings/RCON/@Password",
+        "IncludeInCommandLine": false,
+        "EnumValues":{}
+    },
     {
         "DisplayName": "Server Name",
         "Category": "Server Settings",
@@ -83,19 +96,6 @@
         "DefaultValue": "",
         "EnumValues":{}
     },
-    {
-        "DisplayName": "RCON Password",
-        "Category": "Server Settings",
-        "Description": "Password to connect to RCON. Change this after installing the server",
-        "Keywords": "RCON,password",
-        "FieldName": "$RemoteAdminPassword",
-        "InputType": "RandomPassword",
-        "IsFlagArgument": false,
-        "ParamFieldName": "/RocketSettings/RCON/@Password",
-        "IncludeInCommandLine": false,
-        "DefaultValue": "Password123",
-        "EnumValues":{}
-    },
     {
         "DisplayName": "Owner",
         "Category": "Server Settings",