Updated LegacyJavaFixer Download URL (#1667)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/build-multiarch.yml

@@ -10,13 +10,6 @@ on:
       - "*.md"
       - "docs/**"
       - "examples/**"
-  pull_request:
-    branches: [ master ]
-    types: [assigned, opened, synchronize, labeled]
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
 
 jobs:
   build:
@@ -96,6 +89,7 @@ jobs:
             mcVersion: 1.12.2
     env:
       IMAGE_TO_TEST: ${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}
+      HAS_IMAGE_REPO_ACCESS: ${{ secrets.DOCKER_USER != '' && secrets.DOCKER_PASSWORD != '' }}
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -128,7 +122,7 @@ jobs:
         uses: docker/setup-qemu-action@v2.0.0
 
       - name: Build for test
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.1.1
         with:
           platforms: linux/amd64
           tags: ${{ env.IMAGE_TO_TEST }}
@@ -152,20 +146,24 @@ jobs:
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
+        if: env.HAS_IMAGE_REPO_ACCESS
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.1.1
+        if: github.actor == github.repository_owner
         with:
           platforms: ${{ matrix.platforms }}
           push: >
             ${{ 
             github.ref_type == 'tag' 
             || github.ref_name == 'master' 
-            || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ci/push-image') )
+            || ( github.event_name == 'pull_request' 
+                 && env.HAS_IMAGE_REPO_ACCESS 
+                 && contains(github.event.pull_request.labels.*.name, 'ci/push-image') 
+               )
             }}
           tags: ${{ steps.meta.outputs.tags }}
           # ensure latest base image is used

.github/workflows/ci.yml

@@ -1,43 +0,0 @@
-name: ContinuousIntegration
-
-on:
-  push:
-    branches:
-      - 'dev*'
-      - '!master'
-      - '!java*'
-      - '!multi*'
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
-
-env:
-  IMAGE_TO_TEST: ${{ secrets.IMAGE_ORG }}/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
-  MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: .
-          platforms: linux/amd64
-          tags: ${{ env.IMAGE_TO_TEST }}
-          load: true
-          cache-from: type=gha
-
-      - name: Run Setup Only Tests
-        run: bash tests/setuponlytests/test.sh
-
-      # - name: Run Full Minecraft Service Tests
-      #   run: |
-      #     tests/fulltests/test.sh          

.github/workflows/verify-pr.yml

@@ -0,0 +1,63 @@
+name: Verify PR
+on:
+  pull_request:
+    branches: [ master ]
+    types: [assigned, opened, synchronize, labeled]
+    paths-ignore:
+      - "*.md"
+      - "docs/**"
+      - "examples/**"
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        variant:
+          - java17
+          - java17-alpine
+        include:
+        # JAVA 17:
+          - variant: java17
+            # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343
+            baseImage: eclipse-temurin:17-jre-focal
+            platforms: linux/amd64,linux/arm/v7,linux/arm64
+            mcVersion: 1.18.2
+          - variant: java17-alpine
+            baseImage: eclipse-temurin:17-jre-alpine
+            platforms: linux/amd64
+            mcVersion: 1.18.2
+    env:
+      IMAGE_TO_TEST: ${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          # for build-files step
+          fetch-depth: 0
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build for test
+        uses: docker/build-push-action@v3.1.1
+        with:
+          platforms: linux/amd64
+          tags: ${{ env.IMAGE_TO_TEST }}
+          # ensure latest base image is used
+          pull: true
+          # load into daemon for test usage in next step
+          load: true
+          push: false
+          build-args: |
+            BASE_IMAGE=${{ matrix.baseImage }}
+          cache-from: type=gha,scope=${{ matrix.variant }}
+
+      - name: Run tests
+        env:
+          MINECRAFT_VERSION: ${{ matrix.mcVersion }}
+          VARIANT: ${{ matrix.variant }}
+          MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
+        run: |
+          tests/test.sh

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.20.1
+ARG MC_HELPER_VERSION=1.20.3
 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}
 RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
   | tar -C /usr/share -zxf - \

README.md

@@ -165,21 +165,24 @@ the server jar remain in the `/data` directory. It is safe to remove those._
 
 ## Running Minecraft server on different Java version
 
-When using the image `itzg:/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container.
+When using the image `itzg/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container.
 
-| Tag name        | Java version | Linux  | JVM Type | Architecture      |
-|-------------------|-------------|--------|------------|-------------------|
-| latest            | 17          | Debian | Hotspot    | amd64,arm64,armv7 |
-| java8             | 8           | Alpine | Hotspot    | amd64             |
-| java8-multiarch   | 8           | Debian | Hotspot    | amd64,arm64,armv7 |
-| java8-openj9      | 8           | Debian | OpenJ9     | amd64             |
-| java8-graalvm-ce  | 8           | Oracle | GraalVM CE | amd64             |
-| java11            | 11          | Debian | Hotspot    | amd64,arm64,armv7 |
-| java11-openj9     | 11          | Debian | OpenJ9     | amd64             |
-| java17            | 17          | Ubuntu | Hotspot    | amd64,arm64,armv7 |
-| java17-openj9     | 17          | Debian | OpenJ9     | amd64             |
-| java17-graalvm-ce | 17          | Oracle | GraalVM CE | amd64,arm64       |
-| java17-alpine     | 17          | Alpine | Hotspot    | amd64             |
+| Tag name          | Java version | Linux  | JVM Type    | Architecture      |
+|-------------------|--------------|--------|-------------|-------------------|
+| latest            | 17           | Ubuntu | Hotspot     | amd64,arm64,armv7 |
+| java8             | 8            | Alpine | Hotspot     | amd64             |
+| java8-jdk         | 8            | Ubuntu | Hotspot+JDK | amd64             |
+| java8-multiarch   | 8            | Ubuntu | Hotspot     | amd64,arm64,armv7 |
+| java8-openj9      | 8            | Debian | OpenJ9      | amd64             |
+| java8-graalvm-ce  | 8            | Oracle | GraalVM CE  | amd64             |
+| java11            | 11           | Ubuntu | Hotspot     | amd64,arm64,armv7 |
+| java11-jdk        | 11           | Ubuntu | Hotspot+JDK | amd64,arm64,armv7 |
+| java11-openj9     | 11           | Debian | OpenJ9      | amd64             |
+| java17            | 17           | Ubuntu | Hotspot     | amd64,arm64,armv7 |
+| java17-jdk        | 17           | Ubuntu | Hotspot+JDK | amd64,arm64,armv7 |
+| java17-openj9     | 17           | Debian | OpenJ9      | amd64             |
+| java17-graalvm-ce | 17           | Oracle | GraalVM CE  | amd64,arm64       |
+| java17-alpine     | 17           | Alpine | Hotspot     | amd64             |
 
 For example, to use Java version 8 on any supported architecture:
 
@@ -657,7 +660,9 @@ There are optional volume paths that can be attached to supply content to be cop
 
 By default, the [environment variable processing](#replacing-variables-inside-configs) is performed on synchronized files that match the expected suffixes in `REPLACE_ENV_SUFFIXES` (by default "yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml") and are not excluded by `REPLACE_ENV_VARIABLES_EXCLUDES` and `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`. This processing can be disabled by setting `REPLACE_ENV_DURING_SYNC` to `false`.
 
-If you want old mods/plugins to be removed before the content is brought over from those attach points, then add `-e REMOVE_OLD_MODS=TRUE`. You can fine tune the removal process by specifying the `REMOVE_OLD_MODS_INCLUDE` and `REMOVE_OLD_MODS_EXCLUDE` variables. By default, everything will be removed. You can also specify the `REMOVE_OLD_MODS_DEPTH` (default is 16) variable to only delete files up to a certain level.
+If you want old mods/plugins to be removed before the content is brought over from those attach points, then add `-e REMOVE_OLD_MODS=TRUE`. You can fine tune the removal process by specifying the `REMOVE_OLD_MODS_INCLUDE` and `REMOVE_OLD_MODS_EXCLUDE` variables, which are comma separated lists of file glob patterns. If a directory is excluded, then it and all of its contents are excluded. By default, only jars are removed. 
+
+You can also specify the `REMOVE_OLD_MODS_DEPTH` (default is 16) variable to only delete files up to a certain level.
 
 For example: `-e REMOVE_OLD_MODS=TRUE -e REMOVE_OLD_MODS_INCLUDE="*.jar" -e REMOVE_OLD_MODS_DEPTH=1` will remove all old jar files that are directly inside the `plugins/` or `mods/` directory.
 
@@ -1694,6 +1699,8 @@ The following environment variables define the behaviour of auto-pausing:
 * `AUTOPAUSE_KNOCK_INTERFACE`, default `eth0`
   <br>Describes the interface passed to the `knockd` daemon. If the default interface does not work, run the `ifconfig` command inside the container and derive the interface receiving the incoming connection from its output. The passed interface must exist inside the container. Using the loopback interface (`lo`) does likely not yield the desired results.
 
+> To troubleshoot, add `DEBUG_AUTOPAUSE=true` to see additional output
+
 ## Autostop
 
 An option to stop the server after a specified time has been added for niche applications (e.g. billing saving on AWS Fargate). The function is incompatible with the Autopause functionality, as they basically cancel out each other.
@@ -1716,6 +1723,8 @@ The following environment variables define the behaviour of auto-stopping:
 * `AUTOSTOP_PERIOD`, default `10` (seconds)
   describes period of the daemonized state machine, that handles the stopping of the server
 
+> To troubleshoot, add `DEBUG_AUTOSTOP=true` to see additional output
+
 ## Running on RaspberryPi
 
 To run this image on a RaspberryPi 3 B+, 4, or newer, use any of the image tags [list in the Java version section](#running-minecraft-server-on-different-java-version) that specify `armv7` for the architecture, which includes `itzg/minecraft-server:latest`.

build/ol/install-packages.sh

@@ -26,6 +26,7 @@ dnf install -y ImageMagick \
   jq \
   dos2unix \
   mysql \
+  procps-ng \
   tzdata \
   rsync \
   nano \

docker-compose.yml

@@ -0,0 +1,16 @@
+version: "3.8"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    environment:
+      EULA: "true"
+    ports:
+      - "25565:25565"
+    volumes:
+      - data:/data
+    stdin_open: true
+    tty: true
+    restart: unless-stopped
+volumes:
+  data: {}

examples/docker-compose-spiget.yml

@@ -3,13 +3,16 @@ version: "3"
 services:
   mc:
     # Only using IMAGE variable to allow for local testing
-    image: ${IMAGE:-itzg/minecraft-server}
+    image: itzg/minecraft-server
+#    image: ${IMAGE:-itzg/minecraft-server}
     ports:
       - "25565:25565"
     environment:
       EULA: "TRUE"
       TYPE: SPIGOT
-      SPIGET_RESOURCES: 34315,3836
+#      SPIGET_RESOURCES: 34315,3836
+      SPIGET_RESOURCES: ""
+      REMOVE_OLD_MODS: "true"
     volumes:
       - data:/data
 

files/autopause/autopause-daemon.sh

@@ -2,8 +2,11 @@
 
 . /autopause/autopause-fcns.sh
 
-. ${SCRIPTS:-/}start-utils
-
+# shellcheck source=../../scripts/start-utils
+. "${SCRIPTS:-/}start-utils"
+if isTrue "${DEBUG_AUTOPAUSE}"; then
+  set -x
+fi
 
 autopause_error_loop() {
   logAutopause "Available interfaces within the docker container:"
@@ -39,7 +42,12 @@ if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
   autopause_error_loop
 fi
 
-sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
+knockdArgs=(-c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE")
+if isTrue "${DEBUG_AUTOPAUSE}"; then
+  knockdArgs+=(-D)
+fi
+
+sudo /usr/sbin/knockd "${knockdArgs[@]}"
 if [ $? -ne 0 ] ; then
   logAutopause "Failed to start knockd daemon."
   logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
@@ -50,12 +58,13 @@ STATE=INIT
 
 while :
 do
+  isTrue "${DEBUG_AUTOPAUSE}" && log "DEBUG: autopause state = $STATE"
   case X$STATE in
   XINIT)
     # Server startup
     if mc_server_listening ; then
       TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_INIT))
-      logAutopause "MC Server listening for connections - stopping in $AUTOPAUSE_TIMEOUT_INIT seconds"
+      logAutopause "MC Server listening for connections - pausing in $AUTOPAUSE_TIMEOUT_INIT seconds"
       STATE=K
     fi
     ;;
@@ -66,7 +75,7 @@ do
       STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client connected since startup / knocked - stopping"
+        logAutopause "No client connected since startup / knocked - pausing"
         /autopause/pause.sh
         STATE=S
       fi
@@ -76,7 +85,7 @@ do
     # Established
     if ! java_clients_connected ; then
       TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_EST))
