docs: Updated description of LEVEL_TYPE (#1575)

* Added support for Pufferfish 1.19

* Update scripts/start-deployPufferfish

Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>

* Removed wrong negation

Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>

.gitattributes

@@ -1,17 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# Auto detect text files and perform LF normalization
+* text=lf

.github/workflows/build-multiarch.yml

@@ -31,21 +31,22 @@ jobs:
         include:
         # JAVA 17:
           - variant: java17
-            baseImage: eclipse-temurin:17-jre
+            # 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: LATEST
+            mcVersion: 1.18.2
           - variant: java17-jdk
-            baseImage: eclipse-temurin:17
+            baseImage: eclipse-temurin:17-focal
             platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: LATEST
+            mcVersion: 1.18.2
           - variant: java17-openj9
             baseImage: ibm-semeru-runtimes:open-17-jre
             platforms: linux/amd64,linux/arm64
-            mcVersion: LATEST
+            mcVersion: 1.18.2
           - variant: java17-alpine
             baseImage: eclipse-temurin:17-jre-alpine
             platforms: linux/amd64
-            mcVersion: LATEST
+            mcVersion: 1.18.2
         # JAVA 11:
           - variant: java11
             baseImage: adoptopenjdk:11-jre-hotspot
@@ -65,11 +66,11 @@ jobs:
             platforms: linux/amd64
             mcVersion: 1.12.2
           - variant: java8-multiarch
-            baseImage: eclipse-temurin:8u312-b07-jre
+            baseImage: eclipse-temurin:8u312-b07-jre-focal
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.12.2
           - variant: java8-jdk
-            baseImage: eclipse-temurin:8u312-b07-jdk
+            baseImage: eclipse-temurin:8u312-b07-jdk-focal
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.12.2
           - variant: java8-openj9

.github/workflows/pr.yml

@@ -34,12 +34,21 @@ jobs:
       - name: Run tests
         env:
           MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
-          MINECRAFT_VERSION: LATEST
+          MINECRAFT_VERSION: 1.18.2
         run: |
           tests/test.sh
+  push:
+    runs-on: ubuntu-20.04
+    needs:
+      - test
+    if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       - name: Gather Docker metadata
-        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
         id: meta
         uses: docker/metadata-action@v4
         with:
@@ -47,18 +56,16 @@ jobs:
             itzg/minecraft-server
 
       - name: Login to DockerHub
-        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Push
-        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
         uses: docker/build-push-action@v3.0.0
         with:
           context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           pull: true
           push: true

Dockerfile

@@ -1,75 +1,75 @@
-# syntax = docker/dockerfile:1.3
-
-ARG BASE_IMAGE=eclipse-temurin:17-jdk
-FROM ${BASE_IMAGE}
-
-# CI system should set this to a hash or git revision of the build directory and it's contents to
-# ensure consistent cache updates.
-ARG BUILD_FILES_REV=1
-RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} /build/run.sh install-packages
-
-RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} /build/run.sh setup-user
-
-COPY --chmod=644 files/sudoers* /etc/sudoers.d
-
-EXPOSE 25565 25575
-
-# hook into docker BuildKit --platform support
-# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
-
-ARG EASY_ADD_VER=0.7.1
-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}} \
-  --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.0 --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.10.3 --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.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.16.11
-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 - \
-  && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
-
-VOLUME ["/data"]
-WORKDIR /data
-
-STOPSIGNAL SIGTERM
-
-# End user MUST set EULA and change RCON_PASSWORD
-ENV TYPE=VANILLA VERSION=LATEST EULA="" UID=1000 GID=1000 RCON_PASSWORD=minecraft
-
-COPY --chmod=755 scripts/start* /
-COPY --chmod=755 bin/ /usr/local/bin/
-COPY --chmod=755 bin/mc-health /health.sh
-COPY --chmod=644 files/server.properties /tmp/server.properties
-COPY --chmod=644 files/log4j2.xml /tmp/log4j2.xml
-COPY --chmod=755 files/autopause /autopause
-COPY --chmod=755 files/autostop /autostop
-COPY --chmod=755 files/rconcmds /rconcmds
-
-RUN dos2unix /start* /autopause/* /autostop/* /rconcmds/*
-
-ENTRYPOINT [ "/start" ]
-HEALTHCHECK --start-period=1m CMD mc-health
+# syntax = docker/dockerfile:1.3
+
+ARG BASE_IMAGE=eclipse-temurin:17-jre-focal
+FROM ${BASE_IMAGE}
+
+# CI system should set this to a hash or git revision of the build directory and it's contents to
+# ensure consistent cache updates.
+ARG BUILD_FILES_REV=1
+RUN --mount=target=/build,source=build \
+    REV=${BUILD_FILES_REV} /build/run.sh install-packages
+
+RUN --mount=target=/build,source=build \
+    REV=${BUILD_FILES_REV} /build/run.sh setup-user
+
+COPY --chmod=644 files/sudoers* /etc/sudoers.d
+
+EXPOSE 25565 25575
+
+# hook into docker BuildKit --platform support
+# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETVARIANT
+
+ARG EASY_ADD_VER=0.7.1
+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}} \
+  --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.0 --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.10.3 --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.1 --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.17.0
+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 - \
+  && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
+
+VOLUME ["/data"]
+WORKDIR /data
+
+STOPSIGNAL SIGTERM
+
+# End user MUST set EULA and change RCON_PASSWORD
+ENV TYPE=VANILLA VERSION=LATEST EULA="" UID=1000 GID=1000 RCON_PASSWORD=minecraft
+
+COPY --chmod=755 scripts/start* /
+COPY --chmod=755 bin/ /usr/local/bin/
+COPY --chmod=755 bin/mc-health /health.sh
+COPY --chmod=644 files/server.properties /tmp/server.properties
+COPY --chmod=644 files/log4j2.xml /tmp/log4j2.xml
+COPY --chmod=755 files/autopause /autopause
+COPY --chmod=755 files/autostop /autostop
+COPY --chmod=755 files/rconcmds /rconcmds
+
+RUN dos2unix /start* /autopause/* /autostop/* /rconcmds/*
+
+ENTRYPOINT [ "/start" ]
+HEALTHCHECK --start-period=1m CMD mc-health

README.md

@@ -86,9 +86,14 @@ Everything the container manages is located under the **container's** `/data` pa
 
 ### Attaching data directory to host filesystem
 
-In most cases the easier way to persist and work with the minecraft data files is to use the `-v` argument to map a directory on your host machine to the container's `/data` directory, such as the following where `/home/user/minecraft-data` would be a directory of your choosing on your host machine:
+In most cases the easiest way to persist and work with the minecraft data files is to use the [volume mounting](https://docs.docker.com/storage/volumes/) `-v` argument to map a directory on your host machine to the container's `/data` directory. In the following example, the path `/home/user/minecraft-data` **must be** a directory on your host machine:
 
-    docker run -d -v /home/user/minecraft-data:/data ...
+    -v /home/user/minecraft-data:/data
+       ------------------------- -----
+        |                         |
+        |                         +-- must always be /data
+        |
+        +-- replace with a directory on your host machine
 
 When attached in this way you can stop the server, edit the configuration under your attached directory and start the server again to pick up the new configuration.
 
@@ -222,6 +227,10 @@ A tool that is bundled with this image that provides health checks and metrics r
 
 A tool that is bundled with this image to provide complex, re-usable preparation operations. 
 
+### [itzg/rcon](https://github.com/itzg/docker-rcon-web-admin)
+
+An image that dockerizes [rcon-web-admin](https://github.com/rcon-web-admin/rcon-web-admin).
+
 ## Healthcheck
 
 This image contains [mc-monitor](https://github.com/itzg/mc-monitor) and uses
@@ -451,6 +460,7 @@ Extra variables:
 - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use
 - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
 - `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the built-in [Flare](https://blog.airplane.gg/flare) profiler
+- `PURPUR_DOWNLOAD_URL=<url>` : set URL to download Purpur from custom URL.
 
 ### Running a Magma server
 
@@ -571,7 +581,7 @@ The following example runs the latest version of [FTB Presents Direwolf20 1.12](
 docker run -d --name mc-ftb -e EULA=TRUE \
   -e TYPE=FTBA -e FTB_MODPACK_ID=31 \
   -p 25565:25565 \
-  itzg/minecraft-server:multiarch
+  itzg/minecraft-server:java8-multiarch
 ```
 
 > Normally you will also add `-v` volume for `/data` since the mods and config are installed there along with world data.
@@ -834,6 +844,14 @@ The following diagram shows how this option can be used in a compose deployment
 ### Overwrite world on start
 The world will only be downloaded or copied if it doesn't exist already. Set `FORCE_WORLD_COPY=TRUE` to force overwrite the world on every server start.
 
+### Custom worlds directory path
+To set a custom worlds directory for the Multiverse plugin on a baremetal server, you'd pass the `--world-dir` argument after the jar file.
+In order to accomplish the same in a containerized server, set the `EXTRA_ARGS` environment variable in your command line or docker compose yaml to the same argument string. For example:
+```
+docker run -d -e EXTRA_ARGS='--world-dir ./worlds/'
+```
+`--world-container`, `-W`, and `--universe` are aliases to `--world-dir` and can also be used.
+
 ### Datapacks
 Datapacks can be installed in a similar manner to mods/plugins. There are many environment variables which function in the same way they do for [mods](#working-with-mods-and-plugins): 
 * `DATAPACKS`
@@ -1161,30 +1179,9 @@ environment variable set to `false`, such as
 ### Level Type and Generator Settings
 
 By default, a standard world is generated with hills, valleys, water, etc. A different level type can
-be configured by setting `LEVEL_TYPE` to an expected type, for example
+be configured by setting `LEVEL_TYPE` to [an expected type listed here](https://minecraft.fandom.com/wiki/Server.properties#level-type).
 
-- DEFAULT
-- FLAT
-- LARGEBIOMES
-- AMPLIFIED
-- CUSTOMIZED
-- BUFFET
-- BIOMESOP (Biomes O' Plenty for 1.12 and older)
-- BIOMESOPLENTY (Biomes O' Plenty for 1.15 and above)
-
-Descriptions are available at the [gamepedia](http://minecraft.gamepedia.com/Server.properties).
-
-When using a level type of `FLAT`, `CUSTOMIZED`, and `BUFFET`, you can further configure the world generator
-by passing [custom generator settings](http://minecraft.gamepedia.com/Superflat).
-**Since generator settings usually have ;'s in them, surround the -e value with a single quote, like below.**
-
-For example (just the `-e` bits):
-
-    -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS=3;minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;2;'
-
-In Minecraft 1.13+ you need to pass json ([generator site](https://misode.github.io/world/)) like this (details see [here](https://github.com/itzg/docker-minecraft-server/issues/999#issuecomment-907849644)):
-
-    -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS={"biome":"minecraft:the_void","layers":[{"block":"minecraft:bedrock","height":1},{"block":"minecraft:stone","height":10},{"block":"minecraft:dirt","height":1}],"structures":{"structures":{}}}'
+For some of the level types, `GENERATOR_SETTINGS` can be used to further customize the world generation [as described here](https://minecraft.fandom.com/wiki/Server.properties#generator-settings).
 
 ### Custom Server Resource Pack
 
@@ -1438,6 +1435,10 @@ environment variable. The JVM requires `-XX` options to precede `-X` options, so
 For some cases, if e.g. after removing mods, it could be necessary to startup minecraft with an additional `-D` parameter like `-Dfml.queryResult=confirm`. To address this you can use the environment variable `JVM_DD_OPTS`, which builds the params from a given list of values separated by space, but without the `-D` prefix. To make things running under systems (e.g. Plesk), which doesn't allow `=` inside values, a `:` (colon) could be used instead. The upper example would look like this:
 `JVM_DD_OPTS=fml.queryResult:confirm`, and will be converted to `-Dfml.queryResult=confirm`.
 
+### Jarfile Options
+Options that would usually be passed to the jar file (those which are written after the filename) can be passed via the `EXTRA_ARGS` environment variable.
+See [Custom worlds directory path](#custom-worlds-directory-path) for an example.
+
 ### Interactive and Color Console
 
 If you would like to `docker attach` to the Minecraft server console with color and interactive capabilities, then add
@@ -1548,6 +1549,14 @@ To enable the JVM flags required to fully support the [Flare profiling suite](ht
     
 Flare is built-in to Airplane/Pufferfish/Purpur, and is available in [plugin form](https://github.com/TECHNOVE/FlarePlugin) for other server types.
 
+### Enable support for optimized SIMD operations
+
+To enable support for optimized SIMD operations, the JVM flag can be set with the following variable:
+
+    -e USE_SIMD_FLAGS=true
+
+SIMD optimized operations are supported by Pufferfish and Purpur.
+
 ### Enable timestamps in init logs
 
 Before the container starts the Minecraft Server its output is prefixed with `[init]`, such as

build/ubuntu/install-packages.sh

@@ -22,6 +22,7 @@ apt-get install -y \
   nano \
   unzip \
   zstd \
+  lbzip2 \
   knockd
 
 apt-get clean

examples/docker-compose-curseforge.yml

@@ -9,7 +9,9 @@ services:
     environment:
       EULA: "true"
       TYPE: CURSEFORGE
-      CF_SERVER_MOD: https://media.forgecdn.net/files/3482/169/Valhelsia+3-3.4.4-SERVER.zip
+      CF_SERVER_MOD: /modpacks/SIMPLE-SERVER-FILES-0.3.20.zip
+#      CF_SERVER_MOD: /modpacks/createlive3serverfiles+1.4.2.zip
+#      CF_SERVER_MOD: /modpacks/Valhelsia+3-3.5.1-SERVER.zip
 #      CF_SERVER_MOD: https://media.forgecdn.net/files/3012/800/SkyFactory-4_Server_4.2.2.zip
 #      CF_SERVER_MOD: /modpacks/${MODPACK:-SkyFactory_4_Server_4.1.0.zip}
     ports:

examples/docker-compose-generic-pack-atm7.yml

@@ -0,0 +1,19 @@
+version: '3.8'
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    volumes:
+    - ./data:/data
+    - ./modpacks:/modpacks:ro
+    environment:
+      EULA: "true"
+      MEMORY: 2G
+      TYPE: FORGE
+      VERSION: 1.18.2
+      FORGEVERSION: 40.1.30
+      # Need to download Server-Files-0.4.13.zip and
+      # put it in modpacks directory next to this compose file
+      GENERIC_PACK: /modpacks/Server-Files-0.4.13.zip
+    ports:
+      - "25565:25565"

examples/docker-compose-rlcraft.yml

@@ -1,27 +1,27 @@
 version: '3.8'
 
 services:
-  rlcraft:
+  mc:
     image: itzg/minecraft-server:java8
-    container_name: rlcraft
     volumes:
-    - rlcraft-modpack:/modpacks:ro
-    - rlcraft-data:/data
+    - data:/data
+    - ./modpacks:/modpacks:ro
     environment:
       EULA: "true"
       TYPE: "FORGE"
       VERSION: "1.12.2"
-      FORGEVERSION: "14.23.5.2855"
+      FORGEVERSION: "14.23.5.2860"
+      OVERRIDE_SERVER_PROPERTIES: "true"
       DIFFICULTY: "hard"
       MAX_TICK_TIME: "-1"
-      VIEW_DISTANCE: "6"
       ALLOW_FLIGHT: "true"
+      ENABLE_COMMAND_BLOCK: "true"
+      VIEW_DISTANCE: "10"
       MEMORY: "4G"
-      GENERIC_PACK: "/modpacks/RLCraft_Server_Pack_1.12.2_Beta_v2.8.2.zip"
+      # Download from https://www.curseforge.com/minecraft/modpacks/rlcraft and place in modpacks subdir
+      GENERIC_PACK: "/modpacks/RLCraft+Server+Pack+1.12.2+-+Release+v2.9.1c.zip"
     ports:
       - 25565:25565
-    restart: unless-stopped
 
 volumes:
-  rlcraft-data:
-  rlcraft-modpack:
+  data:

scripts/start-deployCF

@@ -33,7 +33,10 @@ export TYPE=CURSEFORGE
 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
 
 log "Looking for Feed-The-Beast / CurseForge server modpack."
-requireVar FTB_SERVER_MOD
+if [[ ! $FTB_SERVER_MOD ]]; then
+    log "ERROR: CF_SERVER_MOD or FTB_SERVER_MOD is required to be set"
+    exit 1
+fi
 
 downloadModpack() {
   srv_modpack=${FTB_SERVER_MOD}
@@ -133,31 +136,31 @@ if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
   exec "${SCRIPTS:-/}start-setupWorld" "$@"
 fi
 
-entryScriptExpr="
-  -name ServerStart.sh
-  -o -name serverstart.sh
-  -o -name ServerStartLinux.sh
-  -o -name LaunchServer.sh
-  -o -name server-start.sh
-  -o -name start-server.sh
-  -o -name startserver.sh
-  -o -name StartServer.sh
-  "
 
-if [[ -d ${FTB_BASE_DIR} ]]; then
-  startScriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr |wc -l)
-  if (( startScriptCount > 1 )); then
-    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
-    exit 2
+findStartScript() {
+  entryScriptExpr=(
+    -name ServerStart.sh
+    -o -name serverstart.sh
+    -o -name ServerStartLinux.sh
+    -o -name LaunchServer.sh
+    -o -name server-start.sh
+    -o -name start-server.sh
+    -o -name startserver.sh
+    -o -name StartServer.sh
+    -o -name run.sh
+  )
+
+  if [ -d "${FTB_BASE_DIR}" ]; then
+    find "${FTB_BASE_DIR}" \( "${entryScriptExpr[@]}" \) -print -quit
   fi
-else
-  startScriptCount=0
-fi
+}
+
+startScript=$(findStartScript)
 
 # only download and install if a mod pack isn't already installed
 # also check for the start script rather than just the folder
 # this allows saving just the world separate from the rest of the data directory
-if [[ $startScriptCount = 0 ]]; then
+if [[ ! $startScript ]]; then
   downloadModpack
   srv_modpack=${FTB_SERVER_MOD}
   
@@ -165,49 +168,61 @@ if [[ $startScriptCount = 0 ]]; then
   mkdir -p "${FTB_BASE_DIR}"
   unzip -o "${srv_modpack}" -d "${FTB_BASE_DIR}" | awk '{printf "."} END {print ""}'
 
-  installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f -name install.sh)
+  installScriptExpr=(
+    -name install.sh
+    -o -name FTBInstall.sh
+    -o -name Install.sh
+  )
+
+  installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( "${installScriptExpr[@]}" \) -print -quit)
   if [[ "$installScript" ]]; then
     (
       cd "$(dirname "${installScript}")"
-      chmod +x ./install.sh
-      log "Running included install.sh"
-      ./install.sh
+      chmod +x "${installScript}"
+      log "Running included $(basename "${installScript}"). This might take a minute or two..."
+      "${installScript}" > install.log
     )
   fi
+
+  startScript=$(findStartScript)
 fi
 
-if [[ $(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l) = 0 ]]; then
+# start script provided by unzipped+installed modpack?
+if [[ ! $startScript ]]; then
+  # no, then look for a forge jar to run
 
-    # Allow up to 2 levels since some modpacks have a top-level directory named
-    # for the modpack
-    forgeJar=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
-    if [[ "$forgeJar" ]]; then
-      FTB_BASE_DIR=$(dirname "${forgeJar}")
-      export FTB_BASE_DIR
-      log "No entry script found, so building one for ${forgeJar}"
-      cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
+  # Allow up to 2 levels since some modpacks have a top-level directory named for the modpack
+  forgeJar=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
+  if [[ "$forgeJar" ]]; then
+    FTB_BASE_DIR=$(dirname "${forgeJar}")
+    export FTB_BASE_DIR
+    log "No entry script found, so building one for ${forgeJar}"
+    cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
 #!/bin/sh
 . ./settings-local.sh
 java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
 EOF
-      chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
-    else
-      log "Please make sure you are using the server version of the FTB modpack!"
-      exit 2
-    fi
+    startScript="${FTB_BASE_DIR}/ServerStart.sh"
+    chmod +x "$startScript"
+  else
+    log "ERROR: Modpack missing start script and unable to find Forge jar to generate one"
+    exit 2
+  fi
 fi
 
-scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
-if [[ $scriptCount = 0 ]]; then
-    log "Please make sure you are using the server version of the FTB modpack!"
-    exit 2
-elif (( scriptCount > 1 )); then
-    log "Ambiguous startup scripts in FTB modpack! Found:"
-    find "${FTB_BASE_DIR}" $entryScriptExpr
-    exit 2
+# Modpacks that use https://github.com/BloodyMods/ServerStarter will sometimes specify an
+# extra subpath where all the server files get installed. Need to transplant EULA file there.
+serverSetupConfig=$(find "${FTB_BASE_DIR}" -type f -name server-setup-config.yaml)
+if [[ $serverSetupConfig && $serverSetupConfig != "~" ]]; then
+  if baseInstallPath=$(mc-image-helper yaml-path --file "$serverSetupConfig" ".install.baseInstallPath"); then
+    resolvedBaseInstallPath="$(dirname "$serverSetupConfig")/${baseInstallPath}"
+    mkdir -p "$resolvedBaseInstallPath"
+
+    cp -n /data/eula.txt "${resolvedBaseInstallPath}/eula.txt"
+  fi
 fi
 
-FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
+FTB_SERVER_START="$startScript"
 export FTB_SERVER_START
 
 FTB_DIR=$(dirname "${FTB_SERVER_START}")
@@ -226,15 +241,5 @@ if isTrue "${FTB_LEGACYJAVAFIXER}" && [ ! -e "${legacyJavaFixerPath}" ]; then
   fi
 fi
 
-if [ -e "${FTB_DIR}/FTBInstall.sh" ]; then
-  pushd "${FTB_DIR}"
-  sh FTBInstall.sh
-  popd
-elif [ -e "${FTB_DIR}/Install.sh" ]; then
-  pushd "${FTB_DIR}"
-  sh Install.sh
-  popd
-fi
-
 export FAMILY=FORGE
 exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployForge

@@ -8,7 +8,7 @@ isDebugging && set -x
 
 get_installer() {
   if [[ -z $FORGE_INSTALLER_URL ]]; then
-    log "Downloading $normForgeVersion"
+    log "Downloading Forge Installer $normForgeVersion"
 
     forgeFileNames="
     $shortForgeVersion/forge-$shortForgeVersion-installer.jar
@@ -25,7 +25,7 @@ get_installer() {
     log "Unable to locate usable URL for $normForgeVersion"
     exit 2
  else
-    log "Downloading $FORGE_INSTALLER_URL ..."
+    log "Downloading Forge Installer from $FORGE_INSTALLER_URL ..."
     if ! get -o "$FORGE_INSTALLER" "$FORGE_INSTALLER_URL"; then
       log "Failed to download from given location $FORGE_INSTALLER_URL"
       exit 2

scripts/start-deployPaper

@@ -4,6 +4,30 @@
 set -o pipefail
 isDebugging && set -x
 
+ourScript="$0"
+ourArgs=("$@")
+
+function handleMissingVersion() {
+  expectedVersion=${VANILLA_VERSION}
+  versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
+  if [[ $VERSION = LATEST ]]; then
+    tries=0
+    while ((tries++ < 5)); do
+      VANILLA_VERSION=$(echo "$versions" | jq -r ".versions[$((- tries))]")
+      if [[ $(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
+               | jq '.builds[-1]') != null ]]; then
+        log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
+        # re-execute the current script with the newly computed version
+        exec "$ourScript" "${ourArgs[@]}"
+     fi
+   done
+  fi
+  log "ERROR: ${expectedVersion} is not published by PaperMC"
+  log "       Set VERSION to one of the following: "
+  log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
+  exit 1
+}
+
 if [[ $PAPER_DOWNLOAD_URL ]]; then
   export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
 
@@ -23,26 +47,16 @@ else
     0)
       ;;
     22)
-      versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
-      if [[ $VERSION = LATEST ]]; then
-          VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
-          log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
-          # re-execute the current script with the newly computed version
-          exec "$0" "$@"
-      fi
-      log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
-      log "       Set VERSION to one of the following: "
-      log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
-      exit 1
+      handleMissingVersion
       ;;
     *)
       echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
       exit 1
       ;;
   esac
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
-    exit 1
+
+  if [[ $build = null ]]; then
+    handleMissingVersion
   fi
 
   export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \

scripts/start-deployPufferfish

@@ -8,8 +8,8 @@ isDebugging && set -x
 
 IFS=$'\n\t'
 
-if [[ "${MAJOR_VANILLA_VERSION}" != "1.18" ]] && [[ "${MAJOR_VANILLA_VERSION}" != "1.17" ]]; then
-  log "ERROR: Pufferfish server type only supports versions 1.18 or 1.17, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
+if versionLessThan 1.17; then
+  log "ERROR: Pufferfish server type only supports versions 1.17, 1.18 or 1.19, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
   exit 1
 fi
 

scripts/start-deployPurpur

@@ -2,31 +2,51 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+: "${PURPUR_DOWNLOAD_URL:=}"
+
 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 
-: "${VANILLA_VERSION:?}"
-: "${PURPUR_BUILD:=LATEST}"
-: "${FORCE_REDOWNLOAD:=false}"
+if [[ $PURPUR_DOWNLOAD_URL ]]; then
+  export SERVER=$(getFilenameFromUrl "${PURPUR_DOWNLOAD_URL}")
 
-if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  if ! PURPUR_BUILD=$(get --json-path=".builds.latest" "https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}"); then
-    log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
-    log "       Please check if a download is available at https://purpur.pl3x.net/downloads/"
-    exit 1
+  if [ -f "$SERVER" ]; then
+    zarg=(-z "$SERVER")
   fi
-fi
 
-export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
+  echo "Preparing custom Purpur jar from $PURPUR_DOWNLOAD_URL"
 
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
-    log "Downloading Purpur from $downloadUrl ..."
-    if ! get -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
+  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PURPUR_DOWNLOAD_URL}"
+else
+  : "${VANILLA_VERSION:?}"
+  : "${PURPUR_BUILD:=LATEST}"
+  : "${FORCE_REDOWNLOAD:=false}"
+
+  if [[ ${PURPUR_BUILD} == LATEST ]]; then
+    if ! PURPUR_BUILD=$(get --json-path=".builds.latest" "https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}"); then
+      log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
+      log "       Please check if a download is available at https://purpur.pl3x.net/downloads/"
+      exit 1
     fi
+  fi
+
+  export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
+
+  log "Removing old Purpur versions ..."
+  shopt -s nullglob
+  for f in purpur-*.jar; do
+    [[ $f != "$SERVER" ]] && rm "$f"
+  done
+
+  if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
+      downloadUrl="https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
+      log "Downloading Purpur from $downloadUrl ..."
+      if ! get -o "$SERVER" "$downloadUrl"; then
+        log "ERROR: failed to download from $downloadUrl (status=$?)"
+        exit 3
+      fi
+  fi
 fi
 
 # Normalize on Spigot for later operations

scripts/start-finalExec

@@ -122,8 +122,8 @@ if [ -n "$JVM_DD_OPTS" ]; then
       done
 fi
 
-if isTrue ${ENABLE_JMX}; then
-  : ${JMX_PORT:=7091}
+if isTrue "${ENABLE_JMX}"; then
+  : "${JMX_PORT:=7091}"
   JVM_OPTS="${JVM_OPTS}
   -Dcom.sun.management.jmxremote.local.only=false
   -Dcom.sun.management.jmxremote.port=${JMX_PORT}
@@ -186,6 +186,12 @@ if isTrue "${USE_FLARE_FLAGS}"; then
   "
 fi
 
+if isTrue "${USE_SIMD_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  --add-modules=jdk.incubator.vector
+  "
+fi
+
 if isTrue "${DEBUG_MEMORY}"; then
   log "Memory usage and availability (in MB)"
   uname -a

scripts/start-setupForgeApiMods

@@ -118,7 +118,7 @@ modFileByProjectID(){
       # Looks for file by name
       current_project_file=$(jq -n "$project_files" | jq --arg FILE_NAME "$project_id_file_name" -jc '
         .data | map(select(.fileName<=($FILE_NAME))) | .[0] // empty')
-    elif $( ! isTrue "$MODS_FORGEAPI_IGNORE_GAMETYPE" ) && $FILTER_BY_FAMILY ; then
+    elif isFalse "${MODS_FORGEAPI_IGNORE_GAMETYPE}" && $FILTER_BY_FAMILY ; then
       # Looks for file by version and server type in lowercase
       current_project_file=$(jq -n "$project_files" | jq --arg RELEASE_FILTER "$RELEASE_NUMBER_FILTER" --arg GAME_TYPE "${FAMILY,,}" --arg VERSION "$VANILLA_VERSION" -jc '
         .data | sort_by(.id) | reverse | map(select(.gameVersions[] | ascii_downcase | contains ($GAME_TYPE))) |  map(select(.gameVersions[] | contains ($VERSION))) | map(select(.releaseType<=($RELEASE_FILTER|tonumber))) | .[0] // empty')
@@ -160,7 +160,7 @@ downloadModPackfromModFile() {
   fi
   # trys to make the output directory incase it doesnt exist.
   mkdir -p "$out_dir"
-
+  debug "DEBUG: PROJECT_FILE: ${PROJECT_FILE}"
   # grabs needed values from our json return
   file_name=$(jq -n "$PROJECT_FILE" | jq -jc '.fileName // empty' )
   download_url=$(jq -n "$PROJECT_FILE" | jq -jc '.downloadUrl // empty' )
@@ -204,9 +204,10 @@ if [ "$MODS_FORGEAPI_FILE" ] && [ -z "$MODS_FORGEAPI_PROJECTIDS" ]; then
     log "ERROR: given MODS_FORGEAPI_FILE file does not exist"
     exit 2
   fi
-
+  debug "DEBUG: MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_FILE}"
   # Needs loop here to look up release types befor calling download.
   while read -r current_project; do
+    debug "DEBUG: current_project: ${current_project}"
     # Per stack overflow we can use //empty to return empty string that works with -z
     project_id=$(jq -n "$current_project" | jq -r '.projectId // empty' )
     current_release_type=$(jq -n "$current_project" | jq -r '.releaseType // empty' )

scripts/start-setupModpack

@@ -39,12 +39,22 @@ if [[ "${PACKWIZ_URL}" ]]; then
       ln -sf "${PACKWIZ_JAR}" packwiz-installer-bootstrap.jar
     fi
   fi
-  if [[ ! -e packwiz-installer-bootstrap.jar ]]; then
+  if [[ ! -f packwiz-installer-bootstrap.jar ]]; then
     log "ERROR: Packwiz not available or could not be downloaded from Github!"
     exit 1
   fi
   log "Running packwiz against URL: ${PACKWIZ_URL}"
   java -jar packwiz-installer-bootstrap.jar -g -s server "${PACKWIZ_URL}"
+  #if bootstrap download fails, download installer manually - then run without updating
+  returnVal=$?
+  if [[ $returnVal ]]; then
+    latestPackwizInstaller=$(curl -fsSL https://api.github.com/repos/packwiz/packwiz-installer/releases/latest)
+    latestPackwizInstallerVer=$(echo ${latestPackwizInstaller} | jq --raw-output '.tag_name')
+    latestPackwizInstallerUrl=$(echo ${latestPackwizInstaller} | jq --raw-output '.assets[] | select(.name | match("packwiz-installer.jar")) | .url')
+    log "Packwiz couldn't update - Downloading Packwiz Installer ${latestPackwizInstallerVer}"
+    curl -H "Accept:application/octet-stream" -o "packwiz-installer.jar" -fsSL ${latestPackwizInstallerUrl}
+    java -jar packwiz-installer-bootstrap.jar -g -bootstrap-no-update -s server "${PACKWIZ_URL}"
+  fi
 fi
 
 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack
@@ -216,18 +226,20 @@ if [[ "${GENERIC_PACKS}" ]]; then
   elif isTrue "${FORCE_GENERIC_PACK_UPDATE}" || ! checkSum "${sum_file}"; then
     log "Generic pack(s) are out of date. Re-applying..."
 
-    base_dir=/tmp/generic_pack_base
-    mkdir -p ${base_dir}
+    original_base_dir=/data/.tmp/generic_pack_base
+    base_dir=$original_base_dir
+    rm -rf "${base_dir}"
+    mkdir -p "${base_dir}"
     for pack in "${packFiles[@]}"; do
       isDebugging && ls -l "${pack}"
       extract "${pack}" "${base_dir}"
     done
 
     # recalculate the actual base directory of content
-    base_dir=$(find "$base_dir" -type d \( -name mods -o -name plugins -o -name config \) -printf '%h' -quit)
+    base_dir=$(find "$base_dir" -maxdepth 3 -type d \( -name mods -o -name plugins -o -name config \) -printf '%h' -quit)
     if [[ ! $base_dir ]]; then
       log "ERROR: Unable to find content base of generic packs ${GENERIC_PACKS}. Directories:"
-      find /tmp/generic_pack_base -type d -printf '  - %P\n'
+      find $original_base_dir -maxdepth 3 -type d -printf '  - %P\n'
       exit 1
     fi
 
@@ -246,7 +258,7 @@ if [[ "${GENERIC_PACKS}" ]]; then
 
     log "Applying generic pack ..."
     cp -R -f "${base_dir}"/* /data
-    rm -rf /tmp/generic_pack_base
+    rm -rf $original_base_dir
 
     log "Saving generic pack(s) checksum"
     sha1sum "${packFiles[@]}" > "${sum_file}"

scripts/start-setupServerProperties

@@ -116,6 +116,8 @@ function customizeServerProps {
   setServerProp "prevent-proxy-connections" PREVENT_PROXY_CONNECTIONS
   setServerProp "use-native-transport" USE_NATIVE_TRANSPORT
   setServerProp "simulation-distance" SIMULATION_DISTANCE
+  setServerProp "previews-chat" PREVIEWS_CHAT
+  setServerProp "enforce-secure-profile" ENFORCE_SECURE_PROFILE
   setServerPropValue "motd" "$(echo "$MOTD" | mc-image-helper asciify)"
   [[ $LEVEL_TYPE ]] && setServerPropValue "level-type" "${LEVEL_TYPE^^}"
 

scripts/start-utils

@@ -66,6 +66,28 @@ function isTrue() {
   return ${result}
 }
 
+function isFalse() {
+  local oldState
+  oldState=$(shopt -po xtrace)
+  shopt -u -o xtrace
+
+  local value=${1,,}
+
+  result=
+
+  case ${value} in
+  false | off)
+    result=0
+    ;;
+  *)
+    result=1
+    ;;
+  esac
+
+  eval "$oldState"
+  return ${result}
+}
+
 function isDebugging() {
   if isTrue "${DEBUG:-false}"; then
     return 0

tests/fulltests/vanilla-latest/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     depends_on:
       - mc
     image: itzg/mc-monitor:${MC_MONITOR_VERSION:-0.10.4}
-    command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 240
+    command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 300
   mc:
     restart: "no"
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

tests/setuponlytests/forgeapimods_file/docker-compose.yml

@@ -7,12 +7,13 @@ services:
     environment:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
+      DEBUG: "FALSE"
       # Using custom to bypass Fabric setup
       TYPE: CUSTOM
       # Using family to test FORGEAPI Family filter.
       FAMILY: FABRIC
       CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VERSION: 1.18.2
       MODS_FORGEAPI_FILE: /config/forgeapi_mods.json
       # Key is defined in .github/workflows/pr.yml and ci.yml
       # This should be coming from github secrets.

tests/setuponlytests/forgeapimods_file/forgeapi_mods.json

@@ -1,11 +1,11 @@
-[{
-        "name": "On A Stick [FABRIC]",
-        "projectId": "550544",
-        "releaseType": "release"
-    },
-    {
-        "name": "Fabric Voice Mod",
-        "projectId": "416089",
-        "releaseType": "beta"
-    }
+[
+  {
+    "name": "Flan (Land Claim Tool)",
+    "projectId": "404578"
+  },
+  {
+    "name": "Fabric Voice Mod",
+    "projectId": "416089",
+    "releaseType": "beta"
+  }
 ]

tests/setuponlytests/forgeapimods_file/verify.sh

@@ -1,5 +1,5 @@
 # Validates specific beta call out for specific mod:
 mc-image-helper assert fileExists "/data/mods/voicechat-fabric*"
-mc-image-helper assert fileExists "/data/mods/onastick-fabric*"
-# Dependent of on a stick:
+mc-image-helper assert fileExists "/data/mods/flan*"
+# Dependent of flan:
 mc-image-helper assert fileExists "/data/mods/fabric-api*"

tests/setuponlytests/forgeapimods_gametype/docker-compose.yml

@@ -7,23 +7,24 @@ services:
     environment:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
+      DEBUG: "FALSE"
       # Using custom to bypass Fabric setup
       TYPE: CUSTOM
       # Using family to test FORGEAPI Family filter.
       FAMILY: FABRIC
       CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VERSION: 1.18.2
       # Validate Skip Gametype Filter:
       MODS_FORGEAPI_IGNORE_GAMETYPE: "TRUE"
       # Validates that Biomes does not download terrablender
       # Using default false for testing: 
-      # MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "FALSE"
+      MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "FALSE"
       # Contains mix of Forge and Fabric mods
-      MODS_FORGEAPI_PROJECTIDS: 306612,416089,220318
+      MODS_FORGEAPI_PROJECTIDS: 416089,493246
       # Allows for Beta releases of 416089 the Fabric Voice Mod 
       MODS_FORGEAPI_RELEASES: BETA
       MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
-      REMOVE_OLD_FORGEAPI_MODS: "FALSE"
+      REMOVE_OLD_FORGEAPI_MODS: "TRUE"
     volumes:
       - ./data:/data
       - ./fake.jar:/servers/fake.jar

tests/setuponlytests/forgeapimods_gametype/verify.sh

@@ -1,5 +1,5 @@
-mc-image-helper assert fileExists "/data/mods/BiomesOPlenty*"
 # testing dependencies don't get downloaded when download dependencies is set to false.
-! mc-image-helper assert fileExists "/data/mods/TerraBlender*"
 mc-image-helper assert fileExists "/data/mods/voicechat-fabric*"
-mc-image-helper assert fileExists "/data/mods/fabric-api*"
+mc-image-helper assert fileExists "/data/mods/flan*"
+# Dependent of flan, but dependencies are set to false:
+! mc-image-helper assert fileExists "/data/mods/fabric-api*"

tests/setuponlytests/forgeapimods_projectids/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       #  - Currently we do not support filtering on vanilla.
       FAMILY: VANILLA
       CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VERSION: 1.18.2
       MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "TRUE"
       # Contains mix of Forge and Fabric mods
       MODS_FORGEAPI_PROJECTIDS: 416089,419697

tests/setuponlytests/spiget/docker-compose.yml

@@ -8,6 +8,6 @@ services:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
       TYPE: PAPER
-      SPIGET_RESOURCES: "34315,3836,6245,2124,88135"
+      SPIGET_RESOURCES: "34315,3836,6245,2124"
     volumes:
       - ./data:/data

tests/setuponlytests/spiget/verify.sh

@@ -1,5 +1,4 @@
 mc-image-helper assert fileExists plugins/3836.jar
 mc-image-helper assert fileExists plugins/34315.jar
 mc-image-helper assert fileExists plugins/6245.jar
-mc-image-helper assert fileExists plugins/88135.jar
 mc-image-helper assert fileExists plugins/SkinsRestorer.jar

tests/setuponlytests/test.sh

@@ -15,6 +15,13 @@ $logs
 "
 }
 
+delta() {
+  startTime=${1?}
+
+  endTime=$(date +%s)
+  echo "$(( endTime - startTime )) seconds"
+}
+
 # tests that only run the setup files for things like downloads and configuration.
 setupOnlyMinecraftTest(){
   folder=$1
@@ -32,19 +39,22 @@ setupOnlyMinecraftTest(){
     fi
   fi
 
+  start=$(date +%s)
   if ! logs=$(docker-compose run mc 2>&1); then
     outputContainerLog "$logs"
     result=1
   elif [ -f verify.sh ]; then
     if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
-      echo "Verify ${folder} FAILED"
+      endTime=$(date +%s)
+      echo "${folder} FAILED verify in $(delta start)"
       outputContainerLog "$logs"
       result=1
     else
-      echo "Verify ${folder} PASS"
+      endTime=$(date +%s)
+      echo "${folder} PASSED verify in $(delta start)"
     fi
   else
-    echo "${folder} PASS"
+    echo "${folder} PASSED in $(delta start)"
   fi
 
   docker-compose down -v --remove-orphans > /dev/null