spigot and paper updates

Updated spigot install script to install nss.
Added README to each paper and spigot.
Removed taco-spigot.

minecraft_java/README.md

@@ -7,19 +7,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains,
 ## Server Ports
 The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
-## Spigot
-A collection of spigot and forked spigot eggs.
-
-[Spigot](https://www.spigotmc.org/)  
-This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar.  
-- (It's noted that building the jar is intensive and time consuming)
-
-[PaperMC GitHub](https://github.com/PaperMC/Paper)  
-High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies  
-
-[Taco Spigot GitHub](https://github.com/TacoSpigot/TacoSpigot)  
-An even-higher higher performance PaperSpigot fork that adds new features.  
-
 ## Forge 
 [Forge MC](https://files.minecraftforge.net/)  
 This is a direct fork of the default forge service  
@@ -38,6 +25,19 @@ Supply values to 2 variables to use
 [FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation)  
 Revelation is a general all-purpose modpack with optimal FPS, server performance and stability.  
 
+## Paper
+Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar.
+
+## Spigot
+A collection of spigot and forked spigot eggs.
+
+[Spigot](https://www.spigotmc.org/)  
+This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar.  
+- (It's noted that building the jar is intensive and time consuming)
+
+[PaperMC GitHub](https://github.com/PaperMC/Paper)  
+High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies  
+
 #### Technic Packs
 [Hexxit](https://www.technicpack.net/modpack/hexxit)  
 Gear up and set forth on a campaign worthy of legend, for Hexxit has been unearthed!  

minecraft_java/paper/README.MD

@@ -0,0 +1,11 @@
+# Paper
+
+Paper is the next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance.
+
+## 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 |
+|-------|---------|
+| Game  | 25565   |

minecraft_java/spigot/spigot/README.MD

@@ -0,0 +1,19 @@
+# Spigot
+
+A high performance Minecraft server implementation
+
+## 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 |
+|-------|---------|
+| Game  | 25565   |
+
+## Server Specific
+
+Spigot was hit with a DMCA and now requires that it be built by the user.
+
+#### This egg will build spigot for you.
+
+You can also supply a download link to a server jar if you want. 

minecraft_java/spigot/spigot/egg-spigot.json

@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-03-28T15:16:44-04:00",
+    "exported_at": "2019-03-29T13:00:51-04:00",
     "name": "Spigot",
     "author": "support@pterodactyl.io",
     "description": "Spigot 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.",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    apk add --no-cache --update curl curl git openjdk8 openssl bash\r\n\r\n    cd \/mnt\/server\r\n\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    mv BuildTools.jar \/srv\/\r\n\r\n    java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
+            "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache --update curl git openjdk8 openssl bash nss\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    cd \/mnt\/server\r\n\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    mv BuildTools.jar \/srv\/\r\n\r\n    java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
             "container": "alpine:3.9",
             "entrypoint": "ash"
         }

minecraft_java/spigot/taco-spigot/egg-taco-spigot.json

@@ -1,45 +0,0 @@
-{
-    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
-    "meta": {
-        "version": "PTDL_v1"
-    },
-    "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": "{\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# 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=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar",
-            "container": "alpine:3.9",
-            "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"
-        }
-    ]
-}