Fix commands to use correct java version

pufferpanel · Nov 16, 2023 · ec538d6 · ec538d6
1 parent 716ae11
commit ec538d6
Showing 1 changed file with 34 additions and 6 deletions.
diff --git a/minecraft/minecraft.json b/minecraft/minecraft.json
@@ -211,20 +211,34 @@
       "type": "fabricdl"
     },
     {
-      "if": "modlauncher == 'fabric'",
+      "if": "modlauncher == 'fabric' && env == 'host'",
       "type": "command",
       "commands": [
         "java${javaversion} -jar fabric-installer.jar server -mcversion ${version} -downloadMinecraft -noprofile"
       ]
     },
+    {
+      "if": "modlauncher == 'fabric' && env != 'host'",
+      "type": "command",
+      "commands": [
+        "java -jar fabric-installer.jar server -mcversion ${version} -downloadMinecraft -noprofile"
+      ]
+    },
     {
       "if": "modlauncher == 'forge'",
       "type": "forgedl",
       "version": "${forgebuild}",
       "target": "installer.jar"
     },
     {
-      "if": "modlauncher == 'forge'",
+      "if": "modlauncher == 'forge' && env == 'host'",
+      "type": "command",
+      "commands": [
+        "java${javaversion} -jar installer.jar --installServer"
+      ]
+    },
+    {
+      "if": "modlauncher == 'forge' && env != 'host'",
       "type": "command",
       "commands": [
         "java${javaversion} -jar installer.jar --installServer"
@@ -240,8 +254,8 @@
     {
       "if": "modlauncher == 'magma'",
       "type": "move",
-      "target": "server.jar",
-      "source": "Magma-*.jar"
+      "source": "Magma-*.jar",
+      "target": "server.jar"      
     },
     {
       "if": "modlauncher == 'mohist'",
@@ -281,12 +295,19 @@
       "target": "quilt-installer.jar"
     },
     {
-      "if": "modlauncher == 'quilt'",
+      "if": "modlauncher == 'quilt' && env == 'host'",
       "type": "command",
       "commands": [
         "java${javaversion} -jar quilt-installer.jar install server ${version} --download-server --install-dir=."
       ]
     },
+    {
+      "if": "modlauncher == 'quilt' && env != 'host'",
+      "type": "command",
+      "commands": [
+        "java$ -jar quilt-installer.jar install server ${version} --download-server --install-dir=."
+      ]
+    },
     {
       "if": "modlauncher == 'quilt'",
       "type": "move",
@@ -299,12 +320,19 @@
       "files": "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
     },
     {
-      "if": "modlauncher == 'spigot'",
+      "if": "modlauncher == 'spigot' && env == 'host'",
       "type": "command",
       "commands": [
         "java${javaversion} -jar BuildTools.jar --rev ${version}"
       ]
     },
+    {
+      "if": "modlauncher == 'spigot' && env != 'host'",
+      "type": "command",
+      "commands": [
+        "java -jar BuildTools.jar --rev ${version}"
+      ]
+    },
     {
       "if": "modlauncher == 'spigot'",
       "type": "move",