From c00718b551ee6206bd69868f2d5dfbdf63a3365b Mon Sep 17 00:00:00 2001 From: Sayaniku <44569441+Sayaniku@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:54:06 +0100 Subject: [PATCH] Update egg-purpur.json (#40) * Update egg-purpur.json Quick hotfix for who use the unlimited option for creating purpur server (replacing the the Xmx({SERVER_MEMORY}) because on unlimited it's use the variable 0) * Do it right with export from panel --------- Co-authored-by: Quinten <67589015+QuintenQVD0@users.noreply.github.com> --- java/purpur/egg-pterodactyl-purpur.json | 31 ++++++++--------- java/purpur/egg-purpur.json | 46 +++++++++++++++---------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/java/purpur/egg-pterodactyl-purpur.json b/java/purpur/egg-pterodactyl-purpur.json index 0485c2ed..91b1cf2e 100644 --- a/java/purpur/egg-pterodactyl-purpur.json +++ b/java/purpur/egg-pterodactyl-purpur.json @@ -1,10 +1,10 @@ { - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL", + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "update_url": null, - "version": "PTDL_v2" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2024-06-01T19:39:58+00:00", + "exported_at": "2024-11-20T10:52:34+01:00", "name": "Purpur", "author": "purpur@birdflop.com", "description": "A drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features.", @@ -14,26 +14,25 @@ "pid_limit" ], "docker_images": { - "Java 11": "ghcr.io/pterodactyl/yolks:java_11", - "Java 16": "ghcr.io/pterodactyl/yolks:java_16", - "Java 17": "ghcr.io/pterodactyl/yolks:java_17", - "Java 18": "ghcr.io/pterodactyl/yolks:java_18", - "Java 21": "ghcr.io/pterodactyl/yolks:java_21", - "Java 8": "ghcr.io/pterodactyl/yolks:java_8" + "Java 11": "ghcr.io\/parkervcp\/yolks:java_11", + "Java 16": "ghcr.io\/parkervcp\/yolks:java_16", + "Java 17": "ghcr.io\/parkervcp\/yolks:java_17", + "Java 21": "ghcr.io\/parkervcp\/yolks:java_21", + "Java 8": "ghcr.io\/parkervcp\/yolks:java_8" }, "file_denylist": [], - "startup": "java --add-modules=jdk.incubator.vector -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "startup": "java --add-modules=jdk.incubator.vector -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true -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 \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "logs": "{}", "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "container": "ghcr.io/parkervcp/installers:alpine", - "entrypoint": "ash", - "script": "#!/bin/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: /mnt/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's/{{/${/g' -e 's/}}/}/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https://api.purpurmc.org/v2/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https://api.purpurmc.org/v2/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https://api.purpurmc.org/v2/${PROJECT}/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https://api.purpurmc.org/v2/${PROJECT}/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https://api.purpurmc.org/v2/${PROJECT}/${MINECRAFT_VERSION}/${BUILD_NUMBER}/download\r\nfi\r\n\r\ncd /mnt/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https://raw.githubusercontent.com/parkervcp/eggs/master/minecraft/java/server.properties\r\nfi" + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "container": "ghcr.io\/parkervcp\/installers:alpine", + "entrypoint": "ash" } }, "variables": [ @@ -54,7 +53,7 @@ "default_value": "server.jar", "user_viewable": true, "user_editable": true, - "rules": "required|regex:/^([\\w\\d._-]+)(\\.jar)$/|max:80", + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/|max:80", "field_type": "text" }, { diff --git a/java/purpur/egg-purpur.json b/java/purpur/egg-purpur.json index 44679d06..7601f550 100644 --- a/java/purpur/egg-purpur.json +++ b/java/purpur/egg-purpur.json @@ -1,10 +1,10 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL", "meta": { - "version": "PTDL_v2", + "version": "PLCN_v1", "update_url": null }, - "exported_at": "2024-06-01T19:39:58+00:00", + "exported_at": "2024-11-20T09:50:13+00:00", "name": "Purpur", "author": "purpur@birdflop.com", "uuid": "49adec15-ccfe-45c3-ac3f-2fc20582739d", @@ -15,17 +15,16 @@ "pid_limit" ], "docker_images": { - "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8", - "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", - "Java 16": "ghcr.io\/pterodactyl\/yolks:java_16", - "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17", - "Java 18": "ghcr.io\/pterodactyl\/yolks:java_18", - "Java 21": "ghcr.io\/pterodactyl\/yolks:java_21" + "Java 8": "ghcr.io\/parkervcp\/yolks:java_8", + "Java 11": "ghcr.io\/parkervcp\/yolks:java_11", + "Java 16": "ghcr.io\/parkervcp\/yolks:java_16", + "Java 17": "ghcr.io\/parkervcp\/yolks:java_17", + "Java 21": "ghcr.io\/parkervcp\/yolks:java_21" }, "file_denylist": [], - "startup": "java --add-modules=jdk.incubator.vector -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "startup": "java --add-modules=jdk.incubator.vector -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true -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 \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "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.allocations.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", "logs": "{}", "stop": "stop" @@ -39,37 +38,46 @@ }, "variables": [ { + "sort": 1, "name": "Minecraft Version", "description": "The version of Minecraft to download. \r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", "env_variable": "MINECRAFT_VERSION", "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20", - "sort": null, - "field_type": "text" + "rules": [ + "required", + "string", + "max:20" + ] }, { + "sort": 2, "name": "Server Jar File", "description": "The name of the .jar file 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)$\/|max:80", - "sort": null, - "field_type": "text" + "rules": [ + "required", + "regex:\/^([\\w\\d._-]+)(\\.jar)$\/", + "max:80" + ] }, { + "sort": 3, "name": "Build Number", "description": "The build number for the Purpur release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", "env_variable": "BUILD_NUMBER", "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20", - "sort": null, - "field_type": "text" + "rules": [ + "required", + "string", + "max:20" + ] } ] } \ No newline at end of file