From 14735fd47245c6d330d1bf48d7a7bf41d7077f93 Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sat, 24 Aug 2024 22:27:43 +0200 Subject: [PATCH 01/12] Update README.md --- java/technic/README.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/java/technic/README.md b/java/technic/README.md index a6f88370..e46fb0e5 100644 --- a/java/technic/README.md +++ b/java/technic/README.md @@ -1,13 +1,14 @@ # Technic Eggs -[Technic](/game_eggs/minecraft/java/technic/) +[Technic](/java/technic/) -* [Attack of the B-Team](/game_eggs/minecraft/java/technic/attack-of-the-bteam/) -* [Blightfall](/game_eggs/minecraft/java/technic/blightfall/) -* [Hexxit](/game_eggs/minecraft/java/technic/hexxit/) -* [Tekkit](/game_eggs/minecraft/java/technic/Tekkit/) -* [Tekkit 2](/game_eggs/minecraft/java/technic/Tekkit-2/) -* [Tekkit Classic](/game_eggs/minecraft/java/technic/tekkit-classic/) -* [Tekkit Legends](/game_eggs/minecraft/java/technic/tekkit-legends/) -* [The 1.7.10 Pack](/game_eggs/minecraft/java/technic/the-1-7-10-pack/) -* [The 1.12.2 Pack](/game_eggs/minecraft/java/technic/the-1-12-2-pack/) +* [Attack of the B-Team](/java/technic/attack-of-the-bteam/) +* [Blightfall](/java/technic/blightfall/) +* [Hexxit](/java/technic/hexxit/) +* [Tekkit](/java/technic/Tekkit/) +* [Tekkit 2](/java/technic/Tekkit-2/) +* [Tekkit Classic](/java/technic/tekkit-classic/) +* [Tekkit Legends](/java/technic/tekkit-legends/) +* [Tekkit SMP](/java/technic/tekkit-smp/) +* [The 1.7.10 Pack](/java/technic/the-1-7-10-pack/) +* [The 1.12.2 Pack](/java/technic/the-1-12-2-pack/) From d39bfdac129e52f4b5ee511e0453acf01ecc8aae Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sat, 24 Aug 2024 22:28:18 +0200 Subject: [PATCH 02/12] Create egg-tekkit-smp.json --- java/technic/tekkit-smp/egg-tekkit-smp.json | 49 +++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 java/technic/tekkit-smp/egg-tekkit-smp.json diff --git a/java/technic/tekkit-smp/egg-tekkit-smp.json b/java/technic/tekkit-smp/egg-tekkit-smp.json new file mode 100644 index 00000000..bfc99d0a --- /dev/null +++ b/java/technic/tekkit-smp/egg-tekkit-smp.json @@ -0,0 +1,49 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL", + "meta": { + "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-24T19:18:42+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", + "pid_limit" + ], + "docker_images": { + "Java11": "ghcr.io\/parkervcp\/yolks:java_11", + "Java8": "ghcr.io\/parkervcp\/yolks:java_8" + }, + "file_denylist": [], + "startup": "java -server -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -Dfml.queryResult=confirm -jar forge.jar nogui", + "config": { + "files": "{\n \"server.properties\": {\n \"parser\": \"properties\",\n \"find\": {\n \"server-ip\": \"0.0.0.0\",\n \"server-port\": \"{{server.allocations.default.port}}\",\n \"query.port\": \"{{server.allocations.default.port}}\"\n }\n }\n}", + "startup": "{\n \"done\": \")! For help, type \"\n}", + "logs": "{}", + "stop": "stop" + }, + "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.0\"} # Default to v1.0.0 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\"", + "container": "ghcr.io\/parkervcp\/installers:alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "The version of Tekkit SMP to download.", + "env_variable": "MODPACK_VERSION", + "default_value": "v1.0.0", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:10", + "sort": 1, + "field_type": "text" + } + ] +} From c84cdb6486ff5db36057e2aa8e0799506dcc64c9 Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sat, 24 Aug 2024 22:28:49 +0200 Subject: [PATCH 03/12] Create egg-pterodactyl-tekkit-smp.json --- .../egg-pterodactyl-tekkit-smp.json | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json diff --git a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json new file mode 100644 index 00000000..473f7346 --- /dev/null +++ b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json @@ -0,0 +1,43 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2024-08-24T19:30:48+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": null, + "docker_images": { + "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", + "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8" + }, + "file_denylist": [], + "startup": "java -server -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -Dfml.queryResult=confirm -jar forge.jar nogui", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server tick complete! \"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "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.0\"} # Default to v1.0.0 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\"", + "container": "ghcr.io\/pterodactyl\/installers:alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "The version of Tekkit SMP to download.", + "env_variable": "MODPACK_VERSION", + "default_value": "v1.0.0", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:10", + "field_type": "text" + } + ] +} From 98b452bdfad2b610a50a48b0ec3785dd98d26400 Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sat, 24 Aug 2024 22:33:02 +0200 Subject: [PATCH 04/12] Update egg-tekkit-smp.json --- java/technic/tekkit-smp/egg-tekkit-smp.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/technic/tekkit-smp/egg-tekkit-smp.json b/java/technic/tekkit-smp/egg-tekkit-smp.json index bfc99d0a..2c6f5aea 100644 --- a/java/technic/tekkit-smp/egg-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-tekkit-smp.json @@ -4,15 +4,14 @@ "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-24T19:18:42+00:00", + "exported_at": "2024-08-24T20:29:50+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", - "pid_limit" + "java_version" ], "docker_images": { "Java11": "ghcr.io\/parkervcp\/yolks:java_11", From effac5ab72cc33b7ee6aa87621d88abea7e0775c Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sat, 24 Aug 2024 22:34:40 +0200 Subject: [PATCH 05/12] Create README.md --- java/technic/tekkit-smp/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 java/technic/tekkit-smp/README.md diff --git a/java/technic/tekkit-smp/README.md b/java/technic/tekkit-smp/README.md new file mode 100644 index 00000000..4c6683b3 --- /dev/null +++ b/java/technic/tekkit-smp/README.md @@ -0,0 +1,10 @@ +# Minecraft: Tekkit SMP +https://www.technicpack.net/modpack/tekkit-smp.1988819 + +## Server Ports +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + + +| Port | default | +|-------|---------| +| Game | 25565 | From 2d92d1b16c1a825deb88987e73383bd79735bf61 Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sun, 25 Aug 2024 00:05:10 +0200 Subject: [PATCH 06/12] Add features - pterodactyl --- java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json index 473f7346..f22ca2ae 100644 --- a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json @@ -4,11 +4,14 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-08-24T19:30:48+02:00", + "exported_at": "2024-08-25T00:03:31+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": null, + "features": [ + "eula", + "java_version" + ], "docker_images": { "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8" From b91728899358e4c1f249de1f3838f9531cde3e42 Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sun, 25 Aug 2024 14:19:17 +0200 Subject: [PATCH 07/12] Use Parker images --- java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json index f22ca2ae..65b902a2 100644 --- a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-08-25T00:03:31+02:00", + "exported_at": "2024-08-25T14:16:38+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.", @@ -13,8 +13,8 @@ "java_version" ], "docker_images": { - "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", - "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8" + "Java 11": "ghcr.io\/parkervcp\/yolks:java_11", + "Java 8": "ghcr.io\/parkervcp\/yolks:java_8" }, "file_denylist": [], "startup": "java -server -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -Dfml.queryResult=confirm -jar forge.jar nogui", From 3b9aad596fac0507cb94ce870e799dc24a2ac7cb Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sun, 25 Aug 2024 14:40:23 +0200 Subject: [PATCH 08/12] Update egg-pterodactyl-tekkit-smp.json Forgot to adapt the script container. now fixed --- java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json index 65b902a2..ba9dd5cc 100644 --- a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-08-25T14:16:38+02:00", + "exported_at": "2024-08-25T14:38:21+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.", @@ -27,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.0\"} # Default to v1.0.0 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\"", - "container": "ghcr.io\/pterodactyl\/installers:alpine", + "container": "ghcr.io\/parkervcp\/installers:alpine", "entrypoint": "ash" } }, From fd910dcd16db156b8bf60cf36a4d56965cbfdfba Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Sun, 25 Aug 2024 14:45:54 +0200 Subject: [PATCH 09/12] Update startup message --- java/technic/tekkit-smp/egg-tekkit-smp.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/technic/tekkit-smp/egg-tekkit-smp.json b/java/technic/tekkit-smp/egg-tekkit-smp.json index 2c6f5aea..2c15005b 100644 --- a/java/technic/tekkit-smp/egg-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-tekkit-smp.json @@ -4,7 +4,7 @@ "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-24T20:29:50+00:00", + "exported_at": "2024-08-25T12:44:50+00:00", "name": "Tekkit SMP", "author": "lovinoes@lovinoes.de", "uuid": "c22ea4db-1541-490c-8ee6-296e61d97a1e", @@ -21,7 +21,7 @@ "startup": "java -server -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -Dfml.queryResult=confirm -jar forge.jar nogui", "config": { "files": "{\n \"server.properties\": {\n \"parser\": \"properties\",\n \"find\": {\n \"server-ip\": \"0.0.0.0\",\n \"server-port\": \"{{server.allocations.default.port}}\",\n \"query.port\": \"{{server.allocations.default.port}}\"\n }\n }\n}", - "startup": "{\n \"done\": \")! For help, type \"\n}", + "startup": "{\n \"done\": \"Server tick complete! \"\n}", "logs": "{}", "stop": "stop" }, From b15ab483ea037864f8a636ab0980b5dbf8c1885b Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Wed, 28 Aug 2024 21:21:22 +0200 Subject: [PATCH 10/12] Set default Version to v1.0.1 Version 1.0.1 - Hotfix applied to resolve critical issues following the initial release (v1.0.0). - Fixed BuildCraft oil transfer issues from Tekkit 2 worlds to Tekkit SMP. - Resolved crashes caused by items being placed in the Baubles slot. - Corrected BuildCraft Auto Workbenches not accepting power for accelerated processing. - Updated 4 mods and made minor configuration adjustments. --- java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json index ba9dd5cc..807a3c29 100644 --- a/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-pterodactyl-tekkit-smp.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-08-25T14:38:21+02:00", + "exported_at": "2024-08-28T21:14:54+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.", @@ -26,7 +26,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.0\"} # Default to v1.0.0 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\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\"", "container": "ghcr.io\/parkervcp\/installers:alpine", "entrypoint": "ash" } @@ -36,7 +36,7 @@ "name": "Modpack Version", "description": "The version of Tekkit SMP to download.", "env_variable": "MODPACK_VERSION", - "default_value": "v1.0.0", + "default_value": "v1.0.1", "user_viewable": true, "user_editable": true, "rules": "required|string|max:10", From 1cff5fac6daaa315af8e549d123a0c6850a7d2dd Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Wed, 28 Aug 2024 21:22:06 +0200 Subject: [PATCH 11/12] Set default Version to v1.0.1 Version 1.0.1 - Hotfix applied to resolve critical issues following the initial release (v1.0.0). - Fixed BuildCraft oil transfer issues from Tekkit 2 worlds to Tekkit SMP. - Resolved crashes caused by items being placed in the Baubles slot. - Corrected BuildCraft Auto Workbenches not accepting power for accelerated processing. - Updated 4 mods and made minor configuration adjustments. --- java/technic/tekkit-smp/egg-tekkit-smp.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/technic/tekkit-smp/egg-tekkit-smp.json b/java/technic/tekkit-smp/egg-tekkit-smp.json index 2c15005b..f8ea86f1 100644 --- a/java/technic/tekkit-smp/egg-tekkit-smp.json +++ b/java/technic/tekkit-smp/egg-tekkit-smp.json @@ -4,7 +4,7 @@ "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-25T12:44:50+00:00", + "exported_at": "2024-08-28T19:16:49+00:00", "name": "Tekkit SMP", "author": "lovinoes@lovinoes.de", "uuid": "c22ea4db-1541-490c-8ee6-296e61d97a1e", @@ -27,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.0\"} # Default to v1.0.0 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\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\"", "container": "ghcr.io\/parkervcp\/installers:alpine", "entrypoint": "ash" } @@ -37,7 +37,7 @@ "name": "Modpack Version", "description": "The version of Tekkit SMP to download.", "env_variable": "MODPACK_VERSION", - "default_value": "v1.0.0", + "default_value": "v1.0.1", "user_viewable": true, "user_editable": true, "rules": "required|string|max:10", From 0e75966a1f054d05f2ce4fe82b4487ff0b0bd74b Mon Sep 17 00:00:00 2001 From: Lovinoes Date: Thu, 12 Sep 2024 21:56:33 +0200 Subject: [PATCH 12/12] 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