From f9719d76f91fec048e2766d71fc0b0025ef7cdf3 Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Sun, 6 Dec 2020 19:32:15 -0800 Subject: [PATCH 1/2] Add EULA feature flag add flag and rename forge version --- .../java/forge/forge/egg-forge-enhanced.json | 23 ++++++++++--------- minecraft/java/paper/egg-paper.json | 4 ++-- minecraft/java/spigot/egg-spigot.json | 15 ++++++------ .../java/spongeforge/egg-sponge-forge.json | 11 +++++---- .../spongevanilla/egg-sponge-vanilla.json | 11 +++++---- minecraft/java/tuinity/egg-tuinity.json | 9 ++++---- .../java/vanillacord/egg-vanilla-cord.json | 13 ++++++----- 7 files changed, 46 insertions(+), 40 deletions(-) diff --git a/minecraft/java/forge/forge/egg-forge-enhanced.json b/minecraft/java/forge/forge/egg-forge-enhanced.json index a0d7fac3..36f4b2ea 100644 --- a/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-06-01T21:19:06-04:00", + "exported_at": "2020-12-06T19:03:10-08:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { @@ -28,17 +29,17 @@ "description": "The name of the Jarfile to use when running Forge Mod.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { - "name": "Forge version", + "name": "Minecraft Version", "description": "The version of minecraft you want to install for.\r\n\r\nLeaving latest will install the latest recommended version.", "env_variable": "MC_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:9" }, { @@ -46,8 +47,8 @@ "description": "The type of server jar to download from forge.\r\n\r\nValid types are \"recommended\" and \"latest\".", "env_variable": "BUILD_TYPE", "default_value": "recommended", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -55,9 +56,9 @@ "description": "Gets an exact version.\r\n\r\nEx. 1.15.2-31.2.4\r\n\r\nOverrides MC_VERSION and BUILD_TYPE. If it fails to download the server files it will fail to install.", "env_variable": "FORGE_VERSION", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string|max:20" } ] -} +} \ No newline at end of file diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 942b8f5d..63d37a01 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-04T12:08:20-05:00", + "exported_at": "2020-12-06T18:34:01-08:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "features": null, + "features": ["eula"], "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { diff --git a/minecraft/java/spigot/egg-spigot.json b/minecraft/java/spigot/egg-spigot.json index c6e06f61..f270f799 100644 --- a/minecraft/java/spigot/egg-spigot.json +++ b/minecraft/java/spigot/egg-spigot.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-29T13:00:51-04:00", + "exported_at": "2020-12-06T19:20:29-08: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.", + "features": ["eula"], "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { @@ -37,8 +38,8 @@ "description": "A URL to use to download Spigot rather than building it on the server. This is not user viewable. Use {{DL_VERSION}}<\/code> in the URL to automatically insert the assigned version into the URL. If you do not enter a URL Spigot will build directly in the container (this will fail on low memory containers).", "env_variable": "DL_PATH", "default_value": "", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "nullable|string" }, { @@ -46,8 +47,8 @@ "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.", "env_variable": "DL_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|between:3,7" } ] diff --git a/minecraft/java/spongeforge/egg-sponge-forge.json b/minecraft/java/spongeforge/egg-sponge-forge.json index 91c1d828..3ba615a1 100644 --- a/minecraft/java/spongeforge/egg-sponge-forge.json +++ b/minecraft/java/spongeforge/egg-sponge-forge.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-11T01:44:03+03:00", + "exported_at": "2020-12-06T18:50:01-08:00", "name": "SpongeForge", "author": "parker@parkervcp.com", "description": "A community-driven open source Minecraft: Java Edition modding platform.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "description": "Example 1.12.2-2825-7.1.6\r\n\r\nIf the version fails it defaults to recommended", "env_variable": "SF_VERSION", "default_value": "recommended", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -37,8 +38,8 @@ "description": "The name of the Jarfile to use when running Forge Mod.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] diff --git a/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/minecraft/java/spongevanilla/egg-sponge-vanilla.json index 64b4e9dc..8e1995bc 100644 --- a/minecraft/java/spongevanilla/egg-sponge-vanilla.json +++ b/minecraft/java/spongevanilla/egg-sponge-vanilla.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-09-13T21:18:48-04:00", + "exported_at": "2020-12-06T18:49:56-08:00", "name": "SpongeVanilla", "author": "parker@parkervcp.com", "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "description": "Example 1.12.2-7.1.6\r\n\r\nIf the version fails it defaults to recommended", "env_variable": "SV_VERSION", "default_value": "recommended", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -37,8 +38,8 @@ "description": "The name of the Jarfile to use when running Mod.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] diff --git a/minecraft/java/tuinity/egg-tuinity.json b/minecraft/java/tuinity/egg-tuinity.json index 9bf94c40..f4be0a16 100644 --- a/minecraft/java/tuinity/egg-tuinity.json +++ b/minecraft/java/tuinity/egg-tuinity.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-03-27T00:25:53-04:00", + "exported_at": "2020-12-06T18:58:35-08:00", "name": "Tuinity", "author": "unknown@unknown.com", "description": "Fork of Paper aimed at improving server performance at high playercounts.", + "features": ["eula"], "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { @@ -28,9 +29,9 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/minecraft/java/vanillacord/egg-vanilla-cord.json b/minecraft/java/vanillacord/egg-vanilla-cord.json index 7df2d5c5..83acf714 100644 --- a/minecraft/java/vanillacord/egg-vanilla-cord.json +++ b/minecraft/java/vanillacord/egg-vanilla-cord.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-06T09:33:27-04:00", + "exported_at": "2020-12-06T18:58:33-08:00", "name": "VanillaCord", "author": "support@pterodactyl.io", "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { @@ -37,9 +38,9 @@ "description": "The version of Minecraft Vanilla to install. Use \"latest\" to install the latest version.", "env_variable": "VANILLA_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|between:3,15" } ] -} +} \ No newline at end of file From 53063f742bb326910c8f10de976ef5c88a5721aa Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Sun, 6 Dec 2020 19:55:39 -0800 Subject: [PATCH 2/2] update fabric to java 11 --- minecraft/java/fabric/egg-fabric.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/minecraft/java/fabric/egg-fabric.json b/minecraft/java/fabric/egg-fabric.json index 76904fe2..d8ebf272 100644 --- a/minecraft/java/fabric/egg-fabric.json +++ b/minecraft/java/fabric/egg-fabric.json @@ -3,14 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-11-10T04:10:30-05:00", + "exported_at": "2020-12-06T19:54:35-08:00", "name": "Fabric", "author": "accounts@bofanodes.io", "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.", - "features": [ - "eula" - ], - "image": "quay.io\/pterodactyl\/core:java", + "features": ["eula"], + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "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 }\r\n }\r\n}", @@ -20,7 +18,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\nFABRIC_VERSION=$(curl https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/ | grep -Po '(?<=href=\")[^\"]*' | sort -h | tail -1 | sed 's,\/,,g')\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nelse\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nfi\r\njava -jar fabric-installer-$FABRIC_VERSION.jar server -downloadMinecraft\r\necho -e \"Install Complete\"", "container": "openjdk:8-jdk-slim", + "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\nFABRIC_VERSION=$(curl https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/ | grep -Po '(?<=href=\")[^\"]*' | sort -h | tail -1 | sed 's,\/,,g')\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nelse\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nfi\r\njava -jar fabric-installer-$FABRIC_VERSION.jar server -downloadMinecraft\r\necho -e \"Install Complete\"", + "container": "openjdk:11-jdk-slim", "entrypoint": "bash" } }, @@ -44,4 +43,4 @@ "rules": "required|string|between:3,15" } ] -} +} \ No newline at end of file