From c5c37061b8436676512ca52f134d40183e983b08 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 16 Jun 2019 08:15:13 -0400 Subject: [PATCH] update forge eggs. moved forge-generic to forge-mod-generic brought back forge enhanced as forge generic. --- minecraft_java/forge/forge-generic/README.md | 8 ++-- .../forge-generic/egg-forge-enhanced.json | 45 +++++++++++++++++++ .../forge/forge-mod-generic/README.md | 9 ++++ .../egg-forge-generic.json | 0 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 minecraft_java/forge/forge-generic/egg-forge-enhanced.json create mode 100644 minecraft_java/forge/forge-mod-generic/README.md rename minecraft_java/forge/{forge-generic => forge-mod-generic}/egg-forge-generic.json (100%) diff --git a/minecraft_java/forge/forge-generic/README.md b/minecraft_java/forge/forge-generic/README.md index 03468b6f..72585414 100644 --- a/minecraft_java/forge/forge-generic/README.md +++ b/minecraft_java/forge/forge-generic/README.md @@ -1,9 +1,7 @@ # Forge Generic -### This is a generic egg for curseforge modpacks +### This is a generic egg for the forge standalone server -You will need to give it a modpack URL such as `https://minecraft.curseforge.com/projects/` +This will download the latest jar for a specific forge version. -This will grabe the latest release when the version is set to latest. - -It "should" grab versions of the pack based on the modpack version numbers \ No newline at end of file +this has a fix for the broken 1.7.10 and 1.8.9 versions forge has \ No newline at end of file diff --git a/minecraft_java/forge/forge-generic/egg-forge-enhanced.json b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json new file mode 100644 index 00000000..9b30a67d --- /dev/null +++ b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-06-16T08:09:35-04:00", + "name": "Forge Enhanced", + "author": "parker@parkervcp.com", + "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", + "image": "quay.io\/pterodactyl\/core:java", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\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 \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\nif [ ${MC_VERSION} == \"1.7.10\" ] || [ ${MC_VERSION} == \"1.8.9\" ]; then\r\n\tFORGE_VERSION=\"${FORGE_VERSION}-${MC_VERSION}\"\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$FORGE_VERSION\" =~ [0-9]?[0-9]?\\.[0-9]?[0-9]?\\.?[0-9]?[0-9]-[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]?[0-9] ]]; then\r\n echo \"!!! Invalid forge version \\\"$FORGE_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\nif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\tFORGE=\"${FORGE}-${MCVER}\"\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", + "container": "openjdk:8", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Jar File", + "description": "The name of the Jarfile to use when running Forge Mod.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Forge version", + "description": "The version of forge that you want to run.\r\nExamples:\r\n- 1.12.2\r\n- 1.12.2-14.23.5.2810", + "env_variable": "MC_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:22" + } + ] +} \ No newline at end of file diff --git a/minecraft_java/forge/forge-mod-generic/README.md b/minecraft_java/forge/forge-mod-generic/README.md new file mode 100644 index 00000000..03468b6f --- /dev/null +++ b/minecraft_java/forge/forge-mod-generic/README.md @@ -0,0 +1,9 @@ +# Forge Generic + +### This is a generic egg for curseforge modpacks + +You will need to give it a modpack URL such as `https://minecraft.curseforge.com/projects/` + +This will grabe the latest release when the version is set to latest. + +It "should" grab versions of the pack based on the modpack version numbers \ No newline at end of file diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json similarity index 100% rename from minecraft_java/forge/forge-generic/egg-forge-generic.json rename to minecraft_java/forge/forge-mod-generic/egg-forge-generic.json