Update ftb to work with tester

pufferpanel · Nov 17, 2023 · 9b364f4 · 9b364f4
1 parent dc22cd8
commit 9b364f4
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 5 deletions.
diff --git a/minecraft-ftb/data.json b/minecraft-ftb/data.json
@@ -0,0 +1,37 @@
+[
+  {
+    "name": "minecraft-ftb",
+    "variables": {
+      "memory": "2048",
+      "ip": "0.0.0.0",
+      "port": "25565",
+      "eula": true,      
+      "motd": "None",
+      "javaversion": "17",
+      "version": "1.19.2-43.2.21",
+      "modpack_id": "108",
+      "modpack_version": "6940"
+    },
+    "environment": {
+      "type": "host"
+    }
+  },
+  {
+    "name": "minecraft-ftb-docker",
+    "variables": {
+      "memory": "2048",
+      "ip": "0.0.0.0",
+      "port": "25565",
+      "eula": true,      
+      "motd": "None",
+      "javaversion": "17",
+      "version": "1.19.2-43.2.21",
+      "modpack_id": "108",
+      "modpack_version": "6940"
+    },
+    "environment": {
+      "type": "docker",
+      "image": "eclipse-temurin:${javaversion}"
+    }
+  }
+]
diff --git a/minecraft-ftb/data.txt b/minecraft-ftb/data.txt
diff --git a/minecraft-ftb/minecraft-ftb.json b/minecraft-ftb/minecraft-ftb.json
@@ -74,10 +74,35 @@
       "version": "${javaversion}"
     },
     {
+      "if": "os == 'windows'",
       "type": "download",
-      "files": "https://api.modpacks.ch/public/modpack/${modpack_id}/${modpack_version}/server/linux"
+      "files": [
+        "https://api.modpacks.ch/public/modpack/${modpack_id}/${modpack_version}/server/windows"
+      ]
+    },
+    {
+      "if": "os == 'linux' && arch == 'amd64'",
+      "type": "download",
+      "files": [
+        "https://api.modpacks.ch/public/modpack/${modpack_id}/${modpack_version}/server/linux"
+      ]
+    },
+    {
+      "if": "os == 'linux' && arch == 'arm64'",
+      "type": "download",
+      "files": [
+        "https://api.modpacks.ch/public/modpack/${modpack_id}/${modpack_version}/server/arm/linux"
+      ]
     },
     {
+      "if": "os == 'windows'",
+      "type": "command",
+      "commands": [
+        "./windows ${modpack_id} ${modpack_version} --auto --noscript"
+      ]
+    },
+    {
+      "if": "os == 'linux'",
       "type": "command",
       "commands": [
         "chmod u+x linux",
@@ -105,11 +130,19 @@
     "command": [
       {
         "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${version}/win_args.txt nogui",
-        "if": "os == 'windows' \u0026\u0026 file_exists('libraries/net/minecraftforge/forge/' + version + '/win_args.txt')"
+        "if": "env == 'host' && os == 'windows' && file_exists('libraries/net/minecraftforge/forge/' + version + '/win_args.txt')"
       },
       {
         "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${version}/unix_args.txt nogui",
-        "if": "file_exists('libraries/net/minecraftforge/forge/' + version + '/unix_args.txt')"
+        "if": "env == 'host' && file_exists('libraries/net/minecraftforge/forge/' + version + '/unix_args.txt')"
+      },
+      {
+        "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${version}/win_args.txt nogui",
+        "if": "env != 'host' && os == 'windows' && file_exists('libraries/net/minecraftforge/forge/' + version + '/win_args.txt')"
+      },
+      {
+        "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${version}/unix_args.txt nogui",
+        "if": "env != 'host' && file_exists('libraries/net/minecraftforge/forge/' + version + '/unix_args.txt')"
       },
       {
         "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar",