Auto-merging via docker-versions-create

2026-02-20 08:16:24 +00:00 · 2022-01-23 22:23:50 -06:00 · 2022-01-23 11:00:29 -06:00 · 2022-01-20 23:10:38 +00:00 · 2022-01-17 13:24:44 -06:00 · 2022-01-10 06:57:51 -06:00
93 changed files with 379 additions and 986 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -3,60 +3,29 @@ on:
  push:
    branches:
      - master
+      - java8-multiarch
+      - java8-openj9
+      - java11*
+      - java16*
+      - java17*
      - test/**
    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:
    if: github.repository == 'itzg/docker-minecraft-server'
-    strategy:
-      fail-fast: false
-      matrix:
-        variant:
-          - java17
-          - java17-openj9
-          - java8-multiarch
-          - java8-openj9
-          - java11
-          - java11-openj9
-        include:
-          - variant: java17
-            baseImage: eclipse-temurin:17
-            tagPrefix: java17-
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: LATEST
-          - variant: java17-openj9
-            baseImage: ibm-semeru-runtimes:open-17-jdk
-            tagPrefix: java17-openj9-
-            platforms: linux/amd64,linux/arm64
-            mcVersion: LATEST
-          - variant: java8-multiarch
-            baseImage: eclipse-temurin:8-jdk
-            tagPrefix: java8-
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-          - variant: java8-openj9
-            baseImage: ibm-semeru-runtimes:open-8-jdk
-            tagPrefix: java8-openj9-
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-          - variant: java11
-            baseImage: adoptopenjdk:11-jdk-hotspot
-            tagPrefix: java11-
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: 1.16.5
-          - variant: java11-openj9
-            baseImage: ibm-semeru-runtimes:open-11-jdk
-            tagPrefix: java11-openj9-
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.16.5
-    env:
-      IMAGE_TO_TEST: itzg/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
@@ -69,13 +38,10 @@ jobs:
          images: |
            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
@@ -90,37 +56,38 @@ jobs:
          password: ${{ secrets.DOCKER_PASSWORD }}

      - 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' || startsWith(github.ref_name, 'test/')
        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 }}
-          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' || startsWith(github.ref_name, 'test/')
        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
+          push: true
          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 }}
-          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
@@ -27,7 +27,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
@@ -36,7 +36,7 @@ jobs:
          cache-from: type=gha

      - name: Run Setup Only Tests
-        run: bash tests/setuponlytests/test.sh
+        run: sh tests/setuponlytests/test.sh

      # - name: Run Full Minecraft Service Tests
      #   run: |
--- a/.github/workflows/discord.yml
+++ b/.github/workflows/discord.yml
@@ -1,4 +1,4 @@
-name: Discord notifications
+name: discord

 on:
  workflow_run:
--- a/.github/workflows/issue-label.yml
+++ b/.github/workflows/issue-label.yml
@@ -1,11 +1,9 @@
-name: Issue labels
-
 on:
  issues:
    types: [labeled]

 env:
-  DISCORD_WEBHOOK: ${{ secrets.DISCORD_ISSUES_WEBHOOK }}
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

 jobs:
  labelNotify:
@@ -13,13 +11,7 @@ jobs:
    timeout-minutes: 5
    steps:
      - name: notify
-        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'
+        if: github.event.label.name == 'enhancement' || github.event.label.name == 'bug'
        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"
+          args: "[${{ github.event.issue.title }}](<${{ github.event.issue.html_url }}>) added `${{ github.event.label.name }}` label"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,9 +4,16 @@ 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 }}
@@ -46,7 +53,7 @@ jobs:
        password: ${{ secrets.DOCKER_PASSWORD }}

    - name: Build for test
-      uses: docker/build-push-action@v2.9.0
+      uses: docker/build-push-action@v2.7.0
      if: github.ref_name == 'java8'
      with:
        context: .
@@ -68,7 +75,7 @@ jobs:

    - name: Build and push
      id: docker_build
-      uses: docker/build-push-action@v2.9.0
+      uses: docker/build-push-action@v2.7.0
      with:
        context: .
        file: ./Dockerfile
@@ -85,4 +92,6 @@ jobs:
          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 }}
-          org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
+
+    - name: Image digest
+      run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -24,7 +24,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 +53,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/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -15,24 +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:
-```powershell
-$env:IMAGE_TO_TEST="mc-dev"
-docker build -t $env:IMAGE_TO_TEST .
-pushd tests/setuponlytests/vanillatweaks_file/
-docker-compose run mc
-docker-compose down --remove-orphans
-popd
-```
-
-Bash:
-```bash
-export IMAGE_TO_TEST=mc-dev
-docker build -t $IMAGE_TO_TEST .
-pushd tests/setuponlytests/vanillatweaks_file/
-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.
--- a/45
+++ b/45
@@ -1,32 +1,31 @@
-ARG BASE_IMAGE=openjdk:8-jdk-alpine
-FROM ${BASE_IMAGE}
+FROM adoptopenjdk:8-jdk-openj9

-RUN apk add --no-cache -U \
-    openssl \
+LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
+
+RUN apt-get update \
+  && DEBIAN_FRONTEND=noninteractive \
+  apt-get install -y \
  imagemagick \
  file \
-    lsof \
-    su-exec \
-    # GNU compatible 'find'
-    findutils \
-    shadow \
-    bash \
-    curl iputils \
+  gosu \
+  sudo \
+  net-tools \
+  iputils-ping \
+  curl \
  git \
  jq \
+  dos2unix \
  mysql-client \
  tzdata \
  rsync \
  nano \
-    sudo \
-    knock \
+  unzip \
+  knockd \
  ttf-dejavu \
-    zstd
+  && apt-get clean

-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
+RUN addgroup --gid 1000 minecraft \
+  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft

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

@@ -34,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=linux
-ARG TARGETARCH=amd64
-ARG TARGETVARIANT=""
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETVARIANT

 ARG EASY_ADD_VER=0.7.1
 ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
@@ -62,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.5
+ARG MC_HELPER_VERSION=1.16.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 - \
@@ -74,7 +73,7 @@ WORKDIR /data
 STOPSIGNAL SIGTERM

 ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  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,8 @@ 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)
+      * [<strong>ForgeAPI</strong> usage to use non-version specific projects](#forgeapi-usage-to-use-non-version-specific-projects)
+      * [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)
@@ -134,7 +134,6 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [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 +141,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: Sun Feb  6 18:45:39 UTC 2022 -->
+<!-- Added by: runner, at: Mon Jan 24 04:19:37 UTC 2022 -->

 <!--te-->

@@ -245,8 +244,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
@@ -394,7 +391,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`.

@@ -747,9 +744,9 @@ 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
+### **ForgeAPI** usage to use non-version specific projects

-**NOTE:** This potentially could lead to unexpected behavior if the Mod receives an update with unexpected behavior.
+**NOTE:** This potentially could lead to unexpected behavior if the Mod recieves an update with unexpected behavior.

 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.

@@ -759,7 +756,6 @@ Parameters to use the ForgeAPI:
 * `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.
 * `REMOVE_OLD_FORGEAPI_MODS` - Default is False
 * `REMOVE_OLD_DATAPACKS_DEPTH` - Default is 1
 * `REMOVE_OLD_DATAPACKS_INCLUDE` - Default is *.jar
@@ -772,13 +768,7 @@ Example of expected forge api project ids, releases, and key:
  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.
+Example of expected ForgeAPI file format: **Note**: name is currently unused, but can be used to document each entry.

 ```json
 [
@@ -791,33 +781,15 @@ Example of expected ForgeAPI file format.
      "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
+### Generic pack file

-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.
+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.  

-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 

@@ -896,9 +868,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`
@@ -909,19 +878,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",
@@ -929,39 +892,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,20 +1534,6 @@ To enable the JVM flags required to fully support the [Flare profiling suite](ht
    
 Flare is built-in to Airplane/Pufferfish/Purpur, and is available in [plugin form](https://github.com/TECHNOVE/FlarePlugin) for other server types.

-### Enable 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

 ### Description
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -3,6 +3,12 @@
 # Use this variable to indicate a list of branches that docker hub is watching
 branches_list=(
  'java8'
+  'java8-multiarch'
+  'java8-openj9'
+  'java11'
+  'java11-openj9'
+  'java17'
+  'java17-openj9'
  )

 function TrapExit {
--- a/files/autopause/autopause-fcns.sh
+++ b/files/autopause/autopause-fcns.sh
@@ -5,15 +5,15 @@ current_uptime() {
 }

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

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

 rcon_client_exists() {
-  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
+  [[ -n "$(ps -ax -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 = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
+ command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
 tcpflags = syn
 [unpauseMCServer-rcon]
 sequence = 25575
 seq_timeout = 1
- command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
+ command = /usr/sbin/gosu 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 -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
+if [[ $( ps -ax -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 -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
+if [[ $( ps -ax -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
@@ -40,7 +40,7 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
    echo 'hosts: files dns' > /etc/nsswitch.conf
  fi

-  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration "$@"
+  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration "$@"
 else
  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}:/opt/java/openjdk/bin"
 fi

 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
@@ -119,31 +116,27 @@ 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" "$@"
+    exec ${SCRIPTS:-/}start-deployFabric "$@"
  ;;

  FTBA)
-    log "ERROR: TYPE=FTBA is not supported with this image variant."
-    log "       Use itzg/minecraft-server:java8-multiarch instead."
-    exit 1
+    exec ${SCRIPTS:-/}start-deployFTBA "$@"
  ;;

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

  VANILLA)
@@ -151,47 +144,43 @@ 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)
--- a/scripts/start-deployAirplane
+++ b/scripts/start-deployAirplane
@@ -42,5 +42,6 @@ fi

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

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

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

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployCF
+++ b/scripts/start-deployCF
@@ -111,8 +111,6 @@ 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
@@ -44,5 +44,6 @@ fi

 # Normalize on Spigot for later operations
 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,7 +47,6 @@ 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
@@ -56,6 +55,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,6 +30,6 @@ else

 fi

+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-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
@@ -74,5 +74,6 @@ fi

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

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

 # Normalize on Spigot for later operations
 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
@@ -31,5 +31,6 @@ fi

 # Normalize on Spigot for later operations
 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
@@ -48,10 +134,6 @@ elif isType PURPUR && versionLessThan 1.17; then
 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 +169,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

@@ -249,10 +331,6 @@ EOF
 elif [[ $SERVER =~ 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}"
 else
  # If we have a bootstrap.txt file... feed that in to the server stdin
--- 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
@@ -7,7 +7,6 @@ set -e -o pipefail
 : "${MODS_FORGEAPI_PROJECTIDS:=}"
 : "${MODS_FORGEAPI_FILE:=}"
 : "${MODS_FORGEAPI_RELEASES:=RELEASE}"
-: "${MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES:=false}"
 : "${REMOVE_OLD_MODS_DEPTH:=1} "
 : "${REMOVE_OLD_MODS_INCLUDE:=*.jar}"

@@ -37,11 +36,11 @@ ensureModKey(){
 # NOTE: downcasing release type for comparing types.
 updateReleaseNumber(){
  releaseType=$1
-  if [ "release" = "${releaseType,,}" ] || [ 1 = "${releaseType,,}" ]; then
+  if [ "release" = "${releaseType,,}" ]; then
    RELEASE_NUMBER_FILTER=1
-  elif [ "beta" = "${releaseType,,}" ] || [ 2 = "${releaseType,,}" ]; then
+  elif [ "beta" = "${releaseType,,}" ]; then
    RELEASE_NUMBER_FILTER=2
-  elif [ "alpha" = "${releaseType,,}" ] || [ 3 = "${releaseType,,}" ]; then
+  elif [ "alpha" = "${releaseType,,}" ]; then
    RELEASE_NUMBER_FILTER=3
  fi
 }
@@ -53,12 +52,12 @@ retrieveVersionTypeNumber(){
    -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"
+    log "ERROR: unable to retrieve version types for ${VERSION_NAME} from ForgeAPI"
    exit 2
  fi

  TYPE_ID=$(jq -n "$minecraft_types" | jq --arg VERSION_NAME "$VERSION_NAME" -jc '
-      .data[]? | select(.name==$VERSION_NAME) | .id')
+      .data[] | select(.name==$VERSION_NAME) | .id')

  if [ ! "$TYPE_ID" ]; then
    log "ERROR: unable to retrieve version types for ${VERSION_NAME} from ForgeAPI"
@@ -69,7 +68,6 @@ retrieveVersionTypeNumber(){
 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.
@@ -102,13 +100,9 @@ modFileByProjectID(){
    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
-      current_project_file=$(jq -n "$project_files" | jq --arg FILE_NAME "$project_id_file_name" -jc '
-        .data | map(select(.fileName<=($FILE_NAME))) | .[0]')
-    else
    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]')
-    fi
+
    # Logic to grab the latest release over the entire pagination
    if [ ! "$PROJECT_FILE" ]; then
      PROJECT_FILE=$current_project_file
@@ -149,40 +143,6 @@ downloadModPackfromModFile() {
  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
@@ -190,19 +150,18 @@ if [ "$MODS_FORGEAPI_FILE" ] && [ -z "$MODS_FORGEAPI_PROJECTIDS" ]; then
    log "ERROR: given MODS_FORGEAPI_FILE file does not exist"
    exit 2
  fi
+  MODS_FORGEAPI_PROJECTIDS=$(jq --raw-output '[.[] | .projectId] | join(",")' $MODS_FORGEAPI_FILE)
+  if [ ! "$MODS_FORGEAPI_PROJECTIDS" ]; then
+    log "ERROR: unable to retrieve packs from $MODS_FORGEAPI_FILE"
+    exit 2
+  fi

  # Needs loop here to look up release types befor calling download.
-  jq -n "$required_dependencies" | jq -c '.[]?' | 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 -jc '.projectId // empty' )
-    current_release_type=$(jq -n "$current_project" | jq -jc '.releaseType // empty' )
-    current_file_name=$(jq -n "$current_project" | jq -jc '.fileName // empty' )
-
-    modFileByProjectID $project_id $current_release_type $current_file_name
+  for project_id in ${MODS_FORGEAPI_PROJECTIDS//,/ }; do
+    current_release_type=$(jq --arg PROJECT_ID "$project_id" -jc '
+      .[] | select(.projectId==$PROJECT_ID) | .releaseType' "$MODS_FORGEAPI_FILE")
+    modFileByProjectID $project_id $current_release_type
    downloadModPackfromModFile    
-    if isTrue "${MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES}"; then
-      downloadDependencies
-    fi
  done
 fi

@@ -212,9 +171,6 @@ if [ "$MODS_FORGEAPI_PROJECTIDS" ] && [ -z "$MODS_FORGEAPI_FILE" ]; then
  for project_id in ${MODS_FORGEAPI_PROJECTIDS//,/ }; do
    modFileByProjectID $project_id 
    downloadModPackfromModFile    
-    if isTrue "${MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES}"; then
-      downloadDependencies
-    fi
  done
 fi

--- a/scripts/start-setupModpack
+++ b/scripts/start-setupModpack
@@ -29,7 +29,7 @@ if [[ "${PACKWIZ_URL}" ]]; then
  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}"
@@ -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
@@ -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-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-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"
+  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
-    VANILLATWEAKS_FILE+="${TMP_FILE},"
-  done
 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
+  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"
+  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
+  VT_VERSION=$(jq -jc '.version' $VANILLATWEAKS_FILE)
+  if [ ! "$VT_VERSION" ]; then
+    log "ERROR: unable to retrieve version from $VANILLATWEAKS_FILE"
+    exit 2
+  fi
+fi
+
+# Download and unzip packs
+if [[ "$PACKS" ]] && [[ "$VT_VERSION" ]]; then
+  VT_ZIPDATA_URL=https://vanillatweaks.net/assets/server/zipdatapacks.php
+  DOWNLOAD_URL=$(curl -X POST -F "packs=${PACKS}" -F "version=${VT_VERSION}" $VT_ZIPDATA_URL | jq -r '.link')
+  if [ ! "$DOWNLOAD_URL" ]; then
+    log "ERROR: unable to retrieve DOWNLOAD_URL from vanillatweaks.net!"
+    exit 2
  fi

+  TEMPZIP=/tmp/vanillatweaks.zip
+  if ! get -o $TEMPZIP "https://vanillatweaks.net${DOWNLOAD_URL}"; then 
+    log "ERROR: failed to download from ${DOWNLOAD_URL}"
+    exit 2
+  fi
+
+  mkdir -p "$out_dir"
+  if ! unzip -o -d "$out_dir" $TEMPZIP; then
+    log "ERROR: failed to unzip the ${PACKS} from ${$TEMPZIP}"
+  fi
+
+  # clean up files time!
+  rm -f $TEMPZIP
  # cleans up temp vanilla tweaks file download to get stored packs
  if [[ "$VANILLATWEAKS_SHARECODE" ]]; then
-      rm -f $VT_FILE
+    rm -f $VANILLATWEAKS_FILE
  fi
-  done
 fi

 exec "${SCRIPTS:-/}start-setupDatapack" "$@"
--- a/scripts/start-setupWorld
+++ b/scripts/start-setupWorld
@@ -37,7 +37,11 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
      exit 1
    fi

+    if [ "$FAMILY" = "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

    if ! [[ $baseDirs ]]; then
      log "ERROR world content is not valid since level.dat could not be found"
@@ -46,65 +50,20 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );

    count=$(echo "$baseDirs" | wc -l)
    if [[ $count -gt 1 ]]; then
-      baseDirsNoSpigotSuffix=$(echo "$baseDirs" | sed -re 's:(_nether|_the_end)/?$::' | sort -u)
-      if [ $(echo "$baseDirsNoSpigotSuffix" | wc -l) -eq 1 ]; then
-        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
    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
+      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
    log "Cloning world directory from $WORLD ..."
--- 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-2822)"
-  else
-    ts=
-  fi
-  echo "[init]${ts} $*"
-  eval "$oldState"
+  echo "[init] $*"
 }

 function logAutopause() {
@@ -199,7 +183,6 @@ function isFamily() {
 }
 function isType() {
  for t in "${@}"; do
-    # shellcheck disable=SC2153
    if [[ $TYPE == "$t" ]]; then
      return 0
    fi
@@ -207,49 +190,17 @@ function isType() {
  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)
+  if [[ $type == application/zip ]]; then
    unzip -q -d "${destDir}" "${src}"
-      ;;
-    application/x-tar|application/gzip|application/x-gzip|application/x-bzip2|application/zstd|application/x-zstd)
+  elif [[ $type == application/x-tar ]]; then
    tar -C "${destDir}" -xf "${src}"
-      ;;
-    *)
-      log "ERROR: unsupported archive type: $type"
-      return 1
-      ;;
-  esac
-}
-
-function checkSum() {
-  local sum_file=${1?}
-
-  # Get distro
-  distro=$(cat /etc/os-release | grep -E "^ID=" | cut -d= -f2 | sed -e 's/"//g')
-  
-  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
+    log "ERROR: unsupported archive type: $type"
    return 1
  fi
 }
--- 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/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.disabled.yml
+++ b/tests/setuponlytests/forgeapimods_file/docker-compose.disabled.yml
@@ -8,11 +8,10 @@ services:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      MODS_FORGEAPI_FILE: /config/forgeapi_mods.json
+      MODS_FORGEAPI_FILE: /config/example.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"
-      MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "FALSE"
    volumes:
-      - ./forgeapi_mods.json:/config/forgeapi_mods.json:ro
+      - ./example.json:/config/example.json:ro
--- a/tests/setuponlytests/forgeapimods_file/forgeapi_mods.json
+++ b/tests/setuponlytests/forgeapimods_file/forgeapi_mods.json
@@ -7,11 +7,5 @@
        "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"
    }
 ]
--- 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_projectids/docker-compose.disabled.yml
+++ b/tests/setuponlytests/forgeapimods_projectids/docker-compose.disabled.yml
@@ -8,8 +8,7 @@ services:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "TRUE"
-      MODS_FORGEAPI_PROJECTIDS: 306612,416089,220318
+      MODS_FORGEAPI_PROJECTIDS: 306612,416089
      # Allows for Beta releases of 416089 the Fabric Voice Mod 
      MODS_FORGEAPI_RELEASES: BETA
      MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
--- 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/generic-packs-prefix/docker-compose.yml
+++ b/tests/setuponlytests/generic-packs-prefix/docker-compose.yml
@@ -1,14 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "true"
-      SETUP_ONLY: "TRUE"
-      GENERIC_PACKS: testing
-      GENERIC_PACKS_PREFIX: /packs/
-      GENERIC_PACKS_SUFFIX: .zip
-    volumes:
-      - ./packs:/packs
-      - ./data:/data
--- a/tests/setuponlytests/generic-packs-prefix/packs/testing.zip
+++ b/tests/setuponlytests/generic-packs-prefix/packs/testing.zip
--- 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 +1,12 @@
 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
+      SETUP_ONLY: "TRUE"
+      GENERIC_PACKS: https://github.com/itzg/mc-image-helper/releases/download/v1.9.5/mc-image-helper-1.9.5.zip,/packs/testing.zip
    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/verify.sh
+++ b/tests/setuponlytests/generic-packs/verify.sh
@@ -1,2 +1 @@
 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/docker-compose.yml
+++ b/tests/setuponlytests/ops_from_scratch/docker-compose.yml
@@ -1,13 +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}
-      OPS: itzg
-    volumes:
-      - ./data:/data
--- 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/docker-compose.yml
+++ b/tests/setuponlytests/spigot_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/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
@@ -11,26 +11,15 @@ setupOnlyMinecraftTest(){
  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"
+  if ! logs=$(docker compose run --quiet-pull mc 2>&1); then
+    echo "${folder} setup 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
+    if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" /verify; then
      echo "${folder} verify FAILED"
      result=1
    else
@@ -40,7 +29,7 @@ $logs
    echo "${folder} PASS"
  fi

-  docker-compose down -v --remove-orphans
+  docker compose down -v --remove-orphans
  cd ..

  return $result
--- 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
@@ -8,10 +8,7 @@ services:
      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"
+      VANILLATWEAKS_FILE: /config/vanillatweaks-datapacks.json
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"
    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
+      - ./vanillatweaks-datapacks.json:/config/vanillatweaks-datapacks.json:ro
--- a/tests/setuponlytests/vanillatweaks_file/vanillatweaks-datapacks.json
+++ b/tests/setuponlytests/vanillatweaks_file/vanillatweaks-datapacks.json
--- 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
@@ -8,7 +8,5 @@ services:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      VANILLATWEAKS_SHARECODE: MGr52E,tF1zL2,LnEDwT
-      REMOVE_OLD_VANILLATWEAKS: "FALSE"
-    volumes:
-      - ./data:/data
+      VANILLATWEAKS_SHARECODE: MGr52E
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"
--- a/tests/setuponlytests/vanillatweaks_sharecode/verify.sh
+++ b/tests/setuponlytests/vanillatweaks_sharecode/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/whitelist_from_scratch/docker-compose.yml
+++ b/tests/setuponlytests/whitelist_from_scratch/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}
-      WHITELIST: itzg
-      ENFORCE_WHITELIST: "true"
-      OVERRIDE_SERVER_PROPERTIES: "true"
-    volumes:
-      - ./data:/data
--- a/tests/setuponlytests/whitelist_from_scratch/verify.sh
+++ b/tests/setuponlytests/whitelist_from_scratch/verify.sh
@@ -1,4 +0,0 @@
-mc-image-helper assert jsonPathEquals --file=whitelist.json --path='$[0].name' --expect=itzg
-mc-image-helper assert jsonPathEquals --file=whitelist.json --path='$[0].uuid' --expect=5cddfd26-fc86-4981-b52e-c42bb10bfdef
-mc-image-helper assert propertyEquals --file=server.properties --property=white-list --expect=true
-mc-image-helper assert propertyEquals --file=server.properties --property=enforce-whitelist --expect=true
--- a/tests/setuponlytests/world_from_tar/docker-compose.yml
+++ b/tests/setuponlytests/world_from_tar/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.tar
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/world_from_tarbz2/docker-compose.yml
+++ b/tests/setuponlytests/world_from_tarbz2/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.tar.bz2
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/world_from_tarbz2/verify.sh
+++ b/tests/setuponlytests/world_from_tarbz2/verify.sh
@@ -1 +0,0 @@
-mc-image-helper assert fileExists world/level.dat
--- a/tests/setuponlytests/world_from_tarbz2/worlds/world-for-testing.tar.bz2
+++ b/tests/setuponlytests/world_from_tarbz2/worlds/world-for-testing.tar.bz2
--- a/tests/setuponlytests/world_from_targz/docker-compose.yml
+++ b/tests/setuponlytests/world_from_targz/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.tar.gz
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/world_from_targz/verify.sh
+++ b/tests/setuponlytests/world_from_targz/verify.sh
@@ -1 +0,0 @@
-mc-image-helper assert fileExists world/level.dat
--- a/tests/setuponlytests/world_from_targz/worlds/world-for-testing.tar.gz
+++ b/tests/setuponlytests/world_from_targz/worlds/world-for-testing.tar.gz
--- a/tests/setuponlytests/world_from_tarzst/docker-compose.disabled.yml
+++ b/tests/setuponlytests/world_from_tarzst/docker-compose.disabled.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.tar.zst
-    volumes:
-      - ./worlds:/worlds:ro
-      - ./data:/data
--- a/tests/setuponlytests/world_from_tarzst/verify.sh
+++ b/tests/setuponlytests/world_from_tarzst/verify.sh
@@ -1 +0,0 @@
-mc-image-helper assert fileExists world/level.dat
--- a/tests/setuponlytests/world_from_tarzst/worlds/world-for-testing.tar.zst
+++ b/tests/setuponlytests/world_from_tarzst/worlds/world-for-testing.tar.zst
--- a/tests/setuponlytests/conflicting_world_for_vanilla_server/docker-compose.yml
+++ b/tests/setuponlytests/conflicting_world_for_vanilla_server/docker-compose.yml
@@ -8,7 +8,7 @@ services:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
      VERSION: ${MINECRAFT_VERSION:-LATEST}
-      WORLD: /worlds/world-for-testing.zip
+      WORLD: /worlds/world-for-testing.tgz
    volumes:
      - ./worlds:/worlds:ro
      - ./data:/data
--- a/tests/setuponlytests/world_from_tgz/verify.sh
+++ b/tests/setuponlytests/world_from_tgz/verify.sh
--- a/tests/setuponlytests/world_from_tgz/worlds/world-for-testing.tgz
+++ b/tests/setuponlytests/world_from_tgz/worlds/world-for-testing.tgz
Author	SHA1	Message	Date
Geoff Bourne	bf1b27744c	Auto-merging via docker-versions-create	2022-01-23 22:23:50 -06:00
Geoff Bourne	10a6ae1046	Auto-merging via docker-versions-create	2022-01-23 11:00:29 -06:00
Geoff Bourne	f8458b365c	Auto-merging via docker-versions-create	2022-01-20 23:10:38 +00:00
Geoff Bourne	954d8c6927	Merge latest from master	2022-01-17 13:24:44 -06:00
Geoff Bourne	0563ea5612	Auto-merging via docker-versions-create	2022-01-10 06:57:51 -06:00
Geoff Bourne	a78e9a1780	Auto-merging via docker-versions-create	2022-01-08 15:22:32 -06:00
Geoff Bourne	df1dac4b3a	Auto-merging via docker-versions-create	2022-01-06 21:58:10 -06:00
Geoff Bourne	4f149f8f40	Auto-merging via docker-versions-create	2021-12-23 16:08:38 -06:00
Geoff Bourne	88e5b7e135	Auto-merging via docker-versions-create	2021-12-13 21:28:30 -06:00
Geoff Bourne	86190eafc7	Auto-merging via docker-versions-create	2021-12-12 19:51:45 -06:00
Geoff Bourne	7983a4a3a2	Merging latest from master	2021-12-12 09:15:05 -06:00
Geoff Bourne	52ac180c77	Auto-merging via docker-versions-create	2021-12-11 16:24:32 -06:00
Geoff Bourne	32195e71c5	Auto-merging via docker-versions-create	2021-12-10 21:04:32 -06:00
Geoff Bourne	a0a578f452	Auto-merging via docker-versions-create	2021-12-10 10:42:16 -06:00
Geoff Bourne	ca0ddc80aa	Auto-merging via docker-versions-create	2021-12-10 07:57:27 -06:00
Geoff Bourne	1a625f09bb	Auto-merging via docker-versions-create	2021-12-06 22:05:02 -06:00
Geoff Bourne	9ab345a727	Auto-merging via docker-versions-create	2021-12-04 10:00:12 -06:00
Geoff Bourne	4e3031cff8	Auto-merging via docker-versions-create	2021-12-02 19:46:55 -06:00
Geoff Bourne	466e1728f6	Auto-merging via docker-versions-create	2021-11-24 15:57:45 -06:00
Geoff Bourne	8dddbc4120	Auto-merging via docker-versions-create	2021-11-24 14:34:30 -06:00
Geoff Bourne	53e9d36a05	Track latest from master	2021-11-16 19:02:30 -06:00
Geoff Bourne	275c2d0c54	Auto-merging via docker-versions-create	2021-11-16 18:52:01 -06:00
Geoff Bourne	cf9c40f331	Auto-merging via docker-versions-create	2021-11-15 20:48:30 -06:00
Geoff Bourne	491ffe49bf	Auto-merging via docker-versions-create	2021-11-13 19:18:03 -06:00
Geoff Bourne	d4a9b367c7	Auto-merging via docker-versions-create	2021-11-13 18:52:36 -06:00
Geoff Bourne	032d94a30f	Auto-merging via docker-versions-create	2021-11-12 21:24:26 -06:00
Geoff Bourne	3784d2df54	Auto-merging via docker-versions-create	2021-11-06 21:38:11 -05:00
Geoff Bourne	8a36823843	Auto-merging via docker-versions-create	2021-11-04 21:04:41 -05:00
Geoff Bourne	78c520572a	Auto-merging via docker-versions-create	2021-10-31 09:46:11 -05:00
Geoff Bourne	5303105265	Switched base image to JDK #1064	2021-10-27 21:25:24 -05:00
Geoff Bourne	1f120c5fa4	Auto-merging via docker-versions-create	2021-10-25 19:23:56 -05:00
Geoff Bourne	70ec3b838d	Auto-merging via docker-versions-create	2021-10-24 20:28:03 -05:00
Geoff Bourne	b248ed342f	Auto-merging via docker-versions-create	2021-10-23 09:43:19 -05:00
Geoff Bourne	4c70184804	Merged latest from master	2021-10-22 15:53:10 -05:00
Geoff Bourne	b9ba062add	Auto-merged latest from master	2021-10-18 22:13:11 -05:00
Geoff Bourne	cbb1d0ea52	Added support for Crucible server type #1052	2021-10-18 22:02:23 -05:00
Geoff Bourne	bbad3a3e7a	Auto-merging via docker-versions-create	2021-10-17 14:53:04 -05:00
Geoff Bourne	8965397a5a	Auto-merging via docker-versions-create	2021-10-15 18:57:28 -05:00
Geoff Bourne	c661fe7318	Auto-merging via docker-versions-create	2021-10-15 18:47:46 -05:00
Geoff Bourne	bae1feb750	Auto-merging via docker-versions-create	2021-10-10 09:56:39 -05:00
Geoff Bourne	edbcf80a70	Auto-merging via docker-versions-create	2021-10-09 15:25:44 -05:00
Geoff Bourne	fb23e12680	Auto-merging via docker-versions-create	2021-10-09 12:04:28 -05:00
Geoff Bourne	e30a2e6448	Auto-merging via docker-versions-create	2021-10-02 19:22:34 -05:00
Geoff Bourne	03d7babd68	Auto-merging via docker-versions-create	2021-09-29 10:26:54 -05:00
Geoff Bourne	332b929a6d	Auto-merging via docker-versions-create	2021-09-27 20:41:23 -05:00
Geoff Bourne	c138cabc65	Auto-merging via docker-versions-create	2021-09-20 12:30:46 -05:00
Geoff Bourne	41631e35e8	Auto-merging via docker-versions-create	2021-09-15 21:31:13 -05:00
Geoff Bourne	6f95fa6175	Auto-merging via docker-versions-create	2021-09-15 21:06:58 -05:00
Geoff Bourne	6f16da8309	Auto-merging via docker-versions-create	2021-09-15 20:37:01 -05:00
Geoff Bourne	8cee8d5618	Auto-merging via docker-versions-create	2021-08-30 21:37:26 -05:00
Geoff Bourne	8b76b5776a	Auto-merging via docker-versions-create	2021-08-10 12:56:12 -05:00
Geoff Bourne	e3af06d2e4	Auto-merging via docker-versions-create	2021-08-01 12:12:49 -05:00
Geoff Bourne	0ac583514c	Auto-merging via docker-versions-create	2021-07-31 09:27:29 -05:00
Geoff Bourne	bf3f15f5fb	Auto-merging via docker-versions-create	2021-07-26 19:35:26 -05:00
Geoff Bourne	4aec2322b5	Merge branch 'master' into java8-openj9	2021-07-25 18:20:13 -05:00
Geoff Bourne	51b2eb6851	Auto-merging via docker-versions-create	2021-07-25 09:36:44 -05:00
Geoff Bourne	846050f41a	Auto-merging via docker-versions-create	2021-07-23 21:27:37 -05:00
Geoff Bourne	485ec6a141	Auto-merging via docker-versions-create	2021-07-17 21:14:44 -05:00
Geoff Bourne	0096e41882	Auto-merging via docker-versions-create	2021-07-17 20:57:29 -05:00
Geoff Bourne	d45610723a	Auto-merging via docker-versions-create	2021-07-17 18:03:56 -05:00
Geoff Bourne	072704b54d	Auto-merging via docker-versions-create	2021-07-14 18:43:15 -05:00
Geoff Bourne	0f08e88c5b	Auto-merging via docker-versions-create	2021-07-12 19:09:42 -05:00
Geoff Bourne	89604c8d13	Auto-merging via docker-versions-create	2021-07-09 19:58:27 -05:00
Geoff Bourne	58842d444b	Auto-merging via docker-versions-create	2021-07-08 17:59:28 -05:00
Geoff Bourne	457d09e14d	Auto-merging via docker-versions-create	2021-07-08 08:03:47 -05:00
itzg	7210e81f47	Auto-merging via docker-versions-create	2021-07-08 12:56:00 +00:00
Geoff Bourne	ba86534e6e	Auto-merging via docker-versions-create	2021-07-08 07:38:39 -05:00
itzg	44bafbff09	Auto-merging via docker-versions-create	2021-07-04 19:54:01 +00:00
Geoff Bourne	75c51bf0c7	Merge branch 'master' into java8-openj9	2021-07-03 14:19:04 -05:00
Geoff Bourne	cf651f2279	ci: restored limited image platforms for java8-openj9	2021-07-02 16:23:42 -05:00
Geoff Bourne	6d0d7fe19c	ci: auto-merge from master	2021-07-02 15:56:54 -05:00
itzg	bb58d7a4c9	Auto-merging via docker-versions-create	2021-07-02 16:55:54 +00:00
itzg	6efaac2861	Auto-merging via docker-versions-create	2021-06-28 12:14:05 +00:00
itzg	806342d74b	Auto-merging via docker-versions-create	2021-06-27 13:13:11 +00:00
itzg	926e302595	Auto-merging via docker-versions-create	2021-06-24 12:47:05 +00:00
Geoff Bourne	10e85140ad	Auto-merging via docker-versions-create	2021-06-23 22:33:45 -05:00
Geoff Bourne	fc2ed9e612	Auto-merging via docker-versions-create	2021-06-20 12:48:15 -05:00
Geoff Bourne	edfe58079a	Auto-merging via docker-versions-create	2021-06-05 17:51:25 -05:00
Geoff Bourne	d423cc3b8d	Auto-merging via docker-versions-create	2021-05-24 20:50:52 -05:00
Geoff Bourne	1537e48e29	Merge branch 'master' into java8-openj9	2021-05-23 12:26:56 -05:00
Geoff Bourne	62473771dc	Merge from master	2021-05-22 13:00:01 -05:00
Geoff Bourne	c4528e8f79	Auto-merging via docker-versions-create	2021-05-21 23:02:00 -05:00
Geoff Bourne	0f797487ab	Auto-merging via docker-versions-create	2021-05-21 22:48:32 -05:00
Geoff Bourne	9511e3cc80	Merge branch 'master' into java8-openj9	2021-05-21 22:35:00 -05:00
Geoff Bourne	3aa4dd6c85	ci: added java8-openj9 branch	2021-05-21 22:31:40 -05:00
Geoff Bourne	27571999b2	Merge branch 'master' into java8-multiarch	2021-05-21 17:28:44 -05:00
Geoff Bourne	bbd7d9e39a	ci: introduced CACHE_NAME	2021-05-21 17:26:42 -05:00
Geoff Bourne	ef6f308229	Auto-merging via docker-versions-create	2021-05-19 20:27:42 -05:00
Geoff Bourne	49d89d3e73	Auto-merging via docker-versions-create	2021-05-19 20:25:00 -05:00
Geoff Bourne	74203b23f4	Auto-merging via docker-versions-create	2021-05-15 12:41:22 -05:00
Geoff Bourne	4fb791b490	Merge branch 'multiarch' into java8-multiarch # Conflicts: # Dockerfile # start-configuration	2021-05-14 17:59:49 -05:00
Geoff Bourne	ced25ad50a	Auto-merging via docker-versions-create	2021-05-06 20:12:55 -05:00
Geoff Bourne	48efc224ba	Auto-merging via docker-versions-create	2021-04-30 14:28:07 -05:00
Geoff Bourne	467c1d9954	Auto-merging via docker-versions-create	2021-04-30 11:11:46 -05:00
Geoff Bourne	9ced230f55	Auto-merging via docker-versions-create	2021-04-28 16:51:29 -05:00
Geoff Bourne	f3a8276362	Auto-merging via docker-versions-create	2021-04-26 08:21:06 -05:00
Geoff Bourne	b91d63716e	Auto-merging via docker-versions-create	2021-04-24 13:42:37 -05:00
Geoff Bourne	46cccfd531	Auto-merging via docker-versions-create	2021-04-23 21:03:21 -05:00
Geoff Bourne	9fe1cb4a0d	ci: Switched multiarch-java8 to be based on adoptopenjdk:8-jre-hotspot	2021-04-21 20:13:22 -05:00
Geoff Bourne	076038b470	Auto-merging via docker-versions-create	2021-04-18 13:29:46 -05:00
Geoff Bourne	aa416729ea	Auto-merging via docker-versions-create	2021-04-11 10:09:19 -05:00
Geoff Bourne	812c6365ec	Merged latest from master	2021-04-08 19:14:45 -05:00
Geoff Bourne	42a5131b19	Merging latest from master	2021-04-01 16:32:55 -05:00
Geoff Bourne	624f6a210f	Added git #819	2021-04-01 16:28:32 -05:00
Geoff Bourne	1c63cd18b7	Merge branch 'master' into java8-multiarch # Conflicts: # start-configuration	2021-03-06 16:24:55 -06:00
Geoff Bourne	6266a7e3cc	Shifted PATH-fix earlier in startup	2021-03-06 16:04:31 -06:00
Geoff Bourne	871ecd4d9d	Merge branch 'master' into java8-multiarch # Conflicts: # start-minecraftFinalSetup	2021-02-27 20:52:36 -06:00
Geoff Bourne	c572c95161	Ensure FTBA version.json is readable #784	2021-02-27 16:58:25 -06:00
Geoff Bourne	f7b58fbbb1	Fix PATH to include java when needed	2021-02-10 14:51:24 -06:00
Geoff Bourne	eccfa444a9	Auto-merging via docker-versions-create	2021-02-10 14:02:05 -06:00
Geoff Bourne	e831d25706	Merged latest from master	2021-02-08 21:18:28 -06:00
Geoff Bourne	12e931332b	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:06:06 -06:00
Geoff Bourne	ceee9eddc9	ci: restored base image to ubuntu and install openjdk-8	2021-02-06 15:53:59 -06:00
Geoff Bourne	60ba668743	Merge branch 'master' into java8-multiarch # Conflicts: # Dockerfile	2021-02-06 15:49:16 -06:00
Geoff Bourne	fd1b15e01f	ci: Added java8 variant of multiarch	2021-02-06 15:44:02 -06:00
				`@@ -1 +0,0 @@`
				`mc-image-helper assert fileExists one.txt mods/two.txt`
				`@@ -1 +0,0 @@`
				`mc-image-helper assert fileExists world/level.dat`