mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-07-09 10:05:11 +00:00
For AUTO_CURSEFORGE, provide the option to force include mods (#1900)
This commit is contained in:
+1
-1
@@ -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}} \
|
--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
|
--from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
|
||||||
|
|
||||||
ARG MC_HELPER_VERSION=1.24.7
|
ARG MC_HELPER_VERSION=1.24.8
|
||||||
ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
|
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 \
|
RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
|
||||||
| tar -C /usr/share -zxf - \
|
| tar -C /usr/share -zxf - \
|
||||||
|
|||||||
@@ -650,7 +650,7 @@ 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
|
-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`
|
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`. Similarly, there are some mods that are incorrectly tagged as client only. For those, pass the project IDs via `CF_FORCE_INCLUDE_MODS`. Known, mis-tagged mods have been included in the defaults.
|
||||||
|
|
||||||
Other configuration available:
|
Other configuration available:
|
||||||
- `CF_PARALLEL_DOWNLOADS` (default is 4): specify how many parallel mod downloads to perform
|
- `CF_PARALLEL_DOWNLOADS` (default is 4): specify how many parallel mod downloads to perform
|
||||||
|
|||||||
@@ -36,13 +36,25 @@ args+=(
|
|||||||
)
|
)
|
||||||
|
|
||||||
defaultModExcludes=(
|
defaultModExcludes=(
|
||||||
|
581495 # oculus
|
||||||
363363 # extreme-sound-muffler
|
363363 # extreme-sound-muffler
|
||||||
448233 # entityculling
|
448233 # entityculling
|
||||||
574856 # rubidium
|
574856 # rubidium
|
||||||
|
441114 # nekos-enchanted-books
|
||||||
|
521480 # skin-layers-3d
|
||||||
|
433760 # not-enough-animations
|
||||||
|
568563 # entity-texture-features-fabric
|
||||||
|
274259 # carry-on
|
||||||
)
|
)
|
||||||
: "${CF_EXLUDE_MODS:=${defaultModExcludes[@]}}"
|
: "${CF_EXLUDE_MODS:=${defaultModExcludes[@]}}"
|
||||||
args+=(--exclude-mods="$CF_EXLUDE_MODS")
|
args+=(--exclude-mods="$CF_EXLUDE_MODS")
|
||||||
|
|
||||||
|
defaultModForceIncludes=(
|
||||||
|
656526 # revelationary
|
||||||
|
)
|
||||||
|
: "${CF_FORCE_INCLUDE_MODS:=${defaultModForceIncludes[@]}}"
|
||||||
|
args+=(--force-include-mods="$CF_FORCE_INCLUDE_MODS")
|
||||||
|
|
||||||
if ! mc-image-helper install-curseforge "${args[@]}"; then
|
if ! mc-image-helper install-curseforge "${args[@]}"; then
|
||||||
log "ERROR failed to auto-install CurseForge modpack"
|
log "ERROR failed to auto-install CurseForge modpack"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
Reference in New Issue
Block a user