From 3649847b4563253b1340b7c7a9c949fc62b1887d Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Thu, 23 Dec 2021 08:41:47 -0500 Subject: [PATCH 1/4] Added glowstone --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/minecraft/README.md | 3 +- game_eggs/minecraft/java/README.md | 6 ++- game_eggs/minecraft/java/glowstone/README.md | 9 ++++ .../java/glowstone/egg-glowstone.json | 50 +++++++++++++++++++ 6 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 game_eggs/minecraft/java/glowstone/README.md create mode 100644 game_eggs/minecraft/java/glowstone/egg-glowstone.json diff --git a/README.md b/README.md index 3747d4a3..367d3aba 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,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) + * [Glowstone](game_eggs/minecraft/java/glowstone) * [Magma](game_eggs/minecraft/java/magma) * [Mohist](game_eggs/minecraft/java/mohist) * [NanoLimbo](/game_eggs/minecraft/java/nanolimbo) diff --git a/game_eggs/README.md b/game_eggs/README.md index 8516677e..4eff8c4c 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -58,6 +58,7 @@ * [Feather](minecraft/java/feather) * [Feed The Beast](minecraft/java/ftb) * [Forge](minecraft/java/forge) + * [Glowstone](minecraft/java/glowstone) * [Krypton](/minecraft/java/krypton) * [Magma](minecraft/java/magma) * [Mohist](minecraft/java/mohist) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index cf9cef67..d2dcefcd 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -17,6 +17,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Feather](/game_eggs/minecraft/java/feather) * [Feed The Beast](/game_eggs/minecraft/java/ftb) * [Forge](/game_eggs/minecraft/java/forge) +* [Glowstone](/minecraft/java/glowstone) * [Krypton](/minecraft/java/krypton) * [Magma](/game_eggs/minecraft/java/magma) * [Mohist](/game_eggs/minecraft/java/mohist) @@ -43,4 +44,4 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform) * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) - * DragonProxy abandoned in favour of GeyserMC. + * DragonProxy abandoned in favour of GeyserMC. diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index 7c0198b7..c8271bb5 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -107,4 +107,8 @@ The official Tekkit Classic modpack. Build factories, automate crafting! ## VanillaCord [VanillaCord](https://github.com/ME1312/VanillaCord) -VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers. \ No newline at end of file +VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers. + +## Glowstone +[Glowstone](https://glowstone.net/) +Glowstone is an open-source replacement for CraftBukkit, Spigot, and Paper. diff --git a/game_eggs/minecraft/java/glowstone/README.md b/game_eggs/minecraft/java/glowstone/README.md new file mode 100644 index 00000000..feae6c7a --- /dev/null +++ b/game_eggs/minecraft/java/glowstone/README.md @@ -0,0 +1,9 @@ +## Glowstone +Glowstone is an open-source replacement for CraftBukkit, Spigot, and Paper. + +## Ports +Similar to CraftBukkit and it's derivatives, it only requires a single port. Other plugins may require more ports. + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json new file mode 100644 index 00000000..0a84c60b --- /dev/null +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -0,0 +1,50 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-12-23T08:39:17-05:00", + "name": "Glowstone", + "author": "regulad@regulad.xyz", + "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_8" + ], + "file_denylist": [], + "startup": "java -Xms768M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"config\/glowstone.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Ready for connections.\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl wget grep\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ $MAVEN_VERSION == \"latest\" ]\r\nthen\r\n echo -e \"Downloading latest release from GitHub...\"\r\n\r\n curl -s https:\/\/api.github.com\/repos\/GlowstoneMC\/Glowstone\/releases\/latest \\\r\n | grep \"browser_download_url.*jar\" \\\r\n | cut -d : -f 2,3 \\\r\n | tr -d \\\" \\\r\n | wget -O ${SERVER_JARFILE} -qi -\r\nelse \r\n echo -e \"Downloading release ${MAVEN_VERSION} from Maven Repository...\"\r\n \r\n wget -O ${SERVER_JARFILE} \"https:\/\/repo.glowstone.net\/service\/rest\/v1\/search\/assets\/download?group=net.glowstone&name=glowstone&sort=version&repository=snapshots&maven.baseVersion=${MAVEN_VERSION}&direction=desc&maven.classifier=\"\r\nfi\r\n\r\necho -e \"Generating configuration...\"\r\njava -jar ${SERVER_JARFILE} --generate-config\r\n\r\necho -e \"Install Complete\"", + "container": "eclipse-temurin:8-jdk", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Jar File", + "description": "The name of the server jarfile to run the server with.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Maven Version", + "description": "The version to download from the Maven Repository, or latest (downloads from GitHub)", + "env_variable": "MAVEN_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From fda5868d756510394cef1f62e1990abb8eea9b52 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Thu, 23 Dec 2021 08:50:52 -0500 Subject: [PATCH 2/4] Add files via upload --- game_eggs/minecraft/java/glowstone/egg-glowstone.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json index 0a84c60b..66b1e481 100644 --- a/game_eggs/minecraft/java/glowstone/egg-glowstone.json +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -4,18 +4,21 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-23T08:39:17-05:00", + "exported_at": "2021-12-23T08:49:44-05:00", "name": "Glowstone", - "author": "regulad@regulad.xyz", + "author": "support@pterodactyl.io", "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", "features": null, "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms768M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -jar {{SERVER_JARFILE}}", "config": { - "files": "{\r\n \"config\/glowstone.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config\/glowstone.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.port\": \"{{server.build.default.port}}\",\r\n \"console.prompt\": \"\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Ready for connections.\"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "stop" From 2c502d0e3b022cb06fcc68ae046f01043c81af64 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Thu, 23 Dec 2021 10:40:21 -0500 Subject: [PATCH 3/4] Add files via upload --- .../java/glowstone/egg-glowstone.json | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json index 66b1e481..2e96e84c 100644 --- a/game_eggs/minecraft/java/glowstone/egg-glowstone.json +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-23T08:49:44-05:00", + "exported_at": "2021-12-23T10:20:23-05:00", "name": "Glowstone", "author": "support@pterodactyl.io", "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", @@ -25,7 +25,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl wget grep\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ $MAVEN_VERSION == \"latest\" ]\r\nthen\r\n echo -e \"Downloading latest release from GitHub...\"\r\n\r\n curl -s https:\/\/api.github.com\/repos\/GlowstoneMC\/Glowstone\/releases\/latest \\\r\n | grep \"browser_download_url.*jar\" \\\r\n | cut -d : -f 2,3 \\\r\n | tr -d \\\" \\\r\n | wget -O ${SERVER_JARFILE} -qi -\r\nelse \r\n echo -e \"Downloading release ${MAVEN_VERSION} from Maven Repository...\"\r\n \r\n wget -O ${SERVER_JARFILE} \"https:\/\/repo.glowstone.net\/service\/rest\/v1\/search\/assets\/download?group=net.glowstone&name=glowstone&sort=version&repository=snapshots&maven.baseVersion=${MAVEN_VERSION}&direction=desc&maven.classifier=\"\r\nfi\r\n\r\necho -e \"Generating configuration...\"\r\njava -jar ${SERVER_JARFILE} --generate-config\r\n\r\necho -e \"Install Complete\"", + "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ $VERSION == *SNAPSHOT ]; then\r\n echo -e \"Using Maven\"\r\n \r\n DOWNLOAD_URL=\"https:\/\/repo.glowstone.net\/service\/rest\/v1\/search\/assets\/download?group=net.glowstone&name=glowstone&sort=version&repository=snapshots&maven.baseVersion=${VERSION}&direction=desc&maven.classifier=\"\r\nelse \r\n echo -e \"Using GitHub.\"\r\n\r\n if [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\n else\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\n fi\r\n \r\n ## get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\nfi\r\n\r\necho -e \"Downloading...\"\r\ncurl --silent -L -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Generating configuration...\"\r\njava -jar ${SERVER_JARFILE} --generate-config\r\n\r\necho -e \"Install Complete\"", "container": "eclipse-temurin:8-jdk", "entrypoint": "bash" } @@ -35,19 +35,55 @@ "name": "Server Jar File", "description": "The name of the server jarfile to run the server with.", "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", + "default_value": "glowstone.jar", "user_viewable": true, "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { - "name": "Maven Version", - "description": "The version to download from the Maven Repository, or latest (downloads from GitHub)", - "env_variable": "MAVEN_VERSION", + "name": "Glowstone Version", + "description": "The version of Glowstone to download. If it ends in SNAPSHOT, it will attempt to download from the maven repository.", + "env_variable": "VERSION", "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" + }, + { + "name": "GitHub User", + "description": "GitHub user to use for api calls.\r\n\r\nThis only needs to be set if you hit the GitHub API too often across multiple servers.", + "env_variable": "GITHUB_USER", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "string|nullable" + }, + { + "name": "GitHub OAuth Token", + "description": "This can be either an OAuth or a Personal Access Token.\r\n\r\nThis is required for the install is you set a user.", + "env_variable": "GITHUB_OAUTH_TOKEN", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "string|nullable" + }, + { + "name": "GitHub Package", + "description": "The repository to download from.", + "env_variable": "GITHUB_PACKAGE", + "default_value": "GlowstoneMC\/Glowstone", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Match", + "description": "", + "env_variable": "MATCH", + "default_value": "glowstone.jar", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" } ] } \ No newline at end of file From 1a84600dbea57a87ca4030e33688b979bb5c7c81 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Fri, 7 Jan 2022 15:16:11 -0500 Subject: [PATCH 4/4] Add files via upload --- game_eggs/minecraft/java/glowstone/egg-glowstone.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json index 2e96e84c..18b66715 100644 --- a/game_eggs/minecraft/java/glowstone/egg-glowstone.json +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-23T10:20:23-05:00", + "exported_at": "2022-01-07T15:15:07-05:00", "name": "Glowstone", "author": "support@pterodactyl.io", "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", @@ -74,7 +74,7 @@ "default_value": "GlowstoneMC\/Glowstone", "user_viewable": true, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string" }, { "name": "Match",