diff --git a/Dockerfile b/Dockerfile index 5e1c2263..1f09639a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.24.3 +ARG MC_HELPER_VERSION=1.24.5 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \ | tar -C /usr/share -zxf - \ diff --git a/README.md b/README.md index e5596de9..a940efe9 100644 --- a/README.md +++ b/README.md @@ -650,6 +650,8 @@ The following two examples both refer to version 1.0.7 of ATM8: -e TYPE=AUTO_CURSEFORGE -e CF_SLUG=all-the-mods-8 -e CF_FILENAME_MATCHER=1.0.7 ``` +If there are mods that need to be excluded, such as ones that did not properly declare as a client mod via the file's game versions, then they can be excluded by passing a comma or space delimited list of project IDs via `CF_EXLUDE_MODS` + ### Old approach Enable this server mode by adding `-e TYPE=CURSEFORGE` to your command-line, diff --git a/scripts/start-configuration b/scripts/start-configuration index d23ef2f6..cbb43269 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -197,7 +197,7 @@ case "${TYPE^^}" in ;; AUTO_CURSEFORGE) - exec "${SCRIPTS:-/}start-autoDeployCF" "$@" + exec "${SCRIPTS:-/}start-deployAutoCF" "$@" ;; VANILLA) diff --git a/scripts/start-autoDeployCF b/scripts/start-deployAutoCF similarity index 81% rename from scripts/start-autoDeployCF rename to scripts/start-deployAutoCF index fcdfb4dd..4887881c 100644 --- a/scripts/start-autoDeployCF +++ b/scripts/start-deployAutoCF @@ -29,6 +29,14 @@ if [[ $CF_FILENAME_MATCHER ]]; then args+=(--filename-matcher="$CF_FILENAME_MATCHER") fi +defaultModExcludes=( + 363363 # extreme-sound-muffler + 448233 # entityculling + 574856 # rubidium + ) +: "${CF_EXLUDE_MODS:=${defaultModExcludes[@]}}" +args+=(--exclude-mods="$CF_EXLUDE_MODS") + if ! mc-image-helper install-curseforge "${args[@]}"; then log "ERROR failed to auto-install CurseForge modpack" exit 1