From 8dfe21164c2eee1c85c5cd67d68ba5f4c32d7436 Mon Sep 17 00:00:00 2001 From: cocorico8 <101837373+cocorico8@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:26:51 +0200 Subject: [PATCH 1/4] Update README.md to point to the right place --- proxy/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index a1c5b84f..5b926e64 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -1,12 +1,12 @@ # Minecraft Proxies -* [Java](/game_eggs/minecraft/proxy/java/) - * [Travertine](/game_eggs/minecraft/proxy/java/travertine) - * [Velocity](/game_eggs/minecraft/proxy/java/velocity) - * [VIAaaS](/game_eggs/minecraft/proxy/java/viaaas) - * [Waterfall](/game_eggs/minecraft/proxy/java/waterfall) -* [Bedrock](/game_eggs/minecraft/proxy/bedrock) - * [Waterdog PE](/game_eggs/minecraft/proxy/bedrock/waterdogpe) -* [Cross Platform](/game_eggs/minecraft/proxy/cross_platform) - * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) - * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) +* [Java](/java/) + * [Travertine](java/travertine) + * [Velocity](/java/velocity) + * [VIAaaS](/java/viaaas) + * [Waterfall](/java/waterfall) +* [Bedrock](/bedrock) + * [Waterdog PE](/bedrock/waterdogpe) +* [Cross Platform](/cross_platform) + * [GeyserMC](/cross_platform/geyser) + * [Waterdog](/cross_platform/waterdog) From 05c57009afe8c9c5480b1ceafe944d1c412db340 Mon Sep 17 00:00:00 2001 From: cocorico8 <101837373+cocorico8@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:32:52 +0200 Subject: [PATCH 2/4] Update README.md why not --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b289c78..5e3229d0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ It’s a game about placing blocks and going on adventures It’s set in infinitely-generated worlds of wide open terrain - icy mountains, swampy bayous, vast pastures and much more - filled with secrets, wonders and peril! -## [Bedrock](bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) +## [Bedrock](bedrock) Servers for Bedrock Minecraft (Windows 10, Windows 11, mobile, console) * [Bedrock](bedrock/bedrock) * [gomint](bedrock/gomint) From 18de8641dad243eb8e4b08bc74a32996e93fde5b Mon Sep 17 00:00:00 2001 From: cocorico8 <101837373+cocorico8@users.noreply.github.com> Date: Wed, 9 Oct 2024 23:08:41 +0200 Subject: [PATCH 3/4] update of the mohist egg now capable of fetching information of project, version and builds. you can now also choose beetween mohist and banner. --- java/mohist/egg-mohist.json | 82 ++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/java/mohist/egg-mohist.json b/java/mohist/egg-mohist.json index a1f47a8d..01ebbb74 100644 --- a/java/mohist/egg-mohist.json +++ b/java/mohist/egg-mohist.json @@ -4,8 +4,8 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-06-01T19:40:03+00:00", - "name": "Mohist", + "exported_at": "2024-10-09T21:04:27+00:00", + "name": "MohistMC", "author": "alex.chang-lam@protonmail.com", "uuid": "4f2bddcc-90ce-4cac-8ad7-fafa0d91381b", "description": "Spigot fork with performance optimizations.", @@ -15,25 +15,26 @@ "pid_limit" ], "docker_images": { - "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17", - "Java 16": "ghcr.io\/pterodactyl\/yolks:java_16", - "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8", - "Java 18": "ghcr.io\/pterodactyl\/yolks:java_18" + "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" }, "file_denylist": [], - "startup": "java -Xms128M -XX:MaxRAMPercentage=95.0 -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -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" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y install curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/latest\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\n\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/${SERVER_JARFILE} ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", - "container": "ghcr.io\/parkervcp\/installers:debian", - "entrypoint": "bash" + "script": "#!\/bin\/ash\r\n# MohistMC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\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:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT} | jq -r --arg version ${MINECRAFT_VERSION} '.versions | index($version)'`\r\n\tLATEST_VERSION=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT} | jq -r '.versions[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" != \"null\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Specified version not found. Defaulting to the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\r\n\tBUILD_EXISTS=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MINECRAFT_VERSION}\/builds | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep -m1 true`\r\n\tLATEST_BUILD=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MINECRAFT_VERSION}\/builds | jq -r '.builds[-1]' | jq -r '.number'`\r\n\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ] && [ \"${BUILD_EXISTS}\" != \"null\" ]; 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\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\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:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MINECRAFT_VERSION}\/builds\/${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}", + "container": "ghcr.io\/pelican-eggs\/installers:alpine", + "entrypoint": "ash" } }, "variables": [ @@ -44,30 +45,71 @@ "default_value": "server.jar", "user_viewable": true, "user_editable": false, - "rules": "required|string|max:20", - "sort": null, + "rules": [ + "required", + "string", + "max:20" + ], + "sort": 1, "field_type": "text" }, { "name": "Minecraft Version", "description": "The version of Minecraft to download.", - "env_variable": "MC_VERSION", - "default_value": "1.19.4", + "env_variable": "MINECRAFT_VERSION", + "default_value": "1.20.1", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20", - "sort": null, + "rules": [ + "required", + "string", + "max:20" + ], + "sort": 2, "field_type": "text" }, { "name": "Build Number", "description": "Optional: \r\nThe build number for the Mohist release. Overrides Build Type.", - "env_variable": "BUILD_VERSION", + "env_variable": "BUILD_NUMBER", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:20", - "sort": null, + "rules": [ + "nullable", + "string", + "max:20" + ], + "sort": 3, + "field_type": "text" + }, + { + "name": "Project", + "description": "The type of version to download.", + "env_variable": "PROJECT", + "default_value": "mohist", + "user_viewable": true, + "user_editable": true, + "rules": [ + "required", + "string", + "in:mohist,banner" + ], + "sort": 4, + "field_type": "text" + }, + { + "name": "Download Path", + "description": "A URL to use to download a server.jar rather than the ones in the install script. This is not user viewable.", + "env_variable": "DL_PATH", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": [ + "nullable", + "string" + ], + "sort": 5, "field_type": "text" } ] From f1b1ccb85f384cc7d1f9e11e26374abd5a11f2b7 Mon Sep 17 00:00:00 2001 From: cocorico8 <101837373+cocorico8@users.noreply.github.com> Date: Sun, 20 Oct 2024 20:50:19 +0200 Subject: [PATCH 4/4] updated egg for asked changes --- java/mohist/egg-mohist.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/mohist/egg-mohist.json b/java/mohist/egg-mohist.json index 01ebbb74..03e65a59 100644 --- a/java/mohist/egg-mohist.json +++ b/java/mohist/egg-mohist.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-10-09T21:04:27+00:00", + "exported_at": "2024-10-20T18:47:42+00:00", "name": "MohistMC", "author": "alex.chang-lam@protonmail.com", "uuid": "4f2bddcc-90ce-4cac-8ad7-fafa0d91381b", @@ -23,7 +23,7 @@ "java 21": "ghcr.io\/pterodactyl\/yolks:java_21" }, "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "startup": "java -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.allocations.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", @@ -32,7 +32,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# MohistMC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\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:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT} | jq -r --arg version ${MINECRAFT_VERSION} '.versions | index($version)'`\r\n\tLATEST_VERSION=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT} | jq -r '.versions[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" != \"null\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Specified version not found. Defaulting to the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\r\n\tBUILD_EXISTS=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MINECRAFT_VERSION}\/builds | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep -m1 true`\r\n\tLATEST_BUILD=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MINECRAFT_VERSION}\/builds | jq -r '.builds[-1]' | jq -r '.number'`\r\n\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ] && [ \"${BUILD_EXISTS}\" != \"null\" ]; 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\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\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:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MINECRAFT_VERSION}\/builds\/${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}", + "script": "#!\/bin\/ash\r\n# MohistMC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\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:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT} | jq -r --arg version ${MC_VERSION} '.versions | index($version)'`\r\n\tLATEST_VERSION=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT} | jq -r '.versions[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" != \"null\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MC_VERSION}\"\r\n\telse\r\n\t\techo -e \"Specified version not found. Defaulting to the latest ${PROJECT} version\"\r\n\t\tMC_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\r\n\tBUILD_EXISTS=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MC_VERSION}\/builds | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep -m1 true`\r\n\tLATEST_BUILD=`curl -s https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MC_VERSION}\/builds | jq -r '.builds[-1]' | jq -r '.number'`\r\n\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ] && [ \"${BUILD_EXISTS}\" != \"null\" ]; then\r\n\t\techo -e \"Build is valid for version ${MC_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MC_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\r\n\tJAR_NAME=${PROJECT}-${MC_VERSION}-${BUILD_NUMBER}.jar\r\n\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MC_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/mohistmc.com\/api\/v2\/projects\/${PROJECT}\/${MC_VERSION}\/builds\/${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}", "container": "ghcr.io\/pelican-eggs\/installers:alpine", "entrypoint": "ash" } @@ -56,7 +56,7 @@ { "name": "Minecraft Version", "description": "The version of Minecraft to download.", - "env_variable": "MINECRAFT_VERSION", + "env_variable": "MC_VERSION", "default_value": "1.20.1", "user_viewable": true, "user_editable": true,