diff --git a/minecraft-ftb/data.json b/minecraft-ftb/data.json new file mode 100644 index 00000000..11de662b --- /dev/null +++ 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}" + } + } +] \ No newline at end of file diff --git a/minecraft-ftb/data.txt b/minecraft-ftb/data.txt deleted file mode 100644 index 1b4f5147..00000000 --- a/minecraft-ftb/data.txt +++ /dev/null @@ -1,2 +0,0 @@ -modpack_id=91 -modpack_version=2245 \ No newline at end of file diff --git a/minecraft-ftb/minecraft-ftb.json b/minecraft-ftb/minecraft-ftb.json index 895402b5..18ab4ae8 100644 --- 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",