From 0e75966a1f054d05f2ce4fe82b4487ff0b0bd74b Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Thu, 12 Sep 2024 21:56:33 +0200 Subject: [PATCH] Improve - Switch to API to always have up-to-date builds - Added Build Type menu for "Recommended" and "Latest" version (similar to the Forge-Enhanced egg) - Added option to overwrite the Build Type with a manual version specification. Example: v1.0.0 --- .../egg-pterodactyl-tekkit-smp.json | 29 ++++++++++++------ java/technic/tekkit-smp/egg-tekkit-smp.json | 30 +++++++++++++------ 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json index 807a3c29..80af895f 100644 --- a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json @@ -4,17 +4,18 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-08-28T21:14:54+02:00", + "exported_at": "2024-09-12T21:48:20+02:00", "name": "Tekkit SMP", "author": "lovinoes@lovinoes.de", "description": "Tekkit SMP contains the full range of mods from Tekkit 2, plus the extra mods that were originally dropped in the transition from Technic SSP (to Technic SMP) to Tekkit, in favour of multiplayer and Bukkit support: mainly Thaumcraft, Mystcraft, and Mo' Creatures. The new Tekkit SMP expands on that with various carefully selected Thaumcraft and Mystcraft addons, alongside Mo' Creatures Extended, and smaller custom additions such as Re-Crystallized Wing. Electro-Magic Tools is another starring mod, being an addon to both Industrial Craft and Thaumcraft, combining the worlds of tech and magic.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "docker_images": { - "Java 11": "ghcr.io\/parkervcp\/yolks:java_11", - "Java 8": "ghcr.io\/parkervcp\/yolks:java_8" + "Java 8": "ghcr.io\/parkervcp\/yolks:java_8", + "Java 11": "ghcr.io\/parkervcp\/yolks:java_11" }, "file_denylist": [], "startup": "java -server -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -Dfml.queryResult=confirm -jar forge.jar nogui", @@ -26,7 +27,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Tekkit SMP Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk update\r\napk add --no-cache curl zip unzip\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nMODPACK_VERSION=${MODPACK_VERSION:-\"v1.0.1\"} # Default to v1.0.1 if MODPACK_VERSION is not set\r\n\r\necho \"Downloading Tekkit SMP version ${MODPACK_VERSION}\"\r\ncurl -sSL \"https:\/\/servers.technicpack.net\/Technic\/servers\/tekkit-smp\/Tekkit-SMP_Server_${MODPACK_VERSION}.zip\" -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nunzip -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\n\r\nrm -rf \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nrm -f RestoreBackup.bat LaunchServer.bat LaunchServer.sh RestoreBackup.sh\r\n\r\nmv forge-1.12.2-*.jar forge.jar\r\n\r\nif [ ! -f server.properties ]; then\r\n echo \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi\r\n\r\necho \"Done\"", + "script": "#!\/bin\/ash\r\n# Tekkit SMP Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk update\r\napk add --no-cache curl zip unzip jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nBUILD_TYPE=${BUILD_TYPE:-\"recommended\"}\r\n\r\nif [ -z \"$MODPACK_VERSION\" ]; then\r\n MODPACK_VERSION=v$(curl -s https:\/\/solder.technicpack.net\/api\/modpack\/tekkit-smp | jq -r \".${BUILD_TYPE}\")\r\nfi\r\n\r\necho \"Downloading Tekkit SMP version ${MODPACK_VERSION} (This may take a while!)\"\r\ncurl -sSL \"https:\/\/servers.technicpack.net\/Technic\/servers\/tekkit-smp\/Tekkit-SMP_Server_${MODPACK_VERSION}.zip\" -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nunzip -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\n\r\nrm -rf \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nrm -f RestoreBackup.bat LaunchServer.bat LaunchServer.sh RestoreBackup.sh\r\n\r\nmv forge-1.12.2-*.jar forge.jar\r\n\r\nif [ ! -f server.properties ]; then\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi\r\n\r\necho \"Done\"", "container": "ghcr.io\/parkervcp\/installers:alpine", "entrypoint": "ash" } @@ -34,13 +35,23 @@ "variables": [ { "name": "Modpack Version", - "description": "The version of Tekkit SMP to download.", + "description": "The version of Tekkit SMP to download. \r\n\r\nOverrides BUILD TYPE, if set.", "env_variable": "MODPACK_VERSION", - "default_value": "v1.0.1", + "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:10", + "rules": "nullable|string|max:10", + "field_type": "text" + }, + { + "name": "Build Type", + "description": "The type of server jar to download from Technic Solder.", + "env_variable": "BUILD_TYPE", + "default_value": "recommended", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:recommended,latest", "field_type": "text" } ] -} +} \ No newline at end of file diff --git a/java/technic/tekkit-smp/egg-tekkit-smp.json b/java/technic/tekkit-smp/egg-tekkit-smp.json index f8ea86f1..5c31f99c 100644 --- a/java/technic/tekkit-smp/egg-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-tekkit-smp.json @@ -4,18 +4,19 @@ "version": "PTDL_v2", "update_url": "https:\/\/raw.githubusercontent.com\/pelican-eggs\/minecraft\/main\/java\/technic\/tekkit-smp\/egg-tekkit-smp.json" }, - "exported_at": "2024-08-28T19:16:49+00:00", + "exported_at": "2024-09-12T19:50:57+00:00", "name": "Tekkit SMP", "author": "lovinoes@lovinoes.de", "uuid": "c22ea4db-1541-490c-8ee6-296e61d97a1e", "description": "Tekkit SMP contains the full range of mods from Tekkit 2, plus the extra mods that were originally dropped in the transition from Technic SSP (to Technic SMP) to Tekkit, in favour of multiplayer and Bukkit support: mainly Thaumcraft, Mystcraft, and Mo' Creatures. The new Tekkit SMP expands on that with various carefully selected Thaumcraft and Mystcraft addons, alongside Mo' Creatures Extended, and smaller custom additions such as Re-Crystallized Wing. Electro-Magic Tools is another starring mod, being an addon to both Industrial Craft and Thaumcraft, combining the worlds of tech and magic.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "docker_images": { - "Java11": "ghcr.io\/parkervcp\/yolks:java_11", - "Java8": "ghcr.io\/parkervcp\/yolks:java_8" + "Java8": "ghcr.io\/parkervcp\/yolks:java_8", + "Java11": "ghcr.io\/parkervcp\/yolks:java_11" }, "file_denylist": [], "startup": "java -server -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -Dfml.queryResult=confirm -jar forge.jar nogui", @@ -27,7 +28,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Tekkit SMP Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk update\r\napk add --no-cache curl zip unzip\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nMODPACK_VERSION=${MODPACK_VERSION:-\"v1.0.1\"} # Default to v1.0.1 if MODPACK_VERSION is not set\r\n\r\necho \"Downloading Tekkit SMP version ${MODPACK_VERSION}\"\r\ncurl -sSL \"https:\/\/servers.technicpack.net\/Technic\/servers\/tekkit-smp\/Tekkit-SMP_Server_${MODPACK_VERSION}.zip\" -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nunzip -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\n\r\nrm -rf \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nrm -f RestoreBackup.bat LaunchServer.bat LaunchServer.sh RestoreBackup.sh\r\n\r\nmv forge-1.12.2-*.jar forge.jar\r\n\r\nif [ ! -f server.properties ]; then\r\n echo \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi\r\n\r\necho \"Done\"", + "script": "#!\/bin\/ash\r\n# Tekkit SMP Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk update\r\napk add --no-cache curl zip unzip jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nBUILD_TYPE=${BUILD_TYPE:-\"recommended\"}\r\n\r\nif [ -z \"$MODPACK_VERSION\" ]; then\r\n MODPACK_VERSION=v$(curl -s https:\/\/solder.technicpack.net\/api\/modpack\/tekkit-smp | jq -r \".${BUILD_TYPE}\")\r\nfi\r\n\r\necho \"Downloading Tekkit SMP version ${MODPACK_VERSION} (This may take a while!)\"\r\ncurl -sSL \"https:\/\/servers.technicpack.net\/Technic\/servers\/tekkit-smp\/Tekkit-SMP_Server_${MODPACK_VERSION}.zip\" -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nunzip -o \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\n\r\nrm -rf \"Tekkit-SMP_Server_${MODPACK_VERSION}.zip\"\r\nrm -f RestoreBackup.bat LaunchServer.bat LaunchServer.sh RestoreBackup.sh\r\n\r\nmv forge-1.12.2-*.jar forge.jar\r\n\r\nif [ ! -f server.properties ]; then\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi\r\n\r\necho \"Done\"", "container": "ghcr.io\/parkervcp\/installers:alpine", "entrypoint": "ash" } @@ -35,14 +36,25 @@ "variables": [ { "name": "Modpack Version", - "description": "The version of Tekkit SMP to download.", + "description": "The version of Tekkit SMP to download. \n\nOverrides BUILD TYPE, if set.", "env_variable": "MODPACK_VERSION", - "default_value": "v1.0.1", + "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:10", + "rules": "nullable|string|max:10", "sort": 1, "field_type": "text" + }, + { + "name": "Build Type", + "description": "The type of server jar to download from Technic Solder.", + "env_variable": "BUILD_TYPE", + "default_value": "recommended", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:recommended,latest", + "sort": 2, + "field_type": "text" } ] -} +} \ No newline at end of file