Installed GNU-style find package

#1127
Merged latest from master
2026-02-17 15:13:55 +00:00 · 2022-01-06 22:11:26 -06:00 · 2022-01-06 21:56:50 -06:00 · 2021-12-23 16:07:34 -06:00 · 2021-12-13 21:27:47 -06:00 · 2021-12-12 19:51:09 -06:00
122 changed files with 818 additions and 1775 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -3,87 +3,44 @@ on:
  push:
    branches:
      - master
-      - test/**
+      - java8-multiarch
+      - java8-openj9
+      - java11*
+      - java16*
+      - java17*
    tags:
      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+-java8-multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
+      - "[0-9]+.[0-9]+.[0-9]+-java11*"
+      - "[0-9]+.[0-9]+.[0-9]+-java16*"
    paths-ignore:
      - "*.md"
      - "docs/**"
      - "examples/**"

+env:
+  IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
+
 jobs:
  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        variant:
-          - java17
-          - java17-openj9
-          - java17-alpine
-          - java8
-          - java8-multiarch
-          - java8-openj9
-          - java11
-          - java11-openj9
-        include:
-          - variant: java17
-            baseImage: eclipse-temurin:17
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: LATEST
-          - variant: java17-openj9
-            baseImage: ibm-semeru-runtimes:open-17-jdk
-            platforms: linux/amd64,linux/arm64
-            mcVersion: LATEST
-          - variant: java17-alpine
-            baseImage: eclipse-temurin:17-jdk-alpine
-            platforms: linux/amd64
-            mcVersion: LATEST
-          - variant: java8
-            baseImage: openjdk:8-jdk-alpine3.8
-            platforms: linux/amd64
-            mcVersion: 1.12.2
-          - variant: java8-multiarch
-            baseImage: eclipse-temurin:8-jdk
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-          - variant: java8-openj9
-            baseImage: ibm-semeru-runtimes:open-8-jdk
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-          - variant: java11
-            baseImage: adoptopenjdk:11-jdk-hotspot
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: 1.16.5
-          - variant: java11-openj9
-            baseImage: ibm-semeru-runtimes:open-11-jdk
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.16.5
-    env:
-      IMAGE_TO_TEST: ${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}
+    if: github.repository == 'itzg/docker-minecraft-server'
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
        uses: actions/checkout@v2.4.0
-        with:
-          # for build-files step
-          fetch-depth: 0

      - name: Docker meta
        id: meta
        uses: docker/metadata-action@v3
        with:
-          # NOTE for forks: if your Docker Hub organization doesn't match your Github repo's,
-          # then the use of ${{ github.repository_owner }} will need to be replaced.
          images: |
-            ${{ github.repository_owner }}/minecraft-server
+            itzg/minecraft-server
          tags: |
-            type=ref,event=tag,enable=${{ matrix.variant == 'java17' }}
-            type=ref,event=tag,suffix=-${{ matrix.variant }}
-            type=raw,value=${{ matrix.variant }}
+            type=ref,event=branch
+            type=ref,event=tag
          flavor: |
-            latest=${{ matrix.variant == 'java17' }}
-          labels: |
-            org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
+            latest=${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1
@@ -97,45 +54,39 @@ jobs:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}

-      - name: Calculate build files revision
-        id: build-files
-        run: |
-          echo "::set-output name=REV::$(git log -1 --format=%H build)"
-
      - name: Build for test
-        uses: docker/build-push-action@v2.9.0
+        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 into daemon for test usage in next step
          load: true
          push: false
-          build-args: |
-            BASE_IMAGE=${{ matrix.baseImage }}
-            BUILD_FILES_REV=${{ steps.build-files.outputs.REV }}
-          cache-from: type=gha,scope=${{ matrix.variant }}
+          cache-from: type=gha
          # no cache-to to avoid cross-cache update from next build step

      - name: Run tests
-        env:
-          MINECRAFT_VERSION: ${{ matrix.mcVersion }}
+        # 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.9.0
+        uses: docker/build-push-action@v2.7.0
        with:
-          platforms: ${{ matrix.platforms }}
-          push: ${{ github.ref_type == 'tag' || github.ref_name == 'master' }}
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          # ensure latest base image is used
          pull: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            BASE_IMAGE=${{ matrix.baseImage }}
-            BUILD_FILES_REV=${{ steps.build-files-rev.outputs.REV }}
-          cache-from: type=gha,scope=${{ matrix.variant }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.variant }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,43 +0,0 @@
-name: ContinuousIntegration
-
-on:
-  push:
-    branches:
-      - 'dev*'
-      - '!master'
-      - '!java*'
-      - '!multi*'
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
-
-env:
-  IMAGE_TO_TEST: ${{ secrets.IMAGE_ORG }}/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
-  MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2.4.0
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build
-        uses: docker/build-push-action@v2.9.0
-        with:
-          context: .
-          platforms: linux/amd64
-          tags: ${{ env.IMAGE_TO_TEST }}
-          load: true
-          cache-from: type=gha
-
-      - name: Run Setup Only Tests
-        run: bash tests/setuponlytests/test.sh
-
-      # - name: Run Full Minecraft Service Tests
-      #   run: |
-      #     tests/fulltests/test.sh          
--- a/.github/workflows/discord.yml
+++ b/.github/workflows/discord.yml
@@ -1,26 +0,0 @@
-name: Discord notifications
-
-on:
-  workflow_run:
-    workflows: ["ContinuousIntegration", "Build and Publish", "Build and publish multiarch" ]
-    types:
-      - completed
-
-env:
-  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-
-jobs:
-  discord:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: on-success
-        if: ${{ github.event.workflow_run.conclusion == 'success' }}
-        uses: Ilshidur/action-discord@master
-        with:
-          args: "Github repo: ${{ github.repository }}\n- Branch: ${{ github.event.workflow_run.head_branch }}\n- [Link: to Actions](<${{ github.event.workflow_run.html_url }}>)\n- Status: 🎉  ${{ github.event.workflow_run.conclusion }}  🍏"
-      - name: on-failure
-        if: ${{ github.event.workflow_run.conclusion == 'failure' }}
-        uses: Ilshidur/action-discord@master
-        with:
-          args: "Github repo: ${{ github.repository }}\n- Branch: ${{ github.event.workflow_run.head_branch }}\n- [Link: to Actions](<${{ github.event.workflow_run.html_url }}>)\n- Status: 🤔  ${{ github.event.workflow_run.conclusion }}  💣💥"
--- a/.github/workflows/generate-toc.yml
+++ b/.github/workflows/generate-toc.yml
@@ -16,6 +16,6 @@ jobs:
          curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
          chmod a+x gh-md-toc
          ./gh-md-toc --insert --no-backup README.md
-      - uses: stefanzweifel/git-auto-commit-action@v4.13.1
+      - uses: stefanzweifel/git-auto-commit-action@v4.12.0
        with:
          commit_message: "docs: Auto update markdown TOC"
--- a/.github/workflows/issue-label.yml
+++ b/.github/workflows/issue-label.yml
@@ -1,33 +0,0 @@
-name: Issue labels
-
-on:
-  issues:
-    types: [labeled, reopened, closed, deleted]
-
-env:
-  DISCORD_WEBHOOK: ${{ secrets.DISCORD_ISSUES_WEBHOOK }}
-
-jobs:
-  labelNotify:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: notify on label
-        if: > 
-          github.event.label.name == 'enhancement' 
-          || github.event.label.name == 'bug' 
-          || github.event.label.name == 'help wanted'
-          || github.event.label.name == 'priority/high'
-          || github.event.label.name == 'question'
-          || github.event.label.name == 'status/waiting on upstream'
-        uses: Ilshidur/action-discord@master
-        with:
-          args: "[${{ github.event.issue.title }} (#${{ github.event.issue.number }})](<${{ github.event.issue.html_url }}>) added `${{ github.event.label.name }}` label"
-      - name: notify on action change
-        if: > 
-          github.event.action == 'closed'
-          || github.event.action == 'reopened'
-          || github.event.action == 'deleted'
-        uses: Ilshidur/action-discord@master
-        with:
-          args: "[${{ github.event.issue.title }} (#${{ github.event.issue.number }})](<${{ github.event.issue.html_url }}>) has been `${{ github.event.action }}` by `${{ github.event.sender.login }}`"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -0,0 +1,97 @@
+name: Build and Publish
+
+on:
+  push:
+    branches:
+      - java8
+      - openj9
+      - openj9-11
+      - adopt11
+      - test/alpine/*
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+-java8"
+      - "[0-9]+.[0-9]+.[0-9]+-openj9"
+      - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
+      - "[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:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2.4.0
+
+    - name: Prepare
+      id: prep
+      run: |
+        DOCKER_IMAGE=itzg/minecraft-server
+        VERSION=edge
+        if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION=${GITHUB_REF#refs/tags/}
+        fi
+        if [[ $GITHUB_REF == refs/heads/* ]]; then
+          VERSION=${GITHUB_REF#refs/heads/}
+          if [[ $VERSION == master ]]; then
+            VERSION=latest
+          fi
+        fi
+        TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
+        echo ::set-output name=tags::${TAGS}
+        echo ::set-output name=version::${VERSION//\//-}
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - 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
+      with:
+        context: .
+        file: ./Dockerfile
+        # ensure latest base image is used
+        pull: true
+        # publish
+        push: true
+        # tags determined by prep step
+        tags: ${{ steps.prep.outputs.tags }}
+        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 }}
+          org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
+          org.opencontainers.image.revision=${{ github.sha }}
+
+    - name: Image digest
+      run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,4 +1,4 @@
-name: PullRequest
+name: Validate PR

 on:
  pull_request:
@@ -11,7 +11,6 @@ on:

 env:
  IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
-  MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}

 jobs:
  test:
@@ -24,7 +23,7 @@ jobs:
        uses: docker/setup-buildx-action@v1

      - name: Build
-        uses: docker/build-push-action@v2.9.0
+        uses: docker/build-push-action@v2.7.0
        with:
          context: .
          platforms: linux/amd64
@@ -53,7 +52,7 @@ jobs:

      - name: Push
        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
-        uses: docker/build-push-action@v2.9.0
+        uses: docker/build-push-action@v2.7.0
        with:
          context: .
          platforms: linux/amd64,linux/arm/v7,linux/arm64
--- a/.github/workflows/stale-check.yml
+++ b/.github/workflows/stale-check.yml
@@ -21,5 +21,5 @@ jobs:
            Please add a comment describing the reason to keep this issue open.
          days-before-stale: 30
          days-before-close: 5
-          exempt-issue-labels: 'enhancement,keep,status/needs triage,priority/high'
+          exempt-issue-labels: 'enhancement,keep,status/needs triage'

--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /data/
 /.idea/
 *.iml
+*.zip
 /gh-md-toc
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -15,28 +15,8 @@ Individual scripts can be iteratively developed, debugged, and tested using the

 First, build a baseline of the image to include the packages needed by existing or new scripts:

-PowerShell: (Example of building and testing ForgeAPI)
-```powershell
-$env:MODS_FORGEAPI_KEY='$2a$...'
-$env:FOLDER_TO_TEST="forgeapimods_projectids"
-$env:IMAGE_TO_TEST="mc-dev"
-docker build -t $env:IMAGE_TO_TEST .
-pushd "tests/setuponlytests/$env:FOLDER_TO_TEST/"
-docker-compose run mc
-docker-compose down --remove-orphans
-popd
-```
-
-Bash: (Example of building and testing ForgeAPI)
-```bash
-export MODS_FORGEAPI_KEY='$2a$...'
-export FOLDER_TO_TEST="forgeapimods_file"
-export IMAGE_TO_TEST="mc-dev"
-docker build -t $IMAGE_TO_TEST .
-pushd tests/setuponlytests/$FOLDER_TO_TEST/
-docker-compose run mc
-docker-compose down --remove-orphans
-popd
+```shell script
+docker build -t mc-dev .
 ```

 Using the baseline image, an interactive container can be started to iteratively run the scripts to be developed. By attaching the current workspace directory, you can use the local editor of your choice to iteratively modify scripts while using the container to run them.
@@ -83,6 +63,31 @@ Note the port that was selected by http-server and pass the build arguments, suc

 Now the image can be built like normal and it will install mc-image-helper from the locally built copy.

+## Multi-base-image variants
+
+Several base-image variants are maintained in order to offer choices in JDK provider and version. The variants are maintained in their respective branches:
+- openj9 
+- openj9-nightly
+- adopt11
+- adopt13
+- multiarch
+
+The [docker-versions-create.sh](docker-versions-create.sh) script is configured with the branches to maintain and is used to merge changes from the master branch into the mulit-base variant branches. The script also manages git tagging the master branch along with the merged branches. So a typical use of the script would be like:
+
+```shell script
+./docker-versions-create.sh -s -t 1.2.0
+```
+
+> Most often the major version will be bumped unless a bug or hotfix needs to be published in which case the patch version should be incremented.
+
+> The build and publishing of those branches and their tags is currently performed within Docker Hub.
+
+## multiarch support
+
+The [multiarch branch](https://github.com/itzg/docker-minecraft-server/tree/multiarch) supports running the image on amd64, arm64, and armv7 (aka RaspberryPi). Unlike the mainline branches, it is based on Ubuntu 18.04 since the openjdk package provided by Ubuntu includes full JIT support on all of the processor types.
+
+The multiarch images are built and published by [a Github action](https://github.com/itzg/docker-minecraft-server/actions?query=workflow%3A%22Build+and+publish+multiarch%22), which [is configured in that branch](https://github.com/itzg/docker-minecraft-server/blob/multiarch/.github/workflows/build-multiarch.yml).
+
 ## Generating release notes

 The following git command can be used to provide the bulk of release notes content:
@@ -90,3 +95,25 @@ The following git command can be used to provide the bulk of release notes conte
 ```shell script
 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/45
+++ b/45
@@ -1,16 +1,31 @@
-# syntax = docker/dockerfile:1.3
+FROM openjdk:8-jdk-alpine

-ARG BASE_IMAGE=eclipse-temurin:17-jdk
-FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

-# CI system should set this to a hash or git revision of the build directory and it's contents to
-# ensure consistent cache updates.
-ARG BUILD_FILES_REV=1
-RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} /build/run.sh install-packages
+RUN apk add --no-cache -U \
+    openssl \
+    imagemagick \
+    lsof \
+    su-exec \
+    # GNU compatible 'find'
+    findutils \
+    shadow \
+    bash \
+    curl iputils \
+    git \
+    jq \
+    mysql-client \
+    tzdata \
+    rsync \
+    nano \
+    sudo \
+    knock \
+    ttf-dejavu

-RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} /build/run.sh setup-user
+RUN addgroup -g 1000 minecraft \
+  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
+  && mkdir -m 777 /data \
+  && chown minecraft:minecraft /data /home/minecraft

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

@@ -18,9 +33,9 @@ EXPOSE 25565 25575

 # hook into docker BuildKit --platform support
 # see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+ARG TARGETVARIANT=""

 ARG EASY_ADD_VER=0.7.1
 ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
@@ -46,7 +61,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG MC_HELPER_VERSION=1.16.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 - \
@@ -58,7 +73,7 @@ WORKDIR /data
 STOPSIGNAL SIGTERM

 ENV UID=1000 GID=1000 \
-  MEMORY="1G" \
+  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
  TYPE=VANILLA VERSION=LATEST \
  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
--- a/README.md
+++ b/README.md
@@ -68,8 +68,7 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [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, Fabric, and Bukkit-like Servers](#downloadable-modplugin-pack-for-forge-fabric-and-bukkit-like-servers)
-      * [ForgeAPI usage to use non-version specific projects](#forgeapi-usage-to-use-non-version-specific-projects)
-      * [Generic pack files](#generic-pack-files)
+      * [Generic pack file](#generic-pack-file)
      * [Mod/Plugin URL Listing File](#modplugin-url-listing-file)
      * [Remove old mods/plugins](#remove-old-modsplugins)
   * [Working with world data](#working-with-world-data)
@@ -133,8 +132,6 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Explicitly disable GUI](#explicitly-disable-gui)
      * [Stop Duration](#stop-duration)
      * [Setup only](#setup-only)
-      * [Enable Flare Flags](#enable-flare-flags)
-      * [Enable timestamps in init logs](#enable-timestamps-in-init-logs)
   * [Autopause](#autopause)
      * [Description](#description)
      * [Enabling Autopause](#enabling-autopause)
@@ -142,7 +139,7 @@ By default, the container will download the latest version of the "vanilla" [Min
   * [Running on RaspberryPi](#running-on-raspberrypi)
   * [Contributing](#contributing)

-<!-- Added by: runner, at: Sat Feb 12 02:37:53 UTC 2022 -->
+<!-- Added by: runner, at: Thu Jan  6 12:50:03 UTC 2022 -->

 <!--te-->

@@ -245,8 +242,6 @@ If you had used the commands in the first section, without the `-v` volume attac

 > In this example, it is assumed the original container was given a `--name` of "mc", so change the container identifier accordingly.

-> You can also locate the Docker-managed directory from the `Source` field obtained from `docker inspect <container id or name> -f "{{json .Mounts}}"`
-
 First, stop the existing container:
 ```shell
 docker stop mc
@@ -289,12 +284,13 @@ When using the image `itzg:/minecraft-server` without a tag, the `latest` image

 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
-| latest         | 17           | Debian | Hotspot  | amd64,arm64,armv7 |
+| latest         | 16           | 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-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | java17         | 17           | Ubuntu | Hotspot  | amd64,arm64,armv7 |
 | java17-openj9  | 17           | Debian | OpenJ9   | amd64             |

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

 ## Healthcheck

@@ -394,7 +390,7 @@ To troubleshoot any issues with memory allocation reported by the JVM, set the e

 ### Running a Forge Server

-Enable [Forge server](http://www.minecraftforge.net/) mode by adding a `-e TYPE=FORGE` to your command-line.
+Enable [Forge server](http://www.minecraftforge.net/wiki/) mode by adding a `-e TYPE=FORGE` to your command-line.

 The overall version is specified by `VERSION`, [as described in the section above](#versions) and will run the recommended Forge version by default. You can also choose to run a specific Forge version with `FORGEVERSION`, such as `-e FORGEVERSION=14.23.5.2854`.

@@ -419,7 +415,7 @@ In both of the cases above, there is no need for the `VERSION` or `FORGEVERSION`

 ### Running a Fabric Server

-Enable [Fabric server](https://fabricmc.net/) mode by adding a `-e TYPE=FABRIC` to your command-line.
+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 \
@@ -427,22 +423,19 @@ docker run -d -v /path/on/host:/data \
    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 ```

-By default, the container will install the latest [fabric server launcher](https://fabricmc.net/use/server/), using the latest [fabric-loader](https://fabricmc.net/wiki/documentation:fabric_loader) against the minecraft version you have defined with `VERSION` (defaulting to the latest vanilla release of the game).
+See the [Working with mods and plugins](#working-with-mods-and-plugins) section to set up Fabric mods and configuration.

-A specific loader or launcher version other than the latest can be requested using `FABRIC_LOADER_VERSION` and `FABRIC_LAUNCHER_VERSION` respectively, such as:
+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 TYPE=FABRIC \
-    -e FABRIC_LAUNCHER_VERSION=0.10.2 \
-    -e FABRIC_LOADER_VERSION=0.13.1
+    -e FABRIC_LOADER_VERSION=0.12.8
 ```

-> If you wish to use an alternative launcher you can:
-> * Provide the path to a custom launcher jar available to the container with `FABRIC_LAUNCHER`, relative to `/data` (such as `-e FABRIC_LAUNCHER=fabric-server-custom.jar`)
-> * Provide the URL to a custom launcher jar with `FABRIC_LAUNCHER_URL` (such as `-e FABRIC_LAUNCHER_URL=http://HOST/fabric-server-custom.jar`)
-
-See the [Working with mods and plugins](#working-with-mods-and-plugins) section to set up Fabric mods and configuration.
+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

@@ -487,11 +480,12 @@ 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 type to download. The available options are "LATEST" and "PURPUR", both 1.17.1. Airplane does not support 1.18 -- use Paper/Pufferfish/Purpur.
+> 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 built-in [Flare](https://blog.airplane.gg/flare) profiler
+- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler

 ### Running a Pufferfish server

@@ -504,7 +498,6 @@ A [Pufferfish](https://github.com/pufferfish-gg/Pufferfish) server, which is "a
 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
- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the built-in [Flare](https://blog.airplane.gg/flare) profiler

 ### Running a Purpur server

@@ -517,7 +510,7 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "drop-in replacement for P
 Extra variables:
 - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use
 - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the built-in [Flare](https://blog.airplane.gg/flare) profiler
+- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler

 ### Running a Magma server

@@ -594,8 +587,6 @@ Configuration options with defaults:
 - `LIMBO_SCHEMA_FILENAME`=default.schem
 - `LEVEL`="Default;${LIMBO_SCHEMA_FILENAME}"

-> NOTE: instead of using format codes in the MOTD, Limbo requires [JSON chat content](https://minecraft.fandom.com/wiki/Raw_JSON_text_format#Java_Edition). If a plain string is provided, which is the default, then it gets converted into the required JSON structure. 
-
 ### Running a Crucible server

 A [Crucible](https://github.com/CrucibleMC/Crucible) server can be run by setting `TYPE` to `CRUCIBLE`.
@@ -750,83 +741,11 @@ You may also download or copy over individual mods using the `MODS` environment

  docker run -d -e MODS=https://www.example.com/mods/mod1.jar,/plugins/common,/plugins/special/mod2.jar ...

-### ForgeAPI usage to use non-version specific projects
+### Generic pack file

-**NOTE:** This potentially could lead to unexpected behavior if the Mod receives an update with unexpected behavior.
+To install all of the server content (jars, mods, plugins, configs, etc) from a zip file, such as a CurseForge modpack that is missing a server start script, then set `GENERIC_PACK` to the container path of the zip file. That, combined with `TYPE`, allows for custom content along with container managed server download and install.  

-This is more complicated because you will be pulling/using the latest mod for the release of your game. To get started make sure you have a [CursedForge API Key](https://docs.curseforge.com/#getting-started). Then use the environmental parameters in your docker build.
-
-Please be aware of the following when using these options for your mods:
-* Mod Release types: Release, Beta, and Alpha.
-* Mod dependencies: Required and Optional
-* Mod family: Fabric, Forge, and Bukkit.
-
-Parameters to use the ForgeAPI:
-
-* `MODS_FORGEAPI_KEY` - Required
-* `MODS_FORGEAPI_FILE` - Required or use MODS_FORGEAPI_PROJECTIDS (Overrides MODS_FORGEAPI_PROJECTIDS)
-* `MODS_FORGEAPI_PROJECTIDS` - Required or use MODS_FORGEAPI_FILE
-* `MODS_FORGEAPI_RELEASES` - Default is release, Options: [Release|Beta|Alpha]
-* `MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES` - Default is False, attempts to download required mods (releaseType Release) defined in Forge.
-* `MODS_FORGEAPI_IGNORE_GAMETYPE` - Default is False, Allows for filtering mods on family type: FORGE, FABRIC, and BUKKIT. (Does not filter for Vanilla or custom)
-* `REMOVE_OLD_FORGEAPI_MODS` - Default is False
-* `REMOVE_OLD_DATAPACKS_DEPTH` - Default is 1
-* `REMOVE_OLD_DATAPACKS_INCLUDE` - Default is *.jar
-
-Example of expected forge api project ids, releases, and key: 
-
-```yaml
-  MODS_FORGEAPI_PROJECTIDS: 306612,256717
-  MODS_FORGEAPI_RELEASES: Release
-  MODS_FORGEAPI_KEY: $WRX...
-```
-
-Example of expected ForgeAPI file format.
-
-**Field Description**: 
-* `name` is currently unused, but can be used to document each entry.
-* `projectId` id is the id found on the CurseForge website for a particular mod
-* `releaseType` Type corresponds to forge's R, B, A icon for each file. Default Release, options are (release|beta|alpha).
-* `fileName` is used for version pinning if latest file will not work for you.
-
-```json
-[
-  {
-      "name": "fabric api",
-      "projectId": "306612",
-      "releaseType": "release"
-  },
-  {
-      "name": "fabric voice mod",
-      "projectId": "416089",
-      "releaseType": "beta"
-  },
-  {
-      "name": "Biomes o plenty",
-      "projectId": "220318",
-      "fileName": "BiomesOPlenty-1.18.1-15.0.0.100-universal.jar",
-      "releaseType": "release"
-  }
-]
-```
-
-### Generic pack files
-
-To install all the server content (jars, mods, plugins, configs, etc.) from a zip or tgz file, then set `GENERIC_PACK` to the container path or URL of the archive file. This can also be used to apply a CurseForge modpack that is missing a server start script and/or Forge installer.
-
-If multiple generic packs need to be applied together, set `GENERIC_PACKS` instead, with a comma separated list of archive file paths and/or URLs to files.
-
-To avoid repetition, each entry will be prefixed by the value of `GENERIC_PACKS_PREFIX` and suffixed by the value of `GENERIC_PACKS_SUFFIX`, both of which are optional. For example, the following variables
-
-```
-GENERIC_PACKS=configs-v9.0.1,mods-v4.3.6
-GENERIC_PACKS_PREFIX=https://cdn.example.org/
-GENERIC_PACKS_SUFFIX=.zip
-```
-
-would expand to `https://cdn.example.org/configs-v9.0.1.zip,https://cdn.example.org/mods-v4.3.6.zip`.
-
-If applying large generic packs, the update check can be time-consuming since a SHA1 checksum is compared. To skip the update check set `SKIP_GENERIC_PACK_UPDATE_CHECK` to "true". Conversely, the generic pack(s) can be forced to be applied without comparing the checksum by setting `FORCE_GENERIC_PACK_UPDATE` to "true".
+If multiple generic packs need to be applied together, set `GENERIC_PACKS` instead, with a comma separated list of zip file paths and/or URLs to zip files.

 ### Mod/Plugin URL Listing File 

@@ -866,19 +785,23 @@ before unpacking new content from the MODPACK or MODS.

 ### Downloadable world

-Instead of mounting the `/data` volume, you can instead specify the URL of a ZIP or compressed TAR file containing an archived world. It will be searched for a file `level.dat` and the containing subdirectory moved to the directory named by `$LEVEL`. This means that most of the archived Minecraft worlds downloadable from the Internet will already be in the correct format.
+Instead of mounting the `/data` volume, you can instead specify the URL of a ZIP file containing an archived world. It will be searched for a file `level.dat` and the containing subdirectory moved to the directory named by `$LEVEL`. This means that most of the archived Minecraft worlds downloadable from the Internet will already be in the correct format.

    docker run -d -e WORLD=http://www.example.com/worlds/MySave.zip ...

-**NOTE:** This URL must be accessible from inside the container. Therefore, you should use an IP address or a globally resolvable FQDN, or else the name of a linked container.
+**NOTE:** This URL must be accessible from inside the container. Therefore,
+you should use an IP address or a globally resolvable FQDN, or else the
+name of a linked container.

 **NOTE:** If the archive contains more than one `level.dat`, then the one to select can be picked with `WORLD_INDEX`, which defaults to 1.

 ### Cloning world from a container path

-The `WORLD` option can also be used to reference a directory, zip file, or compressed tar file that will be used as a source to clone or extract the world directory.
+The `WORLD` option can also be used to reference a directory or zip file that will be used as a source to clone or unzip the world directory.

-For example, the following would initially clone the world's content from `/worlds/basic`. Also notice in the example that you should use a read-only volume attachment to ensure the clone source remains pristine.
+For example, the following would initially clone the world's content
+from `/worlds/basic`. Also notice in the example that you can use a
+read-only volume attachment to ensure the clone source remains pristine.

 ```
 docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic
@@ -905,9 +828,6 @@ Datapacks will be placed in `/data/$LEVEL/datapacks`

 VanillaTweaks datapacks can be installed with a share code from the website UI **OR** a json file to specify packs to download and install.

-Datapacks will be placed in `/data/$LEVEL/datapacks`
-Resourcepacks will be placed in `/data/resourcepacks`
-
 Accepted Parameters:

 - `VANILLATWEAKS_FILE`
@@ -918,19 +838,13 @@ Accepted Parameters:
 - `REMOVE_OLD_VANILLATWEAKS_EXCLUDE`

 Example of expected Vanillatweaks sharecode: 
-  **Note**: ResourcePacks, DataPacks, and CraftingTweaks all have separate sharecodes

 ```yaml
-VANILLATWEAKS_SHARECODE: MGr52E,tF1zL2,LnEDwT
+VANILLATWEAKS_SHARECODE: MGr52E
 ```

 Example of expected Vanillatweaks file format:

-```yaml
-VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json,/config/vt-resourcepacks.json
-```
-
-Datapacks Json:
 ```json
 {
  "version": "1.18",
@@ -938,39 +852,18 @@ Datapacks Json:
    "survival": [
      "graves",
      "multiplayer sleep",
+      "afk display",
+      "armor statues",
+      "unlock all recipes",
+      "fast leaf decay",
+      "coordinates hud"
    ],
    "items": ["armored elytra"]
  }
 }
 ```

-Resourcepacks Json:
-```json
-{
-    "type": "resourcepacks",
-    "version": "1.18",
-    "packs": {
-        "aesthetic": ["CherryPicking", "BlackNetherBricks", "AlternateBlockDestruction"]
-    },
-    "result": "ok"
-}
-```
-
-CraftingTweaks Json:
-```json
-{
-    "type": "craftingtweaks",
-    "version": "1.18",
-    "packs": {
-        "quality of life": [
-            "dropper to dispenser",
-            "double slabs",
-            "back to blocks"
-        ]
-    },
-    "result": "ok"
-}
-```
+Datapacks will be placed in `/data/$LEVEL/datapacks`

 ## Server configuration

@@ -1592,28 +1485,6 @@ When the container is signalled to stop, the Minecraft process wrapper will atte
 ### Setup only

 If you are using a host-attached data directory, then you can have the image setup the Minecraft server files and stop prior to launching the server process by setting `SETUP_ONLY` to `true`. 
-    
-### Enable Flare Flags
-    
-To enable the JVM flags required to fully support the [Flare profiling suite](https://blog.airplane.gg/flare), set the following variable:
-    
-    -e USE_FLARE_FLAGS=true
-    
-Flare is built-in to Airplane/Pufferfish/Purpur, and is available in [plugin form](https://github.com/TECHNOVE/FlarePlugin) for other server types.
-
-### Enable timestamps in init logs
-
-Before the container starts the Minecraft Server its output is prefixed with `[init]`, such as
-
-```
-[init] Starting the Minecraft server...
-```
-
-To also include the timestamp with each log, set `LOG_TIMESTAMP` to "true". The log output will then look like:
-
-```
-[init] 2022-02-05 16:58:33+00:00 Starting the Minecraft server...
-```

 ## Autopause

--- a/build/alpine/install-packages.sh
+++ b/build/alpine/install-packages.sh
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-apk add --no-cache -U \
-    openssl \
-    imagemagick \
-    file \
-    lsof \
-    su-exec \
-    coreutils \
-    findutils \
-    shadow \
-    bash \
-    curl iputils \
-    git \
-    jq \
-    mysql-client \
-    tzdata \
-    rsync \
-    nano \
-    sudo \
-    knock \
-    ttf-dejavu \
-    tar \
-    zstd
--- a/build/alpine/setup-user.sh
+++ b/build/alpine/setup-user.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-addgroup -g 1000 minecraft
-adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft
--- a/build/run.sh
+++ b/build/run.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-distro=$(cat /etc/os-release | grep -E "^ID=" | cut -d= -f2 | sed -e 's/"//g')
-
-"$(dirname "$0")/${distro}/$1".sh
--- a/build/ubuntu/install-packages.sh
+++ b/build/ubuntu/install-packages.sh
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-apt-get update
-
-DEBIAN_FRONTEND=noninteractive \
-apt-get install -y \
-  imagemagick \
-  file \
-  gosu \
-  sudo \
-  net-tools \
-  iputils-ping \
-  curl \
-  git \
-  jq \
-  dos2unix \
-  mysql-client \
-  tzdata \
-  rsync \
-  nano \
-  unzip \
-  zstd \
-  knockd \
-  ttf-dejavu
-
-apt-get clean
--- a/build/ubuntu/setup-user.sh
+++ b/build/ubuntu/setup-user.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-addgroup --gid 1000 minecraft
-adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -0,0 +1,157 @@
+#!/bin/bash
+#set -x
+# Use this variable to indicate a list of branches that docker hub is watching
+branches_list=(
+  'java8'
+  'java8-multiarch'
+  'java8-openj9'
+  'java11'
+  'java11-openj9'
+  'java16-openj9'
+  'java17'
+  )
+
+function TrapExit {
+  echo "Checking out back in master"
+  git checkout master
+}
+
+batchMode=false
+
+while getopts "hbt:s" arg
+do
+  case $arg in
+    b)
+      batchMode=true
+      ;;
+    t)
+      tag=${OPTARG}
+      ;;
+    s)
+      tagArgs="-s -m 'Signed during docker-versions-create"
+      ;;
+    h)
+      echo "
+Usage $0 [options]
+
+Options:
+  -b      enable batch mode, which avoids interactive prompts and causes script to fail immediately
+          when any merge fails
+  -t TAG  tag and push the current revision on master with the given tag
+          and apply respective tags to each branch
+  -s      enable signed tags
+  -h      display this help and exit
+"
+      exit
+      ;;
+    *)
+      echo "Unsupported arg $arg"
+      exit 2
+      ;;
+  esac
+done
+
+${batchMode} && echo "Using batch mode"
+
+trap TrapExit EXIT SIGTERM
+
+test -d ./.git || { echo ".git folder was not found. Please start this script from root directory of the project!";
+  exit 1; }
+
+# Making sure we are in master
+git checkout master
+git pull --all || { echo "Can't pull the repo!"; \
+  exit 1; }
+if [[ $tag ]]; then
+  git tag $tag
+  git push origin $tag
+fi
+
+git_branches=$(git branch -a)
+
+for branch in "${branches_list[@]}"; do
+  if [[ "$git_branches" != *"$branch"* ]]; then
+    echo "Can't update $branch because I can't find it in the list of branches."
+    exit 1
+  else
+    echo "Branch $branch found. Working with it."
+    git checkout "$branch" || { echo "Can't checkout into the branch. Don't know the cause."; \
+      exit 1; }
+    proceed='False'
+    while [[ "$proceed" == "False" ]]; do
+      # Ensure local branch is aligned with remote since docker-versions-create may have been run elsewhere
+      git pull
+
+      if git merge -m 'Auto-merging via docker-versions-create' master; then
+        proceed="True"
+        echo "Branch $branch updated to current master successfully"
+        # pushing changes to remote for this branch
+        git commit -m "Auto merge branch with master" -a
+        # push may fail if remote doesn't have this branch yet. In this case - sending branch
+        git push || git push -u origin "$branch" || { echo "Can't push changes to the origin."; exit 1; }
+        if [[ $tag ]]; then
+          git tag "$tag-$branch"
+          git push origin "$tag-$branch"
+        fi
+      elif ${batchMode}; then
+        status=$?
+        echo "Git merge failed in batch mode"
+        exit ${status}
+        # and trap exit gets us back to master
+      else
+        cat<<EOL
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Master merge in the branch $branch encountered an error!
+You may try to fix the error and merge again. (Commit changes)
+Or skip this branch merge completely.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+EOL
+        printf "Should we try again? (y):"
+        read -r answer
+        if [[ "$answer" == '' ]] || [[ "$answer" == 'y' ]] || [[ "$answer" == 'Y' ]]; then
+          # If you use non-local editor or files are changed in repo
+          cat <<EOL
+
+The following commands may encounter an error!
+This is completely fine if the changes were made locally and remote branch doesn't know about them.
+
+EOL
+          # Updating branch from remote before trying again
+          git checkout master
+          git fetch --all
+          git pull -a
+          git checkout "$branch"
+          continue
+        else
+          break
+        fi
+      fi
+    done
+  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/files/autopause/autopause-fcns.sh
+++ b/files/autopause/autopause-fcns.sh
@@ -5,15 +5,15 @@ current_uptime() {
 }

 java_running() {
-  [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
+  [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
 }

 java_process_exists() {
-  [[ -n "$(ps -ax -o comm | grep 'java')" ]]
+  [[ -n "$(ps -a -o comm | grep 'java')" ]]
 }

 rcon_client_exists() {
-  [[ -n "$(ps -ax -o comm | grep 'rcon-cli')" ]]
+  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
 }

 mc_server_listening() {
--- a/files/autopause/knockd-config.cfg
+++ b/files/autopause/knockd-config.cfg
@@ -3,12 +3,12 @@
 [unpauseMCServer-server]
 sequence = 25565
 seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
 tcpflags = syn
 [unpauseMCServer-rcon]
 sequence = 25575
 seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
 tcpflags = syn
 [unpauseMCServer-bedrock]
 sequence = 19132:udp
--- a/files/autopause/pause.sh
+++ b/files/autopause/pause.sh
@@ -2,7 +2,7 @@

 . /start-utils

-if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
+if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
  # save world
  rcon-cli save-all >/dev/null

--- a/files/autopause/resume.sh
+++ b/files/autopause/resume.sh
@@ -2,7 +2,7 @@

 . /start-utils

-if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
+if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
  logAutopauseAction "Knocked, resuming Java process"
  pkill -CONT java
 fi
--- a/scripts/start
+++ b/scripts/start
@@ -1,12 +1,11 @@
 #!/bin/bash

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

 umask 0002
 chmod g+w /data

-if ! isTrue "${SKIP_SUDO:-false}" && [ "$(id -u)" = 0 ]; then
+if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
  runAsUser=minecraft
  runAsGroup=minecraft

@@ -25,14 +24,14 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ "$(id -u)" = 0 ]; then
    if [[ $GID != 0 ]]; then
      if [[ $GID != $(id -g minecraft) ]]; then
        log "Changing gid of minecraft to $GID"
-        groupmod -o -g "$GID" minecraft
+        groupmod -o -g $GID minecraft
      fi
    else
      runAsGroup=root
    fi
  fi

-  if [[ $(stat -c "%u" /data) != "$UID" ]]; then
+  if [[ $(stat -c "%u" /data) != $UID ]]; then
    log "Changing ownership of /data to $UID ..."
    chown -R ${runAsUser}:${runAsGroup} /data
  fi
@@ -41,12 +40,7 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ "$(id -u)" = 0 ]; then
    echo 'hosts: files dns' > /etc/nsswitch.conf
  fi

-  distro=$(getDistro)
-  if [[ $distro == alpine ]]; then
-    exec su-exec ${runAsUser}:${runAsGroup} "${SCRIPTS:-/}start-configuration" "$@"
-  else
-    exec gosu ${runAsUser}:${runAsGroup} "${SCRIPTS:-/}start-configuration" "$@"
-  fi
+  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration "$@"
 else
-  exec "${SCRIPTS:-/}start-configuration" "$@"
+  exec ${SCRIPTS:-/}start-configuration "$@"
 fi
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -3,7 +3,7 @@ set -euo pipefail
 IFS=$'\n\t'

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

 : "${EULA:=}"
 : "${PROXY:=}"
@@ -66,12 +66,9 @@ if [[ $RCON_PASSWORD_FILE ]]; then
    log ""
 fi

-# Some Docker management UIs grab all the image declared variables and present them for configuration.
-# When upgrading images across Java versions, that creates a mismatch in PATH's expected by base image.
 if ! which java > /dev/null; then
-  log "ERROR: PATH should not be explicitly passed into the container"
-  log "       Remove configuration of that variable."
-  exit 1
+  log "Fixing PATH to include java"
+  PATH="${PATH}:/usr/bin"
 fi

 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
@@ -119,30 +116,23 @@ fi
 log "Resolving type given ${TYPE}"
 case "${TYPE^^}" in
  *BUKKIT|SPIGOT)
-    exec "${SCRIPTS:-/}start-deployBukkitSpigot" "$@"
+    exec ${SCRIPTS:-/}start-deployBukkitSpigot "$@"
  ;;

  PAPER)
-    exec "${SCRIPTS:-/}start-deployPaper" "$@"
+    exec ${SCRIPTS:-/}start-deployPaper "$@"
  ;;

  FORGE)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployForge" "$@"
+    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

  FABRIC)
-    exec "${SCRIPTS:-/}start-deployFabric" "$@"
-  ;;
-
-  FTBA)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployFTBA" "$@"
+    exec ${SCRIPTS:-/}start-deployFabric "$@"
  ;;

  FTB|CURSEFORGE)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployCF" "$@"
+    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;

  VANILLA)
@@ -150,56 +140,46 @@ case "${TYPE^^}" in
  ;;

  SPONGEVANILLA)
-    exec "${SCRIPTS:-/}start-deploySpongeVanilla" "$@"
+    exec ${SCRIPTS:-/}start-deploySpongeVanilla "$@"
  ;;

  CUSTOM)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployCustom" "$@"
+    exec ${SCRIPTS:-/}start-deployCustom "$@"
  ;;

  MAGMA)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployMagma" "$@"
+    exec ${SCRIPTS:-/}start-deployMagma "$@"
  ;;

  MOHIST)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployMohist" "$@"
+    exec ${SCRIPTS:-/}start-deployMohist "$@"
  ;;

  CATSERVER)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployCatserver" "$@"
+    exec ${SCRIPTS:-/}start-deployCatserver "$@"
  ;;

  PURPUR)
-    exec "${SCRIPTS:-/}start-deployPurpur" "$@"
+    exec ${SCRIPTS:-/}start-deployPurpur "$@"
  ;;

  AIRPLANE)
-    exec "${SCRIPTS:-/}start-deployAirplane" "$@"
+    exec ${SCRIPTS:-/}start-deployAirplane "$@"
  ;;

  PUFFERFISH)
-    exec "${SCRIPTS:-/}start-deployPufferfish" "$@"
+    exec ${SCRIPTS:-/}start-deployPufferfish "$@"
  ;;

  CANYON)
-    exec "${SCRIPTS:-/}start-deployCanyon" "$@"
+    exec ${SCRIPTS:-/}start-deployCanyon "$@"
  ;;

  LIMBO)
-    exec "${SCRIPTS:-/}start-deployLimbo" "$@"
+    exec ${SCRIPTS:-/}start-deployLimbo "$@"
  ;;

  CRUCIBLE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
    exec "${SCRIPTS:-/}start-deployCrucible" "$@"
  ;;

--- a/scripts/start-deployAirplane
+++ b/scripts/start-deployAirplane
@@ -6,33 +6,35 @@ isDebugging && set -x

 IFS=$'\n\t'

-if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "PURPUR" ] ; then
-  log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=PURPUR."
+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" ] ; then
-  AIRPLANE_TYPE="airplane"
+if [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then
+  AIRPLANE_BRANCH="1.17"
 fi

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

-log "Using ${AIRPLANE_TYPE} 1.17.1 (1.18 unsupported - use Paper/Pufferfish/Purpur for newer versions)"
+log "Using Airplane-${AIRPLANE_BRANCH} branch"

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

 log "Removing old Airplane versions ..."
 shopt -s nullglob
-for f in airplane*.jar; do
+for f in airplane-*.jar; do
  [[ $f != $SERVER ]] && rm $f
 done

 if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
-    downloadUrl="https://airplane.gg/dl/launcher-${AIRPLANE_TYPE}1.17.1.jar"
+    downloadUrl="https://ci.tivy.ca/job/Airplane-${AIRPLANE_BRANCH}/${AIRPLANE_BUILD}/artifact/launcher-${AIRPLANE_TYPE}.jar"
    log "Downloading Airplane from $downloadUrl ..."
    if ! get -o "$SERVER" "$downloadUrl"; then
      log "ERROR: failed to download from $downloadUrl (status=$?)"
@@ -41,6 +43,8 @@ if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
 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-deployBukkitSpigot
+++ b/scripts/start-deployBukkitSpigot
@@ -126,6 +126,8 @@ else
 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
@@ -111,6 +111,8 @@ if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
        exit 2
      fi

+      forgeInstallerJar=$(ls -t "${forgeInstallerJar}" | head -1)
+
      log "Installing forge server"
      dirOfInstaller=$(dirname "${forgeInstallerJar}")
      (cd "${dirOfInstaller}"; java -jar "$(basename "${forgeInstallerJar}")" --installServer)
--- a/scripts/start-deployCanyon
+++ b/scripts/start-deployCanyon
@@ -43,6 +43,8 @@ if [ ! -f "$SERVER" ]; then
 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
@@ -1,7 +1,6 @@
 #!/bin/bash

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

@@ -27,6 +26,8 @@ if [ ! -f ${SERVER} ]; then
  curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/assets/${latestJarId}
 fi

-export FAMILY=HYBRID
+export SKIP_LOG4J_CONFIG=true

-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+export FAMILY=HYBRID
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-setupWorld "$@"
--- a/scripts/start-deployCrucible
+++ b/scripts/start-deployCrucible
@@ -47,6 +47,7 @@ if [ ! -d "$librariesDir" ]; then
    exit 1
  fi

+  mkdir "$librariesDir"
  if ! unzip /tmp/libraries.zip -d "$librariesDir"; then
    log "ERROR: failed to unzip Crucible libraries"
    exit 1
@@ -55,6 +56,7 @@ if [ ! -d "$librariesDir" ]; then
 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
@@ -1,7 +1,6 @@
 #!/bin/bash

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

 if isURL ${CUSTOM_SERVER}; then
@@ -31,7 +30,6 @@ else

 fi

-# Allow for overriding Family on custom for testing.
-export FAMILY="${FAMILY:-HYBRID}"
-
+export SKIP_LOG4J_CONFIG=true
+export FAMILY=HYBRID
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployFTBA
+++ b/scripts/start-deployFTBA
@@ -2,8 +2,7 @@

 ftbInstallMarker=".ftb-installed"

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

@@ -81,5 +80,4 @@ if ! [ -v SERVER ]; then
 fi

 export FAMILY=FORGE
-
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployFabric
+++ b/scripts/start-deployFabric
@@ -6,45 +6,76 @@ set -eu

 requireVar VANILLA_VERSION
 export TYPE=FABRIC
-: "${FABRIC_LAUNCHER_VERSION:=${FABRIC_INSTALLER_VERSION:-LATEST}}"
-: "${FABRIC_LAUNCHER:=}"
-: "${FABRIC_LAUNCHER_URL:=}"
+: "${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}"
+: "${FABRIC_INSTALLER:=}"
+: "${FABRIC_INSTALLER_URL:=}"
 : "${FABRIC_LOADER_VERSION:=LATEST}"

 isDebugging && set -x

-# Custom fabric jar
-if [[ $FABRIC_LAUNCHER ]]; then
-  export SERVER=${FABRIC_LAUNCHER}
-# Custom fabric jar url
-elif [[ $FABRIC_LAUNCHER_URL ]]; then
-  export SERVER=fabric-server-$(echo -n "$FABRIC_LAUNCHER_URL" | mc-image-helper hash)
-# Official fabric launcher
-else
-  if [[ ${FABRIC_LAUNCHER_VERSION^^} = LATEST ]]; then
-    log "Checking Fabric Launcher version information."
-    FABRIC_LAUNCHER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-  fi
-  if [[ ${FABRIC_LOADER_VERSION^^} = LATEST ]]; then
-    log "Checking Fabric Loader version information."
-    FABRIC_LOADER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-loader/maven-metadata.xml)
-  fi
-  export SERVER=fabric-server-mc.${VANILLA_VERSION}-loader.${FABRIC_LOADER_VERSION}-launcher.${FABRIC_LAUNCHER_VERSION}.jar
-  export FABRIC_LAUNCHER_URL="https://meta.fabricmc.net/v2/versions/loader/${VANILLA_VERSION}/${FABRIC_LOADER_VERSION}/${FABRIC_LAUNCHER_VERSION}/server/jar"
+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

-if [[ ! -e ${SERVER} && ! -z ${FABRIC_LAUNCHER_URL} ]]; then
-  log "Downloading $FABRIC_LAUNCHER_URL ..."
-  if ! get -o "$SERVER" "$FABRIC_LAUNCHER_URL"; then
-    log "Failed to download from given location $FABRIC_LAUNCHER_URL"
+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
+    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
+    FABRIC_INSTALLER="fabric-installer.jar"
+  elif [[ ! -e $FABRIC_INSTALLER ]]; then
+    log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
    exit 2
  fi
+
+  if [[ -z $FABRIC_LOADER_VERSION || ${FABRIC_LOADER_VERSION^^} = LATEST ]]; then
+    log "Checking Fabric Loader version information."
+
+    FABRIC_LOADER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-loader/maven-metadata.xml)
+  fi
+
+  if [[ ! -e $FABRIC_INSTALLER ]]; then
+    log "Downloading $FABRIC_INSTALLER_URL ..."
+    if ! get -o "$FABRIC_INSTALLER" "$FABRIC_INSTALLER_URL"; then
+      log "Failed to download from given location $FABRIC_INSTALLER_URL"
+      exit 2
+    fi
+  fi
+
+  log "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER with loader version $FABRIC_LOADER_VERSION"
+
+  tries=3
+  set +e
+  while ((--tries >= 0)); do
+    java -jar $FABRIC_INSTALLER server \
+      -mcversion $VANILLA_VERSION \
+      -loader $FABRIC_LOADER_VERSION \
+      -downloadMinecraft \
+      -dir /data
+    if [[ $? == 0 ]]; then
+      break
+    fi
+  done
+  set -e
+  if (($tries < 0)); then
+    log "Fabric failed to install after several tries." >&2
+    exit 10
+  fi
+
+  mv server.jar "server-${VANILLA_VERSION}.jar"
+  mv fabric-server-launch.jar "${SERVER}"
 fi

-if [[ ! -e ${SERVER} ]]; then
-  log "$SERVER does not exist, cannot launch server!"
-  exit 1
-fi
+# 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
@@ -38,23 +38,18 @@ install() {
    get_installer "$normForgeVersion" "$shortForgeVersion"
  fi

-  log "Installing Forge $shortForgeVersion. This might take a minute or two..."
+  log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
  mkdir -p mods
  tries=3
-  while true; do
-    if ! java -jar "$FORGE_INSTALLER" --installServer &> forge-installer.log; then
-      if ((--tries <= 0)); then
-        cat forge-installer.log
-        log "
-ERROR Forge failed to install after several tries.
-"
-        exit 1
-      fi
-      log "Install failed. Trying again..."
-    else
-      break # out of this loop
+  while ((--tries >= 0)); do
+    if java -jar "$FORGE_INSTALLER" --installServer; then
+      break
    fi
  done
+  if ((tries < 0)); then
+    log "Forge failed to install after several tries." >&2
+    exit 10
+  fi
  # NOTE $shortForgeVersion will be empty if installer location was given to us
  log "Finding installed server jar..."
  unset -v latest
@@ -153,5 +148,4 @@ else
 fi

 export FAMILY=FORGE
-
 exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-deployLimbo
+++ b/scripts/start-deployLimbo
@@ -58,5 +58,7 @@ if [[ ${LEVEL} != *\;* ]]; then
 fi
 export LEVEL

+export SKIP_LOG4J_CONFIG=true
+
 export FAMILY=LIMBO
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployMagma
+++ b/scripts/start-deployMagma
@@ -1,12 +1,13 @@
 #!/bin/bash

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

-: "${VANILLA_VERSION?}"
+: ${VANILLA_VERSION?}
 # stable, dev
-: "${MAGMA_CHANNEL:=stable}"
+: ${MAGMA_CHANNEL:=stable}


 magmaDownloadServer() {
@@ -89,5 +90,4 @@ else
 fi

 export FAMILY=HYBRID
-
-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+exec ${SCRIPTS:-/}start-setupWorld "$@"
--- a/scripts/start-deployMohist
+++ b/scripts/start-deployMohist
@@ -38,6 +38,7 @@ if [ ! -f "${SERVER}" ]; then
  get -o "${SERVER}" "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
 fi

-export FAMILY=HYBRID
+export SKIP_LOG4J_CONFIG=true

+export FAMILY=HYBRID
 exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
--- a/scripts/start-deployPaper
+++ b/scripts/start-deployPaper
@@ -73,6 +73,8 @@ else
 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
@@ -39,6 +39,8 @@ if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
 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
@@ -6,9 +6,9 @@ IFS=$'\n\t'
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x

-: "${VANILLA_VERSION:?}"
-: "${PURPUR_BUILD:=LATEST}"
-: "${FORCE_REDOWNLOAD:=false}"
+: ${VANILLA_VERSION:?}
+: ${PURPUR_BUILD:=LATEST}
+: ${FORCE_REDOWNLOAD:=false}

 if [[ ${PURPUR_BUILD} == LATEST ]]; then
  if ! PURPUR_BUILD=$(get --json-path=".builds.latest" "https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}"); then
@@ -30,6 +30,8 @@ if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
 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-finalExec
+++ b/scripts/start-finalExec
@@ -1,9 +1,97 @@
 #!/bin/bash

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

+if versionLessThan 1.7.6; then
+  opsFile=ops.txt
+  whitelistFile=white-list.txt
+else
+  opsFile=ops.json
+  whitelistFile=whitelist.json
+fi
+
+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 ${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
    if [ ! -e server-icon.png ] || [ "${OVERRIDE_ICON}" == "TRUE" ]; then
      log "Using server icon from $ICON..."
@@ -20,15 +108,13 @@ if [ -n "$ICON" ]; then
 fi

 canUseRollingLogs=true
-useFallbackJvmFlag=false

 patchLog4jConfig() {
  file=${1?}
  url=${2?}
  if ! get -o "$file" "$url"; then
-    log "ERROR: failed to download corrected log4j config, fallback to JVM flag"
-    useFallbackJvmFlag=true
-    return 1
+    log "ERROR: failed to download corrected log4j config"
+    exit 1
  fi
  JVM_OPTS="-Dlog4j.configurationFile=${file} ${JVM_OPTS}"
  canUseRollingLogs=false
@@ -42,16 +128,7 @@ 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
-# See https://purpurmc.org/docs/Log4j/
-elif isType PURPUR && versionLessThan 1.17; then
-  patchLog4jConfig purpur_log4j2_1141-1165.xml https://purpurmc.org/docs/xml/purpur_log4j2_1141-1165.xml
-elif isType PURPUR && versionLessThan 1.18.1; then
-  patchLog4jConfig purpur_log4j2_117.xml https://purpurmc.org/docs/xml/purpur_log4j2_117.xml
 elif versionLessThan 1.18.1; then
-  useFallbackJvmFlag=true
-fi
-
-if ${useFallbackJvmFlag}; then
  JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
 fi

@@ -87,7 +164,7 @@ if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
 fi

 # Optional disable GUI for headless servers
-if [[ ${GUI,,} = false ]]; then
+if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
  EXTRA_ARGS+=" nogui"
 fi

@@ -246,14 +323,10 @@ EOF
  else
    exec mc-server-runner "${mcServerRunnerArgs[@]}" "${finalArgs[@]}"
  fi
-elif [[ $SERVER =~ run.sh ]]; then
+elif [[ -x run.sh ]]; then
  log "Using Forge supplied run.sh script..."
  echo $JVM_XX_OPTS $JVM_OPTS $expandedDOpts > user_jvm_args.txt
-  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: bash ${SERVER}"
-    exit
-  fi
-  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER}"
+  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash run.sh
 else
  # If we have a bootstrap.txt file... feed that in to the server stdin
  if [ -f /data/bootstrap.txt ]; then
--- a/scripts/start-setupDatapack
+++ b/scripts/start-setupDatapack
@@ -74,4 +74,4 @@ elif [[ "$DATAPACKS_FILE" ]]; then
  fi
 fi

-exec "${SCRIPTS:-/}start-setupForgeApiMods" "$@"
+exec "${SCRIPTS:-/}start-setupModpack" "$@"
--- a/scripts/start-setupEnvVariables
+++ b/scripts/start-setupEnvVariables
@@ -32,4 +32,4 @@ if [[ ${PATCH_DEFINITIONS} ]]; then
    "${PATCH_DEFINITIONS}"
 fi

-exec "${SCRIPTS:-/}start-setupRbac" "$@"
+exec "${SCRIPTS:-/}start-finalExec" "$@"
--- a/scripts/start-setupForgeApiMods
+++ b/scripts/start-setupForgeApiMods
@@ -1,245 +0,0 @@
-#!/bin/bash
-
-set -e -o pipefail
-
-: "${MODS_FORGEAPI_KEY:=}"
-: "${REMOVE_OLD_FORGEAPI_MODS:=false}"
-: "${MODS_FORGEAPI_PROJECTIDS:=}"
-: "${MODS_FORGEAPI_FILE:=}"
-: "${MODS_FORGEAPI_RELEASES:=RELEASE}"
-: "${MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES:=false}"
-: "${MODS_FORGEAPI_IGNORE_GAMETYPE:=false}"
-: "${REMOVE_OLD_MODS_DEPTH:=1} "
-: "${REMOVE_OLD_MODS_INCLUDE:=*.jar}"
-
-#  FORGEAPI_BASE_URL used in manifest downloads below
-FORGEAPI_BASE_URL=${FORGEAPI_BASE_URL:-https://api.curseforge.com/v1}
-RELEASE_NUMBER_FILTER=1
-MINECRAFT_GAME_ID=432
-FILTER_BY_FAMILY=false
-out_dir=/data/mods
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
-
-# Remove old mods/plugins
-if isTrue "${REMOVE_OLD_FORGEAPI_MODS}" && [ -z "${MODS_FORGEAPI_KEY}" ]; then
-  removeOldMods /data/mods
-fi
-
-# Family filter is on by default for Forge, Fabric, and Bukkit
-updateFamilyFilter(){
-  if isFamily "FORGE" "FABRIC" "BUKKIT"; then
-    FILTER_BY_FAMILY=true
-  fi
-}
-
-ensureModKey(){
-  if [ -z "$MODS_FORGEAPI_KEY" ]; then
-    log "ERROR: MODS_FORGEAPI_KEY REQUIRED to Connect to FORGE API, you supplied: ${MODS_FORGEAPI_KEY}"
-    exit 2
-  fi
-}
-
-# Set the global release type per the text.
-# NOTE: downcasing release type for comparing types.
-updateReleaseNumber(){
-  releaseType=$1
-  if [ "release" = "${releaseType,,}" ] || [ 1 = "${releaseType,,}" ]; then
-    RELEASE_NUMBER_FILTER=1
-  elif [ "beta" = "${releaseType,,}" ] || [ 2 = "${releaseType,,}" ]; then
-    RELEASE_NUMBER_FILTER=2
-  elif [ "alpha" = "${releaseType,,}" ] || [ 3 = "${releaseType,,}" ]; then
-    RELEASE_NUMBER_FILTER=3
-  fi
-}
-
-retrieveVersionTypeNumber(){
-  VERSION_NAME="Minecraft ${VANILLA_VERSION%.*}"
-  minecraft_types=$(curl -X GET -s \
-    "${FORGEAPI_BASE_URL}/games/${MINECRAFT_GAME_ID}/version-types" \
-    -H 'Accept: application/json' -H 'x-api-key: '${MODS_FORGEAPI_KEY}'')
-
-  if [ ! "$minecraft_types" ]; then
-    log "ERROR: unable to retrieve version types for ${VERSION_NAME} from ForgeAPI. Check Forge API key or supplied Minecraft version"
-    exit 2
-  fi
-
-  TYPE_ID=$(jq -n "$minecraft_types" | jq --arg VERSION_NAME "$VERSION_NAME" -jc '
-      .data[]? | select(.name==$VERSION_NAME) | .id')
-
-  if [ ! "$TYPE_ID" ]; then
-    log "ERROR: unable to retrieve version types for ${VERSION_NAME} from ForgeAPI"
-    exit 2
-  fi
-}
-
-modFileByProjectID(){
-  project_id=$(echo $1 | tr -d '"')
-  project_id_release_type=$2
-  project_id_file_name=$3
-  unset PROJECT_FILE
-
-  # if Type id isn't defined use minecraft version to go get it.
-  if [ ! "$TYPE_ID" ]; then
-    retrieveVersionTypeNumber
-  fi
-
-  # JQ is struggling with larger page sizes so having to pagination for mods with a lot of releases
-  pageSize=42
-  index=0
-  total_count=1
-
-  while [ $index -lt $total_count ]; do
-    project_files=$(curl -X GET -s \
-      "${FORGEAPI_BASE_URL}/mods/${project_id}/files?gameVersionTypeId=${TYPE_ID}&index=${index}&pageSize=${pageSize}" \
-      -H 'Accept: application/json' -H 'x-api-key: '${MODS_FORGEAPI_KEY}'')
-
-    if [ ! "$project_files" ]; then
-      log "ERROR: unable to retrieve any project id files for ${project_id} from ForgeAPI"
-      exit 2
-    fi
-    # Use project files to grab out the total count of mods.
-    total_count=$(jq -n "$project_files" | jq -c '.pagination.totalCount' )
-
-    # Checking for a individual release type input, if not use global
-    if [ $project_id_release_type ]; then
-      updateReleaseNumber $project_id_release_type
-      unset project_id_release_type 
-    else
-      updateReleaseNumber $MODS_FORGEAPI_RELEASES
-    fi
-
-    # grabs the highest ID of the releaseTypes selected.
-    # Default is 1 for Release, Beta is 2, and Alpha is 3. Using less than we can validate highest release.
-    if [ $project_id_file_name ]; then
-      # Looks for file by name
-      current_project_file=$(jq -n "$project_files" | jq --arg FILE_NAME "$project_id_file_name" -jc '
-        .data | map(select(.fileName<=($FILE_NAME))) | .[0] // empty')
-    elif $( ! isTrue "$MODS_FORGEAPI_IGNORE_GAMETYPE" ) && $FILTER_BY_FAMILY ; then
-      # Looks for file by version and server type in lowercase
-      current_project_file=$(jq -n "$project_files" | jq --arg RELEASE_FILTER "$RELEASE_NUMBER_FILTER" --arg GAME_TYPE ${FAMILY,,} -jc '
-        .data | sort_by(.id) | reverse | map(select(.gameVersions[] | ascii_downcase | contains ($GAME_TYPE))) | map(select(.releaseType<=($RELEASE_FILTER|tonumber))) | .[0] // empty')
-    else
-      # Looks for file by version only.
-      current_project_file=$(jq -n "$project_files" | jq --arg RELEASE_FILTER "$RELEASE_NUMBER_FILTER" -jc '
-        .data | sort_by(.id) | reverse | map(select(.releaseType<=($RELEASE_FILTER|tonumber))) | .[0] // empty')
-    fi
-
-    # Logic to grab the latest release over the entire pagination
-    if [ ! "$PROJECT_FILE" ]; then
-      PROJECT_FILE=$current_project_file
-    elif [ "$current_project_file" ]; then
-      current_project_file_id=$(jq -n "$current_project_file" | jq -jc '.id' )
-      PROJECT_FILE_ID=$(jq -n "$PROJECT_FILE" | jq -jc '.id' )
-      if (( current_project_file_id > PROJECT_FILE_ID )); then
-        PROJECT_FILE=$current_project_file
-      fi
-    fi
-    
-    # check to see if we have gone to far or lost our index and exit with an error
-    if [ -z "$index" ] || [ -z "$total_count" ] || [ $index -ge $total_count ]; then
-      log "ERROR: Unable to retrieve any files for ${project_id} from ForgeAPI also Validate files have release type associated with no. ${RELEASE_NUMBER_FILTER}"
-      exit 2
-    fi
-    # Increment start index to new set.
-    index=$(($index + $pageSize))
-  done
-  if [ ! "$PROJECT_FILE" ]; then
-    log "ERROR: Unable to retrieve any files for ${project_id}, Release Type: ${RELEASE_NUMBER_FILTER}, FAMILY_TYPE: ${FAMILY,,}"
-    exit 2
-  fi
-}
-
-downloadModPackfromModFile() {
-  if [ ! "$PROJECT_FILE" ]; then
-    log "ERROR: Project File not found from the ForgeAPI"
-    exit 2
-  fi
-
-  # grabs needed values from our json return
-  file_name=$(jq -n "$PROJECT_FILE" | jq -jc '.fileName' )
-  download_url=$(jq -n "$PROJECT_FILE" | jq -jc '.downloadUrl' )
-  
-  # trys to make the output directory incase it doesnt exist.
-  mkdir -p "$out_dir"
-  echo "Downloading ${download_url}"
-  if ! get --skip-up-to-date -o "${out_dir}/${file_name}" $download_url ; then
-    log "ERROR: failed to download from ${download_url}"
-    exit 2
-  fi
-}
-
-downloadDependencies(){
-  if [ "$PROJECT_FILE" ]; then
-    dependencies=$(jq -n "$PROJECT_FILE" | jq -jc '.dependencies' )
-    required_dependencies=$(jq -n "$dependencies" | jq --arg REQUIRED_FILTER "3" -jc '
-      map(select(.relationType==($REQUIRED_FILTER|tonumber)))')
-    if [ "$required_dependencies" ]; then
-      jq -n "$required_dependencies" | jq -c '.[]?' | while read current_dependency; do
-        mod_id=$(jq -n "$current_dependency" | jq -jc '.modId' )
-
-        # BROKEN: Example Voice mod keeps returning the voice mod file id instead of the mod file id.
-        # file_id=$(jq -n "$current_dependency" | jq -jc '.fileId' )
-        # dependency_data=$(curl -X GET -s \
-        #   "${FORGEAPI_BASE_URL}/mods/${mod_id}/files/${file_id}/download-url" \
-        #   -H 'Accept: application/json' -H 'x-api-key: '${MODS_FORGEAPI_KEY}'')  
-        # if [ ! "$dependency_data" ]; then
-        #   log "ERROR: unable to retrieve dependency data files for ${project_id} from ForgeAPI"
-        #   exit 2
-        # fi
-        # dependency_download_url=$(jq -n "$dependency_data" | jq -jc '.data' )
-        # echo "Downloading dependency ${dependency_download_url}"
-        # if ! get -o "${out_dir}/" $dependency_download_url ; then 
-        #   log "ERROR: failed to download dependency from ${dependency_download_url}"
-        #   exit 2
-        # fi
-
-        # Using current mod path and release to go get the REQUIRED DEPENDENCY
-        # NOTE: we are ASUMING it will be release.
-        modFileByProjectID $mod_id "release"
-        downloadModPackfromModFile
-      done
-    fi
-  fi
-}
-
-# Use forge api json file to filter and download the correct mods
-if [ "$MODS_FORGEAPI_FILE" ] && [ -z "$MODS_FORGEAPI_PROJECTIDS" ]; then
-  ensureModKey
-  updateFamilyFilter
-  if [ ! -f "$MODS_FORGEAPI_FILE" ]; then
-    log "ERROR: given MODS_FORGEAPI_FILE file does not exist"
-    exit 2
-  fi
-
-  # Needs loop here to look up release types befor calling download.
-  jq -c '.[]?' $MODS_FORGEAPI_FILE | while read current_project; do
-    # Per stack overflow we can use //empty to return empty string that works with -z
-    project_id=$(jq -n "$current_project" | jq -r '.projectId // empty' )
-    current_release_type=$(jq -n "$current_project" | jq -r '.releaseType // empty' )
-    current_file_name=$(jq -n "$current_project" | jq -r '.fileName // empty' )
-
-    modFileByProjectID $project_id $current_release_type $current_file_name
-    downloadModPackfromModFile
-    if isTrue "${MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES}"; then
-      downloadDependencies
-    fi
-  done
-fi
-
-# Use only project ids and global release data.
-if [ "$MODS_FORGEAPI_PROJECTIDS" ] && [ -z "$MODS_FORGEAPI_FILE" ]; then
-  ensureModKey
-  updateFamilyFilter
-  for project_id in ${MODS_FORGEAPI_PROJECTIDS//,/ }; do
-    modFileByProjectID $project_id 
-    downloadModPackfromModFile
-    if isTrue "${MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES}"; then
-      downloadDependencies
-    fi
-  done
-fi
-
-exec "${SCRIPTS:-/}start-setupModpack" "$@"
--- a/scripts/start-setupModconfig
+++ b/scripts/start-setupModconfig
@@ -1,7 +1,6 @@
 #!/bin/bash

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

 # If supplied with a URL for a config (simple zip of configurations), download it and unpack
 if [[ "$MODCONFIG" ]]; then
@@ -10,7 +9,7 @@ case "X$MODCONFIG" in
    log "Downloading mod/plugin configs via HTTP"
    log "  from $MODCONFIG ..."
    curl -sSL -o /tmp/modconfig.zip "$MODCONFIG"
-    if [ "$FAMILY" = "SPIGOT" ]; then
+    if [ "$TYPE" = "SPIGOT" ]; then
      mkdir -p /data/plugins
      unzip -o -d /data/plugins /tmp/modconfig.zip
    else
@@ -25,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi

-exec "${SCRIPTS:-/}start-setupMounts" "$@"
+exec ${SCRIPTS:-/}start-setupMounts $@
--- a/scripts/start-setupModpack
+++ b/scripts/start-setupModpack
@@ -25,11 +25,11 @@ 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/packwiz/packwiz-installer-bootstrap/releases/latest)
+  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}"
+    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}"
@@ -67,7 +67,7 @@ if [[ "$MODPACK" ]]; then
    exit 1
  fi

-  if [ "$FAMILY" = "SPIGOT" ]; then
+  if [ "$TYPE" = "SPIGOT" ]; then
    mkdir -p /data/plugins
    if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
      log "ERROR: failed to unzip the modpack from ${MODPACK}"
@@ -81,7 +81,7 @@ if [[ "$MODPACK" ]]; then
  rm -f /tmp/modpack.zip

 elif [[ "$MODS" ]]; then
-  if [ "$FAMILY" = "SPIGOT" ]; then
+  if [ "$TYPE" = "SPIGOT" ]; then
    out_dir=/data/plugins
  else
    out_dir=/data/mods
@@ -92,7 +92,7 @@ elif [[ "$MODS" ]]; then
  do
    if isURL "$i"; then
      log "Downloading mod/plugin $i ..."
-      if ! get --skip-up-to-date -o "${out_dir}" "$i"; then
+      if ! get -o "${out_dir}" "$i"; then
        log "ERROR: failed to download from $i into $out_dir"
        exit 2
      fi
@@ -118,7 +118,7 @@ elif [[ "$MODS_FILE" ]]; then
    exit 2
  fi

-  if [ "$FAMILY" = "SPIGOT" ]; then
+  if [ "$TYPE" = "SPIGOT" ]; then
    out_dir=/data/plugins
  else
    out_dir=/data/mods
@@ -128,7 +128,7 @@ elif [[ "$MODS_FILE" ]]; then
  args=(
    -o "${out_dir}"
    --log-progress-each
-    --skip-up-to-date
+    --skip-existing
    --uris-file "${MODS_FILE}"
  )
  if isTrue "${REMOVE_OLD_MODS}"; then
@@ -188,19 +188,15 @@ esac
 fi

 : "${GENERIC_PACKS:=${GENERIC_PACK}}"
-: "${GENERIC_PACKS_PREFIX:=}"
-: "${GENERIC_PACKS_SUFFIX:=}"

 if [[ "${GENERIC_PACKS}" ]]; then
  IFS=',' read -ra packs <<< "${GENERIC_PACKS}"

  packFiles=()
-  for packEntry in "${packs[@]}"; do
-    pack="${GENERIC_PACKS_PREFIX}${packEntry}${GENERIC_PACKS_SUFFIX}"
-    if isURL "${pack}"; then
+  for pack in "${packs[@]}"; do
+    if isURL "$pack"; then
      mkdir -p /data/packs
-      log "Downloading generic pack from $pack"
-      if ! outfile=$(get -o /data/packs --output-filename --skip-up-to-date "$pack"); then
+      if ! outfile=$(get -o /data/packs --output-filename --skip-existing "$pack"); then
        log "ERROR: failed to download $pack"
        exit 2
      fi
@@ -211,18 +207,12 @@ if [[ "${GENERIC_PACKS}" ]]; then
  done

  isDebugging && [ -f "$sum_file}" ] && cat "$sum_file"
-
-  log "Checking if generic packs are up to date"
-  if isTrue "${SKIP_GENERIC_PACK_UPDATE_CHECK:-false}" && [ -f "$sum_file" ]; then
-    log "Skipping generic pack update check"
-  elif isTrue "${FORCE_GENERIC_PACK_UPDATE}" || ! checkSum "${sum_file}"; then
-    log "Generic pack(s) are out of date. Re-applying..."
-
+  if ! sha256sum -c "${sum_file}" --status 2> /dev/null; then
    base_dir=/tmp/generic_pack_base
    mkdir -p ${base_dir}
    for pack in "${packFiles[@]}"; do
      isDebugging && ls -l "${pack}"
-      extract "${pack}" "${base_dir}"
+      unzip -q -d ${base_dir} "${pack}"
    done

    # recalculate the actual base directory of content
@@ -250,8 +240,7 @@ if [[ "${GENERIC_PACKS}" ]]; then
    cp -R -f "${base_dir}"/* /data
    rm -rf /tmp/generic_pack_base

-    log "Saving generic pack(s) checksum"
-    sha1sum "${packFiles[@]}" > "${sum_file}"
+    sha256sum "${packFiles[@]}" > "${sum_file}"
    isDebugging && cat "$sum_file"
  fi
 fi
--- a/scripts/start-setupMounts
+++ b/scripts/start-setupMounts
@@ -1,15 +1,14 @@
 #!/bin/bash

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

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

 set -e
 isDebugging && set -x
@@ -25,8 +24,8 @@ else
 fi

 if [ -d /plugins ]; then
-  case ${FAMILY} in
-    SPIGOT|HYBRID)
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER|MAGMA)
      mkdir -p /data/plugins
      log "Copying plugins over..."
      mc-image-helper \
@@ -41,7 +40,7 @@ if [ -d /plugins ]; then
 fi

 # If any modules have been provided, copy them over
-: "${COPY_MODS_DEST:="/data/mods"}"
+: ${COPY_MODS_DEST:="/data/mods"}

 if [ -d /mods ]; then
  log "Copying any mods over..."
@@ -54,7 +53,7 @@ if [ -d /mods ]; then
    /mods "${COPY_MODS_DEST}"
 fi

-: "${COPY_CONFIG_DEST:="/data/config"}"
+: ${COPY_CONFIG_DEST:="/data/config"}

 if [ -d /config ]; then
  log "Copying any configs from /config to ${COPY_CONFIG_DEST}"
@@ -67,4 +66,4 @@ if [ -d /config ]; then
    /config "${COPY_CONFIG_DEST}"
 fi

-exec "${SCRIPTS:-/}start-setupServerProperties" "$@"
+exec ${SCRIPTS:-/}start-setupServerProperties $@
--- a/scripts/start-setupRbac
+++ b/scripts/start-setupRbac
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
-
-if versionLessThan 1.7.6; then
-  opsFile=ops.txt
-  whitelistFile=white-list.txt
-else
-  opsFile=ops.json
-  whitelistFile=whitelist.json
-fi
-
-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 ${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
-
-
-
-exec "${SCRIPTS:-/}start-finalExec" "$@"
--- a/scripts/start-setupServerProperties
+++ b/scripts/start-setupServerProperties
@@ -48,7 +48,7 @@ function customizeServerProps {

  # If not provided, generate a reasonable default message-of-the-day,
  # which shows up in the server listing in the client
-  if ! [ -v MOTD ]; then
+  if [ -z "$MOTD" ]; then
    # snapshot is the odd case where we have to look at version to identify that label
    if [[ ${ORIGINAL_TYPE} == "VANILLA" && ${VERSION} == "SNAPSHOT" ]]; then
      label=SNAPSHOT
@@ -62,13 +62,6 @@ function customizeServerProps {
    MOTD="A ${label} Minecraft Server powered by Docker"
  fi

-  # normalize MOTD
-  if [[ ${TYPE^^} = LIMBO ]]; then
-    if [[ $MOTD ]] && ! [[ $MOTD =~ ^{ ]]; then
-      MOTD="{\"text\":\"${MOTD}\"}"
-    fi
-  fi
-
  setServerProp "server-name" SERVER_NAME
  setServerProp "server-ip" SERVER_IP
  setServerProp "server-port" SERVER_PORT
--- a/scripts/start-setupVanillaTweaks
+++ b/scripts/start-setupVanillaTweaks
@@ -12,115 +12,73 @@ set -e -o pipefail
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x

-VT_VERSION=""
-DATAPACKS_DIR="/data/${LEVEL:-world}/datapacks"
-RESOURCEPACKS_DIR="/data/resourcepacks"
+out_dir=/data/${LEVEL:-world}/datapacks

 # Remove old VANILLATWEAKS
-if isTrue "${REMOVE_OLD_VANILLATWEAKS}"; then
-  # NOTE: datapacks include crafting tweaks.
-  if [ -d "$DATAPACKS_DIR" ]; then
-    find "$DATAPACKS_DIR" -mindepth 1 -maxdepth ${REMOVE_OLD_VANILLATWEAKS_DEPTH:-16} -wholename "${REMOVE_OLD_VANILLATWEAKS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_VANILLATWEAKS_EXCLUDE:-}" -delete
-  fi
-  if [ -d "$RESOURCEPACKS_DIR" ]; then
-    find "$RESOURCEPACKS_DIR" -mindepth 1 -maxdepth ${REMOVE_OLD_VANILLATWEAKS_DEPTH:-16} -wholename "${REMOVE_OLD_VANILLATWEAKS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_VANILLATWEAKS_EXCLUDE:-}" -delete
+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

-# Gets the download url and downloads the actual files.
-getUrlAndDownload(){
-  VT_FILE=$1
-  URL_SUFFIX=$2
-  OUTPUT_FILE=$3
-  PACKS=$(jq -jc '.packs // empty' $VT_FILE)
-  if [ ! "$PACKS" ]; then
-    log "ERROR: unable to retrieve ${URL_SUFFIX} from ${VT_FILE}"
-    exit 2
-  fi
-
-  ZIPDATA_URL="https://vanillatweaks.net/assets/server/zip${URL_SUFFIX}.php"
-  DOWNLOAD_URL=$(curl -X POST -F "packs=${PACKS}" -F "version=${VT_VERSION}" $ZIPDATA_URL | jq -r '.link // empty')
-  if [ ! "$DOWNLOAD_URL" ]; then
-    log "ERROR: unable to retrieve ${URL_SUFFIX} packs from vanillatweaks.net!"
-    exit 2
-  fi
-
-  if ! get -o $OUTPUT_FILE "https://vanillatweaks.net${DOWNLOAD_URL}"; then
-    log "ERROR: failed to download ${URL_SUFFIX} from ${DOWNLOAD_URL}"
-    exit 2
-  fi
-}
-
-# Datapacks Handler
-downloadDatapacks(){
-  VT_FILE=$1
-  URL_SUFFIX="datapacks"
-  OUTPUT_FILE="/tmp/vanillatweaks.zip"
-  getUrlAndDownload $VT_FILE $URL_SUFFIX $OUTPUT_FILE
-  mkdir -p "$DATAPACKS_DIR"
-  if ! unzip -o -d "$DATAPACKS_DIR" $OUTPUT_FILE; then
-    log "ERROR: failed to unzip the datapacks ${DATAPACKS} from ${OUTPUT_FILE}"
-  fi
-  rm -f $OUTPUT_FILE
-}
-
-# Crafting Tweaks Handler
-downloadCraftingtweaks(){
-  VT_FILE=$1
-  mkdir -p "$DATAPACKS_DIR"
-  getUrlAndDownload $VT_FILE "craftingtweaks" "${DATAPACKS_DIR}/craftingtweaks.zip"
-}
-
-# Resourcepacks Handler
-downloadResourcepacks(){
-  VT_FILE=$1
-  mkdir -p "$RESOURCEPACKS_DIR"
-  getUrlAndDownload  $VT_FILE "resourcepacks" "${RESOURCEPACKS_DIR}/resourcepacks.zip"
-}
-
 # Example: VANILLATWEAKS_SHARECODE=MGr52E
 # Code generated from the UI website, typically a alphanumeric 6 digit code.
 if [[ "$VANILLATWEAKS_SHARECODE" ]]; then
-  VANILLATWEAKS_FILE=()
-  for SHARECODE in ${VANILLATWEAKS_SHARECODE//,/ }; do
-    TMP_FILE="/tmp/${SHARECODE}.json"
-    SHARECODE_LOOKUP_URL="https://vanillatweaks.net/assets/server/sharecode.php?code=${SHARECODE}"
-    if ! get -o "$TMP_FILE" "$SHARECODE_LOOKUP_URL"; then
-      log "ERROR: Unable to use ${SHARECODE} share code provided to retrieve vanillatweaks file"
-      exit 2
-    fi
-    VANILLATWEAKS_FILE+="${TMP_FILE},"
-  done
+  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 and crafting tweaks
+# Use vanillatweaks file to specify VT and datapacks
 if [[ "$VANILLATWEAKS_FILE" ]]; then
-  for VT_FILE in ${VANILLATWEAKS_FILE//,/ }; do
-    if [ ! -f "$VT_FILE" ]; then
-      log "ERROR: given VANILLATWEAKS_FILE file does not exist"
-      exit 2
-    fi
+  if [ ! -f "$VANILLATWEAKS_FILE" ]; then
+    log "ERROR: given VANILLATWEAKS_FILE file does not exist"
+    exit 2
+  fi

-    VT_VERSION=$(jq -jc '.version // empty' $VT_FILE)
-    if [ ! "$VT_VERSION" ]; then
-      log "ERROR: unable to retrieve version from $VT_FILE"
-      exit 2
-    fi
+  PACKS=$(jq -jc '.packs' $VANILLATWEAKS_FILE)
+  if [ ! "$PACKS" ]; then
+    log "ERROR: unable to retrieve packs from $VANILLATWEAKS_FILE"
+    exit 2
+  fi

-    TYPE=$(jq -jc '.type // empty' $VT_FILE)
-    if [[ "$TYPE" = "datapacks" ]]; then
-      downloadDatapacks $VT_FILE
-    elif [[ "$TYPE" = "craftingtweaks" ]]; then
-      downloadCraftingtweaks $VT_FILE
-    elif [[ "$TYPE" = "resourcepacks" ]]; then
-      downloadResourcepacks $VT_FILE
-    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

-    # cleans up temp vanilla tweaks file download to get stored packs
-    if [[ "$VANILLATWEAKS_SHARECODE" ]]; then
-      rm -f $VT_FILE
-    fi
-  done
+# 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
@@ -5,7 +5,7 @@
 set -e
 isDebugging && set -x

-if [ "$TYPE" = "CURSEFORGE" ]; then
+if [ $TYPE = "CURSEFORGE" ]; then
  worldDest=$FTB_DIR/${LEVEL:-world}
 else
  worldDest=/data/${LEVEL:-world}
@@ -19,103 +19,49 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
      "${worldDest}_the_end"
  fi

-  if isURL "$WORLD"; then
-    log "Downloading world from $WORLD"
-    if ! get -o /tmp/world.bin "$WORLD"; then
-      log "ERROR: failed to download world from $WORLD"
-      exit 1
-    fi
-    WORLD=/tmp/world.bin
+  if isURL $WORLD; then
+    curl -fsSL "$WORLD" -o /tmp/world.zip
+    zipSrc=/tmp/world.zip
+  elif [[ "$WORLD" =~ .*\.zip ]]; then
+    zipSrc="$WORLD"
  fi

-  if [ -f "$WORLD" ]; then
-    log "Extracting world"
+  if [[ "$zipSrc" ]]; then
+    log "Unzipping world"

    # Stage contents so that the correct subdirectory can be picked off
    mkdir -p /tmp/world-data
-    if ! extract "$WORLD" /tmp/world-data; then
-      log "ERROR extracting world from $WORLD"
-      exit 1
-    fi
+    (cd /tmp/world-data && unzip -o -q "$zipSrc")

-    baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
-
-    if ! [[ $baseDirs ]]; then
-      log "ERROR world content is not valid since level.dat could not be found"
-      exit 2
+    if [ "$TYPE" = "SPIGOT" ]; then
+      baseDirs=$(find /tmp/world-data -name "level.dat" -not -path "*_nether*" -not -path "*_the_end*" -exec dirname "{}" \;)
+    else
+      baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
    fi

    count=$(echo "$baseDirs" | wc -l)
    if [[ $count -gt 1 ]]; then
-      baseDirsNoSpigotSuffix=$(echo "$baseDirs" | sed -re 's:(_nether|_the_end)/?$::' | sort -u)
-      if [ $(echo "$baseDirsNoSpigotSuffix" | wc -l) -eq 1 ]; then
-        baseDir="$baseDirsNoSpigotSuffix"
-        baseName=$(basename "$baseDir")
-        log "Found Spigot naming conventions, taking $baseName as main dimension"
-      else
-        baseDir="$(echo "$baseDirs" | sed -n ${WORLD_INDEX:-1}p)"
-        baseName=$(basename "$baseDir")
-        log "WARN multiple levels found, picking: $baseName"
-      fi
+      baseDir="$(echo "$baseDirs" | sed -n ${WORLD_INDEX:-1}p)"
+      baseName=$(basename "$baseDir")
+      log "WARN multiple levels found, picking: $baseName"
    elif [[ $count -gt 0 ]]; then
      baseDir="$baseDirs"
    else
      log "ERROR invalid world content"
      exit 1
    fi
-
-    if [ -d "${baseDir}_nether/DIM-1" ]; then
-      if [ -d "$baseDir/DIM-1" ]; then
-        log "WARN found Nether dimension in both $baseDir and ${baseDir}_nether, picking ${baseDir}_nether"
-        rm -r "$baseDir/DIM-1"
-      fi
-    fi
-    if [ -d "${baseDir}_the_end/DIM1" ]; then
-      if [ -d "$baseDir/DIM1" ]; then
-        log "WARN found End dimension in both $baseDir and ${baseDir}_the_end, picking ${baseDir}_the_end"
-        rm -r "$baseDir/DIM1"
-      fi
-    fi
-
-    log "Copying world..."
    rsync --remove-source-files --recursive --delete "$baseDir/" "$worldDest"
-
-    if [ "$FAMILY" = "SPIGOT" ]; then
-      if [ -d "${baseDir}_nether" ]; then
-        log "Copying Spigot Nether..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_nether/" "${worldDest}_nether"
-      elif [ -d "$worldDest/DIM-1" ]; then
-        log "Moving Nether to Spigot location..."
-        mkdir -p "${worldDest}_nether"
-        mv -f "$worldDest/DIM-1" "${worldDest}_nether/"
-      fi
-      if [ -d "${baseDir}_the_end" ]; then
-        log "Copying Spigot End..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_the_end/" "${worldDest}_the_end"
-      elif [ -d "$worldDest/DIM1" ]; then
-        log "Moving End to Spigot location..."
-        mkdir -p "${worldDest}_the_end"
-        mv -f "$worldDest/DIM1" "${worldDest}_the_end/"
-      fi
-    else
-      if [ -d "${baseDir}_nether/DIM-1" ]; then
-        log "Copying Spigot Nether to vanilla location..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_nether/DIM-1" "${worldDest}/"
-      fi
-      if [ -d "${baseDir}_the_end/DIM1" ]; then
-        log "Copying Spigot End to vanilla location..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_the_end/DIM1" "${worldDest}/"
-      fi
+    if [ "$TYPE" = "SPIGOT" ]; then
+      log "Copying end and nether ..."
+      [ -d "${baseDir}_nether" ] && rsync --remove-source-files --recursive --delete "${baseDir}_nether/" "${worldDest}_nether"
+      [ -d "${baseDir}_the_end" ] && rsync --remove-source-files --recursive --delete "${baseDir}_the_end/" "${worldDest}_the_end"
    fi
-  elif [ -d "$WORLD" ]; then
+  else
    log "Cloning world directory from $WORLD ..."
    rsync --recursive --delete "${WORLD%/}"/ "$worldDest"
-  else
-    log "ERROR: world file/directory $WORLD is missing"
-    exit 1
  fi

-  if [ "$FAMILY" = "SPIGOT" ]; then
+  if [ "$TYPE" = "SPIGOT" ]; then
    # Reorganise if a Spigot server
    log "Moving End and Nether maps to Spigot location"
    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "${worldDest}_the_end"
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -40,10 +40,6 @@ function getFilenameFromUrl() {
 }

 function isTrue() {
-  local oldState
-  oldState=$(shopt -po xtrace)
-  shopt -u -o xtrace
-
  local value=${1,,}

  result=
@@ -57,7 +53,6 @@ function isTrue() {
    ;;
  esac

-  eval "$oldState"
  return ${result}
 }

@@ -87,18 +82,7 @@ function logn() {
 }

 function log() {
-  local oldState
-  # The  return  status  when listing options is zero if all optnames are enabled, non- zero otherwise.
-  oldState=$(shopt -po xtrace || true)
-  shopt -u -o xtrace
-
-  if isDebugging || isTrue "${LOG_TIMESTAMP:-false}"; then
-    ts=" $(date --rfc-3339=seconds)"
-  else
-    ts=
-  fi
-  echo "[init]${ts} $*"
-  eval "$oldState"
+  echo "[init] $*"
 }

 function logAutopause() {
@@ -190,70 +174,9 @@ function get() {

 function isFamily() {
  for f in "${@}"; do
-    if [[ ${FAMILY^^} == "${f^^}" ]]; then
+    if [[ $FAMILY == "$f" ]]; then
      return 0
    fi
  done
  return 1
-}
-
-function isType() {
-  for t in "${@}"; do
-    # shellcheck disable=SC2153
-    if [[ $TYPE == "$t" ]]; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-function evaluateJavaCompatibilityForForge() {
-  javaRelease=$(mc-image-helper java-release)
-  if versionLessThan 1.18 && (( javaRelease > 8 )); then
-    log "**********************************************************************"
-    log "WARNING: Some mods and modpacks may require Java 8."
-    log "         Please use itzg/minecraft-server:java8"
-    log "**********************************************************************"
-    sleep 5
-  fi
-}
-
-function extract() {
-  src=${1?}
-  destDir=${2?}
-
-  type=$(file -b --mime-type "${src}")
-  case "${type}" in
-    application/zip)
-      unzip -q -d "${destDir}" "${src}"
-      ;;
-    application/x-tar|application/gzip|application/x-gzip|application/x-bzip2|application/zstd|application/x-zstd)
-      tar -C "${destDir}" -xf "${src}"
-      ;;
-    *)
-      log "ERROR: unsupported archive type: $type"
-      return 1
-      ;;
-  esac
-}
-
-function getDistro() {
-  cat /etc/os-release | grep -E "^ID=" | cut -d= -f2 | sed -e 's/"//g'
-}
-
-function checkSum() {
-  local sum_file=${1?}
-
-  # Get distro
-  distro=$(getDistro)
-  
-  if [ "${distro}" == "debian" ] && sha1sum -c "${sum_file}" --status 2> /dev/null; then
-    return 0
-  elif [ "${distro}" == "ubuntu" ] && sha1sum -c "${sum_file}" --status 2> /dev/null; then
-    return 0
-  elif [ "${distro}" == "alpine" ] && sha1sum -c "${sum_file}" -s 2> /dev/null; then
-    return 0
-  else
-    return 1
-  fi
-}
+}
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +0,0 @@
-data/
--- a/tests/fulltests/vanilla-latest/docker-compose.yml
+++ b/tests/fulltests/vanilla-latest/docker-compose.yml
--- a/tests/fulltests/test.sh
+++ b/tests/fulltests/test.sh
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# go to script root directory
-cd "$(dirname "$0")" || exit 1
-
-# compose down function for reuse
-down() {
-  docker-compose down -v --remove-orphans
-}
-
-checkandExitOnFailure(){
-  failed=$1
-  # docker-compose logs outputs messages from the specified container
-  if $failed; then
-    docker-compose logs mc
-    down
-    cd ..
-    exit 2
-  fi
-}
-
-# tests to completely spin up Minecraft and use the monitor to validate the service is running.
-fullMinecraftUpTest(){
-  folder=$1
-  cd "$folder"
-  failed=false
-  # run the monitor to validate the Minecraft image is healthy
-  docker-compose run monitor || failed=true
-  echo "${folder} Result: failed=$failed"
-  checkandExitOnFailure $failed
-  down
-  cd ..
-}
-
-# go through each folder in fulltests and run fullbuilds
-FOLDERS=$(ls)
-for folder in $FOLDERS; do
-    # If folder is a directory
-    if [ -d "$folder" ]; then
-      echo "Starting Tests on ${folder}"
-      fullMinecraftUpTest $folder
-    fi
-done
--- a/tests/setuponlytests/generic-packs-prefix/docker-compose.yml
+++ b/tests/setuponlytests/generic-packs-prefix/docker-compose.yml
@@ -6,9 +6,9 @@ services:
    environment:
      EULA: "true"
      SETUP_ONLY: "TRUE"
-      GENERIC_PACKS: testing
-      GENERIC_PACKS_PREFIX: /packs/
-      GENERIC_PACKS_SUFFIX: .zip
+      GENERIC_PACKS: https://github.com/itzg/mc-image-helper/releases/download/v1.9.5/mc-image-helper-1.9.5.zip,/packs/testing.zip
    volumes:
      - ./packs:/packs
-      - ./data:/data
+      - data:/data
+volumes:
+  data: {}
--- a/tests/setuponlytests/generic-packs-prefix/packs/testing.zip
+++ b/tests/setuponlytests/generic-packs-prefix/packs/testing.zip
--- a/tests/setuponlytests/conflicting_world_for_spigot_server/docker-compose.yml
+++ b/tests/setuponlytests/conflicting_world_for_spigot_server/docker-compose.yml
@@ -1,15 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      TYPE: "PAPER"
-      WORLD: /worlds/world-for-testing.zip
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/conflicting_world_for_spigot_server/verify.sh
+++ b/tests/setuponlytests/conflicting_world_for_spigot_server/verify.sh
@@ -1,5 +0,0 @@
-mc-image-helper assert fileExists world/level.dat && \
-mc-image-helper assert fileExists world_nether/DIM-1/some_spigot_nether_file && \
-mc-image-helper assert fileExists world_the_end/DIM1/some_spigot_end_file && \
-! mc-image-helper assert fileExists world_nether/DIM-1/some_vanilla_nether_file && \
-! mc-image-helper assert fileExists world_the_end/DIM1/some_vanilla_end_file
--- a/tests/setuponlytests/conflicting_world_for_spigot_server/worlds/world-for-testing.zip
+++ b/tests/setuponlytests/conflicting_world_for_spigot_server/worlds/world-for-testing.zip
--- a/tests/setuponlytests/conflicting_world_for_vanilla_server/docker-compose.yml
+++ b/tests/setuponlytests/conflicting_world_for_vanilla_server/docker-compose.yml
@@ -1,14 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      WORLD: /worlds/world-for-testing.zip
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/conflicting_world_for_vanilla_server/verify.sh
+++ b/tests/setuponlytests/conflicting_world_for_vanilla_server/verify.sh
@@ -1,5 +0,0 @@
-mc-image-helper assert fileExists world/level.dat && \
-mc-image-helper assert fileExists world/DIM-1/some_spigot_nether_file && \
-mc-image-helper assert fileExists world/DIM1/some_spigot_end_file && \
-! mc-image-helper assert fileExists world/DIM-1/some_vanilla_nether_file && \
-! mc-image-helper assert fileExists world/DIM1/some_vanilla_end_file
--- a/tests/setuponlytests/conflicting_world_for_vanilla_server/worlds/world-for-testing.zip
+++ b/tests/setuponlytests/conflicting_world_for_vanilla_server/worlds/world-for-testing.zip
--- a/tests/setuponlytests/forgeapimods_file/docker-compose.yml
+++ b/tests/setuponlytests/forgeapimods_file/docker-compose.yml
@@ -1,26 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      # Using custom to bypass Fabric setup
-      TYPE: CUSTOM
-      # Using family to test FORGEAPI Family filter.
-      FAMILY: FABRIC
-      CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      MODS_FORGEAPI_FILE: /config/forgeapi_mods.json
-      # Key is defined in .github/workflows/pr.yml and ci.yml
-      # This should be coming from github secrets.
-      MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
-      REMOVE_OLD_FORGEAPI_MODS: "TRUE"
-      # Validates that Fabric API gets download as a dependency.
-      MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "TRUE"
-    volumes:
-      - ./forgeapi_mods.json:/config/forgeapi_mods.json:ro
-      - ./data:/data
-      - ./fake.jar:/servers/fake.jar
--- a/tests/setuponlytests/forgeapimods_file/fake.jar
+++ b/tests/setuponlytests/forgeapimods_file/fake.jar
--- a/tests/setuponlytests/forgeapimods_file/forgeapi_mods.json
+++ b/tests/setuponlytests/forgeapimods_file/forgeapi_mods.json
@@ -1,11 +0,0 @@
-[{
-        "name": "On A Stick [FABRIC]",
-        "projectId": "550544",
-        "releaseType": "release"
-    },
-    {
-        "name": "Fabric Voice Mod",
-        "projectId": "416089",
-        "releaseType": "beta"
-    }
-]
--- a/tests/setuponlytests/forgeapimods_file/require.sh
+++ b/tests/setuponlytests/forgeapimods_file/require.sh
@@ -1 +0,0 @@
-[[ $MODS_FORGEAPI_KEY ]] || exit 1
--- a/tests/setuponlytests/forgeapimods_file/verify.sh
+++ b/tests/setuponlytests/forgeapimods_file/verify.sh
@@ -1,5 +0,0 @@
-# Validates specific beta call out for specific mod:
-mc-image-helper assert fileExists "/data/mods/voicechat-fabric*"
-mc-image-helper assert fileExists "/data/mods/onastick-fabric*"
-# Dependent of on a stick:
-mc-image-helper assert fileExists "/data/mods/fabric-api*"
--- a/tests/setuponlytests/forgeapimods_gametype/docker-compose.yml
+++ b/tests/setuponlytests/forgeapimods_gametype/docker-compose.yml
@@ -1,29 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      # Using custom to bypass Fabric setup
-      TYPE: CUSTOM
-      # Using family to test FORGEAPI Family filter.
-      FAMILY: FABRIC
-      CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      # Validate Skip Gametype Filter:
-      MODS_FORGEAPI_IGNORE_GAMETYPE: "TRUE"
-      # Validates that Biomes does not download terrablender
-      # Using default false for testing: 
-      # MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "FALSE"
-      # Contains mix of Forge and Fabric mods
-      MODS_FORGEAPI_PROJECTIDS: 306612,416089,220318
-      # Allows for Beta releases of 416089 the Fabric Voice Mod 
-      MODS_FORGEAPI_RELEASES: BETA
-      MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
-      REMOVE_OLD_FORGEAPI_MODS: "FALSE"
-    volumes:
-      - ./data:/data
-      - ./fake.jar:/servers/fake.jar
--- a/tests/setuponlytests/forgeapimods_gametype/fake.jar
+++ b/tests/setuponlytests/forgeapimods_gametype/fake.jar
--- a/tests/setuponlytests/forgeapimods_gametype/require.sh
+++ b/tests/setuponlytests/forgeapimods_gametype/require.sh
@@ -1 +0,0 @@
-[[ $MODS_FORGEAPI_KEY ]] || exit 1
--- a/tests/setuponlytests/forgeapimods_gametype/verify.sh
+++ b/tests/setuponlytests/forgeapimods_gametype/verify.sh
@@ -1,5 +0,0 @@
-mc-image-helper assert fileExists "/data/mods/BiomesOPlenty*"
-# testing dependencies don't get downloaded when download dependencies is set to false.
-! mc-image-helper assert fileExists "/data/mods/TerraBlender*"
-mc-image-helper assert fileExists "/data/mods/voicechat-fabric*"
-mc-image-helper assert fileExists "/data/mods/fabric-api*"
--- a/tests/setuponlytests/forgeapimods_projectids/docker-compose.yml
+++ b/tests/setuponlytests/forgeapimods_projectids/docker-compose.yml
@@ -1,26 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      # Using custom to bypass Fabric setup
-      TYPE: CUSTOM
-      # Validate Skip Gametype Filter for vanilla 
-      #  - Currently we do not support filtering on vanilla.
-      FAMILY: VANILLA
-      CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "TRUE"
-      # Contains mix of Forge and Fabric mods
-      MODS_FORGEAPI_PROJECTIDS: 306612,416089,220318
-      # Allows for Beta releases of 416089 the Fabric Voice Mod 
-      MODS_FORGEAPI_RELEASES: BETA
-      MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
-      REMOVE_OLD_FORGEAPI_MODS: "TRUE"
-    volumes:
-      - ./data:/data
-      - ./fake.jar:/servers/fake.jar
--- a/tests/setuponlytests/forgeapimods_projectids/fake.jar
+++ b/tests/setuponlytests/forgeapimods_projectids/fake.jar
--- a/tests/setuponlytests/forgeapimods_projectids/require.sh
+++ b/tests/setuponlytests/forgeapimods_projectids/require.sh
@@ -1 +0,0 @@
-[[ $MODS_FORGEAPI_KEY ]] || exit 1
--- a/tests/setuponlytests/forgeapimods_projectids/verify.sh
+++ b/tests/setuponlytests/forgeapimods_projectids/verify.sh
@@ -1,4 +0,0 @@
-mc-image-helper assert fileExists "/data/mods/BiomesOPlenty*"
-mc-image-helper assert fileExists "/data/mods/TerraBlender*"
-mc-image-helper assert fileExists "/data/mods/voicechat-fabric*"
-mc-image-helper assert fileExists "/data/mods/fabric-api*"
--- a/tests/setuponlytests/generic-packs-prefix/verify.sh
+++ b/tests/setuponlytests/generic-packs-prefix/verify.sh
@@ -1 +0,0 @@
-mc-image-helper assert fileExists one.txt mods/two.txt
--- a/tests/setuponlytests/generic-packs/docker-compose.yml
+++ b/tests/setuponlytests/generic-packs/docker-compose.yml
@@ -1,24 +0,0 @@
-version: "3"
-
-services:
-  web:
-    image: nginx
-    volumes:
-      - ./web:/usr/share/nginx/html
-  mc:
-    depends_on:
-      - web
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "true"
-      SETUP_ONLY: "true"
-      GENERIC_PACKS: http://web/configs.zip,/packs/testing.zip
-      LOG_TIMESTAMP: "true"
-      # the following are only used to speed up test execution
-      TYPE: CUSTOM
-      CUSTOM_SERVER: /servers/fake.jar
-      VERSION: 1.18.1
-    volumes:
-      - ./packs:/packs
-      - ./data:/data
-      - ./fake.jar:/servers/fake.jar
--- a/tests/setuponlytests/generic-packs/fake.jar
+++ b/tests/setuponlytests/generic-packs/fake.jar
--- a/tests/setuponlytests/generic-packs/packs/testing.zip
+++ b/tests/setuponlytests/generic-packs/packs/testing.zip
--- a/tests/setuponlytests/generic-packs/verify.sh
+++ b/tests/setuponlytests/generic-packs/verify.sh
@@ -1,2 +0,0 @@
-mc-image-helper assert fileExists one.txt mods/two.txt
-mc-image-helper assert fileExists config/opt.yml
--- a/tests/setuponlytests/generic-packs/web/configs.zip
+++ b/tests/setuponlytests/generic-packs/web/configs.zip
--- a/tests/setuponlytests/ops_from_scratch/verify.sh
+++ b/tests/setuponlytests/ops_from_scratch/verify.sh
@@ -1,3 +0,0 @@
-mc-image-helper assert jsonPathEquals --file=ops.json --path='$[0].name' --expect=itzg
-mc-image-helper assert jsonPathEquals --file=ops.json --path='$[0].uuid' --expect=5cddfd26-fc86-4981-b52e-c42bb10bfdef
-mc-image-helper assert jsonPathEquals --file=ops.json --path='$[0].level' --expect=4
--- a/tests/setuponlytests/spigot_world_for_spigot_server/verify.sh
+++ b/tests/setuponlytests/spigot_world_for_spigot_server/verify.sh
@@ -1,4 +0,0 @@
-mc-image-helper assert fileExists world/level.dat && \
-mc-image-helper assert fileExists world/some_overworld_file && \
-mc-image-helper assert fileExists world_nether/DIM-1/some_nether_file && \
-mc-image-helper assert fileExists world_the_end/DIM1/some_end_file
--- a/tests/setuponlytests/spigot_world_for_spigot_server/worlds/world-for-testing.zip
+++ b/tests/setuponlytests/spigot_world_for_spigot_server/worlds/world-for-testing.zip
--- a/tests/setuponlytests/spigot_world_for_vanilla_server/docker-compose.yml
+++ b/tests/setuponlytests/spigot_world_for_vanilla_server/docker-compose.yml
@@ -1,14 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      WORLD: /worlds/world-for-testing.zip
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/spigot_world_for_vanilla_server/verify.sh
+++ b/tests/setuponlytests/spigot_world_for_vanilla_server/verify.sh
@@ -1,4 +0,0 @@
-mc-image-helper assert fileExists world/level.dat && \
-mc-image-helper assert fileExists world/some_overworld_file && \
-mc-image-helper assert fileExists world/DIM-1/some_nether_file && \
-mc-image-helper assert fileExists world/DIM1/some_end_file
--- a/tests/setuponlytests/spigot_world_for_vanilla_server/worlds/world-for-testing.zip
+++ b/tests/setuponlytests/spigot_world_for_vanilla_server/worlds/world-for-testing.zip
--- a/tests/setuponlytests/test.sh
+++ b/tests/setuponlytests/test.sh
@@ -1,61 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-# go to script root directory
-cd "$(dirname "$0")" || exit 1
-
-# tests that only run the setup files for things like downloads and configuration.
-setupOnlyMinecraftTest(){
-  folder=$1
-  cd "$folder"
-  result=0
-
-  if [ -f require.sh ]; then
-    # require.sh scripts can check for environment variables, etc that are required for the test.
-    # The script should exit with a non-zero status to indicate the test requirements are missing
-    # and the test should be skipped
-    if ! bash require.sh; then
-      echo "${folder} SKIP"
-      cd ..
-      return 0
-    fi
-  fi
-
-  if ! logs=$(docker-compose run mc 2>&1); then
-    echo "${folder} test scenario FAILED"
-    echo ":::::::::::: LOGS ::::::::::::::::
-$logs
-::::::::::::::::::::::::::::::::::
-"
-    result=1
-  elif [ -f verify.sh ]; then
-    if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
-      echo "${folder} verify FAILED"
-      result=1
-    else
-      echo "${folder} verify PASS"
-    fi
-  else
-    echo "${folder} PASS"
-  fi
-
-  docker-compose down -v --remove-orphans > /dev/null
-  cd ..
-
-  return $result
-}
-
-# go through each folder in setuponly and test setups
-if (( $# > 0 )); then
-  for folder in "$@"; do
-    echo "Starting Tests in ${folder}"
-    setupOnlyMinecraftTest "$folder"
-  done
-else
-  readarray -t folders < <(find . -maxdepth 2 -mindepth 2 -name docker-compose.yml -printf '%h\n')
-  for folder in "${folders[@]}"; do
-    echo "Starting Tests in ${folder}"
-    setupOnlyMinecraftTest "$folder"
-  done
-fi
--- a/tests/setuponlytests/vanilla_world_for_spigot_server/docker-compose.yml
+++ b/tests/setuponlytests/vanilla_world_for_spigot_server/docker-compose.yml
@@ -1,15 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      TYPE: "PAPER"
-      WORLD: /worlds/world-for-testing.zip
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/vanilla_world_for_spigot_server/verify.sh
+++ b/tests/setuponlytests/vanilla_world_for_spigot_server/verify.sh
@@ -1,3 +0,0 @@
-mc-image-helper assert fileExists world/level.dat && \
-mc-image-helper assert fileExists world_nether/DIM-1/some_nether_file && \
-mc-image-helper assert fileExists world_the_end/DIM1/some_end_file
--- a/tests/setuponlytests/vanilla_world_for_spigot_server/worlds/world-for-testing.zip
+++ b/tests/setuponlytests/vanilla_world_for_spigot_server/worlds/world-for-testing.zip
--- a/tests/setuponlytests/vanilla_world_for_vanilla_server/docker-compose.yml
+++ b/tests/setuponlytests/vanilla_world_for_vanilla_server/docker-compose.yml
@@ -1,14 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      WORLD: /worlds/world-for-testing.zip
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/vanilla_world_for_vanilla_server/verify.sh
+++ b/tests/setuponlytests/vanilla_world_for_vanilla_server/verify.sh
@@ -1,3 +0,0 @@
-mc-image-helper assert fileExists world/level.dat && \
-mc-image-helper assert fileExists world/DIM-1/some_nether_file && \
-mc-image-helper assert fileExists world/DIM1/some_end_file
--- a/tests/setuponlytests/vanilla_world_for_vanilla_server/worlds/world-for-testing.zip
+++ b/tests/setuponlytests/vanilla_world_for_vanilla_server/worlds/world-for-testing.zip
--- a/tests/setuponlytests/vanillatweaks_file/docker-compose.yml
+++ b/tests/setuponlytests/vanillatweaks_file/docker-compose.yml
@@ -1,17 +0,0 @@
-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/vt-datapacks.json,/config/vt-craftingtweaks.json,/config/vt-resourcepacks.json
-      REMOVE_OLD_VANILLATWEAKS: "FALSE"
-    volumes:
-      - ./data:/data
-      - ./vt-datapacks.json:/config/vt-datapacks.json:ro
-      - ./vt-craftingtweaks.json:/config/vt-craftingtweaks.json:ro
-      - ./vt-resourcepacks.json:/config/vt-resourcepacks.json:ro
--- a/tests/setuponlytests/vanillatweaks_file/verify.sh
+++ b/tests/setuponlytests/vanillatweaks_file/verify.sh
@@ -1,4 +0,0 @@
-mc-image-helper assert fileExists "/data/world/datapacks/afk*"
-mc-image-helper assert fileExists "/data/world/datapacks/graves*"
-mc-image-helper assert fileExists "/data/world/datapacks/craftingtweaks*"
-mc-image-helper assert fileExists "/data/resourcepacks/resourcepacks*"
--- a/tests/setuponlytests/vanillatweaks_file/vt-craftingtweaks.json
+++ b/tests/setuponlytests/vanillatweaks_file/vt-craftingtweaks.json
@@ -1,12 +0,0 @@
-{
-    "type": "craftingtweaks",
-    "version": "1.18",
-    "packs": {
-        "quality of life": [
-            "dropper to dispenser",
-            "double slabs",
-            "back to blocks"
-        ]
-    },
-    "result": "ok"
-}
--- a/tests/setuponlytests/vanillatweaks_file/vt-resourcepacks.json
+++ b/tests/setuponlytests/vanillatweaks_file/vt-resourcepacks.json
@@ -1,8 +0,0 @@
-{
-    "type": "resourcepacks",
-    "version": "1.18",
-    "packs": {
-        "aesthetic": ["CherryPicking", "BlackNetherBricks", "AlternateBlockDestruction"]
-    },
-    "result": "ok"
-}
--- a/tests/setuponlytests/vanillatweaks_sharecode/docker-compose.yml
+++ b/tests/setuponlytests/vanillatweaks_sharecode/docker-compose.yml
@@ -1,14 +0,0 @@
-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,tF1zL2,LnEDwT
-      REMOVE_OLD_VANILLATWEAKS: "FALSE"
-    volumes:
-      - ./data:/data
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Geoff Bourne	0a2e6721fb	Installed GNU-style `find` package #1127	2022-01-06 22:11:26 -06:00
Geoff Bourne	5461107b83	Merged latest from master	2022-01-06 21:56:50 -06:00
Geoff Bourne	5356c76dd6	Merged latest from master	2021-12-23 16:07:34 -06:00
Geoff Bourne	bd97029446	Auto-merging via docker-versions-create	2021-12-13 21:27:47 -06:00
Geoff Bourne	6537cfb5b5	Auto-merging via docker-versions-create	2021-12-12 19:51:09 -06:00
Geoff Bourne	6729ba462e	Merge branch 'master' of github.com:itzg/docker-minecraft-server	2021-12-12 15:35:14 -06:00
Geoff Bourne	4b28d5e472	fix: qualify Fabric server jar by installer version Fixes #1191	2021-12-12 15:28:30 -06:00
Geoff Bourne	51002c956e	Merging latest from master	2021-12-12 09:01:39 -06:00
Geoff Bourne	de62cf8dc7	Auto-merging via docker-versions-create	2021-12-11 16:23:55 -06:00
Geoff Bourne	3f2022da40	Merge branch 'master' of github.com:itzg/docker-minecraft-server	2021-12-11 16:23:25 -06:00
Geoff Bourne	0f7464403c	build: added github release creation step to docker-versions-create.sh	2021-12-11 16:09:15 -06:00
Geoff Bourne	c9d5ad7530	Auto-merging via docker-versions-create	2021-12-10 21:01:24 -06:00
Geoff Bourne	1be933bd63	Auto-merging via docker-versions-create	2021-12-10 10:41:48 -06:00
Geoff Bourne	99b792dec1	Auto-merging via docker-versions-create	2021-12-10 07:56:57 -06:00
Geoff Bourne	ee5267cf41	Merge branch 'master' into java8	2021-12-06 22:20:24 -06:00
Geoff Bourne	0a46d0382e	build: also run tests with java8	2021-12-06 22:16:50 -06:00
Geoff Bourne	cc61497f7e	build: test 1.12.2 with java8	2021-12-06 22:15:32 -06:00
Geoff Bourne	2c2cbadd9a	build: fixed combined test/build jobs	2021-12-06 22:11:43 -06:00
Geoff Bourne	bfc29d289d	Auto-merging via docker-versions-create	2021-12-06 22:04:39 -06:00
Geoff Bourne	84a1313261	Auto-merging via docker-versions-create	2021-12-04 09:59:45 -06:00
Geoff Bourne	39bcfddf3c	Auto-merging via docker-versions-create	2021-12-02 19:46:33 -06:00
Geoff Bourne	e6ea8197aa	Auto-merging via docker-versions-create	2021-11-24 15:57:25 -06:00
Geoff Bourne	0184c095fc	Auto-merging via docker-versions-create	2021-11-24 14:34:08 -06:00
Geoff Bourne	524a7e21f3	Merge branch 'master' into java8	2021-11-16 18:57:49 -06:00
Geoff Bourne	f817cae945	Merge latest from master	2021-11-16 18:51:22 -06:00
Geoff Bourne	675d05920b	Auto-merging via docker-versions-create	2021-11-15 20:48:02 -06:00
Geoff Bourne	106a7132d4	Auto-merging via docker-versions-create	2021-11-13 19:17:46 -06:00
Geoff Bourne	0e04a10efa	Auto-merging via docker-versions-create	2021-11-13 18:52:19 -06:00
Geoff Bourne	0d8df635d6	Auto-merging via docker-versions-create	2021-11-12 21:24:10 -06:00
Geoff Bourne	e0dedc194d	Auto-merging via docker-versions-create	2021-11-06 21:36:59 -05:00
Geoff Bourne	ef32e8ed4c	Auto-merging via docker-versions-create	2021-11-04 21:03:18 -05:00
Geoff Bourne	489b583ad7	Auto-merging via docker-versions-create	2021-10-31 09:44:37 -05:00
Geoff Bourne	8c4dff22fb	Switched base image to JDK #1064	2021-10-27 21:23:27 -05:00
Geoff Bourne	455f31c9d8	Auto-merging via docker-versions-create	2021-10-25 19:22:48 -05:00
Geoff Bourne	bac1bfb5dc	Auto-merging via docker-versions-create	2021-10-24 20:25:05 -05:00
Geoff Bourne	9994c64b51	Auto-merging via docker-versions-create	2021-10-23 09:42:03 -05:00
Geoff Bourne	92079fc01f	Merged latest from master	2021-10-21 21:55:29 -05:00
Geoff Bourne	98378130f2	Fixed Crucible libraries unzip for Alpine #1052	2021-10-19 21:17:54 -05:00
Geoff Bourne	42856da49d	Auto-merged latest from master	2021-10-18 22:08:22 -05:00
Geoff Bourne	83b05609d3	Added support for Crucible server type #1052	2021-10-18 22:01:52 -05:00
Geoff Bourne	21fab1bf41	Auto-merging via docker-versions-create	2021-10-17 14:51:54 -05:00
Geoff Bourne	2849359a11	Auto-merging via docker-versions-create	2021-10-15 18:56:01 -05:00
Geoff Bourne	cd337f34da	Auto-merging via docker-versions-create	2021-10-15 18:46:01 -05:00
Geoff Bourne	7a9aa760a2	Auto-merging via docker-versions-create	2021-10-10 09:55:28 -05:00
Geoff Bourne	2fd405ec5b	Auto-merging via docker-versions-create	2021-10-09 15:24:22 -05:00
Geoff Bourne	cbfe9a069c	Merged latest from master	2021-10-09 12:02:02 -05:00
Geoff Bourne	2db61fd72f	Auto-merging via docker-versions-create	2021-10-02 19:21:27 -05:00
Geoff Bourne	6e2073fda5	Auto-merging via docker-versions-create	2021-09-29 10:26:44 -05:00
Geoff Bourne	ae48a8710e	Auto-merging via docker-versions-create	2021-09-27 20:40:23 -05:00
Geoff Bourne	3b54a9fd67	Auto-merging via docker-versions-create	2021-09-20 12:29:36 -05:00
Geoff Bourne	a66efb1a4f	Auto-merging via docker-versions-create	2021-09-15 21:30:00 -05:00
Geoff Bourne	83938d8989	Auto-merging via docker-versions-create	2021-09-15 21:05:30 -05:00
Geoff Bourne	8335b81bd8	Merged latest from master	2021-09-15 21:01:21 -05:00
Geoff Bourne	b9c379ec6c	Auto-merging via docker-versions-create	2021-09-15 20:35:51 -05:00
Geoff Bourne	b9ecbf7497	Auto-merging via docker-versions-create	2021-08-30 21:36:02 -05:00
Geoff Bourne	eca00e88bf	Auto-merging via docker-versions-create	2021-08-10 12:55:04 -05:00
Geoff Bourne	2a3169344d	Auto-merging via docker-versions-create	2021-08-01 12:11:15 -05:00
Geoff Bourne	8ec4f0d244	Auto-merging via docker-versions-create	2021-07-31 09:26:17 -05:00
Geoff Bourne	d45250ebf2	Auto-merging via docker-versions-create	2021-07-26 19:34:15 -05:00
Geoff Bourne	03110aef99	Merged latest from master	2021-07-25 09:58:03 -05:00
Geoff Bourne	f344e7e823	Auto-merging via docker-versions-create	2021-07-25 09:35:30 -05:00
Geoff Bourne	c7fcaf1ec6	Auto-merging via docker-versions-create	2021-07-23 21:26:32 -05:00
Geoff Bourne	9d700041a7	Auto-merging via docker-versions-create	2021-07-17 21:13:39 -05:00
Geoff Bourne	4af4ed69a5	Auto-merging via docker-versions-create	2021-07-17 20:56:25 -05:00
Geoff Bourne	d215c14996	Auto-merging via docker-versions-create	2021-07-17 18:02:29 -05:00
Geoff Bourne	4716254b5b	Auto-merging via docker-versions-create	2021-07-14 18:43:03 -05:00
Geoff Bourne	3c2b7f0718	Auto-merging via docker-versions-create	2021-07-12 19:08:38 -05:00
Geoff Bourne	0fd43f5a05	Auto-merging via docker-versions-create	2021-07-09 19:57:21 -05:00
Geoff Bourne	fae6479453	Auto-merging via docker-versions-create	2021-07-08 17:58:19 -05:00
Geoff Bourne	d9df5bf773	Auto-merging via docker-versions-create	2021-07-08 08:02:40 -05:00
itzg	13d7248c38	Auto-merging via docker-versions-create	2021-07-08 12:55:55 +00:00
Geoff Bourne	3c54954057	Auto merge branch with master	2021-07-08 07:37:23 -05:00
itzg	84823a559d	Auto-merging via docker-versions-create	2021-07-07 14:56:34 +00:00
itzg	d543df768b	Auto-merging via docker-versions-create	2021-07-06 12:22:19 +00:00
itzg	74968389a2	Auto-merging via docker-versions-create	2021-07-05 12:10:23 +00:00
itzg	1701718515	Auto-merging via docker-versions-create	2021-07-04 19:53:56 +00:00
Geoff Bourne	ed6937654c	Auto-merging from master	2021-07-03 14:22:14 -05:00
Geoff Bourne	73eb6e2e45	Auto-merge from master	2021-07-02 15:52:08 -05:00
itzg	8b982472a4	Auto-merging via docker-versions-create	2021-07-02 16:55:49 +00:00
itzg	ab406727d6	Auto-merging via docker-versions-create	2021-06-28 12:13:57 +00:00
itzg	5fc74a45f7	Auto-merging via docker-versions-create	2021-06-27 13:13:05 +00:00
itzg	17ecd48cd8	Auto-merging via docker-versions-create	2021-06-24 12:46:59 +00:00
Geoff Bourne	4732ce27a6	Auto-merging via docker-versions-create	2021-06-23 22:32:34 -05:00
Geoff Bourne	6e10768e7f	ci: test java8 with VERSION=1.16.5	2021-06-20 13:49:02 -05:00
Geoff Bourne	bb47a3705d	Auto merge branch with master	2021-06-20 12:46:28 -05:00
Geoff Bourne	c3e1e92547	Auto-merging via docker-versions-create	2021-06-20 12:46:25 -05:00
Geoff Bourne	9ddd768f44	Auto-merging via docker-versions-create	2021-06-05 17:49:30 -05:00
Geoff Bourne	62e1ff8ffa	Restored correct ps usage for autopause in Alpine #897	2021-05-27 08:22:17 -05:00
Geoff Bourne	5f95d135f5	Auto-merging via docker-versions-create	2021-05-24 20:49:44 -05:00
Geoff Bourne	8e32d26b0f	Merge branch 'master' into java8	2021-05-23 12:26:33 -05:00
Geoff Bourne	573f064970	Merge from master	2021-05-22 12:58:53 -05:00
Geoff Bourne	0bc6f4075b	Auto-merging via docker-versions-create	2021-05-21 23:01:07 -05:00
Geoff Bourne	4ebcc0ef48	Auto-merging via docker-versions-create	2021-05-21 22:47:21 -05:00
Geoff Bourne	57720cf394	Merge branch 'master' into java8	2021-05-21 22:15:35 -05:00
Geoff Bourne	64b2783f19	ci: restored changes for java8	2021-05-21 17:18:57 -05:00
Geoff Bourne	1dbdd7628a	Merge branch 'master' into java8	2021-05-21 17:04:24 -05:00
Geoff Bourne	4252ec710f	ci: use CACHE_NAME in main.yml	2021-05-21 17:04:11 -05:00
Geoff Bourne	11d455c284	Merge branch 'master' into java8 # Conflicts: # Dockerfile	2021-05-21 17:02:17 -05:00
Geoff Bourne	08bc419dc8	Auto-merging via docker-versions-create	2021-05-19 20:27:11 -05:00
Geoff Bourne	67c23017d0	Auto-merging via docker-versions-create	2021-05-19 20:24:31 -05:00
Geoff Bourne	6e1ba3667c	Auto-merging via docker-versions-create	2021-05-19 20:18:57 -05:00
Geoff Bourne	0c2f8b903b	Auto-merging via docker-versions-create	2021-05-15 12:40:56 -05:00
Geoff Bourne	b9335d9cd6	Auto-merging via docker-versions-create	2021-05-06 20:12:25 -05:00
Geoff Bourne	0d92092b90	Auto-merging via docker-versions-create	2021-04-30 14:27:40 -05:00
Geoff Bourne	e653a41b3f	Auto-merging via docker-versions-create	2021-04-30 11:11:19 -05:00
Geoff Bourne	82e63c54c4	Auto-merging via docker-versions-create	2021-04-28 16:50:55 -05:00
Geoff Bourne	f9c573f598	Auto-merging via docker-versions-create	2021-04-26 08:20:41 -05:00
Geoff Bourne	bf8b9cf20d	Auto-merging via docker-versions-create	2021-04-24 13:42:07 -05:00
Geoff Bourne	0dd5a412d9	Auto-merging via docker-versions-create	2021-04-23 21:02:46 -05:00
Geoff Bourne	b389561091	Auto-merging via docker-versions-create	2021-04-18 13:29:12 -05:00
Geoff Bourne	6ee055761d	Merge branch 'master' into java8	2021-04-11 10:41:32 -05:00
Geoff Bourne	49f9ff645e	Auto-merging via docker-versions-create	2021-04-11 10:08:47 -05:00
Geoff Bourne	004cbdb9f7	Auto-merging via docker-versions-create	2021-04-08 19:12:56 -05:00
Geoff Bourne	45856a1a81	Auto-merging via docker-versions-create	2021-04-01 16:30:55 -05:00
Geoff Bourne	1e615e76e8	Merge branch 'master' into java8 # Conflicts: # start-configuration # start-deployCF	2021-03-18 19:58:16 -05:00
Geoff Bourne	1c85a685de	Added support for CF modpacks using settings.cfg #772 #800	2021-03-14 15:02:40 -05:00
Geoff Bourne	7cd207f40b	docs: Added more info about getbukkit's weird 1.8 file naming #103	2021-03-13 16:54:56 -06:00
Geoff Bourne	140a8aa90c	Merge branch 'master' into java8	2021-03-11 19:40:26 -06:00
Geoff Bourne	76dcff9d18	Merge branch 'master' into java8	2021-03-11 17:23:48 -06:00
Geoff Bourne	a9a86d249b	Merge branch 'master' into java8 # Conflicts: # start-configuration	2021-03-06 16:23:07 -06:00
Geoff Bourne	595760d301	Shifted PATH-fix earlier in startup	2021-03-06 16:04:06 -06:00
Geoff Bourne	6d3f194ce3	Merge from master	2021-02-27 20:47:00 -06:00
Geoff Bourne	21c1620f0c	misc: java is actually found in /usr/bin by default	2021-02-11 15:05:45 -06:00
Geoff Bourne	e78e5af96d	Fix PATH to include java when needed	2021-02-10 14:49:13 -06:00
Geoff Bourne	0fb9700fc7	Auto-merging via docker-versions-create	2021-02-10 14:01:35 -06:00
Geoff Bourne	18925ef32c	Merged latest from master	2021-02-08 21:16:50 -06:00
Geoff Bourne	f06b990f8a	Auto-merging via docker-versions-create	2021-02-07 18:03:40 -06:00
Geoff Bourne	75844ae81a	Fix java8 base image to actually be Java 8 #753	2021-02-07 11:10:38 -06:00
Geoff Bourne	6bb2323c46	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in docker-versions-create.sh Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.	2021-02-07 09:07:30 -06:00
Geoff Bourne	7814ca21b5	Merge branch 'master' into java8 # Conflicts: # README.md # start-configuration	2021-01-30 18:56:33 -06:00
Geoff Bourne	b8806629ec	Merged latest from master	2021-01-30 16:48:11 -06:00
Geoff Bourne	4a7f838a0f	Upgraded mainline/latest to Java 11	2021-01-30 16:16:36 -06:00
Geoff Bourne	2d07dee4df	Prepared forge branch's Dockerfile	2021-01-30 15:58:03 -06:00
				`@@ -1 +0,0 @@`
				`mc-image-helper assert fileExists one.txt mods/two.txt`