-      logAutopause "All clients disconnected - stopping in $AUTOPAUSE_TIMEOUT_EST seconds"
+      logAutopause "All clients disconnected - pausing in $AUTOPAUSE_TIMEOUT_EST seconds"
       STATE=I
     fi
     ;;
@@ -87,7 +96,7 @@ do
       STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client reconnected - stopping"
+        logAutopause "No client reconnected - pausing"
         /autopause/pause.sh
         STATE=S
       fi
@@ -115,8 +124,8 @@ do
   esac
   if [[ "$STATE" == "S" ]] ; then
     # before rcon times out
-    sleep 2
+    sleep 5
   else
-    sleep $AUTOPAUSE_PERIOD
+    sleep "$AUTOPAUSE_PERIOD"
   fi
 done

files/autopause/pause.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
 . /start-utils
+if isTrue "${DEBUG_AUTOPAUSE}"; then
+  set -x
+fi
 
 if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
   # save world

files/autopause/resume.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
 . /start-utils
+if isTrue "${DEBUG_AUTOPAUSE}"; then
+  set -x
+fi
 
 if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
   logAutopauseAction "Knocked, resuming Java process"

files/autostop/autostop-daemon.sh

@@ -3,7 +3,11 @@
 # needed for the clients connected function residing in autopause
 . /autopause/autopause-fcns.sh
 
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=../../scripts/start-utils
+. "${SCRIPTS:-/}start-utils"
+if isTrue "${DEBUG_AUTOSTOP}"; then
+  set -x
+fi
 
 # wait for java process to be started
 while :
