From 46fb560ed9305e95016e8f60d004747096fc00b6 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Wed, 27 Mar 2024 08:21:07 -0500 Subject: [PATCH] Hybrid servers using CURSEFORGE_FILES assume mc-mods for Forge (#2740) --- examples/ketting/docker-compose.yml | 11 +++++++++++ scripts/start-setupModpack | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 examples/ketting/docker-compose.yml diff --git a/examples/ketting/docker-compose.yml b/examples/ketting/docker-compose.yml new file mode 100644 index 00000000..1a139a01 --- /dev/null +++ b/examples/ketting/docker-compose.yml @@ -0,0 +1,11 @@ +services: + mc: + image: itzg/minecraft-server + environment: + EULA: true + TYPE: KETTING + VERSION: 1.20.1 + CF_API_KEY: "${CF_API_KEY}" + CURSEFORGE_FILES: https://www.curseforge.com/minecraft/mc-mods/aquaculture + ports: + - "25565:25565" \ No newline at end of file diff --git a/scripts/start-setupModpack b/scripts/start-setupModpack index b399c23d..4b05bb08 100755 --- a/scripts/start-setupModpack +++ b/scripts/start-setupModpack @@ -272,6 +272,13 @@ function handleCurseForgeFiles() { forge|fabric|quilt) args+=(--mod-loader "$TYPE") ;; + *) + if isFamily HYBRID; then + # To disambiguate mc-mods we'll assume that hybrid servers + # are blending Forge (rather than Fabric or NeoForge) + args+=(--mod-loader "forge") + fi + ;; esac # shellcheck disable=SC2086