Update to templates

pufferpanel · Dec 13, 2023 · 0e6fb3f · 0e6fb3f
1 parent dc2f801
commit 0e6fb3f
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 14 deletions.
diff --git a/ark/ark.json b/ark/ark.json
@@ -101,7 +101,7 @@
     "stopCode": 2,
     "stdin": {},
     "stdout": {},
-    "expectedExitCode": 1
+    "expectedExitCode": -1
   },
   "environment": {
     "type": "host"

diff --git a/minecraft/minecraft.json b/minecraft/minecraft.json
@@ -139,6 +139,14 @@
       "desc": "Version of Minecraft you wish to install (not all software may respect this value",
       "required": true,
       "userEdit": true
+    },
+    "jvmArgs": {
+      "type": "string",
+      "value": "-Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true",
+      "display": "JVM Arguments",
+      "desc": "Extra JVM arguments to pass",
+      "required": false,
+      "userEdit": false
     }
   },
   "groups": [
@@ -244,6 +252,12 @@
         "java -jar installer.jar --installServer"
       ]
     },
+    {
+      "if": "modlauncher == 'forge' && file_exists('forge-' + forgebuild + '-shim.jar')",
+      "type": "move",
+      "source": "forge-${forgebuild}-shim.jar",
+      "target": "server.jar"
+    },
     {
       "if": "modlauncher == 'magma'",
       "type": "download",
@@ -354,35 +368,35 @@
   "run": {
     "command": [
       {
-        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${forgebuild}/win_args.txt nogui",
+        "command": "java${javaversion} -Xmx${memory}M ${jvmArgs} @libraries/net/minecraftforge/forge/${forgebuild}/win_args.txt nogui",
         "if": "env == 'host' && modlauncher == 'forge' && os == 'windows' && file_exists('libraries/net/minecraftforge/forge/' + forgebuild + '/win_args.txt')"
       },
       {
-        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${forgebuild}/unix_args.txt nogui",
+        "command": "java${javaversion} -Xmx${memory}M ${jvmArgs} @libraries/net/minecraftforge/forge/${forgebuild}/unix_args.txt nogui",
         "if": "env == 'host' && modlauncher == 'forge' && file_exists('libraries/net/minecraftforge/forge/' + forgebuild + '/unix_args.txt')"
       },
       {
-        "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${forgebuild}/win_args.txt nogui",
+        "command": "java -Xmx${memory}M ${jvmArgs} @libraries/net/minecraftforge/forge/${forgebuild}/win_args.txt nogui",
         "if": "env != 'host' && modlauncher == 'forge' && os == 'windows' && file_exists('libraries/net/minecraftforge/forge/' + forgebuild + '/win_args.txt')"
       },
       {
-        "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${forgebuild}/unix_args.txt nogui",
+        "command": "java -Xmx${memory}M ${jvmArgs} @libraries/net/minecraftforge/forge/${forgebuild}/unix_args.txt nogui",
         "if": "env != 'host' && modlauncher == 'forge' && file_exists('libraries/net/minecraftforge/forge/' + forgebuild+ '/unix_args.txt')"
       },
       {
-        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar fabric-server-launch.jar",
+        "command": "java${javaversion} -Xmx${memory}M ${jvmArgs} -jar fabric-server-launch.jar",
         "if": "env == 'host' && modlauncher == 'fabric'"
       },
       {
-        "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar",
+        "command": "java -Xmx${memory}M ${jvmArgs} -jar server.jar",
         "if": "env != 'host' && modlauncher == 'fabric'"
       },      
       {
-        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar",
+        "command": "java${javaversion} -Xmx${memory}M ${jvmArgs} -jar server.jar",
         "if": "env == 'host'"
       },
       {
-        "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar"
+        "command": "java -Xmx${memory}M ${jvmArgs} -jar server.jar"
       }
     ],
     "stop": "stop",

diff --git a/rust/data.json b/rust/data.json
@@ -7,7 +7,8 @@
     "environment": {
       "type": "host"
     },
-    "runtimeRequirement": 10
+    "runtimeRequirement": 10,
+    "ignoreExitCode": true
   },
   {
     "name": "rust-docker",
@@ -18,6 +19,7 @@
       "type": "docker",
       "image": "steamcmd/steamcmd"
     },
-    "runtimeRequirement": 10
+    "runtimeRequirement": 10,
+    "ignoreExitCode": true
   }
 ]
diff --git a/rust/rust.json b/rust/rust.json
@@ -127,8 +127,7 @@
       "port": "${RConPort}",
       "password": "${RConPassword}"
     },
-    "stdout": {},
-    "expectedExitCode": -1
+    "stdout": {}
   },
   "environment": {
     "type": "host"

diff --git a/satisfactory/satisfactory.json b/satisfactory/satisfactory.json
@@ -40,14 +40,23 @@
     "command": "./Engine/Binaries/Linux/UE4Server-Linux-Shipping FactoryGame ?listen -multihome=${multihome} -ServerQueryPort=${port}",
     "stopCode": 2,
     "environmentVars": {
-      "LD_LIBRARY_PATH": "./linux64:$LD_LIBRARY_PATH"
+      "LD_LIBRARY_PATH": "./linux64"
     },
     "stdin": {},
     "stdout": {}
   },
   "environment": {
     "type": "host"
   },
+  "supportedEnvironments": [
+    {
+      "type": "host"
+    },
+    {
+      "type": "docker",
+      "image": "steamcmd/steamcmd"
+    }
+  ],
   "requirements": {
     "os": "linux",
     "arch": "amd64"

diff --git a/squad/squad.json b/squad/squad.json
@@ -88,6 +88,15 @@
   "environment": {
     "type": "host"
   },
+  "supportedEnvironments": [
+    {
+      "type": "host"
+    },
+    {
+      "type": "docker",
+      "image": "steamcmd/steamcmd"
+    }
+  ],
   "requirements": {
     "os": "linux",
     "arch": "amd64"