@@ -18,11 +22,12 @@ STATE=INIT
 
 while :
 do
+  isTrue "${DEBUG_AUTOSTOP}" && log "DEBUG: autostop state = $STATE"
   case X$STATE in
   XINIT)
     # Server startup
     if mc_server_listening ; then
-      TIME_THRESH=$(($(current_uptime)+$AUTOSTOP_TIMEOUT_INIT))
+      TIME_THRESH=$(($(current_uptime)+AUTOSTOP_TIMEOUT_INIT))
       logAutostop "MC Server listening for connections - stopping in $AUTOSTOP_TIMEOUT_INIT seconds"
       STATE=II
     fi

files/autostop/stop.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
 . /start-utils
+if isTrue "${DEBUG_AUTOSTOP}"; then
+  set -x
+fi
 
 logAutostopAction "Stopping Java process"
 kill -SIGTERM 1

scripts/start-autopause

@@ -10,6 +10,7 @@
 : "${AUTOPAUSE_TIMEOUT_INIT:=600}"
 : "${AUTOPAUSE_PERIOD:=10}"
 : "${AUTOPAUSE_KNOCK_INTERFACE:=eth0}"
+: "${DEBUG_AUTOPAUSE:=false}"
 export SERVER_PORT
 export ENABLE_AUTOPAUSE
 export AUTOPAUSE_TIMEOUT_EST
