From 098cdad6f772b2cc0a1e75d494325b032527351d Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Wed, 28 Feb 2018 00:50:15 -0600 Subject: [PATCH 01/14] Added PaperSpigot PaperSpigot is a Performance/Game Fix fork of Spigot. --- .../egg-paper-spigot--spigot-fork.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json diff --git a/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json b/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json new file mode 100644 index 00000000..b3b76f62 --- /dev/null +++ b/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-28T00:49:31-06:00", + "name": "PaperSpigot (Spigot Fork)", + "author": "hostmaster@waterfallgaming.net", + "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.\r\n\r\nSpigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", + "image": "quay.io\/pterodactyl\/core:java-glibc", + "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" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Bungeecord 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", + "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", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|between:3,7" + } + ] +} \ No newline at end of file From 89ed7d31e632fb5778d1e82ea83acbf459805f0c Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Wed, 28 Feb 2018 00:52:11 -0600 Subject: [PATCH 02/14] Added Waterfall Waterfall is a performance fork of bungeecord. --- .../egg-waterfall--bungeecord-fork.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json diff --git a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json new file mode 100644 index 00000000..af00fb9e --- /dev/null +++ b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-28T00:49:00-06:00", + "name": "Waterfall (Bungeecord Fork)", + "author": "hostmaster@waterfallgaming.net", + "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 \"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# 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": "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|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 From f356ca902a544cfd62f01bff46be1bc43284a60f Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Wed, 28 Feb 2018 01:02:19 -0600 Subject: [PATCH 03/14] Added TacoSpigot A fork of PaperSpigot which is a fork of Spigot. Adds even more performance enhancements. --- .../egg-taco-spigot--paper-spigot-fork.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json diff --git a/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json b/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json new file mode 100644 index 00000000..1ccb1248 --- /dev/null +++ b/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-28T01:01:31-06:00", + "name": "TacoSpigot (PaperSpigot Fork)", + "author": "hostmaster@waterfallgaming.net", + "description": "A even-higher higher performance PaperSpigot fork that adds new features.", + "image": "quay.io\/pterodactyl\/core:java-glibc", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": null, + "startup": null, + "logs": null, + "stop": null + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Bungeecord 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.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.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": "TacoSpigot Version", + "description": "The version of TacoSpigot to download, Use \"latest\" for latest.", + "env_variable": "DL_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|between:3,7" + } + ] +} \ No newline at end of file From 667299809d61135340097187052927b47917ac62 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:15:02 -0600 Subject: [PATCH 04/14] Update egg-waterfall--bungeecord-fork.json Changed Name. --- .../waterfall/egg-waterfall--bungeecord-fork.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json index af00fb9e..7863fbc3 100644 --- a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json +++ b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-28T00:49:00-06:00", - "name": "Waterfall (Bungeecord Fork)", + "exported_at": "2018-03-08T01:14:39-06:00", + "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "image": "quay.io\/pterodactyl\/core:java", @@ -42,4 +42,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} From 7d769ad63922ec34a5ef79b4872ee5c1e7a61bf8 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:15:51 -0600 Subject: [PATCH 05/14] Rename egg-waterfall--bungeecord-fork.json to egg-waterfall.json --- .../{egg-waterfall--bungeecord-fork.json => egg-waterfall.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Minecraft Proxy/waterfall/{egg-waterfall--bungeecord-fork.json => egg-waterfall.json} (100%) diff --git a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json b/Minecraft Proxy/waterfall/egg-waterfall.json similarity index 100% rename from Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json rename to Minecraft Proxy/waterfall/egg-waterfall.json From 96eb2f1b85ebbcd5c7984b175817f1a251afd3df Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:17:38 -0600 Subject: [PATCH 06/14] Update and rename egg-taco-spigot--paper-spigot-fork.json to egg-taco-spigot.json --- ...-spigot--paper-spigot-fork.json => egg-taco-spigot.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename Minecraft/taco-spigot/{egg-taco-spigot--paper-spigot-fork.json => egg-taco-spigot.json} (95%) diff --git a/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json b/Minecraft/taco-spigot/egg-taco-spigot.json similarity index 95% rename from Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json rename to Minecraft/taco-spigot/egg-taco-spigot.json index 1ccb1248..a3b26b6e 100644 --- a/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json +++ b/Minecraft/taco-spigot/egg-taco-spigot.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-28T01:01:31-06:00", - "name": "TacoSpigot (PaperSpigot Fork)", + "exported_at": "2018-03-08T01:16:59-06:00", + "name": "Taco Spigot", "author": "hostmaster@waterfallgaming.net", "description": "A even-higher higher performance PaperSpigot fork that adds new features.", "image": "quay.io\/pterodactyl\/core:java-glibc", @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From 327ec9286505cfcc8450ffe352ade5d011b4f334 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:18:40 -0600 Subject: [PATCH 07/14] Update egg-taco-spigot.json --- Minecraft/taco-spigot/egg-taco-spigot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/taco-spigot/egg-taco-spigot.json b/Minecraft/taco-spigot/egg-taco-spigot.json index a3b26b6e..3ca553db 100644 --- a/Minecraft/taco-spigot/egg-taco-spigot.json +++ b/Minecraft/taco-spigot/egg-taco-spigot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-08T01:16:59-06:00", + "exported_at": "2018-03-08T01:18:25-06:00", "name": "Taco Spigot", "author": "hostmaster@waterfallgaming.net", "description": "A even-higher higher performance PaperSpigot fork that adds new features.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Bungeecord 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.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar", + "script": "#!\/bin\/ash\r\n# Taco 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.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar", "container": "alpine:3.4", "entrypoint": "ash" } From a6d82529772f0e1dfcc844b11b7a8e52988c2dc6 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:20:58 -0600 Subject: [PATCH 08/14] Update and rename egg-paper-spigot--spigot-fork.json to egg-paper-spigot.json --- ...-spigot--spigot-fork.json => egg-paper-spigot.json} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename Minecraft/paper-spigot/{egg-paper-spigot--spigot-fork.json => egg-paper-spigot.json} (66%) diff --git a/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json b/Minecraft/paper-spigot/egg-paper-spigot.json similarity index 66% rename from Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json rename to Minecraft/paper-spigot/egg-paper-spigot.json index b3b76f62..e4e5bfdf 100644 --- a/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json +++ b/Minecraft/paper-spigot/egg-paper-spigot.json @@ -3,10 +3,10 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-28T00:49:31-06:00", - "name": "PaperSpigot (Spigot Fork)", + "exported_at": "2018-03-08T01:20:41-06:00", + "name": "Paper Spigot", "author": "hostmaster@waterfallgaming.net", - "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.\r\n\r\nSpigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", + "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", "image": "quay.io\/pterodactyl\/core:java-glibc", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Bungeecord 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# 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", "container": "alpine:3.4", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From 45dcc85fabbdbc36cadcdfd627bbabf28b0d5191 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:31:19 -0600 Subject: [PATCH 09/14] Add CONFIG to Waterfall Proxy --- 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 7863fbc3..fc99620e 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-08T01:14:39-06:00", - "name": "Waterfall", + "exported_at": "2018-03-10T00:30:35-06:00", + "name": "Paper Spigot", "author": "hostmaster@waterfallgaming.net", - "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", - "image": "quay.io\/pterodactyl\/core:java", + "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", + "image": "quay.io\/pterodactyl\/core:java-glibc", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { - "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" + "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" }, "scripts": { "installation": { - "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", + "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", "container": "alpine:3.4", "entrypoint": "ash" } }, "variables": [ { - "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|alpha_num|between:1,6" - }, - { - "name": "Waterfall Jar File", - "description": "The name of the Jarfile to use when running Waterfall.", + "name": "Server Jar File", + "description": "The name of the server jarfile to run the server with.", "env_variable": "SERVER_JARFILE", - "default_value": "waterfall.jar", + "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", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From 1239fd7c19478b481e36604b4941d507fc6d2cd5 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:33:09 -0600 Subject: [PATCH 10/14] Add PaperSpigot CONFIG --- Minecraft/paper-spigot/egg-paper-spigot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/paper-spigot/egg-paper-spigot.json b/Minecraft/paper-spigot/egg-paper-spigot.json index e4e5bfdf..fc99620e 100644 --- a/Minecraft/paper-spigot/egg-paper-spigot.json +++ b/Minecraft/paper-spigot/egg-paper-spigot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-08T01:20:41-06:00", + "exported_at": "2018-03-10T00:30:35-06:00", "name": "Paper Spigot", "author": "hostmaster@waterfallgaming.net", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From f1efc79a3bfa0a07239ecd0a0530e201233a58c2 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:34:27 -0600 Subject: [PATCH 11/14] Add TacoSpigot CONFIG --- Minecraft/taco-spigot/egg-taco-spigot.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Minecraft/taco-spigot/egg-taco-spigot.json b/Minecraft/taco-spigot/egg-taco-spigot.json index 3ca553db..79a70f11 100644 --- a/Minecraft/taco-spigot/egg-taco-spigot.json +++ b/Minecraft/taco-spigot/egg-taco-spigot.json @@ -3,17 +3,17 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-08T01:18:25-06:00", + "exported_at": "2018-03-10T00:34:01-06:00", "name": "Taco Spigot", "author": "hostmaster@waterfallgaming.net", "description": "A even-higher higher performance PaperSpigot fork that adds new features.", "image": "quay.io\/pterodactyl\/core:java-glibc", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { - "files": null, - "startup": null, - "logs": null, - "stop": null + "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" }, "scripts": { "installation": { @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From 35e56fa84cf53bc102f6d82fb3b78b512b5c055f Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:36:44 -0600 Subject: [PATCH 12/14] 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 From 4fcce7cb305da8815035a84ce4a8cacb18a8b985 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:56:43 -0600 Subject: [PATCH 13/14] Rename HOWTO.md to CONTRIBUTING.md Github monitors the "CONTRIBUTING.md" for the "Community" feature. This falls under that. I feel this would be better listed as that feature instead of a seperate Markdown that Github has no special features for. --- HOWTO.md => CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename HOWTO.md => CONTRIBUTING.md (100%) diff --git a/HOWTO.md b/CONTRIBUTING.md similarity index 100% rename from HOWTO.md rename to CONTRIBUTING.md From 51f966b4af2133d34b99b90d668bca3bafbeaf90 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 01:01:56 -0600 Subject: [PATCH 14/14] Add MIT License The MIT License should be added to follow the panels license. This is just a formality. --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..7302e436 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT + +Copyright (c) 2015 - 2017 Dane Everitt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file