From ec8ec50821f071b31bf486677a0d4341cc36b272 Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Mon, 28 Jun 2021 11:15:50 -0400 Subject: [PATCH 1/7] Add VIAaaS egg and close #1207 --- README.md | 1 + minecraft/proxy/java/viaaas/README.md | 10 +++++ .../proxy/java/viaaas/egg-v-i-aaa-s.json | 42 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 minecraft/proxy/java/viaaas/README.md create mode 100644 minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json diff --git a/README.md b/README.md index c1df35db..772a0500 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) * [Velocity](/minecraft/proxy/java/velocity) * [Waterfall](/minecraft/proxy/java/waterfall) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) diff --git a/minecraft/proxy/java/viaaas/README.md b/minecraft/proxy/java/viaaas/README.md new file mode 100644 index 00000000..13dc8fe3 --- /dev/null +++ b/minecraft/proxy/java/viaaas/README.md @@ -0,0 +1,10 @@ +# VIAaaS +VIAaaS is the Minecraft plugin VIAaaS made standalone as a proxy. + +## Server Ports +The minecraft server requires a single port for access (default 25565), and one TCP port 25543, to be used for HTTPS and WebSocket connections. + +| Port | default | +|------------|---------| +| Game | 25565 | +| WS & HTTPS | 25543 | diff --git a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json new file mode 100644 index 00000000..8dedae77 --- /dev/null +++ b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -0,0 +1,42 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-06-28T11:03:44-04:00", + "name": "VIAaaS", + "author": "regulad@outlook.com", + "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16" + ], + "file_denylist": [], + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"config\/viaaas.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"bind-address\": \"0.0.0.0\"\r\n }\r\n }\r\n}", + "startup": "{\n \"done\": \"Listening on \",\n \"userInteraction\": [\n \"Listening on /0.0.0.0:\"\n ]\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "end" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -Lf -o ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "VIAaaS Jar File", + "description": "The name of the jarfile to be used when downloading & running VIAaaS", + "env_variable": "SERVER_JARFILE", + "default_value": "VIAaaS-all.jar", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" + } + ] +} \ No newline at end of file From 7b5b88917b399cccf475384897b5a506c4dfe84a Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Mon, 28 Jun 2021 11:56:28 -0400 Subject: [PATCH 2/7] Remove bad docker images, fix startup, and add option to change webserver port --- .../proxy/java/viaaas/egg-v-i-aaa-s.json | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json index 8dedae77..708939f9 100644 --- a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json +++ b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -4,20 +4,19 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-28T11:03:44-04:00", + "exported_at": "2021-06-28T11:55:37-04:00", "name": "VIAaaS", "author": "regulad@outlook.com", "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy", "features": null, "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort {{WEBSERVER_PORT}}", "config": { "files": "{\r\n \"config\/viaaas.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"bind-address\": \"0.0.0.0\"\r\n }\r\n }\r\n}", - "startup": "{\n \"done\": \"Listening on \",\n \"userInteraction\": [\n \"Listening on /0.0.0.0:\"\n ]\n}", + "startup": "{\r\n \"done\": \"Application started:\"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "end" }, @@ -31,10 +30,19 @@ "variables": [ { "name": "VIAaaS Jar File", - "description": "The name of the jarfile to be used when downloading & running VIAaaS", + "description": "The name of the jarfile to be used when downloading & running VIAaaS.", "env_variable": "SERVER_JARFILE", "default_value": "VIAaaS-all.jar", - "user_viewable": false, + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Webserver Port", + "description": "The port to listen to webserver connections on.", + "env_variable": "WEBSERVER_PORT", + "default_value": "25543", + "user_viewable": true, "user_editable": false, "rules": "required|string" } From fb13854a089cf40cd22e22e778a224446603ec16 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Tue, 29 Jun 2021 10:51:38 -0400 Subject: [PATCH 3/7] Link to GitHub repo --- minecraft/proxy/java/viaaas/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/minecraft/proxy/java/viaaas/README.md b/minecraft/proxy/java/viaaas/README.md index 13dc8fe3..f3736ab3 100644 --- a/minecraft/proxy/java/viaaas/README.md +++ b/minecraft/proxy/java/viaaas/README.md @@ -1,6 +1,8 @@ # VIAaaS VIAaaS is the Minecraft plugin VIAaaS made standalone as a proxy. +More information is available here: https://github.com/ViaVersion/VIAaaS + ## Server Ports The minecraft server requires a single port for access (default 25565), and one TCP port 25543, to be used for HTTPS and WebSocket connections. From 27297461809885178dd1f5577b9d5f1f31e3fae6 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Tue, 29 Jun 2021 14:11:12 -0400 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 772a0500..a18aa3e7 100644 --- a/README.md +++ b/README.md @@ -140,8 +140,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) * [Velocity](/minecraft/proxy/java/velocity) - * [Waterfall](/minecraft/proxy/java/waterfall) * [VIAaaS](/minecraft/proxy/java/viaaas) + * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) From bda83944d35c53d1006182251b05fe4498a3f4a8 Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Tue, 29 Jun 2021 14:30:02 -0400 Subject: [PATCH 5/7] Couple small things I didn't notice on first whack --- README.md | 2 +- minecraft/README.md | 1 + minecraft/proxy/README.md | 5 +++-- minecraft/proxy/java/README.md | 3 +++ minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a18aa3e7..efaa7a55 100644 --- a/README.md +++ b/README.md @@ -139,8 +139,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [Velocity](/minecraft/proxy/java/velocity) * [VIAaaS](/minecraft/proxy/java/viaaas) + * [Velocity](/minecraft/proxy/java/velocity) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) diff --git a/minecraft/README.md b/minecraft/README.md index 1cd6d519..8b7644b3 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -31,6 +31,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md index 0ade0eb7..a58c2562 100644 --- a/minecraft/proxy/README.md +++ b/minecraft/proxy/README.md @@ -2,10 +2,11 @@ * [Java](/minecraft/proxy/java/) * [FlameCord](/minecraft/proxy/java/flamecord) - * [Waterfall](/minecraft/proxy/java/waterfall) * [Travertine](/minecraft/proxy/java/travertine) - * [Velocity](/minecraft/proxy/java/velocity) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) + * [VIAaaS](/minecraft/proxy/java/viaaas) + * [Velocity](/minecraft/proxy/java/velocity) + * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) diff --git a/minecraft/proxy/java/README.md b/minecraft/proxy/java/README.md index b9be1296..6fe06983 100644 --- a/minecraft/proxy/java/README.md +++ b/minecraft/proxy/java/README.md @@ -17,6 +17,9 @@ A limbo server is a fallback server able to handle a massive amount of simultane [Velocity](https://velocitypowered.com) Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. +#### VIAaaS +[VIAaaS](https://github.com/ViaVersion/VIAaaS) is the Minecraft plugin VIAaaS made standalone as a proxy. + #### Waterfall [Waterfall](https://papermc.io/downloads#Waterfall) Paper fork of the BungeeCord software, with improved Forge support and more features. \ No newline at end of file diff --git a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json index 708939f9..19837abd 100644 --- a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json +++ b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -13,7 +13,7 @@ "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort {{WEBSERVER_PORT}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort={{WEBSERVER_PORT}}", "config": { "files": "{\r\n \"config\/viaaas.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"bind-address\": \"0.0.0.0\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Application started:\"\r\n}", @@ -43,7 +43,7 @@ "env_variable": "WEBSERVER_PORT", "default_value": "25543", "user_viewable": true, - "user_editable": false, + "user_editable": true, "rules": "required|string" } ] From 25f5ad248dbbd20991cbc81bb92e77800fc6966a Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Tue, 29 Jun 2021 16:10:43 -0400 Subject: [PATCH 6/7] Should be it? --- minecraft/proxy/java/README.md | 2 +- minecraft/proxy/java/viaaas/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft/proxy/java/README.md b/minecraft/proxy/java/README.md index 6fe06983..b546c9c4 100644 --- a/minecraft/proxy/java/README.md +++ b/minecraft/proxy/java/README.md @@ -18,7 +18,7 @@ A limbo server is a fallback server able to handle a massive amount of simultane Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. #### VIAaaS -[VIAaaS](https://github.com/ViaVersion/VIAaaS) is the Minecraft plugin VIAaaS made standalone as a proxy. +[VIAaaS](https://github.com/ViaVersion/VIAaaS) is the Minecraft plugin ViaVersion made standalone as a proxy. #### Waterfall [Waterfall](https://papermc.io/downloads#Waterfall) diff --git a/minecraft/proxy/java/viaaas/README.md b/minecraft/proxy/java/viaaas/README.md index f3736ab3..d84615e9 100644 --- a/minecraft/proxy/java/viaaas/README.md +++ b/minecraft/proxy/java/viaaas/README.md @@ -1,5 +1,5 @@ # VIAaaS -VIAaaS is the Minecraft plugin VIAaaS made standalone as a proxy. +VIAaaS is the Minecraft plugin ViaVersion made standalone as a proxy. More information is available here: https://github.com/ViaVersion/VIAaaS From 6222033ce2c7f043b64ebead10e4f623a333e67b Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Fri, 2 Jul 2021 13:29:58 -0400 Subject: [PATCH 7/7] https://github.com/parkervcp/eggs/pull/1210#issuecomment-871663016 --- README.md | 2 +- minecraft/README.md | 2 +- minecraft/proxy/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index efaa7a55..a18aa3e7 100644 --- a/README.md +++ b/README.md @@ -139,8 +139,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) diff --git a/minecraft/README.md b/minecraft/README.md index 8b7644b3..eec1eeec 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -31,8 +31,8 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md index a58c2562..b0364aaa 100644 --- a/minecraft/proxy/README.md +++ b/minecraft/proxy/README.md @@ -4,8 +4,8 @@ * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser)