From a29b400c80e7e27ccc17f20685e72abb39c0a7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:27:12 +0100 Subject: [PATCH 01/18] Added NeoForge to Minecraft --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 62273c67..d5cc0215 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Feather](game_eggs/minecraft/java/feather) * [Feed The Beast](game_eggs/minecraft/java/ftb) * [Forge](game_eggs/minecraft/java/forge) + * [NeoForge](game_eggs/minecraft/java/neoforge) * [Glowstone](game_eggs/minecraft/java/glowstone) * [Limbo](game_eggs/minecraft/java/limbo) * [Magma](game_eggs/minecraft/java/magma) From d029a67cf345ecdfcab48de082af60aba804a02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:33:39 +0100 Subject: [PATCH 02/18] Create README.md --- game_eggs/minecraft/java/neoforge/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 game_eggs/minecraft/java/neoforge/README.md diff --git a/game_eggs/minecraft/java/neoforge/README.md b/game_eggs/minecraft/java/neoforge/README.md new file mode 100644 index 00000000..5d3779ef --- /dev/null +++ b/game_eggs/minecraft/java/neoforge/README.md @@ -0,0 +1,11 @@ +## NeoForge 🦊 + +### This is an egg for a standalone NeoForge Minecraft Server. + +NeoForge is a fork of the orginal Forge server software, the egg can be found [here](game_eggs/minecraft/java/forge). + +- **NeoForge Website:** https://neoforged.net +- **Forge Website:** https://minecraftforge.net + + +*The install script contains parts of the orginal forge egg by parkervcp (c)* From 3ac30309c10bcc8a973862632e4c173302a30e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:36:13 +0100 Subject: [PATCH 03/18] Added egg file --- .../java/neoforge/egg-neo-forge.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 game_eggs/minecraft/java/neoforge/egg-neo-forge.json diff --git a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json new file mode 100644 index 00000000..671cbaeb --- /dev/null +++ b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json @@ -0,0 +1,42 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": "https://mirror.invalidpanda.dev/neoforge/egg-neo-forge.json" + }, + "exported_at": "2024-02-14T21:28:58+01:00", + "name": "NeoForge", + "author": "mail@invalidpanda.dev", + "description": "A new fork of the Minecraft modding platform Forge. NeoForge provides support for many Forge mods, but some newer mods are NeoForge-exclusive. NeoForge supports Minecraft version 1.20.1 and newer.", + "features": null, + "docker_images": { + "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17" + }, + "file_denylist": [], + "startup": "java -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true $( [[ ! -f unix_args.txt ]] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", + "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n#\r\n# NeoForge Installation script\r\n#\r\n# Files kindly mirrored by invalidpandaa\r\n# Inspired by orginal Forge install script by parkervcp (c)\r\n#\r\n# Server files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nDOWNLOAD_LINK=https:\/\/mirror.invalidpanda.dev\/neoforge\/${MC_VERSION}\/installer.jar\r\n\r\n# Download the installer\r\necho -e \"Downloading NeoForge installer with Minecraft version ${MC_VERSION} \\nDownload link is ${DOWNLOAD_LINK}\\n\"\r\nif curl --output \/dev\/null --silent --head --fail \"${DOWNLOAD_LINK}\"; then\r\n curl -LO ${DOWNLOAD_LINK}\r\n\r\n # Check if file exists\r\n if [ -e \"installer.jar\" ]; then\r\n echo -e \"Successfully downloaded installer.jar\"\r\n else\r\n echo -e \"Failed to download installer.jar. Exiting now! \\n\"\r\n exit 1\r\n fi\r\nelse\r\n echo -e \"Couldn't reach the download server! If this error persists, please contact mail@invalidpanda.dev. \\n\"\r\n exit 1\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args. \\n\"\r\n ln -sf libraries\/net\/neoforged\/neoforge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/neoforged\/neoforge\r\nrm unix_args.txt\r\n\r\n\r\n# Installing NeoForge\r\necho -e \"Installing NeoForge server \\n\"\r\njava -jar installer.jar --installServer || { echo -e \"\\nFailed to install NeoForge server with Minecraft version ${MC_VERSION}! \\nMake sure to allocate enough memory and disk space.\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nfi \r\n \r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar\r\necho -e \"Installation process is completed.\"", + "container": "openjdk:8-jdk-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Minecraft Version", + "description": "The version of Minecraft you want to use. NeoForge supports 1.20.1+", + "env_variable": "MC_VERSION", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:6", + "field_type": "text" + } + ] +} From 70175b321fb7b89fe3c0e22eadd1624cedc8584c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:38:12 +0100 Subject: [PATCH 04/18] Update README.md --- game_eggs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index c450b247..e13aa13b 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -79,6 +79,7 @@ * [Feather](minecraft/java/feather) * [Feed The Beast](minecraft/java/ftb) * [Forge](minecraft/java/forge) + * [NeoForge](minecraft/java/neoforge) * [Glowstone](minecraft/java/glowstone) * [Limbo](minecraft/java/limbo) * [Magma](minecraft/java/magma) From f4630f8683c06f2732a5f3b0e0efb331ac885c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:40:04 +0100 Subject: [PATCH 05/18] Update README.md --- game_eggs/minecraft/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 9e374b05..2b289c78 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -28,6 +28,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Modrinth](java/modrinth) * [Mohist](java/mohist) * [NanoLimbo](java/nanolimbo) +* [NeoForge](java/neoforge) * [Paper](java/paper) * [Folia](java/folia) * [Purpur](java/purpur) From c154f00e566a06f669ac722794a6b4b8ff5cf8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:44:21 +0100 Subject: [PATCH 06/18] Update README.md --- game_eggs/minecraft/java/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index 11f583f3..b309b35e 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -37,6 +37,11 @@ This is a direct fork of the default forge service [CurseForge Generic Website](https://www.curseforge.com) A generic service to pull forge mod packs from the curseforge site. +### [NeoForge](neoforge) + +[NeoForge Website](https://neoforged.net) +A new fork of Forge that supports Minecraft version 1.20.1 and newer. + ## Glowstone [Glowstone](https://glowstone.net/) Glowstone is an open-source replacement for CraftBukkit, Spigot, and Paper. From a204ddd56c1192c8ead5c7279a1fdcb0d91011bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:45:17 +0100 Subject: [PATCH 07/18] Update README.md --- game_eggs/minecraft/java/neoforge/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/neoforge/README.md b/game_eggs/minecraft/java/neoforge/README.md index 5d3779ef..d7bb996d 100644 --- a/game_eggs/minecraft/java/neoforge/README.md +++ b/game_eggs/minecraft/java/neoforge/README.md @@ -2,7 +2,7 @@ ### This is an egg for a standalone NeoForge Minecraft Server. -NeoForge is a fork of the orginal Forge server software, the egg can be found [here](game_eggs/minecraft/java/forge). +NeoForge is a fork of the orginal Forge server software, the egg can be found [here](../game_eggs/minecraft/java/forge). - **NeoForge Website:** https://neoforged.net - **Forge Website:** https://minecraftforge.net From 34563a07247193e6400a322897471974ff1259c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:46:33 +0100 Subject: [PATCH 08/18] Update README.md --- game_eggs/minecraft/java/neoforge/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/neoforge/README.md b/game_eggs/minecraft/java/neoforge/README.md index d7bb996d..ddc3a269 100644 --- a/game_eggs/minecraft/java/neoforge/README.md +++ b/game_eggs/minecraft/java/neoforge/README.md @@ -2,7 +2,7 @@ ### This is an egg for a standalone NeoForge Minecraft Server. -NeoForge is a fork of the orginal Forge server software, the egg can be found [here](../game_eggs/minecraft/java/forge). +NeoForge is a fork of Forge, supporting Minecraft version 1.20.1 and newer.. - **NeoForge Website:** https://neoforged.net - **Forge Website:** https://minecraftforge.net From 05a564dfbefd3394af3e5555a99a7f70db0fe498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:49:04 +0100 Subject: [PATCH 09/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d5cc0215..13329c89 100644 --- a/README.md +++ b/README.md @@ -184,13 +184,13 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Feather](game_eggs/minecraft/java/feather) * [Feed The Beast](game_eggs/minecraft/java/ftb) * [Forge](game_eggs/minecraft/java/forge) - * [NeoForge](game_eggs/minecraft/java/neoforge) * [Glowstone](game_eggs/minecraft/java/glowstone) * [Limbo](game_eggs/minecraft/java/limbo) * [Magma](game_eggs/minecraft/java/magma) * [Modrinth](game_eggs/minecraft/java/modrinth) * [Mohist](game_eggs/minecraft/java/mohist) * [NanoLimbo](game_eggs/minecraft/java/nanolimbo) + * [NeoForge](game_eggs/minecraft/java/neoforge) * [Paper](game_eggs/minecraft/java/paper) * [Folia](game_eggs/minecraft/java/folia) * [Purpur](game_eggs/minecraft/java/purpur) From 7aacf6b9d62df35dd7067bbd44d247facc0deaaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:57:29 +0100 Subject: [PATCH 10/18] Update README.md --- game_eggs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index e13aa13b..c81df7bd 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -79,12 +79,12 @@ * [Feather](minecraft/java/feather) * [Feed The Beast](minecraft/java/ftb) * [Forge](minecraft/java/forge) - * [NeoForge](minecraft/java/neoforge) * [Glowstone](minecraft/java/glowstone) * [Limbo](minecraft/java/limbo) * [Magma](minecraft/java/magma) * [Mohist](minecraft/java/mohist) * [NanoLimbo](minecraft/java/nanolimbo) + * [NeoForge](minecraft/java/neoforge) * [Paper](minecraft/java/paper) * [Folia](minecraft/java/folia) * [Purpur](minecraft/java/purpur) From 48b2e6ec12eafa0bc60d4c45c70efff78ada0908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:02:56 +0100 Subject: [PATCH 11/18] Update README.md --- game_eggs/minecraft/java/neoforge/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/neoforge/README.md b/game_eggs/minecraft/java/neoforge/README.md index ddc3a269..d7cb68b6 100644 --- a/game_eggs/minecraft/java/neoforge/README.md +++ b/game_eggs/minecraft/java/neoforge/README.md @@ -2,7 +2,7 @@ ### This is an egg for a standalone NeoForge Minecraft Server. -NeoForge is a fork of Forge, supporting Minecraft version 1.20.1 and newer.. +NeoForge is a fork of Forge, supporting Minecraft version 1.20.1 and newer. - **NeoForge Website:** https://neoforged.net - **Forge Website:** https://minecraftforge.net From d02c073bd2a06b04076f837d91f17a6610b60cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:22:26 +0100 Subject: [PATCH 12/18] Added EULA feature --- game_eggs/minecraft/java/neoforge/egg-neo-forge.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json index 671cbaeb..54eb7e5f 100644 --- a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json +++ b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json @@ -8,7 +8,9 @@ "name": "NeoForge", "author": "mail@invalidpanda.dev", "description": "A new fork of the Minecraft modding platform Forge. NeoForge provides support for many Forge mods, but some newer mods are NeoForge-exclusive. NeoForge supports Minecraft version 1.20.1 and newer.", - "features": null, + "features": [ + "eula" + ], "docker_images": { "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17" }, From 385a6c6d87cf749b9f81a7100eedfad1bf1fe7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 19:08:19 +0100 Subject: [PATCH 13/18] Added game ports --- game_eggs/minecraft/java/neoforge/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/game_eggs/minecraft/java/neoforge/README.md b/game_eggs/minecraft/java/neoforge/README.md index d7cb68b6..aeefee77 100644 --- a/game_eggs/minecraft/java/neoforge/README.md +++ b/game_eggs/minecraft/java/neoforge/README.md @@ -9,3 +9,11 @@ NeoForge is a fork of Forge, supporting Minecraft version 1.20.1 and newer. *The install script contains parts of the orginal forge egg by parkervcp (c)* + +## Server Ports + +The NeoForge server requires a single port for access (default 25565) but mods may require extra ports to enabled for the server. + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file From 7ae0add57043ed644d71b2339e76dbd587eb583f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 20:52:01 +0100 Subject: [PATCH 14/18] removed update url --- game_eggs/minecraft/java/neoforge/egg-neo-forge.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json index 54eb7e5f..fdd5f602 100644 --- a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json +++ b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json @@ -2,7 +2,7 @@ "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { "version": "PTDL_v2", - "update_url": "https://mirror.invalidpanda.dev/neoforge/egg-neo-forge.json" + "update_url": null }, "exported_at": "2024-02-14T21:28:58+01:00", "name": "NeoForge", From 7ddac9b39a4c02d2220dafcb5a6ab2a186ef7d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Tue, 20 Feb 2024 10:11:31 +0100 Subject: [PATCH 15/18] updated egg description --- game_eggs/minecraft/java/neoforge/egg-neo-forge.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json index fdd5f602..eb597de3 100644 --- a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json +++ b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json @@ -7,7 +7,7 @@ "exported_at": "2024-02-14T21:28:58+01:00", "name": "NeoForge", "author": "mail@invalidpanda.dev", - "description": "A new fork of the Minecraft modding platform Forge. NeoForge provides support for many Forge mods, but some newer mods are NeoForge-exclusive. NeoForge supports Minecraft version 1.20.1 and newer.", + "description": "NeoForge is a new fork of Forge, supporting Minecraft version 1.20.1 and newer.", "features": [ "eula" ], From c654fff68219c5c065b982029cf29160a12adc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Fri, 23 Feb 2024 22:22:29 +0100 Subject: [PATCH 16/18] added unix args for 1.20.1 --- .../java/neoforge/egg-neo-forge.json | 100 ++++++++++-------- 1 file changed, 57 insertions(+), 43 deletions(-) diff --git a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json index eb597de3..3017948f 100644 --- a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json +++ b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json @@ -1,44 +1,58 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v2", - "update_url": null - }, - "exported_at": "2024-02-14T21:28:58+01:00", - "name": "NeoForge", - "author": "mail@invalidpanda.dev", - "description": "NeoForge is a new fork of Forge, supporting Minecraft version 1.20.1 and newer.", - "features": [ - "eula" - ], - "docker_images": { - "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17" - }, - "file_denylist": [], - "startup": "java -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true $( [[ ! -f unix_args.txt ]] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", - "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", - "logs": "{}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n#\r\n# NeoForge Installation script\r\n#\r\n# Files kindly mirrored by invalidpandaa\r\n# Inspired by orginal Forge install script by parkervcp (c)\r\n#\r\n# Server files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nDOWNLOAD_LINK=https:\/\/mirror.invalidpanda.dev\/neoforge\/${MC_VERSION}\/installer.jar\r\n\r\n# Download the installer\r\necho -e \"Downloading NeoForge installer with Minecraft version ${MC_VERSION} \\nDownload link is ${DOWNLOAD_LINK}\\n\"\r\nif curl --output \/dev\/null --silent --head --fail \"${DOWNLOAD_LINK}\"; then\r\n curl -LO ${DOWNLOAD_LINK}\r\n\r\n # Check if file exists\r\n if [ -e \"installer.jar\" ]; then\r\n echo -e \"Successfully downloaded installer.jar\"\r\n else\r\n echo -e \"Failed to download installer.jar. Exiting now! \\n\"\r\n exit 1\r\n fi\r\nelse\r\n echo -e \"Couldn't reach the download server! If this error persists, please contact mail@invalidpanda.dev. \\n\"\r\n exit 1\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args. \\n\"\r\n ln -sf libraries\/net\/neoforged\/neoforge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/neoforged\/neoforge\r\nrm unix_args.txt\r\n\r\n\r\n# Installing NeoForge\r\necho -e \"Installing NeoForge server \\n\"\r\njava -jar installer.jar --installServer || { echo -e \"\\nFailed to install NeoForge server with Minecraft version ${MC_VERSION}! \\nMake sure to allocate enough memory and disk space.\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nfi \r\n \r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar\r\necho -e \"Installation process is completed.\"", - "container": "openjdk:8-jdk-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Minecraft Version", - "description": "The version of Minecraft you want to use. NeoForge supports 1.20.1+", - "env_variable": "MC_VERSION", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:6", - "field_type": "text" - } - ] +#!/bin/bash +# +# NeoForge Installation script +# +# Files kindly mirrored by invalidpandaa +# The install script contains parts of the orginal forge egg by parkervcp (c) +# +# Server files: /mnt/server +apt update +apt install -y curl jq +if [[ ! -d /mnt/server ]]; then +mkdir /mnt/server +fi +cd /mnt/server +DOWNLOAD_LINK=https://mirror.invalidpanda.dev/neoforge/${MC_VERSION}/installer.jar +# Download the installer +echo -e "Downloading NeoForge installer with Minecraft version ${MC_VERSION} \nDownload link is ${DOWNLOAD_LINK}\n" +if curl --output /dev/null --silent --head --fail "${DOWNLOAD_LINK}"; then +curl -LO ${DOWNLOAD_LINK} +# Check if file exists +if [ -e "installer.jar" ]; then +echo -e "Successfully downloaded installer.jar" +else +echo -e "Failed to download installer.jar. Exiting now! \n" +exit 1 +fi +else +echo -e "Couldn't reach the download server! If this error persists, please contact mail@invalidpanda.dev. \n" +exit 1 +fi +function unix_args { +echo -e "Setting up Unix args..." +if [ "$MC_VERSION" = "1.20.1" ]; then +ln -sf libraries/net/neoforged/forge/*/unix_args.txt unix_args.txt +else +ln -sf libraries/net/neoforged/neoforge/*/unix_args.txt unix_args.txt +fi } +# Delete args to support downgrading/upgrading +rm -rf libraries/net/neoforged/neoforge +rm -rf libraries/net/neoforged/forge # if on 1.20.1 +rm unix_args.txt +# Installing NeoForge +echo -e "Installing NeoForge server \n" +java -jar installer.jar --installServer || { echo -e "\nFailed to install NeoForge server with Minecraft version ${MC_VERSION}! \nMake sure to allocate enough memory and disk space."; exit 4; } +# Check if we need a symlink for 1.17+ Forge JPMS args +if [[ $MC_VERSION =~ ^1\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\.(17|18|19|20|21|22|23) ]]; then +unix_args +fi +echo -e "Deleting installer.jar file.\n" +rm -rf installer.jar +echo "-------------------------------------------------------------------------------------- + +Installation complete! + +If any issues occured during install, please contact mail@invalidpanda.dev. + +--------------------------------------------------------------------------------------" From c116f0fb9aac1bfe053f7f170b1c4391f7d8f8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= Date: Fri, 23 Feb 2024 22:24:13 +0100 Subject: [PATCH 17/18] Revert "added unix args for 1.20.1" This reverts commit c654fff68219c5c065b982029cf29160a12adc2b. --- .../java/neoforge/egg-neo-forge.json | 100 ++++++++---------- 1 file changed, 43 insertions(+), 57 deletions(-) diff --git a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json index 3017948f..eb597de3 100644 --- a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json +++ b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json @@ -1,58 +1,44 @@ -#!/bin/bash -# -# NeoForge Installation script -# -# Files kindly mirrored by invalidpandaa -# The install script contains parts of the orginal forge egg by parkervcp (c) -# -# Server files: /mnt/server -apt update -apt install -y curl jq -if [[ ! -d /mnt/server ]]; then -mkdir /mnt/server -fi -cd /mnt/server -DOWNLOAD_LINK=https://mirror.invalidpanda.dev/neoforge/${MC_VERSION}/installer.jar -# Download the installer -echo -e "Downloading NeoForge installer with Minecraft version ${MC_VERSION} \nDownload link is ${DOWNLOAD_LINK}\n" -if curl --output /dev/null --silent --head --fail "${DOWNLOAD_LINK}"; then -curl -LO ${DOWNLOAD_LINK} -# Check if file exists -if [ -e "installer.jar" ]; then -echo -e "Successfully downloaded installer.jar" -else -echo -e "Failed to download installer.jar. Exiting now! \n" -exit 1 -fi -else -echo -e "Couldn't reach the download server! If this error persists, please contact mail@invalidpanda.dev. \n" -exit 1 -fi -function unix_args { -echo -e "Setting up Unix args..." -if [ "$MC_VERSION" = "1.20.1" ]; then -ln -sf libraries/net/neoforged/forge/*/unix_args.txt unix_args.txt -else -ln -sf libraries/net/neoforged/neoforge/*/unix_args.txt unix_args.txt -fi +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2024-02-14T21:28:58+01:00", + "name": "NeoForge", + "author": "mail@invalidpanda.dev", + "description": "NeoForge is a new fork of Forge, supporting Minecraft version 1.20.1 and newer.", + "features": [ + "eula" + ], + "docker_images": { + "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17" + }, + "file_denylist": [], + "startup": "java -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true $( [[ ! -f unix_args.txt ]] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", + "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 \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n#\r\n# NeoForge Installation script\r\n#\r\n# Files kindly mirrored by invalidpandaa\r\n# Inspired by orginal Forge install script by parkervcp (c)\r\n#\r\n# Server files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nDOWNLOAD_LINK=https:\/\/mirror.invalidpanda.dev\/neoforge\/${MC_VERSION}\/installer.jar\r\n\r\n# Download the installer\r\necho -e \"Downloading NeoForge installer with Minecraft version ${MC_VERSION} \\nDownload link is ${DOWNLOAD_LINK}\\n\"\r\nif curl --output \/dev\/null --silent --head --fail \"${DOWNLOAD_LINK}\"; then\r\n curl -LO ${DOWNLOAD_LINK}\r\n\r\n # Check if file exists\r\n if [ -e \"installer.jar\" ]; then\r\n echo -e \"Successfully downloaded installer.jar\"\r\n else\r\n echo -e \"Failed to download installer.jar. Exiting now! \\n\"\r\n exit 1\r\n fi\r\nelse\r\n echo -e \"Couldn't reach the download server! If this error persists, please contact mail@invalidpanda.dev. \\n\"\r\n exit 1\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args. \\n\"\r\n ln -sf libraries\/net\/neoforged\/neoforge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/neoforged\/neoforge\r\nrm unix_args.txt\r\n\r\n\r\n# Installing NeoForge\r\necho -e \"Installing NeoForge server \\n\"\r\njava -jar installer.jar --installServer || { echo -e \"\\nFailed to install NeoForge server with Minecraft version ${MC_VERSION}! \\nMake sure to allocate enough memory and disk space.\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nfi \r\n \r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar\r\necho -e \"Installation process is completed.\"", + "container": "openjdk:8-jdk-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Minecraft Version", + "description": "The version of Minecraft you want to use. NeoForge supports 1.20.1+", + "env_variable": "MC_VERSION", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:6", + "field_type": "text" + } + ] } -# Delete args to support downgrading/upgrading -rm -rf libraries/net/neoforged/neoforge -rm -rf libraries/net/neoforged/forge # if on 1.20.1 -rm unix_args.txt -# Installing NeoForge -echo -e "Installing NeoForge server \n" -java -jar installer.jar --installServer || { echo -e "\nFailed to install NeoForge server with Minecraft version ${MC_VERSION}! \nMake sure to allocate enough memory and disk space."; exit 4; } -# Check if we need a symlink for 1.17+ Forge JPMS args -if [[ $MC_VERSION =~ ^1\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\.(17|18|19|20|21|22|23) ]]; then -unix_args -fi -echo -e "Deleting installer.jar file.\n" -rm -rf installer.jar -echo "-------------------------------------------------------------------------------------- - -Installation complete! - -If any issues occured during install, please contact mail@invalidpanda.dev. - ---------------------------------------------------------------------------------------" From 403773c95253374b14a566bb944d47a0de8ede52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?InvalidPanda=20=E3=83=84?= <117936522+InvalidPandaa@users.noreply.github.com> Date: Fri, 23 Feb 2024 22:27:12 +0100 Subject: [PATCH 18/18] unix args for 1.20.1 --- game_eggs/minecraft/java/neoforge/egg-neo-forge.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json index eb597de3..bafeda07 100644 --- a/game_eggs/minecraft/java/neoforge/egg-neo-forge.json +++ b/game_eggs/minecraft/java/neoforge/egg-neo-forge.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-02-14T21:28:58+01:00", + "exported_at": "2024-02-23T22:25:23+01:00", "name": "NeoForge", "author": "mail@invalidpanda.dev", "description": "NeoForge is a new fork of Forge, supporting Minecraft version 1.20.1 and newer.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n#\r\n# NeoForge Installation script\r\n#\r\n# Files kindly mirrored by invalidpandaa\r\n# Inspired by orginal Forge install script by parkervcp (c)\r\n#\r\n# Server files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nDOWNLOAD_LINK=https:\/\/mirror.invalidpanda.dev\/neoforge\/${MC_VERSION}\/installer.jar\r\n\r\n# Download the installer\r\necho -e \"Downloading NeoForge installer with Minecraft version ${MC_VERSION} \\nDownload link is ${DOWNLOAD_LINK}\\n\"\r\nif curl --output \/dev\/null --silent --head --fail \"${DOWNLOAD_LINK}\"; then\r\n curl -LO ${DOWNLOAD_LINK}\r\n\r\n # Check if file exists\r\n if [ -e \"installer.jar\" ]; then\r\n echo -e \"Successfully downloaded installer.jar\"\r\n else\r\n echo -e \"Failed to download installer.jar. Exiting now! \\n\"\r\n exit 1\r\n fi\r\nelse\r\n echo -e \"Couldn't reach the download server! If this error persists, please contact mail@invalidpanda.dev. \\n\"\r\n exit 1\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args. \\n\"\r\n ln -sf libraries\/net\/neoforged\/neoforge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/neoforged\/neoforge\r\nrm unix_args.txt\r\n\r\n\r\n# Installing NeoForge\r\necho -e \"Installing NeoForge server \\n\"\r\njava -jar installer.jar --installServer || { echo -e \"\\nFailed to install NeoForge server with Minecraft version ${MC_VERSION}! \\nMake sure to allocate enough memory and disk space.\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nfi \r\n \r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar\r\necho -e \"Installation process is completed.\"", + "script": "#!\/bin\/bash\r\n#\r\n# NeoForge Installation script\r\n#\r\n# Files kindly mirrored by invalidpandaa\r\n# Inspired by orginal Forge install script by parkervcp (c)\r\n#\r\n# Server files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\nif [[ ! -d \/mnt\/server ]]; then\r\nmkdir \/mnt\/server\r\nfi\r\ncd \/mnt\/server\r\nDOWNLOAD_LINK=https:\/\/mirror.invalidpanda.dev\/neoforge\/${MC_VERSION}\/installer.jar\r\n# Download the installer\r\necho -e \"Downloading NeoForge installer with Minecraft version ${MC_VERSION} \\nDownload link is ${DOWNLOAD_LINK}\\n\"\r\nif curl --output \/dev\/null --silent --head --fail \"${DOWNLOAD_LINK}\"; then\r\ncurl -LO ${DOWNLOAD_LINK}\r\n# Check if file exists\r\nif [ -e \"installer.jar\" ]; then\r\necho -e \"Successfully downloaded installer.jar\"\r\nelse\r\necho -e \"Failed to download installer.jar. Exiting now! \\n\"\r\nexit 1\r\nfi\r\nelse\r\necho -e \"Couldn't reach the download server! If this error persists, please contact mail@invalidpanda.dev. \\n\"\r\nexit 1\r\nfi\r\nfunction unix_args {\r\necho -e \"Setting up Unix args...\"\r\nif [ \"$MC_VERSION\" = \"1.20.1\" ]; then\r\nln -sf libraries\/net\/neoforged\/forge\/*\/unix_args.txt unix_args.txt\r\nelse\r\nln -sf libraries\/net\/neoforged\/neoforge\/*\/unix_args.txt unix_args.txt\r\nfi\r\n}\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/neoforged\/neoforge\r\nrm -rf libraries\/net\/neoforged\/forge # if on 1.20.1\r\nrm unix_args.txt\r\n# Installing NeoForge\r\necho -e \"Installing NeoForge server \\n\"\r\njava -jar installer.jar --installServer || { echo -e \"\\nFailed to install NeoForge server with Minecraft version ${MC_VERSION}! \\nMake sure to allocate enough memory and disk space.\"; exit 4; }\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\nunix_args\r\nfi\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar\r\necho \"--------------------------------------------------------------------------------------\r\n\r\nInstallation complete!\r\n\r\nIf any issues occured during install, please contact mail@invalidpanda.dev.\r\n\r\n--------------------------------------------------------------------------------------\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" }