@@ -17,6 +18,7 @@ export AUTOPAUSE_TIMEOUT_KN
 export AUTOPAUSE_TIMEOUT_INIT
 export AUTOPAUSE_PERIOD
 export AUTOPAUSE_KNOCK_INTERFACE
+export DEBUG_AUTOPAUSE
 
 log "Autopause functionality enabled"
 

scripts/start-autostop

@@ -8,11 +8,13 @@
 : "${AUTOSTOP_TIMEOUT_EST:=3600}"
 : "${AUTOSTOP_TIMEOUT_INIT:=1800}"
 : "${AUTOSTOP_PERIOD:=10}"
+: "${DEBUG_AUTOSTOP:=false}"
 export SERVER_PORT
 export ENABLE_AUTOSTOP
 export AUTOSTOP_TIMEOUT_EST
 export AUTOSTOP_TIMEOUT_INIT
 export AUTOSTOP_PERIOD
+export DEBUG_AUTOSTOP
 
 log "Autostop functionality enabled"
 

scripts/start-deployCF

@@ -27,7 +27,7 @@ isDebugging && set -x
 : "${FTB_BASE_DIR:=${CF_BASE_DIR:-/data/FeedTheBeast}}"
 export FTB_BASE_DIR
 
-legacyJavaFixerUrl=https://ftb.forgecdn.net/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
+legacyJavaFixerUrl=https://files.minecraftforge.net/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
 export TYPE=CURSEFORGE
 
 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}

