From cc28755765c948b240de7b8b5067506406d02420 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 12 Jan 2023 20:11:52 -0600
Subject: [PATCH] For AUTO_CURSEFORGE, provide the option to force include mods

---
 Dockerfile                 |  2 +-
 README.md                  |  2 +-
 scripts/start-deployAutoCF | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6502c6a223f..e43b815772f 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.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}
 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 fd8508f7321..3a0cb3e798f 100644
--- a/README.md
+++ b/README.md
@@ -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
 ```
 
-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:
 - `CF_PARALLEL_DOWNLOADS` (default is 4): specify how many parallel mod downloads to perform
diff --git a/scripts/start-deployAutoCF b/scripts/start-deployAutoCF
index e7cb5eb763b..ae99f34d5af 100644
--- a/scripts/start-deployAutoCF
+++ b/scripts/start-deployAutoCF
@@ -36,13 +36,25 @@ args+=(
 )
 
 defaultModExcludes=(
+  581495 # oculus
   363363 # extreme-sound-muffler
   448233 # entityculling
   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[@]}}"
 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
     log "ERROR failed to auto-install CurseForge modpack"
     exit 1