From a61e6dc0152b2bf3bf322a516faef78afc0629d5 Mon Sep 17 00:00:00 2001
From: Zake <74693042+xcgc@users.noreply.github.com>
Date: Fri, 11 Jun 2021 21:31:17 +0800
Subject: [PATCH] Add Java 16 to build Spigot 1.17

---
 minecraft/java/spigot/egg-spigot.json | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/minecraft/java/spigot/egg-spigot.json b/minecraft/java/spigot/egg-spigot.json
index e59a33e0..c54c8e9f 100644
--- a/minecraft/java/spigot/egg-spigot.json
+++ b/minecraft/java/spigot/egg-spigot.json
@@ -1,18 +1,22 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-06T19:20:29-08:00",
+    "exported_at": "2021-06-11T14:13:30+01:00",
     "name": "Spigot",
     "author": "support@pterodactyl.io",
     "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.",
-    "features": ["eula"],
-    "image": "quay.io\/pterodactyl\/core:java-11",
+    "features": [
+        "eula"
+    ],
     "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-16",
         "quay.io\/pterodactyl\/core:java-11",
         "quay.io\/pterodactyl\/core:java"
     ],
+    "file_denylist": [],
     "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}",
@@ -22,9 +26,9 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache --update curl git openjdk8 openssl bash nss\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    cd \/mnt\/server\r\n\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    mv BuildTools.jar \/srv\/\r\n\r\n    java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
-            "container": "alpine:3.9",
-            "entrypoint": "ash"
+            "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update \r\napt install -y curl wget git openssl bash\r\n\r\n## Download Java 16 and 8\r\ncurl -Lo java16.tar.gz https:\/\/github.com\/AdoptOpenJDK\/openjdk16-binaries\/releases\/download\/jdk-16.0.1%2B9_openj9-0.26.0\/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz\r\n\r\ncurl -Lo java8.tar.gz https:\/\/github.com\/AdoptOpenJDK\/openjdk8-binaries\/releases\/download\/jdk8u282-b08_openj9-0.24.0\/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz\r\n\r\n## Create directories for Java 16 and 8.\r\nmkdir -p \/usr\/local\/java16 \/usr\/local\/java8\r\n\r\n## Extract Java 16, 8 to its folder.\r\ntar -xzvf java16.tar.gz -C \/usr\/local\/java16 --strip-components=1\r\ntar -xzvf java8.tar.gz -C \/usr\/local\/java8 --strip-components=1\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    cd \/mnt\/server\r\n\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n    mkdir -p \/srv\/\r\n    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    if [[ \"${DL_VERSION}\" ==  \"latest\" ]] || [[ \"${DL_VERSION}\" == 1.17* ]]; then\r\n        export PATH=\/usr\/local\/java16\/bin:$PATH\r\n        export JAVA_HOME=\/usr\/local\/java16\r\n    else\r\n        export PATH=\/usr\/local\/java8\/bin:$PATH\r\n        export JAVA_HOME=\/usr\/local\/java8\r\n    fi\r\n    \r\n    java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
         }
     },
     "variables": [
@@ -56,4 +60,4 @@
             "rules": "required|string|between:3,7"
         }
     ]
-}
\ No newline at end of file
+}