scripts/start-deployFTBA

@@ -7,6 +7,11 @@ ftbInstallMarker=".ftb-installed"
 isDebugging && set -x
 set -e
 
+if [[ $(getDistro) = alpine ]]; then
+  log "ERROR: the FTBA installer is not supported on Alpine. Use the java8-multiarch image tag instead."
+  exit 1
+fi
+
 if ! [[ -v FTB_MODPACK_ID ]]; then
   log "ERROR FTB_MODPACK_ID is required with TYPE=FTB"
   exit 1
@@ -27,7 +32,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 ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
   ftbInstaller=/data/ftb-installer
   if ! [[ -f "${ftbInstaller}" ]]; then
     log "Downloading FTB installer"
@@ -63,10 +68,10 @@ fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version'
 mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
 
 variants=(
-  forge-${mcVersion}-${forgeVersion}.jar
-  forge-${mcVersion}-${forgeVersion}-universal.jar
-  forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
-  fabric-${mcVersion}-${fabricVersion}-server-launch.jar
+  "forge-${mcVersion}-${forgeVersion}.jar"
+  "forge-${mcVersion}-${forgeVersion}-universal.jar"
+  "forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar"
+  "fabric-${mcVersion}-${fabricVersion}-server-launch.jar"
   run.sh
 )
 for f in "${variants[@]}"; do
@@ -77,10 +82,10 @@ for f in "${variants[@]}"; do
 done
 if ! [ -v SERVER ]; then
   log "ERROR unable to locate the installed FTB server jar"
-  ls *.jar
+  log "      Tried looking for ${variants[*]}"
   exit 2
 fi
 
 export FAMILY=FORGE
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-setupForgeApiMods

@@ -10,7 +10,7 @@ set -e -o pipefail
 : "${MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES:=false}"
 : "${MODS_FORGEAPI_IGNORE_GAMETYPE:=false}"
 : "${REMOVE_OLD_MODS_DEPTH:=1} "
-: "${REMOVE_OLD_MODS_INCLUDE:=*.jar}"
+: "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
 
 #  FORGEAPI_BASE_URL used in manifest downloads below
 FORGEAPI_BASE_URL=${FORGEAPI_BASE_URL:-https://api.curseforge.com/v1}

scripts/start-setupModpack

@@ -5,7 +5,7 @@ set -e -o pipefail
 : "${REMOVE_OLD_MODS:=false}"
 : "${MODS_FILE:=}"
 : "${REMOVE_OLD_MODS_DEPTH:=1} "
-: "${REMOVE_OLD_MODS_INCLUDE:=*.jar}"
+: "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
 sum_file=/data/.generic_pack.sum
 
 # shellcheck source=start-utils

scripts/start-spiget

@@ -8,6 +8,7 @@ handleDebugMode
 
 : "${SPIGET_RESOURCES:=}"
 : "${SPIGET_DOWNLOAD_TOLERANCE:=5}" # in minutes
+: "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
 
 acceptArgs=(--accept application/zip --accept application/java-archive --accept application/octet-stream)
 

scripts/start-utils

@@ -99,7 +99,6 @@ function isDebugging() {
 function handleDebugMode() {
   if isDebugging; then
     set -x
-    extraCurlArgs=(-v)
   fi
 }
 
@@ -207,7 +206,15 @@ eula=${EULA,,}
 
 function removeOldMods {
   if [ -d "$1" ]; then
-    find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE:-}" -delete
+    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"
   fi
 }
 

tests/setuponlytests/modrinth/docker-compose.yml

@@ -9,6 +9,7 @@ services:
       TYPE: FABRIC
       FABRIC_LAUNCHER: /servers/fake.jar
       CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.19.1
       MODRINTH_PROJECTS: fabric-api,cloth-config
     volumes:
       - ./data:/data