From bb3f2300668a865098d55cc34e51f4a1da4ecc50 Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sat, 24 Jul 2021 23:24:29 +0200 Subject: [PATCH 1/9] Add airplane minecraft server jar --- game_eggs/minecraft/java/airplane/README.md | 16 +++++ .../minecraft/java/airplane/egg-airplane.json | 60 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 game_eggs/minecraft/java/airplane/README.md create mode 100644 game_eggs/minecraft/java/airplane/egg-airplane.json diff --git a/game_eggs/minecraft/java/airplane/README.md b/game_eggs/minecraft/java/airplane/README.md new file mode 100644 index 00000000..8daf5495 --- /dev/null +++ b/game_eggs/minecraft/java/airplane/README.md @@ -0,0 +1,16 @@ +# Example Server Name +### From their [Github](https://github.com/TECHNOVE/Airplane) +A stable, optimized and fast Paper fork. + + +### Minimum RAM warning +Approximately 2048MB + + +### Server Ports + +| Port | default | +|---------|---------| +| Game | 25565 | + +#### Mods/Plugins may require ports to be added to the server. diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json new file mode 100644 index 00000000..98588030 --- /dev/null +++ b/game_eggs/minecraft/java/airplane/egg-airplane.json @@ -0,0 +1,60 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-07-24T20:33:25+02:00", + "name": "Airplane", + "author": "info@ttr3.eu", + "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16" + ], + "file_denylist": [], + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https:\/\/mcflags.emc.gs -Daikars.new.flags=true -Dterminal.jline=false -Dterminal.ansi=true -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 \"server-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": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "apt update\r\napt -y install wget\r\ncd \/mnt\/server\r\nif [ -z \"$BUILDVERSION\" ] || [ \"$BUILDVERSION\" == \"latest\" ]; then\r\n wget https:\/\/ci.tivy.ca\/job\/Airplane-${VER}\/lastSuccessfulBuild\/artifact\/launcher-airplane.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.tivy.ca\/job\/Airplane-${VER}\/${BUILDVERSION}\/artifact\/launcher-airplane.jar -O ${SERVER_JARFILE}\r\nfi", + "container": "ubuntu", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server file name", + "description": "Here you can set the server jar's name", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Minecraft Version", + "description": "Here you can set the server's version (1.17 or 1.16)", + "env_variable": "VER", + "default_value": "1.17", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Build version", + "description": "Here you can set which build version you want to use from Airplane release", + "env_variable": "BUILDVERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 11bbd20c4977ddfbb992166a04eaf233739ec9b7 Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sat, 24 Jul 2021 23:29:22 +0200 Subject: [PATCH 2/9] Add Airplane links to readme files --- README.md | 1 + game_eggs/minecraft/java/README.md | 3 +++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index ae5229a8..969f2d05 100644 --- a/README.md +++ b/README.md @@ -118,6 +118,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [PocketMine MP](game_eggs/minecraft/bedrock/pocketmine_mp) * [Java](game_eggs/minecraft/java) Servers for Java Minecraft + * [Airplane](game_eggs/minecraft/java/airplane) * [Cuberite](game_eggs/minecraft/java/cuberite) * [Fabric](game_eggs/minecraft/java/fabric) * [Feather](game_eggs/minecraft/java/feather) diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index 78b2f595..c2552ef8 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -71,6 +71,9 @@ This is a direct fork of the default spigot service with the added benefit of be [Mohist Github](https://github.com/Mohist-Community/Mohist) Fork of Spigot focused on performance optimizations. +[Airplane Github](https://github.com/TECHNOVE/Airplane) +A stable, optimized and fast Paper fork. + [Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) Fork of Paper aimed at improving server performance at high playercounts. From a892230d1f08f2235379a444fe05a2dfff9caeba Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sat, 24 Jul 2021 23:31:35 +0200 Subject: [PATCH 3/9] Delete last line from airplane folder's readme --- game_eggs/minecraft/java/airplane/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/airplane/README.md b/game_eggs/minecraft/java/airplane/README.md index 8daf5495..fe317ac3 100644 --- a/game_eggs/minecraft/java/airplane/README.md +++ b/game_eggs/minecraft/java/airplane/README.md @@ -11,6 +11,4 @@ Approximately 2048MB | Port | default | |---------|---------| -| Game | 25565 | - -#### Mods/Plugins may require ports to be added to the server. +| Game | 25565 | \ No newline at end of file From 17c6e590e6e44acb67fcec3caf7f337cc28a9795 Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sat, 24 Jul 2021 23:34:10 +0200 Subject: [PATCH 4/9] update README.MD files --- game_eggs/README.md | 1 + game_eggs/minecraft/README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index 57a59346..76bfba3e 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -49,6 +49,7 @@ * [PocketMine MP](minecraft/bedrock/pocketmine_mp) * [Java](minecraft/java) Servers for Java Minecraft + * [Airplane](game_eggs/minecraft/java/airplane) * [Cuberite](minecraft/java/cuberite) * [Fabric](minecraft/java/fabric) * [Feather](minecraft/java/feather) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 32fd58f5..a4f791fc 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -11,6 +11,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [PocketMine MP](/game_eggs/minecraft/bedrock/pocketmine_mp) [Java](/game_eggs/minecraft/java/) Servers for Java Minecraft +* [Airplane](game_eggs/minecraft/java/airplane) * [Cuberite](/game_eggs/minecraft/java/cuberite) * [Fabric](/game_eggs/minecraft/java/fabric) * [Feather](/game_eggs/minecraft/java/feather) From 7d83ca47852f2070c8e346830586518227bb5bf3 Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sat, 24 Jul 2021 23:36:39 +0200 Subject: [PATCH 5/9] Correct a link in game_eggs folder's readme file --- game_eggs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index 76bfba3e..06df3977 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -49,7 +49,7 @@ * [PocketMine MP](minecraft/bedrock/pocketmine_mp) * [Java](minecraft/java) Servers for Java Minecraft - * [Airplane](game_eggs/minecraft/java/airplane) + * [Airplane](minecraft/java/airplane) * [Cuberite](minecraft/java/cuberite) * [Fabric](minecraft/java/fabric) * [Feather](minecraft/java/feather) From 56da2dd0d9e55084ba91b579694c6bf5195b96c5 Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sat, 24 Jul 2021 23:38:27 +0200 Subject: [PATCH 6/9] Update README.md --- game_eggs/minecraft/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index a4f791fc..3b27c2a6 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -11,7 +11,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [PocketMine MP](/game_eggs/minecraft/bedrock/pocketmine_mp) [Java](/game_eggs/minecraft/java/) Servers for Java Minecraft -* [Airplane](game_eggs/minecraft/java/airplane) +* [Airplane](/game_eggs/minecraft/java/airplane) * [Cuberite](/game_eggs/minecraft/java/cuberite) * [Fabric](/game_eggs/minecraft/java/fabric) * [Feather](/game_eggs/minecraft/java/feather) From f725b96bc89cb4e75a46c58b41585ffe094ce50b Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sun, 25 Jul 2021 09:40:08 +0200 Subject: [PATCH 7/9] airplane egg fixes --- game_eggs/minecraft/java/airplane/egg-airplane.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json index 98588030..65dbc396 100644 --- a/game_eggs/minecraft/java/airplane/egg-airplane.json +++ b/game_eggs/minecraft/java/airplane/egg-airplane.json @@ -4,17 +4,19 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-24T20:33:25+02:00", + "exported_at": "2021-07-25T09:38:49+02:00", "name": "Airplane", "author": "info@ttr3.eu", "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", - "features": null, + "features": [ + "eula" + ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https:\/\/mcflags.emc.gs -Daikars.new.flags=true -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -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 \"server-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}", @@ -24,7 +26,7 @@ "scripts": { "installation": { "script": "apt update\r\napt -y install wget\r\ncd \/mnt\/server\r\nif [ -z \"$BUILDVERSION\" ] || [ \"$BUILDVERSION\" == \"latest\" ]; then\r\n wget https:\/\/ci.tivy.ca\/job\/Airplane-${VER}\/lastSuccessfulBuild\/artifact\/launcher-airplane.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.tivy.ca\/job\/Airplane-${VER}\/${BUILDVERSION}\/artifact\/launcher-airplane.jar -O ${SERVER_JARFILE}\r\nfi", - "container": "ubuntu", + "container": "debian:buster-slim", "entrypoint": "bash" } }, @@ -36,7 +38,7 @@ "default_value": "server.jar", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { "name": "Minecraft Version", From 6e6e84ddd4b7a77ae61c3a5541fdd0bb663f3960 Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sun, 25 Jul 2021 09:43:43 +0200 Subject: [PATCH 8/9] Add airplane jenkins url to build version variable's description --- game_eggs/minecraft/java/airplane/egg-airplane.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json index 65dbc396..96b484a9 100644 --- a/game_eggs/minecraft/java/airplane/egg-airplane.json +++ b/game_eggs/minecraft/java/airplane/egg-airplane.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-25T09:38:49+02:00", + "exported_at": "2021-07-25T09:42:47+02:00", "name": "Airplane", "author": "info@ttr3.eu", "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", @@ -51,7 +51,7 @@ }, { "name": "Build version", - "description": "Here you can set which build version you want to use from Airplane release", + "description": "Here you can set which build version you want to use from Airplane release\r\n(You can see the version from this site https:\/\/ci.tivy.ca)\r\n\r\nExample: https:\/\/ci.tivy.ca\/job\/Airplane-1.17\/(Build version)\/artifact\/launcher-airplane.jar", "env_variable": "BUILDVERSION", "default_value": "latest", "user_viewable": true, From e28125f163dda0a97743c130ded421099cce4ece Mon Sep 17 00:00:00 2001 From: TTRCharlie Date: Sun, 25 Jul 2021 09:45:52 +0200 Subject: [PATCH 9/9] Change default Docker image --- game_eggs/minecraft/java/airplane/egg-airplane.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json index 96b484a9..aa0ca689 100644 --- a/game_eggs/minecraft/java/airplane/egg-airplane.json +++ b/game_eggs/minecraft/java/airplane/egg-airplane.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-25T09:42:47+02:00", + "exported_at": "2021-07-25T09:45:04+02:00", "name": "Airplane", "author": "info@ttr3.eu", "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", @@ -12,8 +12,8 @@ "eula" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_11" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",