From 9a56bd660226741f5d1f1850edd36d1039bfca2d Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 15 Oct 2020 00:13:58 -0400 Subject: [PATCH] add waterdog Add waterdog resolves #348 --- README.md | 3 +- minecraft/README.md | 3 +- minecraft/proxy/waterdog/README.md | 11 ++++++ minecraft/proxy/waterdog/egg-waterdog.json | 45 ++++++++++++++++++++++ 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 minecraft/proxy/waterdog/README.md create mode 100644 minecraft/proxy/waterdog/egg-waterdog.json diff --git a/README.md b/README.md index 371a0604..f03125b7 100644 --- a/README.md +++ b/README.md @@ -103,10 +103,11 @@ If you are reading this it looks like you are looking to add an egg to your serv * [VanillaCord](/minecraft/java/vanillacord/) * [Proxies](/minecraft/proxy/) (these are for the java version of minecraft) - * [Waterfall](/minecraft/proxy/waterfall/) * [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) * [Travertine](/minecraft/proxy/travertine/) Java * [Velocity](/minecraft/proxy/velocity/) + * [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock + * [Waterfall](/minecraft/proxy/waterfall/) [OpenRA](/openra/) * [OpenRA Dune2000](/openra/openra_dune2000) diff --git a/minecraft/README.md b/minecraft/README.md index 06db4c0d..fa00deba 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -25,7 +25,8 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [VanillaCord](/minecraft/java/vanillacord/) [Proxies](/minecraft/proxy/) Minecraft Server Proxies -* [Waterfall](/minecraft/proxy/waterfall/) Java * [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) Java * [Travertine](/minecraft/proxy/travertine/) Java * [Velocity](/minecraft/proxy/velocity/) Java +* [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock +* [Waterfall](/minecraft/proxy/waterfall/) Java \ No newline at end of file diff --git a/minecraft/proxy/waterdog/README.md b/minecraft/proxy/waterdog/README.md new file mode 100644 index 00000000..736f820f --- /dev/null +++ b/minecraft/proxy/waterdog/README.md @@ -0,0 +1,11 @@ +# Waterdog server +Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others. + +## Server Ports +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + + +| Port | default | +|----------|---------| +| Java | 25565 | +| Bedrock | 19132 | \ No newline at end of file diff --git a/minecraft/proxy/waterdog/egg-waterdog.json b/minecraft/proxy/waterdog/egg-waterdog.json new file mode 100644 index 00000000..007dc04b --- /dev/null +++ b/minecraft/proxy/waterdog/egg-waterdog.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-10-15T03:54:24+00:00", + "name": "Waterdog", + "author": "parker@pterodactyl.io", + "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.", + "image": "quay.io\/pterodactyl\/core:java", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Listening on \"\r\n}", + "logs": "{}", + "stop": "end" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n echo -e \"adding.jar to server file name\"\r\n SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n echo -e \"downloading latest waterdog build\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/lastSuccessfulBuild\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nelse \r\n echo -e \"downloading waterdog build ${WATERDOG_VERSION}\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/${WATERDOG_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Waterdog Version", + "description": "The build to pull and install. (Ex. 1604)\r\n\r\nThis is the build number on https:\/\/jenkins.pmmp.io", + "env_variable": "WATERDOG_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Server Jar File", + "description": "The jar to run to", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file