From 461219ad30debc8abc73e48a55eba7404ebae978 Mon Sep 17 00:00:00 2001
From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com>
Date: Wed, 29 Dec 2021 07:34:30 -0600
Subject: [PATCH 1/2] Add StarMade Module

This adds StarMade Windows and Linux support. Currently all settings are managed in a single file with 188 settings. Once AutoMap receives new features to specify partial settings this will be added to the module as well.
---
 starmade.kvp        | 36 ++++++++++++++++++++++++++++++++++++
 starmadeconfig.json | 15 +++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 starmade.kvp
 create mode 100644 starmadeconfig.json

diff --git a/starmade.kvp b/starmade.kvp
new file mode 100644
index 0000000..9bd532b
--- /dev/null
+++ b/starmade.kvp
@@ -0,0 +1,36 @@
+App.AdminMethod=STDIO
+App.ApplicationPort1=4242
+App.ApplicationReadyMode=RegexMatch
+App.BaseDirectory=./starmade/244770/StarMade
+App.CommandLineArgs=-Xmx{{MaxRAM}}M -Xincgc -Xshare:off -jar StarMade.jar -server
+App.CommandLineParameterDelimiter= 
+App.CommandLineParameterFormat=-{0} "{1}"
+App.DisplayName=Starmade
+App.EnvironmentVariables={"LD_LIBRARY_PATH": "./linux64:%LD_LIBRARY_PATH%", "SteamAppId": "244770"}
+App.ExecutableLinux=244770/dep/java/jre1.7.0_80/bin/java
+App.ExecutableWin=244770\dep\java\jre1.7.0_80\bin\java.exe
+App.ExitMethod=OS_CLOSE
+App.ExitString=/shutdown
+App.HasReadableConsole=true
+App.HasWritableConsole=true
+App.RapidStartup=false
+App.RootDir=./starmade/
+App.UpdateSource=Multi
+App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "244770"}]
+App.WorkingDir=244770/StarMade
+App.SteamUpdateAnonymousLogin=False
+App.SteamForceLoginPrompt=True
+Console.AppReadyRegex=^\[SERVER\] SERVER INIT FINISHED$
+Console.ThrowawayMessageRegex=
+Console.UserChatRegex=^\[CHANNELROUTER\] RECEIVED MESSAGE ON Server\(\d+\): \[CHAT\]\[sender=(?<username>.+?)\].*\[message=(?<message>.+?)\]$
+Console.UserJoinRegex=^\[CONTROLLER\]\[ADD-UNIT\] \(Server\(\d+\)\): PlS\[(?<username>.+?) ; id.*Added to controllers: PlayerCharacter\[\(ENTITY_PLAYERCHARACTER.*\)\(\d+\)\]$
+Console.UserLeaveRegex=^\[SERVERLOG\] \[DISCONNECT\] Client 'RegisteredClient: (?<username>.+?) \(\d+\).*HAS BEEN DISCONNECTED.*$
+Meta.Author=Shinynecrid, IceOfWraith
+Meta.ConfigManifest=starmadeconfig.json
+Meta.ConfigRoot=starmade.kvp
+Meta.Description=Starmade Dedicated Server
+Meta.DisplayImageSource=steam:244770
+Meta.DisplayName=Starmade
+Meta.EndpointURIFormat=
+Meta.OS=3
+Meta.URL=https://steamdb.info/app/244770/
\ No newline at end of file
diff --git a/starmadeconfig.json b/starmadeconfig.json
new file mode 100644
index 0000000..6dd4fb5
--- /dev/null
+++ b/starmadeconfig.json
@@ -0,0 +1,15 @@
+[
+    {
+        "DisplayName": "Maximum RAM",
+        "Category": "Server Settings",
+        "Description": "Set the Max amount of RAM the server should use",
+        "Keywords": "max ram",
+        "FieldName": "MaxRAM",
+        "InputType": "number",
+        "IsFlagArgument": false,
+        "ParamFieldName": "MaxRAM",
+        "IncludeInCommandLine": true,
+        "DefaultValue": "1024",
+        "EnumValues": {}
+    }
+]
\ No newline at end of file

From 47f5e4c3260c5d98b3c4a0a8c3333ad58c088a5d Mon Sep 17 00:00:00 2001
From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com>
Date: Wed, 29 Dec 2021 13:50:59 -0600
Subject: [PATCH 2/2] Add StarMade Module

Adjusted to show "Memory Limit (MB)" and "Java's maximum heap size" to mirror other modules.
---
 starmade.kvp        | 4 ++--
 starmadeconfig.json | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/starmade.kvp b/starmade.kvp
index 9bd532b..5429ded 100644
--- a/starmade.kvp
+++ b/starmade.kvp
@@ -2,10 +2,10 @@ App.AdminMethod=STDIO
 App.ApplicationPort1=4242
 App.ApplicationReadyMode=RegexMatch
 App.BaseDirectory=./starmade/244770/StarMade
-App.CommandLineArgs=-Xmx{{MaxRAM}}M -Xincgc -Xshare:off -jar StarMade.jar -server
+App.CommandLineArgs=-Xmx{{MaxHeap}}M -Xincgc -Xshare:off -jar StarMade.jar -server
 App.CommandLineParameterDelimiter= 
 App.CommandLineParameterFormat=-{0} "{1}"
-App.DisplayName=Starmade
+App.DisplayName=StarMade
 App.EnvironmentVariables={"LD_LIBRARY_PATH": "./linux64:%LD_LIBRARY_PATH%", "SteamAppId": "244770"}
 App.ExecutableLinux=244770/dep/java/jre1.7.0_80/bin/java
 App.ExecutableWin=244770\dep\java\jre1.7.0_80\bin\java.exe
diff --git a/starmadeconfig.json b/starmadeconfig.json
index 6dd4fb5..d8d5481 100644
--- a/starmadeconfig.json
+++ b/starmadeconfig.json
@@ -1,13 +1,13 @@
 [
     {
-        "DisplayName": "Maximum RAM",
+        "DisplayName": "Memory Limit (MB)",
         "Category": "Server Settings",
-        "Description": "Set the Max amount of RAM the server should use",
+        "Description": "Java's maximum heap size",
         "Keywords": "max ram",
-        "FieldName": "MaxRAM",
+        "FieldName": "MaxHeap",
         "InputType": "number",
         "IsFlagArgument": false,
-        "ParamFieldName": "MaxRAM",
+        "ParamFieldName": "MaxHeap",
         "IncludeInCommandLine": true,
         "DefaultValue": "1024",
         "EnumValues": {}