From 35e56fa84cf53bc102f6d82fb3b78b512b5c055f Mon Sep 17 00:00:00 2001
From: William Cody Ardoin <w.rouing@gmail.com>
Date: Sat, 10 Mar 2018 00:36:44 -0600
Subject: [PATCH] Add Waterfall Config

---
 Minecraft Proxy/waterfall/egg-waterfall.json | 44 ++++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/Minecraft Proxy/waterfall/egg-waterfall.json b/Minecraft Proxy/waterfall/egg-waterfall.json
index fc99620e..5c42ea03 100644
--- a/Minecraft Proxy/waterfall/egg-waterfall.json	
+++ b/Minecraft Proxy/waterfall/egg-waterfall.json	
@@ -3,43 +3,43 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-03-10T00:30:35-06:00",
-    "name": "Paper Spigot",
+    "exported_at": "2018-03-10T00:36:18-06:00",
+    "name": "Waterfall",
     "author": "hostmaster@waterfallgaming.net",
-    "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.",
-    "image": "quay.io\/pterodactyl\/core:java-glibc",
+    "description": "Waterfall 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": "{\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}",
-        "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "stop"
+        "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"listeners[0].query_enabled\": true,\r\n            \"listeners[0].query_port\": \"{{server.build.default.port}}\",\r\n            \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n            \"servers.*.address\": {\r\n                \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n                \"localhost\": \"{{config.docker.interface}}\"\r\n            }\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Listening on \",\r\n    \"userInteraction\": [\r\n        \"Listening on \/0.0.0.0:25577\"\r\n    ]\r\n}",
+        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"proxy.log.0\"\r\n}",
+        "stop": "end"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Paper Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n    DL_VERSION=\"lastSucessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.destroystokyo.com\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.jar",
+            "script": "#!\/bin\/ash\r\n# Waterfall Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${WATERFALL_VERSION}\" ] || [ \"${WATERFALL_VERSION}\" == \"latest\" ]; then\r\n    WATERFALL_VERSION=\"lastStableBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.destroystokyo.com\/job\/Waterfall\/${WATERFALL_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterfall.jar",
             "container": "alpine:3.4",
             "entrypoint": "ash"
         }
     },
     "variables": [
         {
-            "name": "Server Jar File",
-            "description": "The name of the server jarfile to run the server with.",
-            "env_variable": "SERVER_JARFILE",
-            "default_value": "server.jar",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
-        },
-        {
-            "name": "PaperSpigot Version",
-            "description": "The version of PaperSpigot to download, Use \"latest\" for latest.",
-            "env_variable": "DL_VERSION",
+            "name": "Waterfall Version",
+            "description": "The version of Waterfall to download and use.",
+            "env_variable": "WATERFALL_VERSION",
             "default_value": "latest",
             "user_viewable": 1,
             "user_editable": 1,
-            "rules": "required|string|between:3,7"
+            "rules": "required|alpha_num|between:1,6"
+        },
+        {
+            "name": "Waterfall Jar File",
+            "description": "The name of the Jarfile to use when running Waterfall.",
+            "env_variable": "SERVER_JARFILE",
+            "default_value": "waterfall.jar",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
 }
\ No newline at end of file