docs: Auto update markdown TOC

Add Pufferfish support (#1255 )
fix: ensured GENERIC_PACKS are re-applied with REMOVE_OLD_MODS (#1257 )
2026-02-17 15:13:55 +00:00 · 2022-01-06 12:50:04 +00:00 · 2022-01-06 06:49:46 -06:00 · 2022-01-05 21:38:51 -06:00 · 2022-01-04 03:59:33 +00:00 · 2022-01-03 21:59:19 -06:00
63 changed files with 1362 additions and 474 deletions
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -24,9 +24,17 @@ body:
    attributes:
      label: Container definition
      description: Please provide the compose file or run command used to create the container
+      value: |
+        ```
+        Paste run command or compose file here
+        ```
  - type: textarea
    id: logs
    attributes:
      label: Container logs
      description: |
-        Please provide container logs from the start of the container, which will be the ones prefixed with `[init]`. It is even better if you can set the variable `DEBUG` to "true" and provide those debug container logs.
+        Please provide container logs from the start of the container, which will be the ones prefixed with `[init]`. It is even better if you can set the variable `DEBUG` to "true" and provide those debug container logs.
+      value: |
+        ```
+        Paste logs here
+        ```
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: Ask a question in discussions
+    url: https://github.com/itzg/docker-minecraft-server/discussions
+    about: Please ask questions here
+  - name: Ask a question on Discord
+    url: https://discord.gg/DXfKpjB
+    about: Please ask questions here
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -0,0 +1,4 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -8,7 +8,6 @@ on:
      - java11*
      - java16*
      - java17*
-      - test/*
    tags:
      - "[0-9]+.[0-9]+.[0-9]+"
      - "[0-9]+.[0-9]+.[0-9]+-java8-multiarch"
@@ -20,13 +19,16 @@ on:
      - "docs/**"
      - "examples/**"

+env:
+  IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
+
 jobs:
-  docker-buildx:
+  build:
    if: github.repository == 'itzg/docker-minecraft-server'
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.4.0

      - name: Docker meta
        id: meta
@@ -43,14 +45,6 @@ jobs:
      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1

-      - name: Cache Docker layers
-        uses: actions/cache@v2.1.6
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v1.2.0

@@ -60,6 +54,26 @@ jobs:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}

+      - name: Build for test
+        uses: docker/build-push-action@v2.7.0
+        if: github.ref_name == 'master'
+        with:
+          context: .
+          platforms: linux/amd64
+          tags: ${{ env.IMAGE_TO_TEST }}
+          # ensure latest base image is used
+          pull: true
+          load: true
+          push: false
+          cache-from: type=gha
+          # no cache-to to avoid cross-cache update from next build step
+
+      - name: Run tests
+        # It is assumed that image variants are merged from master and tested there
+        if: github.ref_name == 'master'
+        run: |
+          tests/test.sh
+
      - name: Build and push
        id: docker_build
        uses: docker/build-push-action@v2.7.0
@@ -70,17 +84,9 @@ jobs:
          tags: ${{ steps.meta.outputs.tags }}
          # ensure latest base image is used
          pull: true
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
          labels: ${{ steps.meta.outputs.labels }}

      - name: Image digest
        run: echo ${{ steps.docker_build.outputs.digest }}
-
-      - # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-        name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
--- a/.github/workflows/generate-toc.yml
+++ b/.github/workflows/generate-toc.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 5
    steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
      - run: |
          curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
          chmod a+x gh-md-toc
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,23 +15,15 @@ on:
      - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
      - "[0-9]+.[0-9]+.[0-9]+-adopt11"

+env:
+  IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
+
 jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2.3.5
-
-      - name: Run tests
-        run: |
-          tests/test.sh
  build:
-    needs:
-      - test
    runs-on: ubuntu-20.04

    steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0

    - name: Prepare
      id: prep
@@ -54,20 +46,33 @@ jobs:
    - name: Setup Docker Buildx
      uses: docker/setup-buildx-action@v1

-    - name: Cache Docker layers
-      uses: actions/cache@v2.1.6
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-
    - name: Login to DockerHub
      uses: docker/login-action@v1
      with:
        username: ${{ secrets.DOCKER_USER }}
        password: ${{ secrets.DOCKER_PASSWORD }}

+    - name: Build for test
+      uses: docker/build-push-action@v2.7.0
+      if: github.ref_name == 'java8'
+      with:
+        context: .
+        platforms: linux/amd64
+        tags: ${{ env.IMAGE_TO_TEST }}
+        # ensure latest base image is used
+        pull: true
+        load: true
+        push: false
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+
+    - name: Run tests
+      if: github.ref_name == 'java8'
+      run: |
+        tests/test.sh
+      env:
+        MINECRAFT_VERSION: 1.12.2
+
    - name: Build and push
      id: docker_build
      uses: docker/build-push-action@v2.7.0
@@ -80,8 +85,8 @@ jobs:
        push: true
        # tags determined by prep step
        tags: ${{ steps.prep.outputs.tags }}
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
        labels: |
          org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
          org.opencontainers.image.version=${{ steps.prep.outputs.version }}
@@ -90,11 +95,3 @@ jobs:

    - name: Image digest
      run: echo ${{ steps.docker_build.outputs.digest }}
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -3,14 +3,61 @@ name: Validate PR
 on:
  pull_request:
    branches: [ master ]
+    types: [assigned, opened, synchronize, labeled]
+    paths-ignore:
+      - "*.md"
+      - "docs/**"
+      - "examples/**"
+
+env:
+  IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}

 jobs:
  test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04

    steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build
+        uses: docker/build-push-action@v2.7.0
+        with:
+          context: .
+          platforms: linux/amd64
+          tags: ${{ env.IMAGE_TO_TEST }}
+          load: true
+          cache-from: type=gha

      - name: Run tests
        run: |
          tests/test.sh
+
+      - name: Gather Docker metadata
+        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            itzg/minecraft-server
+
+      - name: Login to DockerHub
+        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
+        uses: docker/login-action@v1
+        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@v2.7.0
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          pull: true
+          push: true
+          cache-from: type=gha
+          labels: ${{ steps.meta.outputs.labels }}
--- a/.github/workflows/stale-check.yml
+++ b/.github/workflows/stale-check.yml
@@ -1,7 +1,6 @@
 name: Stale Check

 on:
-  issue_comment:
  schedule:
    - cron: 0 2 * * *

@@ -13,7 +12,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Process Stale Issues
-        uses: actions/stale@v4.0.0
+        uses: actions/stale@v4.1.0
        with:
          stale-issue-label: status/stale
          stale-pr-label: status/stale
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+.vscode
 /data/
 /.idea/
 *.iml
-/gh-md-toc
+*.zip
+/gh-md-toc
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -93,5 +93,27 @@ The multiarch images are built and published by [a Github action](https://github
 The following git command can be used to provide the bulk of release notes content:

 ```shell script
-git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="- %s" 1.1.0..1.2.0
+git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="* %s" 1.1.0..1.2.0
 ```
+## Tracking changes from master without content
+
+The following script uses the [ours](https://git-scm.com/docs/merge-strategies#Documentation/merge-strategies.txt-ours) merging strategy to track the history from master into the other branches without actually bringing the changes over. It is useful when a change is specific to master only, such as bumping the base Java version for the `latest` image tag.
+
+```shell
+branches=(
+  java8
+  java8-multiarch
+  java8-openj9
+  java11
+  java11-openj9
+  java16
+  java16-openj9
+  java17
+)
+
+for b in "${branches[@]}"; do
+  git checkout "$b"
+  git merge -s ours -m "Track latest from master" master
+  git push origin
+done
+```
--- a/80
+++ b/80
@@ -1,32 +1,32 @@
-FROM eclipse-temurin:16-jdk
+FROM eclipse-temurin:17-jdk

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive \
  apt-get install -y \
-    imagemagick \
-    gosu \
-    sudo \
-    net-tools \
-    iputils-ping \
-    curl wget \
-    git \
-    jq \
-    dos2unix \
-    mysql-client \
-    tzdata \
-    rsync \
-    nano \
-    unzip \
-    knockd \
-    ttf-dejavu \
-    && apt-get clean
+  imagemagick \
+  gosu \
+  sudo \
+  net-tools \
+  iputils-ping \
+  curl \
+  git \
+  jq \
+  dos2unix \
+  mysql-client \
+  tzdata \
+  rsync \
+  nano \
+  unzip \
+  knockd \
+  ttf-dejavu \
+  && apt-get clean

 RUN addgroup --gid 1000 minecraft \
  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft

-COPY files/sudoers* /etc/sudoers.d
+COPY --chmod=644 files/sudoers* /etc/sudoers.d

 EXPOSE 25565 25575

@@ -45,26 +45,26 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --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.5.1 --var app=rcon-cli --file {{.app}} \
- --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+  --var version=1.5.1 --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.1 --var app=mc-monitor --file {{.app}} \
- --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+  --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
+  --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
+  --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.9.6
+ARG MC_HELPER_VERSION=1.11.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
+  | 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
@@ -75,19 +75,19 @@ ENV UID=1000 GID=1000 \
  MEMORY="1G" \
  TYPE=VANILLA VERSION=LATEST \
  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
-  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
+  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0 \
+  ENABLE_AUTOSTOP=false AUTOSTOP_TIMEOUT_EST=3600 AUTOSTOP_TIMEOUT_INIT=1800 AUTOSTOP_PERIOD=10

-COPY scripts/start* /
-COPY bin/ /usr/local/bin/
-COPY bin/mc-health /health.sh
-COPY files/server.properties /tmp/server.properties
-COPY files/log4j2.xml /tmp/log4j2.xml
-COPY files/autopause /autopause
+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

-RUN dos2unix /start* && chmod +x /start* \
-    && dos2unix /autopause/* && chmod +x /autopause/*.sh
+RUN dos2unix /start* /autopause/* /autostop/*

 ENTRYPOINT [ "/start" ]
 HEALTHCHECK --start-period=1m CMD mc-health
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ By default, the container will download the latest version of the "vanilla" [Min
 **TABLE OF CONTENTS**

 <!--ts-->
+   * [Mitigated Log4jShell Vulnerability](#mitigated-log4jshell-vulnerability)
   * [Looking for a Bedrock Dedicated Server](#looking-for-a-bedrock-dedicated-server)
   * [Interacting with the server](#interacting-with-the-server)
   * [Data Directory](#data-directory)
@@ -41,16 +42,17 @@ By default, the container will download the latest version of the "vanilla" [Min
   * [Troubleshooting](#troubleshooting)
   * [Server types](#server-types)
      * [Running a Forge Server](#running-a-forge-server)
+      * [Running a Fabric Server](#running-a-fabric-server)
      * [Running a Bukkit/Spigot server](#running-a-bukkitspigot-server)
      * [Running a Paper server](#running-a-paper-server)
      * [Running an Airplane server](#running-an-airplane-server)
+      * [Running a Pufferfish server](#running-a-pufferfish-server)
      * [Running a Purpur server](#running-a-purpur-server)
      * [Running a Magma server](#running-a-magma-server)
      * [Running a Mohist server](#running-a-mohist-server)
      * [Running a Catserver type server](#running-a-catserver-type-server)
-      * [Running an Canyon server](#running-an-canyon-server)
+      * [Running a Canyon server](#running-a-canyon-server)
      * [Running a SpongeVanilla server](#running-a-spongevanilla-server)
-      * [Running a Fabric Server](#running-a-fabric-server)
      * [Running a Limbo server](#running-a-limbo-server)
      * [Running a Crucible server](#running-a-crucible-server)
   * [Running a server with a Feed the Beast modpack](#running-a-server-with-a-feed-the-beast-modpack)
@@ -61,10 +63,11 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Modpack data directory](#modpack-data-directory)
      * [Buggy start scripts](#buggy-start-scripts)
      * [Fixing "unable to launch forgemodloader"](#fixing-unable-to-launch-forgemodloader)
+   * [Running a server with a packwiz modpack](#running-a-server-with-a-packwiz-modpack)
   * [Working with mods and plugins](#working-with-mods-and-plugins)
      * [Optional plugins, mods, and config attach points](#optional-plugins-mods-and-config-attach-points)
      * [Auto-downloading SpigotMC/Bukkit/PaperMC plugins](#auto-downloading-spigotmcbukkitpapermc-plugins)
-      * [Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers](#downloadable-modplugin-pack-for-forge-bukkit-and-spigot-servers)
+      * [Downloadable mod/plugin pack for Forge, Fabric, and Bukkit-like Servers](#downloadable-modplugin-pack-for-forge-fabric-and-bukkit-like-servers)
      * [Generic pack file](#generic-pack-file)
      * [Mod/Plugin URL Listing File](#modplugin-url-listing-file)
      * [Remove old mods/plugins](#remove-old-modsplugins)
@@ -72,6 +75,8 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Downloadable world](#downloadable-world)
      * [Cloning world from a container path](#cloning-world-from-a-container-path)
      * [Overwrite world on start](#overwrite-world-on-start)
+      * [Datapacks](#datapacks)
+      * [VanillaTweaks](#vanillatweaks)
   * [Server configuration](#server-configuration)
      * [Message of the Day](#message-of-the-day)
      * [Difficulty](#difficulty)
@@ -130,13 +135,18 @@ By default, the container will download the latest version of the "vanilla" [Min
   * [Autopause](#autopause)
      * [Description](#description)
      * [Enabling Autopause](#enabling-autopause)
+   * [Autostop](#autostop)
   * [Running on RaspberryPi](#running-on-raspberrypi)
   * [Contributing](#contributing)

-<!-- Added by: runner, at: Fri Nov  5 02:00:06 UTC 2021 -->
+<!-- Added by: runner, at: Thu Jan  6 12:50:03 UTC 2022 -->

 <!--te-->

+## Mitigated Log4jShell Vulnerability
+
+**Please ensure you have pulled the latest image** since [all official mitigations](https://www.minecraft.net/en-us/article/important-message--security-vulnerability-java-edition) are automatically applied by the container startup process.
+
 ## Looking for a Bedrock Dedicated Server

 For Minecraft clients running on consoles, mobile, or native Windows, you'll need to
@@ -270,25 +280,27 @@ the server jar remain in the `/data` directory. It is safe to remove those._

 ## Running Minecraft server on different Java version

-To use a different version of Java, please use a docker tag to run your Minecraft server.
+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         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
+| 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             |
 | java11         | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java11-openj9  | 11           | Debian | OpenJ9   | amd64             |
-| java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | java17         | 17           | Ubuntu | Hotspot  | amd64,arm64,armv7 |
+| java17-openj9  | 17           | Debian | OpenJ9   | amd64             |

-For example, to use Java version 16 on any supported architecture:
+For example, to use Java version 8 on any supported architecture:

-    docker run --name mc itzg/minecraft-server:java16
+    docker run --name mc itzg/minecraft-server:java8-multiarch

 > Keep in mind that some versions of Minecraft server, such as Forge before 1.17, can't work on the newest versions of Java. Instead, one of the Java 8 images should be used. Also, FORGE doesn't support openj9 JVM implementation.
+> 
+> Some versions of vanilla Minecraft, such as 1.10, also do not run correctly with Java 17. If in doubt, use `java8-multiarch` for any version less than 1.17.

 ### Deprecated Image Tags

@@ -298,6 +310,7 @@ The following image tags have been deprecated and are no longer receiving update
 - adopt15
 - openj9-nightly
 - multiarch-latest
+- java16

 ## Healthcheck

@@ -400,6 +413,30 @@ the URL with `FORGE_INSTALLER_URL`, such as:

 In both of the cases above, there is no need for the `VERSION` or `FORGEVERSION` variables.

+### Running a Fabric Server
+
+Enable [Fabric server](https://fabricmc.net/) mode by adding a `-e TYPE=FABRIC` to your command-line. By default, the container will install the latest [fabric-loader](https://fabricmc.net/wiki/documentation:fabric_loader) using the latest [fabric-installer](https://fabricmc.net/use/), against the minecraft server version you have defined with `VERSION` (defaulting to the latest vanilla release of the game).
+
+```
+docker run -d -v /path/on/host:/data \
+    -e TYPE=FABRIC \
+    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+```
+
+See the [Working with mods and plugins](#working-with-mods-and-plugins) section to set up Fabric mods and configuration.
+
+A specific loader version other than the latest can be requested using `FABRIC_LOADER_VERSION`, such as:
+
+```
+docker run -d -v /path/on/host:/data ... \
+    -e FABRIC_LOADER_VERSION=0.12.8
+```
+
+If you wish to use an alternative installer you can:
+* Specify an alternative version using `FABRIC_INSTALLER_VERSION` (such as `-e FABRIC_INSTALLER_VERSION=0.10.2`)
+* Provide the path to a custom installer jar available to the container with `FABRIC_INSTALLER`, relative to `/data` (such as `-e FABRIC_INSTALLER=fabric-installer-0.5.0.32.jar`)
+* Provide the URL to a custom installer jar with `FABRIC_INSTALLER_URL` (such as `-e FABRIC_INSTALLER_URL=http://HOST/fabric-installer-0.5.0.32.jar`)
+
 ### Running a Bukkit/Spigot server

 Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT` or `-e TYPE=SPIGOT` to your command-line.
@@ -425,19 +462,13 @@ Plugins can either be managed within the `plugins` subdirectory of the [data dir

 Enable Paper server mode by adding a `-e TYPE=PAPER` to your command-line.

-By default the container will run the latest build of [Paper server](https://papermc.io/downloads)
-but you can also choose to run a specific build with `-e PAPERBUILD=205`.
+By default, the container will run the latest build of [Paper server](https://papermc.io/downloads) but you can also choose to run a specific build with `-e PAPERBUILD=205`.

    docker run -d -v /path/on/host:/data \
        -e TYPE=PAPER \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

-If you are hosting your own copy of Paper you can override the download URL with:
-
- -e PAPER_DOWNLOAD_URL=<url>
-
-An example compose file is provided at
-[examples/docker-compose-paper.yml](examples/docker-compose-paper.yml).
+If you are hosting your own copy of Paper you can override the download URL with `PAPER_DOWNLOAD_URL=<url>`.

 If you have attached a host directory to the `/data` volume, then you can install plugins via the `plugins` subdirectory. You can also [attach a `/plugins` volume](#optional-plugins-mods-and-config-attach-points). If you add plugins while the container is running, you'll need to restart it to pick those up.

@@ -449,13 +480,25 @@ An [Airplane](https://airplane.gg) server, which is "a stable, optimized, well s

    -e TYPE=AIRPLANE

-> NOTE: The `VERSION` variable is used to select an Airplane branch to download from. The available options are "LATEST" "1.17" "1.16" "PURPUR" and "PURPUR-1.16"
+> NOTE: The `VERSION` variable is used to select an Airplane branch to download from. The available options are "LATEST" "1.17" and "PURPUR"

 Extra variables:
 - `AIRPLANE_BUILD=lastSuccessfulBuild` : set a specific Airplane 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 [Flare](https://blog.airplane.gg/flare) profiler

+### Running a Pufferfish server
+
+A [Pufferfish](https://github.com/pufferfish-gg/Pufferfish) server, which is "a highly optimized Paper fork designed for large servers requiring both maximum performance, stability, and "enterprise" features."
+
+    -e TYPE=PUFFERFISH
+
+> NOTE: The `VERSION` variable is used to select a Pufferfish branch to download from. The available options are "LATEST" and "1.18"
+
+Extra variables:
+- `PUFFERFISH_BUILD=lastSuccessfulBuild` : set a specific Pufferfish build to use
+- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
+
 ### Running a Purpur server

 A [Purpur](https://purpur.pl3x.net/) server, which is "drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and performance built on top of Airplane."
@@ -482,8 +525,6 @@ By default, the "stable" channel is used, but you can set `MAGMA_CHANNEL` to "de

 ### Running a Mohist server

-> **CAUTION** Be sure to [read this article](https://essentialsx.net/do-not-use-mohist.html) to understand the risks associated with using Mohist.
-
 A [Mohist](https://github.com/MohistMC/Mohist) server can be used with

    -e TYPE=MOHIST
@@ -502,17 +543,15 @@ A [Catserver](http://catserver.moe/) type server can be used with

 > **NOTE** Catserver only provides a single release stream, so `VERSION` is ignored

-### Running an Canyon server
+### Running a Canyon server

 [Canyon](https://github.com/canyonmodded/canyon) is a fork of CraftBukkit for Minecraft Beta 1.7.3. It includes multiple enhancements whilst also retaining compatibility with old Bukkit plugins and mods as much as possible.

    -e VERSION=b1.7.3 -e TYPE=CANYON

-> **NOTE** only `VERSION=b1.7.3` is supported
+> **NOTE** only `VERSION=b1.7.3` is supported. Since that version pre-dates the health check mechanism used by this image, that will need to be disabled by setting `DISABLE_HEALTHCHECK=true`.

-> **NOTE** only Java 8 is supported
-
-By default the latest build will be used; however, a specific build number can be selected by setting `CANYON_BUILD`, such as
+By default, the latest build will be used; however, a specific build number can be selected by setting `CANYON_BUILD`, such as

    -e CANYON_BUILD=11

@@ -534,41 +573,6 @@ Just change it with `SPONGEBRANCH`, such as:
    $ docker run -d -v /path/on/host:/data ... \
        -e TYPE=SPONGEVANILLA -e SPONGEBRANCH=EXPERIMENTAL ...

-### Running a Fabric Server
-
-Enable [Fabric server](http://fabricmc.net/use/) mode by adding a `-e TYPE=FABRIC` to your command-line. By default, the container will run the latest version, but you can also choose to run a specific version with `VERSION`.
-
-```
-docker run -d -v /path/on/host:/data \
-    -e TYPE=FABRIC \
-    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
-```
-
-A specific installer version can be requested using `FABRIC_INSTALLER_VERSION`.
-
-To use a pre-downloaded Fabric installer, place it in a directory attached into the container, such as the `/data` volume and specify the name of the installer file with `FABRIC_INSTALLER`, such as:
-
-```
-docker run -d -v /path/on/host:/data ... \
-    -e FABRIC_INSTALLER=fabric-installer-0.5.0.32.jar ...
-```
-
-To download a Fabric installer from a custom location, such as your own file repository, specify the URL with `FABRIC_INSTALLER_URL`, such as:
-
-```
-docker run -d -v /path/on/host:/data ... \
-    -e FABRIC_INSTALLER_URL=http://HOST/fabric-installer-0.5.0.32.jar ...
-```
-
-A specific loader version can be requested using `FABRIC_LOADER_VERSION`, such as:
-
-```
-docker run -d -v /path/on/host:/data ... \
-    -e FABRIC_LOADER_VERSION=0.11.7
-```
-
-In order to add mods, you have two options:
-
 ### Running a Limbo server

 A [Limbo](https://github.com/LOOHP/Limbo) server can be run by setting `TYPE` to `LIMBO`.
@@ -664,6 +668,20 @@ then you apply a workaround by adding this to the run invocation:

    -e FTB_LEGACYJAVAFIXER=true

+## Running a server with a packwiz modpack
+
+[packwiz](https://packwiz.infra.link/) is a CLI tool for maintaining and providing modpack definitions, with support for both CurseForge and Modrinth as sources. See the [packwiz tutorial](https://packwiz.infra.link/tutorials/getting-started/) for more information.
+
+To configure server mods using a packwiz modpack, set the `PACKWIZ_URL` environment variable to the location of your `pack.toml` modpack definition:
+
+    docker run -d -v /path/on/host:/data -e TYPE=FABRIC \
+        -e "PACKWIZ_URL=https://example.com/modpack/pack.toml" \
+        itzg/minecraft-server
+
+packwiz modpack defitions are processed before other mod definitions (`MODPACK`, `MODS`, etc.) to allow for additional processing/overrides you may want to perform (in case of mods not available via Modrinth/CurseForge, or you do not maintain the pack).
+
+> packwiz is pre-configured to only download server mods. If client-side mods are downloaded and cause issues, check your pack.toml configuration, and make sure any client-only mods are not set to `"both"`, but rather `"client"` for the side configuration item.
+
 ## Working with mods and plugins

 ### Optional plugins, mods, and config attach points
@@ -674,7 +692,7 @@ There are optional volume paths that can be attached to supply content to be cop
 : contents are synchronized into `/data/plugins` for Bukkit related server types. Set `SYNC_SKIP_NEWER_IN_DESTINATION=false` if you want files from `/plugins` to take precedence over newer files in `/data/plugins`.

 `/mods`
-: contents are synchronized into `/data/mods` for Forge related server types. The destination can be changed by setting `COPY_MODS_DEST`.
+: contents are synchronized into `/data/mods` for Fabric and Forge related server types. The destination can be changed by setting `COPY_MODS_DEST`.

 `/config`
 : contents are synchronized into `/data/config` by default, but can be changed with `COPY_CONFIG_DEST`. For example, `-v ./config:/config -e COPY_CONFIG_DEST=/data` will allow you to copy over files like `bukkit.yml` and so on directly into the server directory. Set `SYNC_SKIP_NEWER_IN_DESTINATION=false` if you want files from `/config` to take precedence over newer files in `/data/config`.
@@ -687,7 +705,7 @@ For example: `-e REMOVE_OLD_MODS=TRUE -e REMOVE_OLD_MODS_INCLUDE="*.jar" -e REMO

 These paths work well if you want to have a common set of modules in a separate location, but still have multiple worlds with different server requirements in either persistent volumes or a downloadable archive.

-> For more flexibility with mods/plugins preparation, you can declare directories to use in [the `MODS` variable](#downloadable-modplugin-pack-for-forge-bukkit-and-spigot-servers)
+> For more flexibility with mods/plugins preparation, you can declare directories to use in [the `MODS` variable](#downloadable-modplugin-pack-for-forge-fabric-and-bukkit-like-servers)

 ### Auto-downloading SpigotMC/Bukkit/PaperMC plugins

@@ -704,10 +722,10 @@ For example, the following will auto-download the [EssentialsX](https://www.spig

    -e SPIGET_RESOURCES=9089,34315

-### Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers
+### Downloadable mod/plugin pack for Forge, Fabric, and Bukkit-like Servers

 Like the `WORLD` option above, you can specify the URL or path of a "mod pack"
-to download and install into `mods` for Forge or `plugins` for Bukkit/Spigot.
+to download and install into `mods` for Forge/Fabric or `plugins` for Bukkit/Spigot.
 To use this option pass the environment variable `MODPACK`, such as

    docker run -d -e MODPACK=http://www.example.com/mods/modpack.zip ...
@@ -796,6 +814,57 @@ 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.

+### 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`
+* `DATAPACKS_FILE` 
+* `REMOVE_OLD_DATAPACKS` 
+* `REMOVE_OLD_DATAPACKS_DEPTH` 
+* `REMOVE_OLD_DATAPACKS_INCLUDE`
+* `REMOVE_OLD_DATAPACKS_EXCLUDE`
+Datapacks will be placed in `/data/$LEVEL/datapacks`
+
+### VanillaTweaks
+
+VanillaTweaks datapacks can be installed with a share code from the website UI **OR** a json file to specify packs to download and install.
+
+Accepted Parameters:
+
+- `VANILLATWEAKS_FILE`
+- `VANILLATWEAKS_SHARECODE`
+- `REMOVE_OLD_VANILLATWEAKS`
+- `REMOVE_OLD_VANILLATWEAKS_DEPTH`
+- `REMOVE_OLD_VANILLATWEAKS_INCLUDE`
+- `REMOVE_OLD_VANILLATWEAKS_EXCLUDE`
+
+Example of expected Vanillatweaks sharecode: 
+
+```yaml
+VANILLATWEAKS_SHARECODE: MGr52E
+```
+
+Example of expected Vanillatweaks file format:
+
+```json
+{
+  "version": "1.18",
+  "packs": {
+    "survival": [
+      "graves",
+      "multiplayer sleep",
+      "afk display",
+      "armor statues",
+      "unlock all recipes",
+      "fast leaf decay",
+      "coordinates hud"
+    ],
+    "items": ["armored elytra"]
+  }
+}
+```
+
+Datapacks will be placed in `/data/$LEVEL/datapacks`
+
 ## Server configuration

 By default, the server configuration will be created and set based on the following environment variables, but only the first time the server is started. If the `server.properties` file already exists, the values in them will not be changed.
@@ -808,6 +877,8 @@ This will reset any manual configuration of the `server.properties` file, so if

 In the opposite case, you can skip the startup script's creation of `server.properties`, by setting `SKIP_SERVER_PROPERTIES` to "true".

+> NOTE: to clear a server property, set the variable to an empty string, such as `-e RESOURCE_PACK=""`. A variables that maps to a server property that is unset, is ignored and the existing `server.property` is left unchanged. 
+
 ### Message of the Day

 The message of the day, shown below each server entry in the client UI, can be changed with the `MOTD` environment variable, such as
@@ -842,24 +913,35 @@ values.

 > **NOTE** it is very important to set this with servers exposed to the internet where you want only limited players to join.

-To whitelist players for your Minecraft server, pass the Minecraft usernames separated by commas via the `WHITELIST` environment variable, such as
+To whitelist players for your Minecraft server, you can:
+- Provide the url or path to a whitelist file via `WHITELIST_FILE` environment variable  
+    `docker run -d -e WHITELIST_FILE=/extra/whitelist.json ...`
+- Provide a list of usernames and/or UUIDs separated by commas via the `WHITELIST` environment variable  
+    `docker run -d -e WHITELIST=user1,uuid2 ...`

-    docker run -d -e WHITELIST=user1,user2 ...
+To enforce the whitelist and auto-kick players not included in whitelist configuration, set `ENFORCE_WHITELIST=TRUE`. **By default** any user can join your Minecraft server if it's publicly accessible, regardless of your whitelist configuration.

-If the `WHITELIST` environment variable is not used, any user can join your Minecraft server if it's publicly accessible.
+If whitelist configuration already exists, `WHITELIST_FILE` will not be retrieved and any usernames in `WHITELIST` are **added** to the whitelist configuration. You can enforce regeneration of the whitelist on each server startup by setting `OVERRIDE_WHITELIST` to "true". This will delete the whitelist file before processing whitelist configuration.

-> NOTE: When `WHITELIST` is used the server properties `white-list` and `whitelist` will automatically get set to `true`.
+> NOTE: You can provide both `WHITELIST_FILE` and `WHITELIST`, which are processed in that order.

-> By default, the players in `WHITELIST` are **added** to the final `whitelist.json` file by the Minecraft server. If you set `OVERRIDE_WHITELIST` to "true" then the `whitelist.json` file will be recreated on each server startup.
+> NOTE: UUIDs passed via `WHITELIST` need to be the dashed variant, otherwise it not be recognised and instead added as a username.
+
+> If running Minecraft 1.7.5 or earlier, these variables will apply to `white-list.txt`, with 1.7.6 implementing support for `whitelist.json`. Make sure your `WHITELIST_FILE` is in the appropriate format.
+
+If either `WHITELIST_FILE` or `WHITELIST` is provided, the server property `white-list` is automatically set to `true`, enabline whitelist functionality. Alternatively you can set `ENABLE_WHITELIST=TRUE` to only set the server property `white-list` without modifying the whitelist file. In this case the whitelist can be managed using the `whitelist add` and `whitelist remove` commands. Remember you can set enforcement via the `ENFORCE_WHITELIST` variable.

-Alternatively, you can set `ENABLE_WHITELIST=true` to only set the server properties `white-list` and `whitelist` without modifying the whitelist file. In this case the whitelist is solely managed using the `whitelist add` and `whitelist remove` commands.
 ### Op/Administrator Players

-To add more "op" (aka adminstrator) users to your Minecraft server, pass the Minecraft usernames separated by commas via the `OPS` environment variable, such as
+Similar to the whitelist, to add users as operators (aka adminstrators) to your Minecraft server, you can:
+- Provide te url or path to an ops file via `OPS_FILE` environment variable  
+    `docker run -d -e OPS_FILE=https://config.example.com/extra/ops.json ...`
+- Provide a list of usernames and/or UUIDs separated by commas via the `OPS` environment variable  
+    `docker run -d -e OPS=user1,uuid2 ...`

-    docker run -d -e OPS=user1,user2 ...
+If ops configuration already exists, `OPS_FILE` will not be retrieved and any usernames in `OPS` are **added** to the ops configuration. You can enforce regeneration of the ops configuration on each server startup by setting `OVERRIDE_OPS` to "true". This will delete the ops file before processing ops configuration.

-> By default, the players in `OPS` are **added** to the final `ops.json` file by the Minecraft server. If you set `OVERRIDE_OPS` to "true" then the `ops.json` file will be recreated on each server startup.
+> Similar to whitelists, you can provide both `OPS_FILE` and `OPS`, and Minecraft 1.7.5 or earlier will use `ops.txt` rather than `ops.json`.

 ### Server icon

@@ -875,6 +957,7 @@ The server icon which has been set doesn't get overridden by default. It can be
 ### Rcon

 To use rcon use the `ENABLE_RCON` and `RCON_PASSWORD` variables.
+The default RCON password is _"minecraft",_ but it's **highly** recommended to override that.
 By default rcon port will be `25575` but can easily be changed with the `RCON_PORT` variable.

    docker run -d -e ENABLE_RCON=true -e RCON_PASSWORD=testing
@@ -1056,9 +1139,9 @@ In Minecraft 1.13+ you need to pass json ([generator site](https://misode.github

 You can set a link to a custom resource pack and set it's checksum using the `RESOURCE_PACK` and `RESOURCE_PACK_SHA1` options respectively, the default is blank:

-    docker run -d -e 'RESOURCE_PACK=http\://link.com/to/pack.zip?\=1' -e 'RESOURCE_PACK_SHA1=d5db29cd03a2ed055086cef9c31c252b4587d6d0'
+    docker run -d -e 'RESOURCE_PACK=http://link.com/to/pack.zip?=1' -e 'RESOURCE_PACK_SHA1=d5db29cd03a2ed055086cef9c31c252b4587d6d0'

-**NOTE:** `:` and `=` must be escaped using `\`. The checksum plain-text hexadecimal.
+You can enforce the resource pack on clients by setting `RESOURCE_PACK_ENFORCE` to `TRUE` (default: `FALSE`).

 ### Level / World Save Name

@@ -1316,6 +1399,8 @@ If you would like to `docker attach` to the Minecraft server console with color
 > This will bypass graceful server shutdown handling when using `docker stop`, so be sure the server console's `stop` command.
 > 
 > Make to enable stdin and tty with `-it` when using `docker run` or `stdin_open: true` and `tty: true` when using docker compose.
+>
+> This feature is incompatible with Autopause and cannot be set when `ENABLE_AUTOPAUSE=true`.

 ### Server Shutdown Options

@@ -1370,16 +1455,12 @@ To enable remote JMX, such as for profiling with VisualVM or JMC, add the enviro

 ### Enable Aikar's Flags

-[Aikar has does some research](https://mcflags.emc.gs/) into finding the optimal JVM flags for GC tuning, which becomes more important as more users are connected concurrently. The set of flags documented there can be added using
+[Aikar has does some research](https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/) into finding the optimal JVM flags for GC tuning, which becomes more important as more users are connected concurrently. The set of flags documented there can be added using

    -e USE_AIKAR_FLAGS=true

 When `MEMORY` is greater than or equal to 12G, then the Aikar flags will be adjusted according to the article.

-Large page support can also be enabled by adding
-
-    -e USE_LARGE_PAGES=true
-
 ### HTTP Proxy

 You may configure the use of an HTTP/HTTPS proxy by passing the proxy's URL via the `PROXY`
@@ -1433,6 +1514,10 @@ Enable the Autopause functionality by setting:
 -e ENABLE_AUTOPAUSE=TRUE
 ```

+Autopause is not compatible with `EXEC_DIRECTLY=true` and the two cannot be set together.
+
+> When configuring kubernetes readiness/liveness health checks with auto-pause enabled, be sure to reference the `mc-health` wrapper script rather than `mc-status` directly.
+
 The following environment variables define the behaviour of auto-pausing:
 * `AUTOPAUSE_TIMEOUT_EST`, default `3600` (seconds)
  describes the time between the last client disconnect and the pausing of the process (read as timeout established)
@@ -1445,6 +1530,28 @@ 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.

+## 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.
+
+Note that the docker container variables have to be set accordingly (restart policy set to "no") and that the container has to be manually restarted.
+
+A starting, example compose file has been provided in [examples/docker-compose-autostop.yml](examples/docker-compose-autostop.yml).
+
+Enable the Autostop functionality by setting:
+
+```
+-e ENABLE_AUTOSTOP=TRUE
+```
+
+The following environment variables define the behaviour of auto-stopping:
+* `AUTOSTOP_TIMEOUT_EST`, default `3600` (seconds)
+  describes the time between the last client disconnect and the stopping of the server (read as timeout established)
+* `AUTOSTOP_TIMEOUT_INIT`, default `1800` (seconds)
+  describes the time between server start and the stopping of the server, when no client connects inbetween (read as timeout initialized)
+* `AUTOSTOP_PERIOD`, default `10` (seconds)
+  describes period of the daemonized state machine, that handles the stopping of the server
+
 ## 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`.
--- a/bin/mc-health
+++ b/bin/mc-health
@@ -1,7 +1,10 @@
 #!/bin/bash

-# shellcheck source=../start-utils
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=../scripts/start-utils
+. "${SCRIPTS:-/}start-utils"
+if [ -f /data/.mc-health.env ]; then
+  . /data/.mc-health.env
+fi

 if isTrue "${DISABLE_HEALTHCHECK}"; then
  echo "Healthcheck disabled"
@@ -10,6 +13,6 @@ elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -ax -o stat,comm | grep 'java' |
  echo "Java process suspended by Autopause function"
  exit 0
 else
-  mc-monitor status --host localhost --port $SERVER_PORT
+  mc-monitor status "${MC_HEALTH_EXTRA_ARGS[@]}" --host localhost --port "${SERVER_PORT:-25565}"
  exit $?
 fi
--- a/bin/mc-send-to-console
+++ b/bin/mc-send-to-console
@@ -12,4 +12,4 @@ if [ ! -p "${CONSOLE_IN_NAMED_PIPE}" ]; then
  exit 1
 fi

-echo "$@" > "${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}"
+gosu minecraft bash -c "echo $* > '${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}'"
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -7,7 +7,6 @@ branches_list=(
  'java8-openj9'
  'java11'
  'java11-openj9'
-  'java16'
  'java16-openj9'
  'java17'
  )
@@ -131,3 +130,28 @@ EOL
  fi

 done
+
+if [[ $tag ]]; then
+  if [ -f "$HOME/.github.env" ]; then
+    source "$HOME/.github.env"
+    if [[ $GITHUB_TOKEN ]]
+    then
+      auth=(-u ":$GITHUB_TOKEN")
+      base=https://api.github.com
+      : "${owner:=itzg}"
+      : "${repo:=docker-minecraft-server}"
+      read -r -d '' releaseBody << EOF
+        {
+          "tag_name": "$tag",
+          "name": "$tag",
+          "generate_release_notes": true
+        }
+EOF
+      if ! curl "${auth[@]}" -H "Accept: application/vnd.github.v3+json" \
+        "${base}/repos/${owner}/${repo}/releases" -d "$releaseBody"; then
+          echo "ERROR failed to create github release $tag"
+          exit 1
+      fi
+    fi
+  fi
+fi
--- a/examples/docker-compose-autostop.yml
+++ b/examples/docker-compose-autostop.yml
@@ -0,0 +1,20 @@
+version: '3.8'
+
+services:
+  minecraft:
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565"
+    volumes:
+      - "mc:/data"
+    environment:
+      EULA: "TRUE"
+      ENABLE_AUTOSTOP: "TRUE"
+      # More aggressive settings for demo purposes
+      AUTOSTOP_TIMEOUT_INIT: "30"
+      AUTOSTOP_TIMEOUT_EST: "20"
+    # Important not to auto-restart the server!!!
+    restart: "no"
+
+volumes:
+  mc: {}
--- a/examples/docker-compose-generic-pack.yml
+++ b/examples/docker-compose-generic-pack.yml
@@ -13,6 +13,7 @@ services:
      VERSION: ${VERSION:-1.17.1}
      FORGEVERSION: ${FORGEVERSION:-37.0.90}
      GENERIC_PACK: /modpacks/${MODPACK:-Server-Files-0.0.21.zip}
+      REMOVE_OLD_MODS: "${REMOVE_OLD_MODS:-false}"
    ports:
      - "25565:25565"

--- a/examples/docker-compose-paper.yml
+++ b/examples/docker-compose-paper.yml
@@ -1,18 +1,19 @@
 version: '3.8'
-
 services:
  mc:
    image: itzg/minecraft-server
+    container_name: paper
    environment:
      EULA: "true"
+      ENABLE_RCON: "true"
      TYPE: PAPER
-      VERSION: 1.9.4
-      # needed for Paper versions before 1.14
+      VIEW_DISTANCE: 10
+      MEMORY: 2G
      CONSOLE: "false"
    ports:
      - 25565:25565
    volumes:
      - mc-paper:/data
-
+    restart: unless-stopped
 volumes:
  mc-paper:
--- a/examples/k8s/using-statefulset.yml
+++ b/examples/k8s/using-statefulset.yml
@@ -3,18 +3,18 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
  labels:
-    app: example
-  name: example
+    app: mc-example
+  name: mc-example
 spec:
  replicas: 1
-  serviceName: example
+  serviceName: mc-example
  selector:
    matchLabels:
-      app: example
+      app: mc-example
  template:
    metadata:
      labels:
-        app: example
+        app: mc-example
    spec:
      containers:
        - name: mc
@@ -25,6 +25,18 @@ spec:
          volumeMounts:
            - mountPath: /data
              name: data
+          readinessProbe:
+            exec:
+              command:
+                - mc-monitor 
+                - status 
+                - --host 
+                - localhost 
+                - --port
+                - "25565"
+            initialDelaySeconds: 30
+            periodSeconds: 5
+            failureThreshold: 18
  volumeClaimTemplates:
    - metadata:
        name: data
@@ -39,12 +51,12 @@ apiVersion: v1
 kind: Service
 metadata:
  labels:
-    service: example
-  name: example
+    service: mc-example
+  name: mc-example
 spec:
  ports:
    - port: 25565
      targetPort: 25565
  selector:
-    app: example
-  type: LoadBalancer
+    app: mc-example
+  type: NodePort
--- a/examples/vanilla-tweaks/docker-compose.yml
+++ b/examples/vanilla-tweaks/docker-compose.yml
@@ -0,0 +1,27 @@
+version: "3.3"
+
+services:
+  vanillatweaks_file:
+    restart: "no"
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565/tcp"
+    environment:
+      EULA: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VANILLATWEAKS_FILE: /config/vanillatweaks-datapacks.json
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"
+    volumes:
+      - data:/data
+      - ./vanillatweaks-datapacks.json:/config/vanillatweaks-datapacks.json:ro
+  vanillatweaks_sharecode:
+    # port is set to 25566 to not conflict with vanillatweaks_file example
+    ports:
+      - "25566:25565/tcp"
+    restart: "no"
+    image: itzg/minecraft-server
+    environment:
+      EULA: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VANILLATWEAKS_SHARECODE: MGr52E
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"
--- a/examples/vanilla-tweaks/vanillatweaks-datapacks.json
+++ b/examples/vanilla-tweaks/vanillatweaks-datapacks.json
@@ -0,0 +1,15 @@
+{
+    "version": "1.18",
+    "packs": {
+        "survival": [
+            "graves",
+            "multiplayer sleep",
+            "afk display",
+            "armor statues",
+            "unlock all recipes",
+            "fast leaf decay",
+            "coordinates hud"
+        ],
+        "items": ["armored elytra"]
+    }
+}
--- a/files/autopause/autopause-fcns.sh
+++ b/files/autopause/autopause-fcns.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

 current_uptime() {
-  echo $(awk '{print $1}' /proc/uptime | cut -d . -f 1)
+  awk '{print $1}' /proc/uptime | cut -d . -f 1
 }

 java_running() {
@@ -17,15 +17,15 @@ rcon_client_exists() {
 }

 mc_server_listening() {
-  mc-monitor status --host localhost --port $SERVER_PORT --timeout 10s >& /dev/null
+  mc-monitor status --host localhost --port "$SERVER_PORT" --timeout 10s >& /dev/null
 }

 java_clients_connected() {
  local connections
  if java_running ; then
-    connections=$(mc-monitor status --host localhost --port $SERVER_PORT --show-player-count)
+    connections=$(mc-monitor status --host localhost --port "$SERVER_PORT" --show-player-count)
  else
    connections=0
  fi
-  (( $connections > 0 ))
+  (( connections > 0 ))
 }
--- a/files/autostop/autostop-daemon.sh
+++ b/files/autostop/autostop-daemon.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# needed for the clients connected function residing in autopause
+. /autopause/autopause-fcns.sh
+
+. ${SCRIPTS:-/}start-utils
+
+# wait for java process to be started
+while :
+do
+  if java_process_exists ; then
+    break
+  fi
+  sleep 0.1
+done
+
+STATE=INIT
+
+while :
+do
+  case X$STATE in
+  XINIT)
+    # 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"
+      STATE=II
+    fi
+    ;;
+  XII)
+    # Initial idle
+    if java_clients_connected ; then
+      logAutostop "Client connected - waiting for disconnect"
+      STATE=E
+    else
+      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
+        logAutostop "No client connected since startup - stopping server"
+        /autostop/stop.sh
+        exit 0
+      fi
+    fi
+    ;;
+  XE)
+    # Established
+    if ! java_clients_connected ; then
+      TIME_THRESH=$(($(current_uptime)+$AUTOSTOP_TIMEOUT_EST))
+      logAutostop "All clients disconnected - stopping in $AUTOSTOP_TIMEOUT_EST seconds"
+      STATE=I
+    fi
+    ;;
+  XI)
+    # Idle
+    if java_clients_connected ; then
+      logAutostop "Client reconnected - waiting for disconnect"
+      STATE=E
+    else
+      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
+        logAutostop "No client reconnected - stopping"
+        /autostop/stop.sh
+        exit 0
+      fi
+    fi
+    ;;
+  *)
+    logAutostop "Error: invalid state: $STATE"
+    ;;
+  esac
+  sleep $AUTOSTOP_PERIOD
+done
--- a/files/autostop/stop.sh
+++ b/files/autostop/stop.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. /start-utils
+
+logAutostopAction "Stopping Java process"
+kill -SIGTERM 1
--- a/files/log4j2.xml
+++ b/files/log4j2.xml
@@ -4,7 +4,7 @@
        <Console name="SysOut" target="SYSTEM_OUT">
            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
        </Console>
-        <Queue name="ServerGuiConsole">
+        <Queue name="TerminalConsole">
            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
        </Queue>
        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
@@ -28,7 +28,7 @@
            </filters>
            <AppenderRef ref="SysOut"/>
            <AppenderRef ref="File"/>
-            <AppenderRef ref="ServerGuiConsole"/>
+            <AppenderRef ref="TerminalConsole"/>
        </Root>
    </Loggers>
 </Configuration>
--- a/scripts/start
+++ b/scripts/start
@@ -40,7 +40,7 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
    echo 'hosts: files dns' > /etc/nsswitch.conf
  fi

-  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
+  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration "$@"
 else
-  exec ${SCRIPTS:-/}start-configuration $@
+  exec ${SCRIPTS:-/}start-configuration "$@"
 fi
--- a/scripts/start-autopause
+++ b/scripts/start-autopause
@@ -1,9 +1,15 @@
 #!/bin/bash

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+
+: "${SERVER_PORT:=25565}"
+export SERVER_PORT

 log "Autopause functionality enabled"

+isDebugging && set -x
+
 cp /autopause/knockd-config.cfg /tmp/knockd-config.cfg

 # update server port to listen to
--- a/scripts/start-autostop
+++ b/scripts/start-autostop
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+
+: "${SERVER_PORT:=25565}"
+export SERVER_PORT
+
+log "Autostop functionality enabled"
+
+isDebugging && set -x
+
+if ! [[ $AUTOSTOP_PERIOD =~ ^[0-9]+$ ]]; then
+  AUTOSTOP_PERIOD=10
+  export AUTOSTOP_PERIOD
+  log "Warning: AUTOSTOP_PERIOD is not numeric, set to 10 (seconds)"
+fi
+if [ "$AUTOSTOP_PERIOD" -eq "0" ] ; then
+  AUTOSTOP_PERIOD=10
+  export AUTOSTOP_PERIOD
+  log "Warning: AUTOSTOP_PERIOD must not be 0, set to 10 (seconds)"
+fi
+if ! [[ $AUTOSTOP_TIMEOUT_EST =~ ^[0-9]+$ ]] ; then
+  AUTOSTOP_TIMEOUT_EST=3600
+  export AUTOSTOP_TIMEOUT_EST
+  log "Warning: AUTOSTOP_TIMEOUT_EST is not numeric, set to 3600 (seconds)"
+fi
+if ! [[ $AUTOSTOP_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
+  AUTOSTOP_TIMEOUT_INIT=1800
+  export AUTOSTOP_TIMEOUT_INIT
+  log "Warning: AUTOSTOP_TIMEOUT_INIT is not numeric, set to 1800 (seconds)"
+fi
+
+/autostop/autostop-daemon.sh &
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -32,6 +32,15 @@ if [ ! -e /data/eula.txt ]; then
  writeEula
 fi

+if isTrue "${ENABLE_AUTOPAUSE}" && isTrue "${EXEC_DIRECTLY:-false}"; then
+    log "EXEC_DIRECTLY=true is incompatible with ENABLE_AUTOPAUSE=true"
+    exit 1
+fi
+
+if isTrue "${ENABLE_AUTOPAUSE}" && isTrue "${ENABLE_AUTOSTOP}"; then
+    log "ENABLE_AUTOPAUSE=true is incompatible with ENABLE_AUTOSTOP=true"
+    exit 1
+fi

 if [[ $PROXY ]]; then
    export http_proxy="$PROXY"
@@ -92,6 +101,18 @@ if isTrue "${ENABLE_AUTOPAUSE}"; then
  ${SCRIPTS:-/}start-autopause
 fi

+if isTrue "${ENABLE_AUTOSTOP}"; then
+  ${SCRIPTS:-/}start-autostop
+fi
+
+if versionLessThan 1.7; then
+  echo "
+MC_HEALTH_EXTRA_ARGS=(
+  --use-server-list-ping
+)
+  " > /data/.mc-health.env
+fi
+
 log "Resolving type given ${TYPE}"
 case "${TYPE^^}" in
  *BUKKIT|SPIGOT)
@@ -162,6 +183,10 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployAirplane "$@"
  ;;

+  PUFFERFISH)
+    exec ${SCRIPTS:-/}start-deployPufferfish "$@"
+  ;;
+
  CANYON)
    exec ${SCRIPTS:-/}start-deployCanyon "$@"
  ;;
@@ -184,7 +209,7 @@ 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, CANYON, LIMBO, CRUCIBLE"
+      log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, PUFFERFISH, CANYON, LIMBO, CRUCIBLE"
      exit 1
  ;;

--- a/scripts/start-deployAirplane
+++ b/scripts/start-deployAirplane
@@ -1,45 +1,42 @@
 #!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'

 . ${SCRIPTS:-/}start-utils
+set -euo pipefail
 isDebugging && set -x

-if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.16" ] && [ "${VERSION}" != "1.17" ] && [ "${VERSION}" != "PURPUR" ] && [ "${VERSION}" != "PURPUR-1.16" ] ; then
-  log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=1.17, VERSION=1.16, VERSION=PURPUR or VERSION=PURPUR-1.16. Note that these are branches, not #.#.# versions."
+IFS=$'\n\t'
+
+if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.17" ] && [ "${VERSION}" != "PURPUR" ] ; then
+  log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=1.17, VERSION=PURPUR. Note that these are branches, not #.#.# versions."
  exit 1
 fi

 : ${AIRPLANE_BUILD:=lastSuccessfulBuild}
 : ${AIRPLANE_TYPE:=airplane}

-if  [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then
+if [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then
  AIRPLANE_BRANCH="1.17"
 fi

-if [ "${VERSION}" = "1.16" ]; then
-  AIRPLANE_BRANCH="1.16"
-fi
-
 if [ "${VERSION}" = "PURPUR" ]; then
  AIRPLANE_BRANCH="Purpur-1.17"
  AIRPLANE_TYPE="airplanepurpur"
 fi

-if [ "${VERSION}" = "PURPUR-1.16" ]; then
-  AIRPLANE_BRANCH="Purpur-1.16"
-  AIRPLANE_TYPE="airplanepurpur"
-fi
-
 log "Using Airplane-${AIRPLANE_BRANCH} branch"

 export SERVER=airplane-${AIRPLANE_BRANCH}-${AIRPLANE_BUILD}.jar

+log "Removing old Airplane versions ..."
+shopt -s nullglob
+for f in airplane-*.jar; do
+  [[ $f != $SERVER ]] && rm $f
+done
+
 if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
    downloadUrl="https://ci.tivy.ca/job/Airplane-${AIRPLANE_BRANCH}/${AIRPLANE_BUILD}/artifact/launcher-${AIRPLANE_TYPE}.jar"
    log "Downloading Airplane from $downloadUrl ..."
-    curl -fsSL -o "$SERVER" "$downloadUrl"
-    if [ ! -f "$SERVER" ]; then
+    if ! get -o "$SERVER" "$downloadUrl"; then
      log "ERROR: failed to download from $downloadUrl (status=$?)"
      exit 3
    fi
@@ -47,6 +44,7 @@ fi

 # Normalize on Spigot for later operations
 export TYPE=SPIGOT
+export FAMILY=SPIGOT
 export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployBukkitSpigot
+++ b/scripts/start-deployBukkitSpigot
@@ -64,7 +64,7 @@ function downloadSpigot {
  fi

  if [[ -z $downloadUrl ]]; then
-    if versionLessThan 1.16.5; then
+    if versionLessThan 1.16.5 || ([[ ${getbukkitFlavor} = "craftbukkit" ]] && [[ ${VANILLA_VERSION} = "1.16.5" ]]); then
      downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
    else
      downloadUrl="https://download.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
@@ -127,6 +127,7 @@ fi

 # Normalize on Spigot for operations below
 export TYPE=SPIGOT
+export FAMILY=SPIGOT
 export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployCF
+++ b/scripts/start-deployCF
@@ -35,11 +35,37 @@ FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
 log "Looking for Feed-The-Beast / CurseForge server modpack."
 requireVar FTB_SERVER_MOD

-if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
-  if ! [ -f "${FTB_SERVER_MOD}" ]; then
-    log "ERROR unable to find requested modpack file ${FTB_SERVER_MOD}"
-    exit 2
+downloadModpack() {
+  srv_modpack=${FTB_SERVER_MOD}
+  if isURL "${srv_modpack}"; then
+    log "Downloading modpack from ${srv_modpack}..."
+    if ! srv_modpack=$(get -o /data --output-filename --skip-existing "${srv_modpack}"); then
+      log "ERROR: failed to download modpack"
+      exit 1
+    fi
  fi
+  if [[ "${srv_modpack:0:5}" == "data/" ]]; then
+      # Prepend with "/"
+      srv_modpack="/${srv_modpack}"
+  fi
+  if [[ ! "${srv_modpack:0:1}" == "/" ]]; then
+      # If not an absolute path, assume file is in "/data"
+      srv_modpack=/data/${srv_modpack}
+  fi
+  if [[ ! -f "${srv_modpack}" ]]; then
+      log "FTB server modpack ${srv_modpack} not found."
+      exit 2
+  fi
+  if [[ ! "${srv_modpack: -4}" == ".zip" ]]; then
+      log "FTB server modpack ${srv_modpack} is not a zip archive."
+      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
+      exit 2
+  fi
+  FTB_SERVER_MOD=${srv_modpack}
+}
+
+if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
+  downloadModpack

  needsInstall=true
  installMarker=/data/.curseforge-installed
@@ -47,7 +73,7 @@ if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
    if [ "$(cat $installMarker)" != "${FTB_SERVER_MOD}" ]; then
      log "Upgrading modpack"

-      serverJar=$(find "${FTB_BASE_DIR}" -not -name "forge*installer.jar" -name "forge*.jar")
+      serverJar=$(find "${FTB_BASE_DIR}" -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
      if [[ "${serverJar}" ]]; then
        rm -rf "$(dirname "${serverJar}")"/{mods,*.jar,libraries,resources,scripts,config}
      fi
@@ -132,32 +158,9 @@ fi
 # 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
+  downloadModpack
  srv_modpack=${FTB_SERVER_MOD}
-  if isURL "${srv_modpack}"; then
-    log "Downloading modpack from ${srv_modpack}..."
-    if ! srv_modpack=$(get -o /data --output-filename --skip-existing "${srv_modpack}"); then
-      log "ERROR: failed to download modpack"
-      exit 1
-    fi
-  fi
-  if [[ "${srv_modpack:0:5}" == "data/" ]]; then
-      # Prepend with "/"
-      srv_modpack="/${srv_modpack}"
-  fi
-  if [[ ! "${srv_modpack:0:1}" == "/" ]]; then
-      # If not an absolute path, assume file is in "/data"
-      srv_modpack=/data/${srv_modpack}
-  fi
-  if [[ ! -f "${srv_modpack}" ]]; then
-      log "FTB server modpack ${srv_modpack} not found."
-      exit 2
-  fi
-  if [[ ! "${srv_modpack: -4}" == ".zip" ]]; then
-      log "FTB server modpack ${srv_modpack} is not a zip archive."
-      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
-      exit 2
-  fi
-
+  
  log "Unpacking FTB server modpack ${srv_modpack} ..."
  mkdir -p "${FTB_BASE_DIR}"
  unzip -o "${srv_modpack}" -d "${FTB_BASE_DIR}" | awk '{printf "."} END {print ""}'
@@ -233,4 +236,5 @@ elif [ -e "${FTB_DIR}/Install.sh" ]; then
  popd
 fi

+export FAMILY=FORGE
 exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-deployCanyon
+++ b/scripts/start-deployCanyon
@@ -2,16 +2,11 @@
 set -euo pipefail
 IFS=$'\n\t'

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 isDebugging && set -x

-: ${CANYON_BUILD:=lastSuccessfulBuild}
-JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
-
-if [ "${JAVA_VER}" != "8" ]; then
-  log "ERROR: Canyon server type only supports Java version 8"
-  exit 1
-fi
+: "${CANYON_BUILD:=lastSuccessfulBuild}"

 if [ "${VERSION}" != "b1.7.3" ]; then
  log "ERROR: Canyon server type only supports VERSION=b1.7.3"
@@ -49,6 +44,7 @@ fi

 # Normalize on Spigot for later operations
 export TYPE=SPIGOT
+export FAMILY=SPIGOT
 export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployCatserver
+++ b/scripts/start-deployCatserver
@@ -28,5 +28,6 @@ fi

 export SKIP_LOG4J_CONFIG=true

+export FAMILY=HYBRID
 # Continue to Final Setup
 exec ${SCRIPTS:-/}start-setupWorld "$@"
--- a/scripts/start-deployCrucible
+++ b/scripts/start-deployCrucible
@@ -56,5 +56,6 @@ fi

 export SERVER
 export SKIP_LOG4J_CONFIG=true
+export FAMILY=HYBRID

 exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
--- a/scripts/start-deployCustom
+++ b/scripts/start-deployCustom
@@ -31,5 +31,5 @@ else
 fi

 export SKIP_LOG4J_CONFIG=true
-
+export FAMILY=HYBRID
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployFTBA
+++ b/scripts/start-deployFTBA
@@ -67,7 +67,7 @@ variants=(
  forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
  fabric-${mcVersion}-${fabricVersion}-server-launch.jar
 )
-for f in ${variants[@]}; do
+for f in "${variants[@]}"; do
  if [ -f $f ]; then
    export SERVER=$f
    break
@@ -79,4 +79,5 @@ if ! [ -v SERVER ]; then
  exit 2
 fi

+export FAMILY=FORGE
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployFabric
+++ b/scripts/start-deployFabric
@@ -2,27 +2,31 @@
 set -eu

 # shellcheck source=start-utils
-. ${SCRIPTS:-/}start-utils
+. "${SCRIPTS:-/}start-utils"

 requireVar VANILLA_VERSION
 export TYPE=FABRIC
-export SERVER=fabric-server-${VANILLA_VERSION}.jar
+: "${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}"
+: "${FABRIC_INSTALLER:=}"
+: "${FABRIC_INSTALLER_URL:=}"
+: "${FABRIC_LOADER_VERSION:=LATEST}"

 isDebugging && set -x

-if [[ ! -e ${SERVER} ]]; then
+log "Checking Fabric version information."
+if [[ $FABRIC_INSTALLER ]]; then
+  FABRIC_INSTALLER_VERSION=$(echo -n "$FABRIC_INSTALLER" | mc-image-helper hash)
+elif [[ $FABRIC_INSTALLER_URL ]]; then
+  FABRIC_INSTALLER_VERSION=$(echo -n "$FABRIC_INSTALLER_URL" | mc-image-helper hash)
+elif [[ ${FABRIC_INSTALLER_VERSION^^} = LATEST ]]; then
+  FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
+fi

-  : ${FABRIC_INSTALLER:=}
-  : ${FABRIC_INSTALLER_URL:=}
-  : ${FABRIC_LOADER_VERSION:=LATEST}
-  : ${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}
+export SERVER=fabric-server-${VANILLA_VERSION}-${FABRIC_INSTALLER_VERSION}.jar
+
+if [ ! \( -e ${SERVER} -a -e "server-${VANILLA_VERSION}.jar" \) ]; then

  if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-    log "Checking Fabric version information."
-    if [[ ${FABRIC_INSTALLER_VERSION^^} = LATEST ]]; then
-      FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-    fi
-
    FABRIC_INSTALLER="fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
    FABRIC_INSTALLER_URL="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
  elif [[ -z $FABRIC_INSTALLER ]]; then
@@ -66,7 +70,12 @@ if [[ ! -e ${SERVER} ]]; then
    exit 10
  fi

+  mv server.jar "server-${VANILLA_VERSION}.jar"
  mv fabric-server-launch.jar "${SERVER}"
 fi

-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Specify which server jar to run
+echo "serverJar=server-${VANILLA_VERSION}.jar" >  fabric-server-launcher.properties
+
+export FAMILY=FABRIC
+exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-deployForge
+++ b/scripts/start-deployForge
@@ -11,8 +11,8 @@ get_installer() {
    log "Downloading $normForgeVersion"

    forgeFileNames="
-    $normForgeVersion/forge-$normForgeVersion-installer.jar
    $shortForgeVersion/forge-$shortForgeVersion-installer.jar
+    $normForgeVersion/forge-$normForgeVersion-installer.jar
  "

    for fn in $forgeFileNames; do
@@ -102,7 +102,7 @@ resolve_versions() {
        ;;

      RECOMMENDED)
-        if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-recommended']" "$promosUrl"); then
+        if ! FORGE_VERSION=$(get -s --json-path ".promos['$VANILLA_VERSION-recommended']" "$promosUrl"); then
          if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-latest']" "$promosUrl"); then
            log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
            log "       Refer to http://files.minecraftforge.net/ for supported versions"
@@ -147,4 +147,5 @@ else
  fi
 fi

+export FAMILY=FORGE
 exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-deployLimbo
+++ b/scripts/start-deployLimbo
@@ -60,4 +60,5 @@ export LEVEL

 export SKIP_LOG4J_CONFIG=true

+export FAMILY=LIMBO
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployMagma
+++ b/scripts/start-deployMagma
@@ -89,4 +89,5 @@ else
  fi
 fi

-exec ${SCRIPTS:-/}start-setupWorld $@
+export FAMILY=HYBRID
+exec ${SCRIPTS:-/}start-setupWorld "$@"
--- a/scripts/start-deployMohist
+++ b/scripts/start-deployMohist
@@ -40,4 +40,5 @@ fi

 export SKIP_LOG4J_CONFIG=true

+export FAMILY=HYBRID
 exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
--- a/scripts/start-deployPaper
+++ b/scripts/start-deployPaper
@@ -74,6 +74,7 @@ fi

 # Normalize on Spigot for downstream operations
 export TYPE=SPIGOT
+export FAMILY=SPIGOT
 export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployPufferfish
+++ b/scripts/start-deployPufferfish
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -euo pipefail
+isDebugging && set -x
+
+IFS=$'\n\t'
+
+if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.18" ] ; then
+  log "ERROR: Pufferfish server type only supports VERSION=LATEST, VERSION=1.18. Note that these are branches, not #.#.# versions."
+  exit 1
+fi
+
+: ${PUFFERFISH_BUILD:=lastSuccessfulBuild}
+
+if  [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.18" ]; then
+  PUFFERFISH_BRANCH="1.18"
+  PUFFERFISH_VERSION="1.18.1-R0.1"
+fi
+
+log "Using Pufferfish-${PUFFERFISH_BRANCH} branch"
+
+export SERVER=pufferfish-${PUFFERFISH_BRANCH}-${PUFFERFISH_BUILD}.jar
+
+log "Removing old Pufferfish versions ..."
+shopt -s nullglob
+for f in pufferfish-*.jar; do
+  [[ $f != $SERVER ]] && rm $f
+done
+
+if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
+    artifact="build/libs/pufferfish-paperclip-${PUFFERFISH_VERSION}-SNAPSHOT-reobf.jar"
+    downloadUrl="https://ci.pufferfish.host/job/Pufferfish-${PUFFERFISH_BRANCH}/${PUFFERFISH_BUILD}/artifact/${artifact}"
+    log "Downloading Pufferfish from $downloadUrl ..."
+    if ! get -o "$SERVER" "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export TYPE=SPIGOT
+export FAMILY=SPIGOT
+export SKIP_LOG4J_CONFIG=true
+
+exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployPurpur
+++ b/scripts/start-deployPurpur
@@ -2,7 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 isDebugging && set -x

 : ${VANILLA_VERSION:?}
@@ -10,21 +11,19 @@ isDebugging && set -x
 : ${FORCE_REDOWNLOAD:=false}

 if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  PURPUR_BUILD=$(curl -fsSL "https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}" |
-    jq -r '.builds.latest' || echo "")
-  if [[ -z ${PURPUR_BUILD} ]]; 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 3
+    exit 1
  fi
 fi

 export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"

 if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
+    downloadUrl="https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
    log "Downloading Purpur from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
+    if ! get -o "$SERVER" "$downloadUrl"; then
      log "ERROR: failed to download from $downloadUrl (status=$?)"
      exit 3
    fi
@@ -32,6 +31,7 @@ fi

 # Normalize on Spigot for later operations
 export TYPE=SPIGOT
+export FAMILY=SPIGOT
 export SKIP_LOG4J_CONFIG=true

-exec ${SCRIPTS:-/}start-spiget "$@"
+exec "${SCRIPTS:-/}start-spiget" "$@"
--- a/scripts/start-deploySpongeVanilla
+++ b/scripts/start-deploySpongeVanilla
@@ -37,4 +37,5 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
  curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
 fi

-exec ${SCRIPTS:-/}start-setupWorld $@
+export FAMILY=SPONGE
+exec ${SCRIPTS:-/}start-setupWorld "$@"
--- a/scripts/start-deployVanilla
+++ b/scripts/start-deployVanilla
@@ -41,6 +41,16 @@ if [ ! -e "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
  fi
 fi

-isDebugging && ls -l
+if versionLessThan 1.6; then
+  if ! [[ -L /data/minecraft_server.jar && /data/minecraft_server.jar -ef "/data/$SERVER" ]]; then
+    rm -f /data/minecraft_server.jar
+    ln -s "/data/$SERVER" /data/minecraft_server.jar
+  fi
+  SERVER=minecraft_server.jar
+elif [[ -L /data/minecraft_server.jar ]]; then
+  rm -f /data/minecraft_server.jar
+fi

+isDebugging && ls -l
+export FAMILY=VANILLA
 exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -3,24 +3,93 @@
 . ${SCRIPTS:-/}start-utils
 isDebugging && set -x

-if [ -n "$OPS" ]; then
-  log "Updating ops"
-  rm -f /data/ops.txt.converted
-  echo $OPS | awk -v RS=, '{print}' > /data/ops.txt
-fi
-if isTrue "${OVERRIDE_OPS}"; then
-  log "Recreating ops.json file at server startup"
-  rm -f /data/ops.json
+if versionLessThan 1.7.6; then
+  opsFile=ops.txt
+  whitelistFile=white-list.txt
+else
+  opsFile=ops.json
+  whitelistFile=whitelist.json
 fi

-if [ -n "$WHITELIST" ]; then
-  log "Updating whitelist"
-  rm -f /data/white-list.txt.converted
-  echo $WHITELIST | awk -v RS=, '{print}' > /data/white-list.txt
+function process_user_file() {
+  local output=$1
+  local source=$2
+
+  if isURL "$source"; then
+    log "Downloading $output from $source"
+    if ! get -o /data/$output "$source"; then
+      log "ERROR: failed to download from $source"
+      exit 2
+    fi
+  else
+    log "Copying $output from $source"
+    if ! cp "$source" /data/$output; then
+      log "ERROR: failed to copy from $source"
+      exit 1
+    fi
+  fi
+}
+
+function process_user_csv() {
+  local output=$1
+  local list=$2
+  local playerDataList
+
+  if [[ "$output" == *"ops"* ]]; then
+    # Extra data for ops.json
+    userData='{"uuid": .id, "name": .username, "level": 4}'
+  else
+    userData='{"uuid": .id, "name": .username}'
+  fi
+
+  log "Updating ${output%.*}"
+  for i in ${list//,/ }
+  do
+    if [ -e "$output" ] && grep -q "$i" "$output"; then
+      log "$i already present in $output, skipping"
+      continue
+    fi
+    if ! playerData=$(get "https://playerdb.co/api/player/minecraft/$i" | jq -re ".data.player"); then
+      log "WARNING: Could not lookup user $i for ${output} addition"
+    else
+      playerDataList=$playerDataList$(echo $playerData | jq -r "$userData")
+    fi
+  done
+  local newUsers=$(echo $playerDataList | jq -s .)
+  if [[ $output =~ .*\.txt ]]; then
+    # username list for txt config (Minecraft <= 1.7.5)
+    echo $newUsers | jq -r '.[].name' >> /data/${output}
+    sort -u /data/${output} -o /data/${output}
+  elif [ -e /data/${output} ]; then
+    # Merge with existing json file
+    local currentUsers=$(cat /data/${output})
+    jq --argjson current "$currentUsers" --argjson new "$newUsers" -n '$new + $current | unique_by(.uuid)' > /data/${output}
+  else
+    # New json file
+    echo $newUsers > /data/${output}
+  fi
+}
+
+if isTrue "${OVERRIDE_OPS}"; then
+  log "Recreating ${opsFile} file at server startup"
+  rm -f /data/${opsFile}
 fi
+if [ -n "${OPS_FILE}" ] && [ ! -e "/data/${opsFile}" ]; then
+  process_user_file ${opsFile} "$OPS_FILE"
+fi
+if [ -n "${OPS}" ]; then
+  process_user_csv ${opsFile} "$OPS"
+fi
+
 if isTrue "${OVERRIDE_WHITELIST}"; then
-  log "Recreating whitelist.json file at server startup"
-  rm -f /data/whitelist.json
+  log "Recreating ${whitelistFile} file at server startup"
+  rm -f /data/${whitelistFile}
+fi
+if [ -n "${WHITELIST_FILE}" ] && [ ! -e "/data/${whitelistFile}" ]; then
+  process_user_file ${whitelistFile} "$WHITELIST_FILE"
+fi
+if [ -n "${WHITELIST}" ]; then
+  process_user_csv ${whitelistFile} "$WHITELIST"
 fi

 if [ -n "$ICON" ]; then
@@ -38,7 +107,36 @@ if [ -n "$ICON" ]; then
    fi
 fi

+canUseRollingLogs=true
+
+patchLog4jConfig() {
+  file=${1?}
+  url=${2?}
+  if ! get -o "$file" "$url"; then
+    log "ERROR: failed to download corrected log4j config"
+    exit 1
+  fi
+  JVM_OPTS="-Dlog4j.configurationFile=${file} ${JVM_OPTS}"
+  canUseRollingLogs=false
+}
+
+# Patch Log4j remote code execution vulnerability
+# See https://www.minecraft.net/en-us/article/important-message--security-vulnerability-java-edition
+if versionLessThan 1.7; then
+  : # No patch required here.
+elif isFamily VANILLA && versionLessThan 1.12; then
+  patchLog4jConfig log4j2_17-111.xml https://launcher.mojang.com/v1/objects/dd2b723346a8dcd48e7f4d245f6bf09e98db9696/log4j2_17-111.xml
+elif isFamily VANILLA && versionLessThan 1.17; then
+  patchLog4jConfig log4j2_112-116.xml https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml
+elif versionLessThan 1.18.1; then
+  JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
+fi
+
 if isTrue ${ENABLE_ROLLING_LOGS:-false}; then
+  if ! ${canUseRollingLogs}; then
+    log "ERROR: Using rolling logs is currently not possible in the selected version due to CVE-2021-44228"
+    exit 1
+  fi
  # Set up log configuration
  LOGFILE="/data/log4j2.xml"
  if [ ! -e "$LOGFILE" ]; then
@@ -138,12 +236,6 @@ if isTrue "${USE_AIKAR_FLAGS}"; then
  "
 fi

-if isTrue "${USE_LARGE_PAGES}"; then
-  JVM_XX_OPTS="${JVM_XX_OPTS}
-  -XX:+UseLargePagesInMetaspace
-  "
-fi
-
 if isTrue "${USE_FLARE_FLAGS}"; then
  JVM_XX_OPTS="${JVM_XX_OPTS}
  -XX:+UnlockDiagnosticVMOptions
--- a/scripts/start-setupDatapack
+++ b/scripts/start-setupDatapack
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+: "${REMOVE_OLD_DATAPACKS:=false}"
+: "${DATAPACKS_FILE:=}"
+: "${REMOVE_OLD_DATAPACKS_DEPTH:=1} "
+: "${REMOVE_OLD_DATAPACKS_INCLUDE:=*.zip}"
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+isDebugging && set -x
+
+out_dir=/data/${LEVEL:-world}/datapacks
+
+# Remove old datapacks
+if isTrue "${REMOVE_OLD_DATAPACKS}" && [ -z "${DATAPACKS_FILE}" ]; then
+    if [ -d "$out_dir" ]; then
+    find "$out_dir" -mindepth 1 -maxdepth ${REMOVE_OLD_DATAPACKS_DEPTH:-16} -wholename "${REMOVE_OLD_DATAPACKS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_DATAPACKS_EXCLUDE:-}" -delete
+  fi
+fi
+
+if [[ "$DATAPACKS" ]]; then
+  mkdir -p "$out_dir"
+
+  for i in ${DATAPACKS//,/ }
+  do
+    if isURL "$i"; then
+      log "Downloading datapack $i ..."
+      if ! get -o "${out_dir}" "$i"; then
+        log "ERROR: failed to download from $i into $out_dir"
+        exit 2
+      fi
+    elif [[ -f "$i" && "$i" =~ .*\.zip ]]; then
+      log "Copying datapack located at $i ..."
+      out_file=$(basename "$i")
+      if ! cp "$i" "${out_dir}/$out_file"; then
+        log "ERROR: failed to copy from $i into $out_dir"
+        exit 2
+      fi
+    elif [[ -d "$i" ]]; then
+      log "Copying datapacks from $i ..."
+      cp "$i"/*.zip "${out_dir}"
+    else
+      log "ERROR Invalid URL or path given in DATAPACKS: $i"
+      exit 2
+    fi
+  done
+
+elif [[ "$DATAPACKS_FILE" ]]; then
+  if [ ! -f "$DATAPACKS_FILE" ]; then
+    log "ERROR: given DATAPACKS_FILE file does not exist"
+    exit 2
+  fi
+
+  mkdir -p "$out_dir"
+
+  args=(
+    -o "${out_dir}"
+    --log-progress-each
+    --skip-existing
+    --uris-file "${DATAPACKS_FILE}"
+  )
+  if isTrue "${REMOVE_OLD_DATAPACKS}"; then
+    args+=(
+    --prune-others "${REMOVE_OLD_DATAPACKS_INCLUDE}"
+    --prune-depth "${REMOVE_OLD_DATAPACKS_DEPTH}"
+    )
+  fi
+
+  if ! get "${args[@]}" ; then
+    log "ERROR: failed to retrieve one or more datapacks"
+    exit 1
+  fi
+fi
+
+exec "${SCRIPTS:-/}start-setupModpack" "$@"
--- a/scripts/start-setupEnvVariables
+++ b/scripts/start-setupEnvVariables
@@ -1,17 +1,18 @@
 #!/bin/bash

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"

 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_VARIABLES_EXCLUDES:=}
-: ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}
-: ${PATCH_DEFINITIONS:=}
-: ${DEBUG:=false}
+: "${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_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 ..."
@@ -20,15 +21,15 @@ if isTrue "${REPLACE_ENV_IN_PLACE}"; then
    --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
    --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
    --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
+    --replace-env-prefix="${REPLACE_ENV_VARIABLE_PREFIX}" \
    "${REPLACE_ENV_PATHS[@]}"
 fi

 if [[ ${PATCH_DEFINITIONS} ]]; then
  log "Applying patch definitions from ${PATCH_DEFINITIONS}"
  mc-image-helper --debug=${DEBUG} patch \
-    --patch-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
+    --patch-env-prefix="${REPLACE_ENV_VARIABLE_PREFIX}" \
    "${PATCH_DEFINITIONS}"
 fi

-exec ${SCRIPTS:-/}start-finalExec $@
+exec "${SCRIPTS:-/}start-finalExec" "$@"
--- a/scripts/start-setupModpack
+++ b/scripts/start-setupModpack
@@ -6,6 +6,7 @@ set -e -o pipefail
 : "${MODS_FILE:=}"
 : "${REMOVE_OLD_MODS_DEPTH:=1} "
 : "${REMOVE_OLD_MODS_INCLUDE:=*.jar}"
+sum_file=/data/.generic_pack.sum

 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"
@@ -18,6 +19,34 @@ CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
 if isTrue "${REMOVE_OLD_MODS}" && [ -z "${MODS_FILE}" ]; then
  removeOldMods /data/mods
  removeOldMods /data/plugins
+  rm -f "$sum_file"
+fi
+
+# If packwiz url passed, bootstrap packwiz and update mods before other modpack processing
+if [[ "${PACKWIZ_URL}" ]]; then
+  # Ensure we have the latest packwiz bootstrap installer
+  latestPackwiz=$(curl -fsSL https://api.github.com/repos/comp500/packwiz-installer-bootstrap/releases/latest)
+  if [[ -z "${latestPackwiz}" ]]; then
+    log "WARNING: Could not retrieve Packwiz bootstrap installer release information"
+  else
+    isDebugging && log "Latest packwiz ${latestPackWiz}"
+    latestPackwizVer=$(echo ${latestPackwiz} | jq --raw-output '.tag_name')
+    latestPackwizUrl=$(echo ${latestPackwiz} | jq --raw-output '.assets[] | select(.name | match("packwiz-installer-bootstrap.jar")) | .url')
+    : "${PACKWIZ_JAR:=packwiz-installer-bootstrap_${latestPackwizVer}.jar}"
+    if [[ ! -e $PACKWIZ_JAR ]]; then
+      log "Downloading Packwiz ${latestPackwizVer}"
+      curl -H "Accept:application/octet-stream" -o "$PACKWIZ_JAR" -fsSL ${latestPackwizUrl}
+      ln -sf "${PACKWIZ_JAR}" packwiz-installer-bootstrap.jar
+    fi
+  fi
+  if [[ ! -e packwiz-installer-bootstrap.jar ]]; then
+    log "ERROR: Packwiz not available or could not be downloaded from Github!"
+    exit 1
+  fi
+  if isURL "${PACKWIZ_URL}"; then
+    log "Running packwiz against URL: ${PACKWIZ_URL}"
+    java -jar packwiz-installer-bootstrap.jar -g -s server "${PACKWIZ_URL}"
+  fi
 fi

 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack
@@ -177,7 +206,6 @@ if [[ "${GENERIC_PACKS}" ]]; then
    fi
  done

-  sum_file=/data/.generic_pack.sum
  isDebugging && [ -f "$sum_file}" ] && cat "$sum_file"
  if ! sha256sum -c "${sum_file}" --status 2> /dev/null; then
    base_dir=/tmp/generic_pack_base
--- a/scripts/start-setupServerProperties
+++ b/scripts/start-setupServerProperties
@@ -1,40 +1,49 @@
 #!/bin/bash

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"

-: ${SERVER_PROPERTIES:=/data/server.properties}
+: "${SERVER_PROPERTIES:=/data/server.properties}"

 # FUNCTIONS
+function setServerPropValue {
+  local prop=$1
+  local value=$2
+  # normalize booleans
+  case ${value^^} in
+    TRUE|FALSE)
+      value=${value,,} ;;
+  esac
+  if grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
+    log "Setting ${prop} to '${value}' in ${SERVER_PROPERTIES}"
+    sed -i "/^${prop}\s*=/ c ${prop}=${value//\\/\\\\}" "$SERVER_PROPERTIES"
+  else
+    log "Adding ${prop} with '${value}' in ${SERVER_PROPERTIES}"
+    echo "${prop}=${value}" >> "$SERVER_PROPERTIES"
+  fi
+}
+
 function setServerProp {
  local prop=$1
-  local var=$2
-  if [ -n "$var" ]; then
-    # normalize booleans
-    case ${var^^} in
-      TRUE|FALSE)
-        var=${var,,} ;;
-    esac
-    if grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
-      log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-      sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
-    else
-      log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
-      echo "${prop}=${var}" >> "$SERVER_PROPERTIES"
-    fi
-  else
-    isDebugging && log "Skip setting ${prop}"
+  local varName=$2
+
+  if [ -v $varName ]; then
+    setServerPropValue "$prop" "${!varName}"
  fi
 }

 function customizeServerProps {
-  if [ -n "$WHITELIST" ] || isTrue ${ENABLE_WHITELIST:-false}; then
-    log "Creating whitelist"
-    setServerProp "whitelist" "true"
-    setServerProp "white-list" "true"
+  # Whitelist processing
+  if [ -n "$WHITELIST" ] || [ -n "$WHITELIST_FILE" ] || isTrue "${ENABLE_WHITELIST:-false}"; then
+    log "Enabling whitelist functionality"
+    setServerPropValue "white-list" "true"
  else
-    log "Disabling whitelist"
-    setServerProp "whitelist" "false"
-    setServerProp "white-list" "false"
+    log "Disabling whitelist functionality"
+    setServerPropValue "white-list" "false"
+  fi
+  setServerProp "enforce-whitelist" ENFORCE_WHITELIST
+  if [[ $(grep "enforce-whitelist" $SERVER_PROPERTIES) != *true ]]; then
+    log "WARNING: whitelist enabled but not enforced. Set ENFORCE_WHITELIST=TRUE or update 'enforce-whitelist' in server.properties to enforce the whitelist."
  fi

  # If not provided, generate a reasonable default message-of-the-day,
@@ -53,57 +62,57 @@ function customizeServerProps {
    MOTD="A ${label} Minecraft Server powered by Docker"
  fi

-  setServerProp "server-name" "$SERVER_NAME"
-  setServerProp "server-ip" "$SERVER_IP"
-  setServerProp "server-port" "$SERVER_PORT"
-  setServerProp "motd" "$(echo $MOTD | mc-image-helper asciify)"
-  setServerProp "allow-nether" "$ALLOW_NETHER"
-  setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"
-  setServerProp "enable-command-block" "$ENABLE_COMMAND_BLOCK"
-  setServerProp "spawn-animals" "$SPAWN_ANIMALS"
-  setServerProp "spawn-monsters" "$SPAWN_MONSTERS"
-  setServerProp "spawn-npcs" "$SPAWN_NPCS"
-  setServerProp "spawn-protection" "$SPAWN_PROTECTION"
-  setServerProp "generate-structures" "$GENERATE_STRUCTURES"
-  setServerProp "view-distance" "$VIEW_DISTANCE"
-  setServerProp "hardcore" "$HARDCORE"
-  setServerProp "snooper-enabled" "$SNOOPER_ENABLED"
-  setServerProp "max-build-height" "$MAX_BUILD_HEIGHT"
-  setServerProp "force-gamemode" "$FORCE_GAMEMODE"
-  setServerProp "max-tick-time" "$MAX_TICK_TIME"
-  setServerProp "enable-query" "$ENABLE_QUERY"
-  setServerProp "query.port" "$QUERY_PORT"
-  setServerProp "enable-rcon" "$ENABLE_RCON"
-  setServerProp "rcon.password" "$RCON_PASSWORD"
-  setServerProp "rcon.port" "$RCON_PORT"
-  setServerProp "max-players" "$MAX_PLAYERS"
-  setServerProp "max-world-size" "$MAX_WORLD_SIZE"
-  setServerProp "level-name" "$LEVEL"
-  setServerProp "level-seed" "$SEED"
-  setServerProp "pvp" "${PVP}"
-  setServerProp "generator-settings" "$GENERATOR_SETTINGS"
-  setServerProp "online-mode" "$ONLINE_MODE"
-  setServerProp "allow-flight" "$ALLOW_FLIGHT"
-  setServerProp "level-type" "${LEVEL_TYPE^^}"
-  setServerProp "resource-pack" "$RESOURCE_PACK"
-  setServerProp "resource-pack-sha1" "$RESOURCE_PACK_SHA1"
-  setServerProp "player-idle-timeout" "$PLAYER_IDLE_TIMEOUT"
-  setServerProp "broadcast-console-to-ops" "$BROADCAST_CONSOLE_TO_OPS"
-  setServerProp "broadcast-rcon-to-ops" "$BROADCAST_RCON_TO_OPS"
-  setServerProp "enable-jmx-monitoring" "$ENABLE_JMX"
-  setServerProp "sync-chunk-writes" "$SYNC_CHUNK_WRITES"
-  setServerProp "enable-status" "$ENABLE_STATUS"
-  setServerProp "entity-broadcast-range-percentage" "$ENTITY_BROADCAST_RANGE_PERCENTAGE"
-  setServerProp "function-permission-level" "$FUNCTION_PERMISSION_LEVEL"
-  setServerProp "network-compression-threshold" "$NETWORK_COMPRESSION_THRESHOLD"
-  setServerProp "op-permission-level" "$OP_PERMISSION_LEVEL"
-  setServerProp "prevent-proxy-connections" "$PREVENT_PROXY_CONNECTIONS"
-  setServerProp "use-native-transport" "$USE_NATIVE_TRANSPORT"
-  setServerProp "enforce-whitelist" "$ENFORCE_WHITELIST"
-  setServerProp "simulation-distance" "$SIMULATION_DISTANCE"
+  setServerProp "server-name" SERVER_NAME
+  setServerProp "server-ip" SERVER_IP
+  setServerProp "server-port" SERVER_PORT
+  setServerProp "allow-nether" ALLOW_NETHER
+  setServerProp "announce-player-achievements" ANNOUNCE_PLAYER_ACHIEVEMENTS
+  setServerProp "enable-command-block" ENABLE_COMMAND_BLOCK
+  setServerProp "spawn-animals" SPAWN_ANIMALS
+  setServerProp "spawn-monsters" SPAWN_MONSTERS
+  setServerProp "spawn-npcs" SPAWN_NPCS
+  setServerProp "spawn-protection" SPAWN_PROTECTION
+  setServerProp "generate-structures" GENERATE_STRUCTURES
+  setServerProp "view-distance" VIEW_DISTANCE
+  setServerProp "hardcore" HARDCORE
+  setServerProp "snooper-enabled" SNOOPER_ENABLED
+  setServerProp "max-build-height" MAX_BUILD_HEIGHT
+  setServerProp "force-gamemode" FORCE_GAMEMODE
+  setServerProp "max-tick-time" MAX_TICK_TIME
+  setServerProp "enable-query" ENABLE_QUERY
+  setServerProp "query.port" QUERY_PORT
+  setServerProp "enable-rcon" ENABLE_RCON
+  setServerProp "rcon.password" RCON_PASSWORD
+  setServerProp "rcon.port" RCON_PORT
+  setServerProp "max-players" MAX_PLAYERS
+  setServerProp "max-world-size" MAX_WORLD_SIZE
+  setServerProp "level-name" LEVEL
+  setServerProp "level-seed" SEED
+  setServerProp "pvp" PVP
+  setServerProp "generator-settings" GENERATOR_SETTINGS
+  setServerProp "online-mode" ONLINE_MODE
+  setServerProp "allow-flight" ALLOW_FLIGHT
+  setServerProp "resource-pack" RESOURCE_PACK
+  setServerProp "resource-pack-sha1" RESOURCE_PACK_SHA1
+  setServerProp "require-resource-pack" RESOURCE_PACK_ENFORCE
+  setServerProp "player-idle-timeout" PLAYER_IDLE_TIMEOUT
+  setServerProp "broadcast-console-to-ops" BROADCAST_CONSOLE_TO_OPS
+  setServerProp "broadcast-rcon-to-ops" BROADCAST_RCON_TO_OPS
+  setServerProp "enable-jmx-monitoring" ENABLE_JMX
+  setServerProp "sync-chunk-writes" SYNC_CHUNK_WRITES
+  setServerProp "enable-status" ENABLE_STATUS
+  setServerProp "entity-broadcast-range-percentage" ENTITY_BROADCAST_RANGE_PERCENTAGE
+  setServerProp "function-permission-level" FUNCTION_PERMISSION_LEVEL
+  setServerProp "network-compression-threshold" NETWORK_COMPRESSION_THRESHOLD
+  setServerProp "op-permission-level" OP_PERMISSION_LEVEL
+  setServerProp "prevent-proxy-connections" PREVENT_PROXY_CONNECTIONS
+  setServerProp "use-native-transport" USE_NATIVE_TRANSPORT
+  setServerProp "simulation-distance" SIMULATION_DISTANCE
+  setServerPropValue "motd" "$(echo "$MOTD" | mc-image-helper asciify)"
+  [[ $LEVEL_TYPE ]] && setServerPropValue "level-type" "${LEVEL_TYPE^^}"

  if [ -n "$DIFFICULTY" ]; then
-    case $DIFFICULTY in
+    case ${DIFFICULTY,,} in
      peaceful|0)
        if versionLessThan 1.13; then
          DIFFICULTY=0
@@ -137,13 +146,12 @@ function customizeServerProps {
        exit 1
        ;;
    esac
-    setServerProp "difficulty" "$DIFFICULTY"
+    setServerPropValue "difficulty" "$DIFFICULTY"
  fi

  if [ -n "$MODE" ]; then
    log "Setting mode"
-    MODE_LC=$( echo $MODE | tr '[:upper:]' '[:lower:]' )
-    case $MODE_LC in
+    case ${MODE,,} in
      su*|0)
        if versionLessThan 1.13; then
          MODE=0
@@ -177,7 +185,7 @@ function customizeServerProps {
        exit 1
        ;;
    esac
-    setServerProp "gamemode" "$MODE"
+    setServerPropValue "gamemode" "$MODE"
  fi
 }

@@ -210,16 +218,16 @@ fi

 if isTrue "${ENABLE_AUTOPAUSE}"; then
  current_max_tick=$( grep 'max-tick-time' "$SERVER_PROPERTIES" | sed -r 's/( )+//g' | awk -F= '{print $2}' )
-  if (( $current_max_tick > 0 && $current_max_tick < 86400000 )); then
+  if (( current_max_tick > 0 && current_max_tick < 86400000 )); then
    log "Warning: The server.properties for the server doesn't have the Server Watchdog (effectively) disabled."
    log "Warning (cont): Autopause functionality resuming the process might trigger the Watchdog and restart the server completely."
    log "Warning (cont): Set the max-tick-time property to a high value (or disable the Watchdog with value -1 for versions 1.8.1+)."
  fi
 fi

-if isDebugging; then
+if isDebugging && [ -f "${SERVER_PROPERTIES}" ]; then
  log "DEBUG Dumping server.properties"
  cat "${SERVER_PROPERTIES}"
 fi

-exec ${SCRIPTS:-/}start-setupEnvVariables $@
+exec "${SCRIPTS:-/}start-setupEnvVariables" "$@"
--- a/scripts/start-setupVanillaTweaks
+++ b/scripts/start-setupVanillaTweaks
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+: "${REMOVE_OLD_VANILLATWEAKS:=false}"
+: "${VANILLATWEAKS_FILE:=}"
+: "${VANILLATWEAKS_SHARECODE:=}"
+: "${REMOVE_OLD_VANILLATWEAKS_DEPTH:=1} "
+: "${REMOVE_OLD_VANILLATWEAKS_INCLUDE:=*.zip}"
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+isDebugging && set -x
+
+out_dir=/data/${LEVEL:-world}/datapacks
+
+# Remove old VANILLATWEAKS
+if isTrue "${REMOVE_OLD_VANILLATWEAKS}" && [ -z "${VANILLATWEAKS_FILE}" ]; then
+    if [ -d "$out_dir" ]; then
+    find "$out_dir" -mindepth 1 -maxdepth ${REMOVE_OLD_VANILLATWEAKS_DEPTH:-16} -wholename "${REMOVE_OLD_VANILLATWEAKS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_VANILLATWEAKS_EXCLUDE:-}" -delete
+  fi
+fi
+
+# Example: VANILLATWEAKS_SHARECODE=MGr52E
+# Code generated from the UI website, typically a alphanumeric 6 digit code.
+if [[ "$VANILLATWEAKS_SHARECODE" ]]; then
+  VANILLATWEAKS_FILE=/tmp/vanillatweaksfile.json
+  SHARECODE_LOOKUP_URL="https://vanillatweaks.net/assets/server/sharecode.php?code=${VANILLATWEAKS_SHARECODE}"
+  curl -f $SHARECODE_LOOKUP_URL -o $VANILLATWEAKS_FILE
+  if [ ! -f "$VANILLATWEAKS_FILE" ]; then
+    log "ERROR: Unable to use share code provided to retreive vanillatweaks file"
+    exit 2
+  fi
+fi
+
+# Use vanillatweaks file to specify VT and datapacks
+if [[ "$VANILLATWEAKS_FILE" ]]; then
+  if [ ! -f "$VANILLATWEAKS_FILE" ]; then
+    log "ERROR: given VANILLATWEAKS_FILE file does not exist"
+    exit 2
+  fi
+
+  PACKS=$(jq -jc '.packs' $VANILLATWEAKS_FILE)
+  if [ ! "$PACKS" ]; then
+    log "ERROR: unable to retrieve packs from $VANILLATWEAKS_FILE"
+    exit 2
+  fi
+
+  VT_VERSION=$(jq -jc '.version' $VANILLATWEAKS_FILE)
+  if [ ! "$VT_VERSION" ]; then
+    log "ERROR: unable to retrieve version from $VANILLATWEAKS_FILE"
+    exit 2
+  fi
+fi
+
+# Download and unzip packs
+if [[ "$PACKS" ]] && [[ "$VT_VERSION" ]]; then
+  VT_ZIPDATA_URL=https://vanillatweaks.net/assets/server/zipdatapacks.php
+  DOWNLOAD_URL=$(curl -X POST -F "packs=${PACKS}" -F "version=${VT_VERSION}" $VT_ZIPDATA_URL | jq -r '.link')
+  if [ ! "$DOWNLOAD_URL" ]; then
+    log "ERROR: unable to retrieve DOWNLOAD_URL from vanillatweaks.net!"
+    exit 2
+  fi
+
+  TEMPZIP=/tmp/vanillatweaks.zip
+  if ! get -o $TEMPZIP "https://vanillatweaks.net${DOWNLOAD_URL}"; then 
+    log "ERROR: failed to download from ${DOWNLOAD_URL}"
+    exit 2
+  fi
+
+  mkdir -p "$out_dir"
+  if ! unzip -o -d "$out_dir" $TEMPZIP; then
+    log "ERROR: failed to unzip the ${PACKS} from ${$TEMPZIP}"
+  fi
+
+  # clean up files time!
+  rm -f $TEMPZIP
+  # cleans up temp vanilla tweaks file download to get stored packs
+  if [[ "$VANILLATWEAKS_SHARECODE" ]]; then
+    rm -f $VANILLATWEAKS_FILE
+  fi
+fi
+
+exec "${SCRIPTS:-/}start-setupDatapack" "$@"
--- a/scripts/start-setupWorld
+++ b/scripts/start-setupWorld
@@ -1,16 +1,14 @@
 #!/bin/bash

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 set -e
 isDebugging && set -x

-: ${LEVEL:=world}
-export LEVEL
-
 if [ $TYPE = "CURSEFORGE" ]; then
-  worldDest=$FTB_DIR/$LEVEL
+  worldDest=$FTB_DIR/${LEVEL:-world}
 else
-  worldDest=/data/$LEVEL
+  worldDest=/data/${LEVEL:-world}
 fi

 if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] ); then
@@ -71,4 +69,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
  fi
 fi

-exec ${SCRIPTS:-/}start-setupModpack $@
+exec "${SCRIPTS:-/}start-setupVanillaTweaks" "$@"
--- a/scripts/start-spiget
+++ b/scripts/start-spiget
@@ -22,6 +22,20 @@ containsJars() {
  return 1
 }

+containsPlugin() {
+  file=${1?}
+
+  pat='plugin.yml$'
+
+  while read -r line; do
+    if [[ $line =~ $pat ]]; then
+      return 0
+    fi
+  done <<<$(unzip -l "$file")
+
+  return 1
+}
+
 getResourceFromSpiget() {
  resource=${1?}

@@ -81,9 +95,12 @@ downloadResourceFromSpiget() {
    log "Extracting contents of resource ${resource} into plugins"
    unzip -o -q -d /data/plugins "${tmpfile}"
    rm "${tmpfile}"
-  else
+  elif containsPlugin "${tmpfile}"; then
    log "Moving resource ${resource} into plugins"
    mv "${tmpfile}" "/data/plugins/${resource}.jar"
+  else
+    log "ERROR downloaded resource '${resource}' seems to be not a valid plugin"
+    exit 2
  fi

 }
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -93,6 +93,14 @@ function logAutopauseAction() {
  echo "[$(date -Iseconds)] [Autopause] $*"
 }

+function logAutostop() {
+  echo "[Autostop loop] $*"
+}
+
+function logAutostopAction() {
+  echo "[$(date -Iseconds)] [Autostop] $*"
+}
+
 function normalizeMemSize() {
  local scale=1
  case ${1,,} in
@@ -112,32 +120,7 @@ function normalizeMemSize() {
 }

 function versionLessThan() {
-  local activeParts
-  IFS=. read -ra activeParts <<<"${VANILLA_VERSION}"
-
-  local givenParts
-  IFS=. read -ra givenParts <<<"$1"
-
-  if ((${#activeParts[@]} < 2)); then
-    return 1
-  fi
-
-  if ((${#activeParts[@]} == 2)); then
-    if ((activeParts[0] < givenParts[0])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])); then
-      return 0
-    else
-      return 1
-    fi
-  else
-    if ((activeParts[0] < givenParts[0])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] == givenParts[1] && activeParts[2] < givenParts[2])); then
-      return 0
-    else
-      return 1
-    fi
-  fi
+  mc-image-helper compare-versions "${VANILLA_VERSION}" lt "${1?}"
 }

 requireVar() {
@@ -161,7 +144,7 @@ requireEnum() {
    fi
  done

-  log "ERROR: $var must be set to one of $@"
+  log "ERROR: $var must be set to one of $*"
 #  exit 1
 }

@@ -187,4 +170,13 @@ function get() {
    flags+=("--debug")
  fi
  mc-image-helper "${flags[@]}" get "$@"
+}
+
+function isFamily() {
+  for f in "${@}"; do
+    if [[ $FAMILY == "$f" ]]; then
+      return 0
+    fi
+  done
+  return 1
 }
--- a/tests/docker-compose.test.yml
+++ b/tests/docker-compose.test.yml
@@ -1,20 +0,0 @@
-version: "3.8"
-
-services:
-  sut:
-    depends_on:
-      - mc
-    image: itzg/mc-monitor:0.6.0
-    command: status --host mc --retry-interval 1s --retry-limit 120
-  mc:
-    restart: "no"
-    build:
-      context: ..
-      args:
-        TARGETOS: linux
-        TARGETARCH: amd64
-      cache_from:
-      - itzg/minecraft-server:latest
-    environment:
-      EULA: "TRUE"
-
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+  monitor:
+    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
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+
--- a/tests/generic-packs/docker-compose.test.yml
+++ b/tests/generic-packs/docker-compose.test.yml
@@ -2,14 +2,13 @@ version: "3"

 services:
  mc:
-    image: itzg/minecraft-server
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
    environment:
      EULA: "true"
+      SETUP_ONLY: "TRUE"
      GENERIC_PACKS: https://github.com/itzg/mc-image-helper/releases/download/v1.9.5/mc-image-helper-1.9.5.zip,/packs/testing.zip
-      DEBUG: "true"
    volumes:
      - ./packs:/packs
      - data:/data
-
 volumes:
-  data: {}
+  data: {}
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -1,17 +1,56 @@
 #!/bin/bash

-cd $(dirname $0)
+# go to script root directory
+cd "$(dirname "$0")" || exit 1

-failed=false
-args="-f docker-compose.test.yml"
-docker-compose $args run sut || failed=true
-echo "
-Result: failed=$failed"
+# compose down function for reuse
+down() {
+  docker-compose down -v --remove-orphans
+}

-$failed && docker-compose $args logs mc
-docker-compose $args down -v
+fullMinecraftUpTest(){
+  name=$1
+  failed=false
+  # run the monitor to validate the Minecraft image is healthy
+  docker-compose run monitor || failed=true
+  echo "${name} Result: failed=$failed"

-if $failed; then
-  exit 1
-fi
+  # docker-compose logs outputs messages from the specified container
+  if $failed; then
+    docker-compose logs mc
+    down
+    exit 2
+  fi
+  down
+}

+setupOnlyMinecraftTest(){
+  folder=$1
+  failed=false
+  # run the monitor to validate the Minecraft image is healthy
+  docker-compose --log-level ERROR up --quiet-pull --exit-code-from mc 2>/dev/null || failed=true
+  echo "${folder} Result: failed=$failed"
+
+  # docker-compose logs outputs messages from the specified container
+  if $failed; then
+    docker-compose logs mc
+    down
+    cd ..
+    exit 2
+  fi
+  down
+  cd ..
+}
+
+# run tests on base docker compose and validate mc service with monitor
+fullMinecraftUpTest 'Full Vanilla Test'
+
+# go through each folder to test builds
+FOLDERS=$(ls)
+for folder in $FOLDERS; do
+    # If folder is a directory
+    if [ -d "$folder" ]; then
+      cd "$folder"
+      setupOnlyMinecraftTest $folder
+    fi
+done
--- a/tests/vanillatweaks_file/docker-compose.yml
+++ b/tests/vanillatweaks_file/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3"
+
+services:
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      SETUP_ONLY: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VANILLATWEAKS_FILE: /config/vanillatweaks-datapacks.json
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"
+    volumes:
+      - ./vanillatweaks-datapacks.json:/config/vanillatweaks-datapacks.json:ro
--- a/tests/vanillatweaks_file/vanillatweaks-datapacks.json
+++ b/tests/vanillatweaks_file/vanillatweaks-datapacks.json
@@ -0,0 +1,17 @@
+{
+    "type": "datapacks",
+    "version": "1.18",
+    "packs": {
+        "survival": [
+            "graves",
+            "multiplayer sleep",
+            "afk display",
+            "armor statues",
+            "unlock all recipes",
+            "fast leaf decay",
+            "coordinates hud"
+        ],
+        "items": ["armored elytra"]
+    },
+    "result": "ok"
+}
--- a/tests/vanillatweaks_sharecode/docker-compose.yml
+++ b/tests/vanillatweaks_sharecode/docker-compose.yml
@@ -0,0 +1,12 @@
+version: "3"
+
+services:
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      SETUP_ONLY: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VANILLATWEAKS_SHARECODE: MGr52E
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"
Author	SHA1	Message	Date
itzg	c506cf11ac	docs: Auto update markdown TOC	2022-01-06 12:50:04 +00:00
Bram	967d5159ea	Add Pufferfish support (#1255 )	2022-01-06 06:49:46 -06:00
Geoff Bourne	79f978359c	fix: ensured GENERIC_PACKS are re-applied with REMOVE_OLD_MODS (#1257 ) #1253	2022-01-05 21:38:51 -06:00
itzg	4c7bb313be	docs: Auto update markdown TOC	2022-01-04 03:59:33 +00:00
chblodg	83d3555eab	Adding Vanilla Tweaks Options (#1246 )	2022-01-03 21:59:19 -06:00
Geoff Bourne	e93cc569c6	fix[purpur]: use mc-image-helper for robust Purpur build lookup (#1242 )	2022-01-02 10:17:32 -06:00
itzg	5c0cf03548	docs: Auto update markdown TOC	2022-01-01 21:46:38 +00:00
Geoff Bourne	00cae995a7	Removed USE_LARGE_PAGES since its use is removed from Java 17 #1239	2022-01-01 15:46:43 -06:00
Jordy Hulck	4ba0a9c98c	Support downloading CurseForge modpack when USE_MODPACK_START_SCRIPT is false (#1229 )	2022-01-01 15:23:21 -06:00
itzg	6520655d6c	docs: Auto update markdown TOC	2022-01-01 18:28:00 +00:00
Geoff Bourne	6bd722b11b	docs: added note about log4jshell mitigation	2022-01-01 12:28:01 -06:00
itzg	4576882f07	docs: Auto update markdown TOC	2022-01-01 17:53:42 +00:00
Geoff Bourne	224553f695	Added java17-openj9 variant #1209	2022-01-01 11:53:45 -06:00
itzg	cc100fd8bb	docs: Auto update markdown TOC	2022-01-01 17:51:22 +00:00
Bartosz Stefańczyk	a7a0e54cb9	docs: Added note about mc-status under autopause section (#1224 )	2022-01-01 11:51:07 -06:00
Jordy Hulck	ce32eb8d4f	fix [CurseForge]: Fix script not deleting old version files when upgrading (#1230 )	2022-01-01 11:05:07 -06:00
Geoff Bourne	39519427bb	build: provide option to push image for a PR (#1221 )	2021-12-23 18:38:18 -06:00
itzg	2f1fed822c	docs: Auto update markdown TOC	2021-12-22 13:01:44 +00:00
Caden Kriese	bf5824b6e5	Added support for downloading and installing datapacks (#1214 )	2021-12-22 07:01:23 -06:00
itzg	52bf2ae094	docs: Auto update markdown TOC	2021-12-21 00:27:44 +00:00
Michael Kirsch	fa4a0e92ce	Autostop feature (#1212 )	2021-12-20 18:27:27 -06:00
Geoff Bourne	c15e231d7e	fix: write to console pipe as minecraft user (#1216 )	2021-12-20 07:09:29 -06:00
Daniel Hoffend	cc885276f5	fix: verify that the downloaded resource is a valid plugin (#1210 )	2021-12-19 19:24:02 -06:00
Geoff Bourne	9dee47cb6d	docs: exclude dependabot from changelog	2021-12-13 21:35:14 -06:00
itzg	39611fa9cb	docs: Auto update markdown TOC	2021-12-14 02:14:33 +00:00
Jawa_Juice	bb56de694a	Remove Airplane 1.16 as unsupported (#1199 )	2021-12-13 20:14:16 -06:00
woeisme	c4d4d2bcc1	Created new template for docker-compose-paper.yml (#1198 )	2021-12-13 14:25:21 -06:00
Levy Ehrstein	4e44f33db9	fix: fabric downgrading not working (#1197 , #1192 ) See #1192 for an in-depth explanation of the problem. Reported-by: Erik "Coding-Kiwi"	2021-12-13 13:50:20 -06:00
dependabot[bot]	58c085527f	build(deps): bump actions/stale from 4.0.0 to 4.1.0 (#1196 )	2021-12-13 07:45:16 -06:00
itzg	79fa4b95c3	docs: Auto update markdown TOC	2021-12-13 02:08:27 +00:00
Geoff Bourne	d5f1660c77	docs: Removed docker-compose-paper.yml since it was out of date (#1195 )	2021-12-12 20:08:13 -06:00
Geoff Bourne	3a3b5fc002	fix: qualify Fabric server jar by installer version (#1193 )	2021-12-12 15:34:24 -06:00
Levy Ehrstein	eccc989887	secruity: Fix CVE-2021-44228 mitigation (#1190 )	2021-12-12 08:19:16 -06:00
Brett Randall	c4aa105042	Added --chmod to all COPY instructions in Dockerfile (#1184 )	2021-12-12 08:10:18 -06:00
Geoff Bourne	ffcb76f73f	build: auto-create github release when docker-versions-create with tag (#1188 )	2021-12-11 16:51:01 -06:00
itzg	bee39343a6	docs: Auto update markdown TOC	2021-12-11 22:09:11 +00:00
StealthCT	e9326db933	Improved whitelist and ops support (#1182 )	2021-12-11 16:08:53 -06:00
itzg	dd1cc82fcd	docs: Auto update markdown TOC	2021-12-11 19:01:44 +00:00
Brett Randall	93825895b9	Startup fail-fast with error message if both ENABLE_AUTOPAUSE=true and EXEC_DIRECTLY=true are set. (#1186 )	2021-12-11 13:01:30 -06:00
Bram	492aebc718	Remove old Airplane versions (#1185 )	2021-12-11 12:56:11 -06:00
Levy Ehrstein	e66b2eda60	fix: log4j patch being applied to <1.7 versions (#1183 ) As described in https://www.minecraft.net/en-us/article/important-message--security-vulnerability-java-edition, versions below 1.7 are not affected by the log4j exploit. They should therefore not use any mitigations. See #1179 discussion after merge. Reported-and-tested-by: Daniel Porter "Stealthii" <dan.porter@rehabstudio.com>	2021-12-11 11:33:44 -06:00
Geoff Bourne	3bb21d8581	Used log4j2.formatMsgNoLookups as fallback for non-vanilla #1180	2021-12-10 20:50:40 -06:00
Geoff Bourne	fb6fa9b7d7	fix: use Mojang log4j config file fixes by version (#1179 )	2021-12-10 10:40:56 -06:00
Pascal Sthamer	0718a62007	security: patch log4j remote code execution vulnerability (#1178 )	2021-12-10 07:52:19 -06:00
Geoff Bourne	529d92fa63	build: also run tests with java8	2021-12-06 22:19:49 -06:00
Geoff Bourne	f7836abc06	build: fixed combined test/build jobs	2021-12-06 22:18:21 -06:00
itzg	cd09a932f9	docs: Auto update markdown TOC	2021-12-07 03:43:47 +00:00
StealthCT	46d21f58cf	Fabric documentation update (#1166 )	2021-12-06 21:43:33 -06:00
itzg	3e63be9988	docs: Auto update markdown TOC	2021-12-07 03:40:20 +00:00
StealthCT	aaaf7796b0	Add support for packwiz toml definitions (#1163 )	2021-12-06 21:40:00 -06:00
Alexandre Boucey	aba10c1d99	Update Purpur version API (#1162 )	2021-12-06 07:25:01 -06:00
Geoff Bourne	c4dd0d2bae	build: Switched to GHA cache (#1153 )	2021-12-04 18:42:03 -06:00
Geoff Bourne	6c636c3d9c	fix: corrected versionLessThan to handle b1.7.3 style #1159	2021-12-04 09:58:28 -06:00
itzg	9098b198c3	docs: Auto update markdown TOC	2021-12-03 14:07:53 +00:00
Geoff Bourne	927ec2a2c3	docs: let users do their own research about Mohist #1107	2021-12-03 08:07:40 -06:00
Paul Heidenreich	07a251b544	Fix downloading of craftbukkit when using 1.16.5 (#1150 )	2021-12-02 19:45:50 -06:00
itzg	b8e163d8b1	docs: Auto update markdown TOC	2021-12-03 01:28:10 +00:00
StealthCT	cd72acb6c6	Feature: Enforcing resource packs (#1149 )	2021-12-02 19:27:55 -06:00
itzg	24942a6f04	docs: Auto update markdown TOC	2021-12-02 03:13:16 +00:00
Kyle	75dcc746f8	Added UUID Support for WHITELIST (#1139 )	2021-12-01 21:12:58 -06:00
dependabot[bot]	263a10848a	build(deps): bump actions/cache from 2.1.6 to 2.1.7 (#1138 )	2021-11-29 06:46:56 -06:00
Geoff Bourne	ff4d46d509	fix: corrected versionLessThan for versions with dashes #1132	2021-11-24 15:52:36 -06:00
itzg	66ead9128a	docs: Auto update markdown TOC	2021-11-24 20:40:16 +00:00
Geoff Bourne	55ff76a85d	docs: clarified java version compatibilities #1130	2021-11-24 14:39:50 -06:00
Geoff Bourne	dca29dcbb5	feat: use server list ping for versions less than 1.7 #1131	2021-11-24 14:30:29 -06:00
itzg	84c577cc96	docs: Auto update markdown TOC	2021-11-23 02:51:46 +00:00
Geoff Bourne	5e8fc43857	fix: removed Java 8 constraint of Canyon server type #1129	2021-11-22 20:51:30 -06:00
Geoff Bourne	66a17c8d58	docs: added readinessProbe to k8s example	2021-11-22 17:19:49 -06:00
itzg	57f7ee50a6	docs: Auto update markdown TOC	2021-11-21 21:00:21 +00:00
Geoff Bourne	f8ac58e200	misc: deprecated java16	2021-11-21 15:00:17 -06:00
Geoff Bourne	71954edf75	misc: silence misleading error when resolving forge version	2021-11-21 14:58:55 -06:00
Geoff Bourne	597faa102a	misc: only run stale-check on cron schedule	2021-11-21 11:16:58 -06:00
itzg	442fccfc41	docs: Auto update markdown TOC	2021-11-17 20:22:20 +00:00
Michael Vorburger ⛑️	784ec6104c	Docs: Fix broken link to Aikar's Flags (#1126 )	2021-11-17 14:22:01 -06:00
Geoff Bourne	817a01bbc3	misc: noted git ours merge strategy	2021-11-16 19:05:23 -06:00
itzg	66c0558174	docs: Auto update markdown TOC	2021-11-17 00:55:17 +00:00
Geoff Bourne	9116be11ae	Updated latest to Java 17 to match 1.18-pre2	2021-11-16 18:55:05 -06:00
Geoff Bourne	969f4c8db6	misc: update changelog processing notes	2021-11-16 18:49:48 -06:00
Geoff Bourne	e6916e91e7	misc: cleaned up warnings in start-setupEnvVariables and autopause-fcns.sh	2021-11-15 20:50:47 -06:00
itzg	9544aeaf7a	docs: Auto update markdown TOC	2021-11-16 02:46:53 +00:00
Geoff Bourne	babeac1693	docs: removed dangling sentence in Fabric section #1121	2021-11-15 20:46:40 -06:00
Geoff Bourne	130b067955	fix: changed logging config's queue to TerminalConsole #1119	2021-11-13 19:17:20 -06:00
Geoff Bourne	df7d6c298a	fix: defaulted SERVER_PORT for health and autopause #1120	2021-11-13 18:42:24 -06:00
Geoff Bourne	a8a60264e9	misc: code cleanup in start-setupServerProperties	2021-11-12 21:21:01 -06:00
itzg	721df8d32b	docs: Auto update markdown TOC	2021-11-13 03:18:08 +00:00
Geoff Bourne	2375a6796c	feat: Allowed for server properties to be cleared vs skipped #1117	2021-11-12 21:17:21 -06:00
dependabot[bot]	e04e943e1c	build(deps): bump actions/checkout from 2.3.5 to 2.4.0 (#1112 )	2021-11-08 07:00:59 -06:00
Geoff Bourne	1bf75671f6	misc: adjusted bug and question templates	2021-11-06 21:58:22 -05:00
Geoff Bourne	7d56de9d15	Cleaned up minecraft_server.jar for versions >= 1.6 #306	2021-11-06 21:46:31 -05:00
Geoff Bourne	a8de790b57	Used minecraft_server.jar for versions before 1.6 #306	2021-11-06 21:35:57 -05:00
Geoff Bourne	cafddd3b12	Used minecraft_server.jar for versions before 1.6 #306	2021-11-06 21:34:24 -05:00
itzg	fc958faf7b	docs: Auto update markdown TOC	2021-11-05 19:39:25 +00:00
Michael Vorburger ⛑️	402894cd8d	document that default RCON_PASSWORD = minecraft in README (#1109 )	2021-11-05 14:38:02 -05:00
Geoff Bourne	f97cea4b06	misc: adjusted debug logs when SKIP_SERVER_PROPERTIES #1108	2021-11-04 21:49:03 -05:00