Corrected REMOVE_OLD_MODS to process file-wise (#2317)

Also
- modrinth modpack support when optional env is absent

.github/workflows/build-multiarch.yml

@@ -125,16 +125,16 @@ jobs:
             type=ref,event=tag,enable=${{ matrix.variant == env.MAIN_VARIANT }}
             # and each variant (including main one) gets the tag with the variant suffix, such as 2023.1.1-java17
             type=ref,event=tag,suffix=-${{ matrix.variant }}
-            # latest repo tag gets a moving 'stable' image tag applied to the main variant
-            type=match,value=stable,enable=${{ matrix.variant == env.MAIN_VARIANT }},pattern=\d+\.\d+\.\d+
             # for building test/* branch images
-            type=ref,event=branch,suffix=-${{ matrix.variant }},enable=${{ github.ref_name != 'master' }}
-            # 
-            type=raw,value=${{ matrix.variant }},enable=${{ github.ref_name == 'master' }}
+            type=ref,event=branch,suffix=-${{ matrix.variant }},enable=${{ github.ref_name != github.event.repository.default_branch }}
+            # latest repo tag gets a moving 'stable' image tag applied to the main variant
+            type=raw,value=stable,enable=${{ github.ref_type == 'tag' && matrix.variant == env.MAIN_VARIANT }}            
+            # apply the variant as a moving tag for most recent commit per variant
+            type=raw,value=${{ matrix.variant }},enable=${{ github.ref_name == github.event.repository.default_branch }}
           # NOTE this identifies which variant will be published as "latest", which isn't
           # necessarily the newest version of Java
           flavor: |
-            latest=${{ matrix.variant == env.MAIN_VARIANT && github.ref_name == 'master' }}
+            latest=${{ matrix.variant == env.MAIN_VARIANT && github.ref_name == github.event.repository.default_branch }}
           labels: |
             org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
 
@@ -191,7 +191,7 @@ jobs:
           push: >
             ${{ 
             github.ref_type == 'tag' 
-            || github.ref_name == 'master'
+            || github.ref_name == github.event.repository.default_branch
             || startsWith(github.ref_name, 'test/')
             || ( github.event_name == 'pull_request' 
                  && env.HAS_IMAGE_REPO_ACCESS 

Dockerfile

@@ -22,31 +22,27 @@ COPY --chmod=644 files/sudoers* /etc/sudoers.d
 
 EXPOSE 25565
 
-ARG EASY_ADD_VER=0.7.1
+ARG EASY_ADD_VER=0.8.0
 ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
 RUN chmod +x /usr/bin/easy-add
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=1.2.0 --var app=restify --file {{.app}} \
+  --var version=1.7.0 --var app=restify --file {{.app}} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=1.6.1 --var app=rcon-cli --file {{.app}} \
+  --var version=1.6.2 --var app=rcon-cli --file {{.app}} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=0.11.0 --var app=mc-monitor --file {{.app}} \
+  --var version=0.12.1 --var app=mc-monitor --file {{.app}} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=1.8.3 --var app=mc-server-runner --file {{.app}} \
+  --var version=1.9.0 --var app=mc-server-runner --file {{.app}} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-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.32.4
+ARG MC_HELPER_VERSION=1.32.9
 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1

docs/configuration/interpolating.md

@@ -17,7 +17,7 @@ When the environment variable `REPLACE_ENV_IN_PLACE` is set to `true` (the defau
 
 Variables that you want to replace need to be declared inside curly brackets and prefixed with a dollar sign, such as  `${CFG_YOUR_VARIABLE}`, which is same as many scripting languages.
 
-You can also change `REPLACE_ENV_VARIABLE_PREFIX`, which defaults to "CFG_", to limit which environment variables are allowed to be used. For example, with "CFG_" as the prefix, the variable `${CFG_DB_HOST}` would be subsituted, but not `${DB_HOST}`.
+You can also change `REPLACE_ENV_VARIABLE_PREFIX`, which defaults to "CFG_", to limit which environment variables are allowed to be used. For example, with "CFG_" as the prefix, the variable `${CFG_DB_HOST}` would be substituted, but not `${DB_HOST}`. The prefix can be set to an empty string to allow for matching any variable name.
 
 If you want to use a file's content for value, such as when using secrets mounted as files, declare the placeholder named like normal in the file and declare an environment variable named the same but with the suffix `_FILE`.
 

docs/misc/autopause-autostop/autopause.md

@@ -14,6 +14,8 @@ The utility used to wake the server (`knock(d)`) works at network interface leve
 
 A file called `.paused` is created in `/data` directory when the server is paused and removed when the server is resumed. Other services may check for this file's existence before waking the server.
 
+A `.skip-pause` file can be created in the `/data` directory to make the server skip autopausing, for as long as the file is present. The autopause timer will also be reset.
+
 A starting, example compose file has been provided in [examples/docker-compose-autopause.yml](https://github.com/itzg/docker-minecraft-server/blob/master/examples/docker-compose-autopause.yml).
 
 Auto-pause is not compatible with `EXEC_DIRECTLY=true` and the two cannot be set together.

docs/misc/autopause-autostop/autostop.md

@@ -6,6 +6,8 @@ An option to stop the server after a specified time has been added for niche app
 
     the docker container variables have to be set accordingly (restart policy set to "no") and that the container has to be manually restarted.
 
+A `.skip-stop` file can be created in the `/data` directory to make the server skip autostopping, for as long as the file is present. The autostop timer will also be reset.
+
 A starting, example compose file has been provided in [examples/docker-compose-autostop.yml](https://github.com/itzg/docker-minecraft-server/blob/master/examples/docker-compose-autostop.yml).
 
 Enable the Autostop functionality by setting:

docs/types-and-platforms/mod-platforms/auto-curseforge.md

@@ -58,7 +58,10 @@ For example:
 
 For mod, modpacks, and world files that are not allowed for automated download, the container path `/downloads` can be attached and matching files will be retrieved from there. The subdirectories `mods`, `modpacks`, and `worlds` will also be checked accordingly. To change the source location of downloaded files, set `CF_DOWNLOADS_REPO` to an existing container path. To disable this feature, set `CF_DOWNLOADS_REPO` to an empty string.
 
-If the authors of the modpack have disallowed project distribution, then the desired **client** modpack zip will need to be manually downloaded and made available to the container. The path to that file must be passed to `CF_MODPACK_ZIP`. Similarly, the container path to a modpack manifest JSON can be passed to `CF_MODPACK_MANIFEST`.  In either case, the modpack slug or page URL must still be provided.
+!!! note "Mods need download report"
+    A file called `MODS_NEED_DOWNLOAD.txt` will be created in the `/data` directory that lists the mods that need to be manually downloaded and where to get them.
+
+If you wish to use a unpublished modpack zip, set the container path to the file in `CF_MODPACK_ZIP`. Similarly, the container path to a modpack manifest JSON can be passed to `CF_MODPACK_MANIFEST`.  In either case, **the modpack slug or page URL must still be provided**.
 
 The latest file will be located and used by default, but if a specific version is desired you can use one of the following options. With any of these options **do not select a server file** -- they lack the required manifest and defeat the ability to consistently automate startup.
 
@@ -84,7 +87,7 @@ The following examples all refer to version 1.0.7 of ATM8:
 -e CF_SLUG=all-the-mods-8 -e CF_FILENAME_MATCHER=1.0.7
 ```
 
-## Exlude client mods
+## Exclude client mods
 
 Quite often 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. Similarly, there are some mods that are incorrectly tagged as client only. The following describes two options to exclude/include mods:
 
@@ -98,7 +101,7 @@ For more complex scenarios, global and per modpack exclusions can be declared in
 If needing to iterate on the options above, set `CF_FORCE_SYNCHRONIZE` to "true" to ensure the exclude/includes are re-evaluated.
 
 !!! important
-These options are provided to empower you to get your server up and running quickly. Please help out by reporting an issue with the respective mod project. Ideally mod developers should [use correct registrations for one-sided client mods](https://docs.minecraftforge.net/en/latest/concepts/sides/#writing-one-sided-mods). Understandably, those code changes may be non-trivial, so mod authors can also add "Client" to the game versions when publishing.
+    These options are provided to empower you to get your server up and running quickly. Please help out by reporting an issue with the respective mod project. Ideally mod developers should [use correct registrations for one-sided client mods](https://docs.minecraftforge.net/en/latest/concepts/sides/#writing-one-sided-mods). Understandably, those code changes may be non-trivial, so mod authors can also add "Client" to the game versions when publishing.
 
 ## Extra options
 

docs/types-and-platforms/mod-platforms/ftb.md

@@ -19,6 +19,8 @@ This mod platform type will automatically take care of downloading and installin
   ```
 - `FTB_MODPACK_VERSION_ID`: optional, the numerical ID of the version to install. If not specified, the latest version will be installed. The "Version ID" can be obtained by hovering over a server file entry and grabbing [this ID in the URL](../../img/ftba-version-id-popup.png).
 
+- `FTB_FORCE_REINSTALL`: if the files become inconsistent, such as when accidentally removing them, the FTB can be forced to re-run by setting this to "true"
+
 ### Upgrading
 
 If a specific `FTB_MODPACK_VERSION_ID` was not specified, simply restart the container to pick up the newest modpack version. If using a specific version ID, recreate the container with the new version ID.

docs/types-and-platforms/server-types/others.md

@@ -48,3 +48,21 @@ Configuration options with defaults:
 - `CRUCIBLE_RELEASE`=latest
 
 Crucible is only available for 1.7.10, so be sure to set `VERSION=1.7.10`.
+
+## Custom
+
+To use a custom server jar or class files, set `TYPE` to "CUSTOM" and continue with one of the following options:
+
+The custom jar to be used can be set with `CUSTOM_SERVER` as either a URL to download or the path to a file within the container.
+
+Alternatively, the final `-jar` invocation can be replaced by setting `CUSTOM_JAR_EXEC` to "`-cp <classpath> <classname>`" or "`-jar <jar file>`" form, such as
+
+```
+-cp worldedit.jar:Carpet-Server.jar net.minecraft.server.MinecraftServer
+```
+
+!!! note
+
+    When using `docker run` make sure to quote the entire value since it has spaces in it, such as
+
+        -e CUSTOM_JAR_EXEC="-cp worldedit.jar:Carpet-Server.jar net.minecraft.server.MinecraftServer"

docs/versions/java.md

@@ -30,8 +30,8 @@ When using the image `itzg/minecraft-server` without a tag, the `latest` image t
 | java17-openj9     | 17           | Debian | OpenJ9      | amd64             |
 | java17-graalvm-ce | 17           | Oracle | GraalVM CE  | amd64,arm64       |
 | java17-alpine     | 17           | Alpine | Hotspot     | amd64             |
-| java20-alpine     | 19           | Alpine | Hotspot     | amd64             |
-| java20            | 19           | Ubuntu | Hotspot     | amd64,arm64       |
+| java20-alpine     | 20           | Alpine | Hotspot     | amd64             |
+| java20            | 20           | Ubuntu | Hotspot     | amd64,arm64       |
 
 For example, to use Java version 8 on any supported architecture:
 

examples/.gitignore

@@ -1,2 +1,3 @@
 data/
-modpacks/
+modpacks/
+.env

examples/atm8/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       MEMORY: 4G
     volumes:
       - mc-data:/data
-      - ./downloads:/downloads
+      - ../downloads:/downloads
   # Since Docker's default volume driver creates volumes owned by root, this
   # init container will change ownership to match final UID of mc service, above
   init-filebrowser:
@@ -29,12 +29,16 @@ services:
   filebrowser:
     image: filebrowser/filebrowser
     depends_on:
-      - init-filebrowser
+      init-filebrowser:
+        condition: service_completed_successfully
     user: "1000:1000"
+    environment:
+      FB_DATABASE: /database/filebrowser.db
     volumes:
+      # Default FB_ROOT is /srv
+      # In this example, the left-side needs to be the same as /data volume of mc service
       - mc-data:/srv
       - filebrowser-db:/database
-      - ./filebrowser.json:/.filebrowser.json
     ports:
       - "25580:80"
 

examples/bettermc/docker-compose.yml

@@ -0,0 +1,21 @@
+version: "3.8"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    environment:
+      EULA: true
+      MOD_PLATFORM: AUTO_CURSEFORGE
+      # Set CF_API_KEY=... in a .env file next to this compose file and don't source control that file
+      CF_API_KEY: ${CF_API_KEY}
+      CF_SLUG: better-mc-fabric-bmc1
+      CF_FILENAME_MATCHER: v18.5
+      MEMORY: 4G
+    volumes:
+      - mc:/data
+      - ../downloads:/downloads
+    ports:
+      - "25565:25565"
+
+volumes:
+  mc: {}

examples/downloads/.gitignore

@@ -0,0 +1 @@
+*.jar

examples/one-block-modded/docker-compose.yml

@@ -14,7 +14,7 @@ services:
       # Modpack client zip must be manually downloaded from
       # https://www.curseforge.com/minecraft/modpacks/one-block-modded
       # due to authors disallowing project distribution
-      CF_MODPACK_ZIP: /modpacks/Modded+OneBock.zip
+      CF_MODPACK_ZIP: /modpacks/Modded+OneBlock.zip
       CF_SET_LEVEL_FROM: OVERRIDES
       DEBUG: "false"
       MEMORY: 4G
@@ -23,4 +23,4 @@ services:
       - ./modpacks:/modpacks:ro
 
 volumes:
-  mc-data: {}
+  mc-data: {}

examples/rlcraft/docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3.8"
+
+services:
+  mc:
+    image: itzg/minecraft-server:java8-multiarch
+    environment:
+      EULA: true
+      MOD_PLATFORM: AUTO_CURSEFORGE
+      # Set CF_API_KEY=... in a .env file next to this compose file and don't source control that file
+      CF_API_KEY: ${CF_API_KEY}
+      CF_SLUG: rlcraft
+      CF_FILENAME_MATCHER: 2.9.3
+      CF_FORCE_SYNCHRONIZE: true
+      MEMORY: 4G
+    volumes:
+      - ./data:/data
+    ports:
+      - "25565:25565"

files/auto/autopause-daemon.sh

@@ -62,7 +62,13 @@ do
     # Server startup
     if mc_server_listening ; then
       TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_INIT))
-      logAutopause "MC Server listening for connections - pausing in $AUTOPAUSE_TIMEOUT_INIT seconds"
+
+      if [ -e /data/.skip-pause ] ; then
+        logAutopause "'/data/.skip-pause' file is present - skipping pausing"
+      else
+        logAutopause "MC Server listening for connections - pausing in $AUTOPAUSE_TIMEOUT_INIT seconds"
+      fi
+
       STATE=K
     fi
     ;;
@@ -71,6 +77,9 @@ do
     if java_clients_connected ; then
       logAutopause "Client connected - waiting for disconnect"
       STATE=E
+    elif [ -e /data/.skip-pause ] ; then
+      logAutopause "'/data/.skip-pause' file is present - skipping pausing"
+      STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutopause "No client connected since startup / knocked - pausing"
@@ -92,6 +101,10 @@ do
     if java_clients_connected ; then
       logAutopause "Client reconnected - waiting for disconnect"
       STATE=E
+    elif [ -e /data/.skip-pause ] ; then
+      TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_EST))
+      logAutopause "'/data/.skip-pause' file is present - skipping pausing"
+      STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutopause "No client reconnected - pausing"

files/auto/autostop-daemon.sh

@@ -28,7 +28,13 @@ do
     # Server startup
     if mc_server_listening ; then
       TIME_THRESH=$(($(current_uptime)+AUTOSTOP_TIMEOUT_INIT))
-      logAutostop "MC Server listening for connections - stopping in $AUTOSTOP_TIMEOUT_INIT seconds"
+
+      if [ -e /data/.skip-stop ] ; then
+        logAutostop "'/data/.skip-stop' file is present - skipping stopping"
+      else
+        logAutostop "MC Server listening for connections - stopping in $AUTOSTOP_TIMEOUT_INIT seconds"
+      fi
+
       STATE=II
     fi
     ;;
@@ -37,6 +43,9 @@ do
     if java_clients_connected ; then
       logAutostop "Client connected - waiting for disconnect"
       STATE=E
+    elif [ -e /data/.skip-stop ] ; then
+      logAutostop "'/data/.skip-stop' file is present - skipping stopping"
+      STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutostop "No client connected since startup - stopping server"
@@ -58,6 +67,10 @@ do
     if java_clients_connected ; then
       logAutostop "Client reconnected - waiting for disconnect"
       STATE=E
+    elif [ -e /data/.skip-stop ] ; then
+      TIME_THRESH=$(($(current_uptime)+$AUTOSTOP_TIMEOUT_EST))
+      logAutostop "'/data/.skip-stop' file is present - skipping stopping"
+      STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutostop "No client reconnected - stopping"

files/cf-exclude-include.json

@@ -16,6 +16,9 @@
     "entityculling",
     "extreme-sound-muffler",
     "ignitioncoil",
+    "inmisaddon",
+    "irisshaders",
+    "iris-flywheel-compat",
     "just-enough-harvestcraft",
     "just-enough-resources-jer",
     "legendary-tooltips",
@@ -38,6 +41,7 @@
     "rubidium",
     "rubidium-extra",
     "skin-layers-3d",
+    "sodium",
     "textrues-rubidium-options",
     "thaumic-jei",
     "tips",

notes/.gitignore

@@ -0,0 +1 @@
+/*.bkp

scripts/start-configuration

@@ -135,7 +135,7 @@ then
   "${SCRIPTS:-/}start-rconcmds"
 fi
 
-: ${MOD_PLATFORM:=}
+: "${MOD_PLATFORM:=}"
 case "${TYPE^^}" in
   AUTO_CURSEFORGE|MODRINTH|CURSEFORGE|FTB|FTBA)
     MOD_PLATFORM="$TYPE"
@@ -159,6 +159,11 @@ if [[ $MOD_PLATFORM ]]; then
     MODRINTH)
       exec "${SCRIPTS:-/}start-deployModrinth" "$@"
       ;;
+
+    *)
+      log "ERROR; Invalid MOD_PLATFORM: '$MOD_PLATFORM'"
+      exit 1
+      ;;
   esac
 fi
 
@@ -237,10 +242,10 @@ case "${TYPE^^}" in
   ;;
 
   *)
-      log "Invalid type: '$TYPE'"
-      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
-      log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, PUFFERFISH, CANYON, LIMBO, CRUCIBLE"
+      log "ERROR: Invalid TYPE: '$TYPE'"
+      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FOLIA, PURPUR, FABRIC, QUILT,"
+      log "         SPONGEVANILLA, CUSTOM, MAGMA, MOHIST, CATSERVER, AIRPLANE, PUFFERFISH,"
+      log "         CANYON, LIMBO, CRUCIBLE"
       exit 1
   ;;
 

scripts/start-deployCatserver

@@ -29,4 +29,4 @@ fi
 
 export FAMILY=HYBRID
 
-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+exec "${SCRIPTS:-/}start-spiget" "$@"

scripts/start-deployCrucible

@@ -57,4 +57,4 @@ fi
 export SERVER
 export FAMILY=HYBRID
 
-exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
+exec "${SCRIPTS:-/}start-spiget" "$@"

scripts/start-deployCustom

@@ -1,18 +1,22 @@
 #!/bin/bash
 
+: "${CUSTOM_SERVER:=}"
+: "${GENERIC_PACK:=}"
+: "${CUSTOM_JAR_EXEC:=}"
+
 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 
-if isURL ${CUSTOM_SERVER}; then
-  filename=$(basename ${CUSTOM_SERVER})
+if isURL "${CUSTOM_SERVER}"; then
+  filename=$(basename "${CUSTOM_SERVER}")
   export SERVER=/data/${filename}
 
   if [[ -f ${SERVER} ]] || [ -n "$FORCE_REDOWNLOAD" ]; then
     log "Using previously downloaded jar at ${SERVER}"
   else
    log "Downloading custom server jar from ${CUSTOM_SERVER} ..."
-   if ! curl -sSL -o ${SERVER} ${CUSTOM_SERVER}; then
+   if ! curl -sSL -o "${SERVER}" "${CUSTOM_SERVER}"; then
       log "Failed to download from ${CUSTOM_SERVER}"
       exit 2
     fi
@@ -25,6 +29,9 @@ elif [[ ${GENERIC_PACK} ]]; then
   log "Using custom server jar from generic pack at ${CUSTOM_SERVER} ..."
   export SERVER=${CUSTOM_SERVER}
 
+elif [[ ${CUSTOM_JAR_EXEC} ]]; then
+  log "CUSTOM_JAR_EXEC is in use, so \$SERVER will not be set"
+
 else
   log "CUSTOM_SERVER is not properly set to a URL or existing jar file"
   exit 2
@@ -34,4 +41,4 @@ fi
 # Allow for overriding Family on custom for testing.
 export FAMILY="${FAMILY:-HYBRID}"
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployFTBA

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+: "${FTB_FORCE_REINSTALL:=false}"
+
 ftbInstallMarker=".ftb-installed"
 
 # shellcheck source=start-utils
@@ -32,7 +34,7 @@ elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
   exit 1
 fi
 
-if ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
+if isTrue "$FTB_FORCE_REINSTALL" || ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
   ftbInstaller=/data/ftb-installer
   if ! [[ -f "${ftbInstaller}" ]]; then
     log "Downloading FTB installer"
@@ -64,6 +66,8 @@ fi
 forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json)
 fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version' version.json)
 mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
+VERSION="$mcVersion"
+export VERSION
 
 variants=(
   "forge-${mcVersion}-${forgeVersion}.jar"

scripts/start-deployMagma

@@ -26,4 +26,4 @@ fi
 export SERVER
 export FAMILY=HYBRID
 
-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+exec "${SCRIPTS:-/}start-spiget" "$@"

scripts/start-deployMohist

@@ -40,4 +40,4 @@ fi
 
 export FAMILY=HYBRID
 
-exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
+exec "${SCRIPTS:-/}start-spiget" "$@"

scripts/start-finalExec

@@ -2,6 +2,7 @@
 
 : "${DEBUG_EXEC:=false}"
 : "${SETUP_ONLY:=false}"
+: "${CUSTOM_JAR_EXEC:=}"
 
 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"
@@ -226,6 +227,8 @@ MC_HEALTH_EXTRA_ARGS=(
   --use-server-list-ping
 )
   " > /data/.mc-health.env
+else
+  rm -f /data/.mc-health.env
 fi
 
 mcServerRunnerArgs=(
@@ -295,12 +298,23 @@ else
 
   log "Starting the Minecraft server..."
 
+  # Specifically want the variables to expand to args, so...
   # shellcheck disable=SC2206
   finalArgs=(
     $JVM_XX_OPTS
     $JVM_OPTS
     $expandedDOpts
-    -jar "$SERVER"
+  )
+
+  if [[ $CUSTOM_JAR_EXEC ]]; then
+    # shellcheck disable=SC2206
+    finalArgs+=($CUSTOM_JAR_EXEC)
+  else
+    finalArgs+=(-jar "$SERVER")
+  fi
+
+  # shellcheck disable=SC2206
+  finalArgs+=(
     "$@" $EXTRA_ARGS
   )
 

scripts/start-setupDatapack

@@ -2,6 +2,8 @@
 
 set -e -o pipefail
 
+: "${VANILLATWEAKS_FILE:=}"
+: "${VANILLATWEAKS_SHARECODE:=}"
 : "${REMOVE_OLD_DATAPACKS:=false}"
 : "${DATAPACKS_FILE:=}"
 : "${REMOVE_OLD_DATAPACKS_DEPTH:=1} "
@@ -74,4 +76,12 @@ elif [[ "$DATAPACKS_FILE" ]]; then
   fi
 fi
 
+if [[ ${VANILLATWEAKS_FILE} || ${VANILLATWEAKS_SHARECODE} ]]; then
+  mc-image-helper vanillatweaks \
+    --output-directory="/data" \
+    --world-subdir="${LEVEL:-world}" \
+    --share-codes="$VANILLATWEAKS_SHARECODE" \
+    --pack-files="$VANILLATWEAKS_FILE"
+fi
+
 exec "${SCRIPTS:-/}start-setupForgeApiMods" "$@"

scripts/start-setupEnvVariables

@@ -8,14 +8,14 @@ set -e
 : "${REPLACE_ENV_IN_PLACE:=${REPLACE_ENV_VARIABLES:-false}}"
 : "${REPLACE_ENV_PATHS:=/data}"
 : "${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}"
-: "${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}"
+: "${REPLACE_ENV_VARIABLE_PREFIX=${ENV_VARIABLE_PREFIX:-CFG_}}"
 : "${REPLACE_ENV_VARIABLES_EXCLUDES:=}"
 : "${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}"
 : "${PATCH_DEFINITIONS:=}"
 : "${DEBUG:=false}"
 
 if isTrue "${REPLACE_ENV_IN_PLACE}"; then
-  log "Replacing env variables in ${REPLACE_ENV_PATHS} that match the prefix $REPLACE_ENV_VARIABLE_PREFIX ..."
+  log "Replacing env variables in ${REPLACE_ENV_PATHS} that match the prefix '$REPLACE_ENV_VARIABLE_PREFIX' ..."
 
   mc-image-helper interpolate \
     --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \

scripts/start-setupMounts

@@ -6,7 +6,7 @@
 : "${SYNC_SKIP_NEWER_IN_DESTINATION:=${PLUGINS_SYNC_UPDATE:-true}}"
 : "${REPLACE_ENV_DURING_SYNC:=true}"
 : "${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}"
-: "${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}"
+: "${REPLACE_ENV_VARIABLE_PREFIX=${ENV_VARIABLE_PREFIX:-CFG_}}"
 : "${REPLACE_ENV_VARIABLES_EXCLUDES:=}"
 : "${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}"
 : "${DEBUG:=false}"

scripts/start-setupVanillaTweaks

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e -o pipefail
-
-: "${VANILLATWEAKS_FILE:=}"
-: "${VANILLATWEAKS_SHARECODE:=}"
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-if [[ ${VANILLATWEAKS_FILE} || ${VANILLATWEAKS_SHARECODE} ]]; then
-  mc-image-helper vanillatweaks \
-    --output-directory="/data" \
-    --world-subdir="${LEVEL:-world}" \
-    --share-codes="$VANILLATWEAKS_SHARECODE" \
-    --pack-files="$VANILLATWEAKS_FILE"
-fi
-
-exec "${SCRIPTS:-/}start-setupDatapack" "$@"

scripts/start-setupWorld

@@ -48,7 +48,7 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
     count=$(echo "$baseDirs" | wc -l)
     if [[ $count -gt 1 ]]; then
       baseDirsNoSpigotSuffix=$(echo "$baseDirs" | sed -re 's:(_nether|_the_end)/?$::' | sort -u)
-      if [ $(echo "$baseDirsNoSpigotSuffix" | wc -l) -eq 1 ]; then
+      if [ "$(echo "$baseDirsNoSpigotSuffix" | wc -l)" -eq 1 ]; then
         baseDir="$baseDirsNoSpigotSuffix"
         baseName=$(basename "$baseDir")
         log "Found Spigot naming conventions, taking $baseName as main dimension"
@@ -123,4 +123,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
   fi
 fi
 
-exec "${SCRIPTS:-/}start-setupVanillaTweaks" "$@"
+exec "${SCRIPTS:-/}start-setupDatapack" "$@"

scripts/start-utils

@@ -208,14 +208,17 @@ eula=${EULA,,}
 function removeOldMods {
   if [ -d "$1" ]; then
     log "Removing old mods including:${REMOVE_OLD_MODS_INCLUDE} excluding:${REMOVE_OLD_MODS_EXCLUDE}"
-    mc-image-helper find \
-      --delete \
-      --type file,directory \
-      --min-depth=1 --max-depth "${REMOVE_OLD_MODS_DEPTH:-16}" \
-      --name "${REMOVE_OLD_MODS_INCLUDE:-*}" \
-      --exclude-name "${REMOVE_OLD_MODS_EXCLUDE:-}" \
-      --quiet \
-      "$1"
+    args=(
+      --delete
+      --type file
+      --min-depth=1 --max-depth "${REMOVE_OLD_MODS_DEPTH:-16}"
+      --name "${REMOVE_OLD_MODS_INCLUDE:-*}"
+      --exclude-name "${REMOVE_OLD_MODS_EXCLUDE:-}"
+    )
+    if ! isDebugging; then
+      args+=(--quiet)
+    fi
+    mc-image-helper find "${args[@]}" "$1"
   fi
 }