From 4736f305c55ece8e2c9a0de8d23e755b1fb816e3 Mon Sep 17 00:00:00 2001 From: Luziferus <8964310+FallenAngel666@users.noreply.github.com> Date: Sun, 28 May 2023 17:02:22 +0000 Subject: [PATCH] :recycle: Refactored itzg's Minecraft server app (#935) * :recycle: Refactored itzg's Minecraft server app - removed forge_minecraft + added dynamic_minecraft * :recycle: after CR1: renamed the minecraft file names back to original In order to see the changes clearer. * :recycle: after CR2: applying formatter --------- Co-authored-by: luziferus --- public/v4/apps/forge_minecraft.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/public/v4/apps/forge_minecraft.yml b/public/v4/apps/forge_minecraft.yml index 9106ae2..1e8b06c 100644 --- a/public/v4/apps/forge_minecraft.yml +++ b/public/v4/apps/forge_minecraft.yml @@ -1,10 +1,10 @@ captainVersion: 4 services: $$cap_appname: - image: itzg/minecraft-server:java19 + image: itzg/minecraft-server:$$java_version environment: EULA: 'true' - TYPE: 'FORGE' + TYPE: '$$server_type' VERSION: '$$cap_minecraft_version' FORGE_VERSION: '$$cap_forge_version' MAX_PLAYERS: '$$cap_max_players' @@ -40,15 +40,26 @@ caproverOneClickApp: - id: $$cap_appname label: service name defaultValue: mc + - id: $$java_version + label: Java version + description: 'Chose the Java version to run the server with. Look in the documentation for different versions: https://github.com/itzg/docker-minecraft-server#running-minecraft-server-on-different-java-version' + validRegex: /^(latest|java8|java8-jdk|java8-multiarch|java8-openj9|java8-graalvm-ce|java11|java11-jdk|java11-openj9|java17|java17-jdk|java17-openj9|java17-graalvm-ce|java17-alpine|java19)$/ + defaultValue: java19 - id: $$cap_minecraft_version label: Minecraft version defaultValue: 1.19.3 - id: $$cap_forge_version label: forge server version - description: 'choose the version that works with your mc version , see: https://files.minecraftforge.net/' + description: 'Choose the version that works with your mc version , see: https://files.minecraftforge.net/' defaultValue: 44.1.16 + - id: $$server_type + label: Server type + description: 'Chose one of the server types from supported ones: https://github.com/itzg/docker-minecraft-server#server-types' + validRegex: /^(MAGMA|FORGE|FABRIC|QUILT|BUKKIT|SPIGOT|PAPER|FOLIA|PUFFERFISH|PURPUR|MOHIST|CATSERVER|CANYON|SPONGEVANILLA|LIMBO|CRUCIBLE|MODRINTH|FTBA|AUTO_CURSEFORGE|CURSEFORGE)$/ + defaultValue: 'FORGE' - id: $$cap_mc_port label: Service port + description: 'Choose "25565" if you want to connect directly to the servers domain without any port specification.' defaultValue: 25575 validRegex: /.{1,}/ - id: $$cap_web_username @@ -72,7 +83,7 @@ caproverOneClickApp: defaultValue: Minecraft server powerd by docker - id: $$cap_online_mode label: online mode - defaultValue: FALSE + defaultValue: 'FALSE' validRegex: /^(TRUE|FALSE)$/ - id: $$cap_game_mode label: game mode @@ -83,9 +94,9 @@ caproverOneClickApp: defaultValue: 20 validRegex: /.{1,}/ instructions: - start: Minecraft server with dynamic version, server types, and modpack support, this oneclickapp in the Forge version of itzg's Minecraft server. - end: minecraft is deployed and available as srv-captain--$$cap_appname. Note that the application may take up to ten minutes to become available. - displayName: Minecraft forge server + start: Minecraft server with dynamic server types and modpack support. This is oneclickapp in the any of itzg's Minecraft server version. + end: Minecraft is deployed and available as srv-captain--$$cap_appname. Note that the application may take up to ten minutes to become available. + displayName: Dynamic Minecraft itzg server isOfficial: false - description: Minecraft server with dynamic version, server types, and modpack support, this oneclickapp in the Forge version of itzg's Minecraft server. + description: Minecraft server with dynamic versions and types. documentation: https://github.com/itzg/docker-minecraft-server