Auto-merging via docker-versions-create

#824

.circleci/config.yml

@@ -1,22 +0,0 @@
-version: 2
-jobs:
-  minecraft_server:
-    docker:
-      - image: circleci/buildpack-deps:19.10
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build image
-          command: docker build -t mc:$CIRCLE_BUILD_NUM .
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - minecraft_server:
-          filters:
-            branches:
-              ignore:
-                - armv7
-                - multiarch

.dockerignore

@@ -1,5 +1,6 @@
 data
+testdata
 examples
 k8s-examples
 .idea
-.git
+.git

.editorconfig

@@ -1,2 +1,4 @@
 [start-*]
-indent_size = 2
+indent_size = 2
+indent_style = space
+end_of_line = lf

.github/workflows/build-multiarch.yml

@@ -0,0 +1,83 @@
+name: Build and publish multiarch
+on:
+  push:
+    branches:
+      - multiarch
+      - java8-multiarch
+      - multiarch-latest
+      - java15
+      - java15-openj9
+      - test/multiarch/*
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
+      - "[0-9]+.[0-9]+.[0-9]+-java15"
+
+jobs:
+  docker-buildx:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.2.0
+
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=itzg/minecraft-server
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          fi
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=${GITHUB_REF#refs/heads/}
+            if [[ $VERSION == master ]]; then
+              VERSION=latest
+            fi
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=cache_from::${TAGS}
+          echo ::set-output name=version::${VERSION//\//-}
+          echo ::set-output name=cache_version::${VERSION//\//-}
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          # ensure latest base image is used
+          pull: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          labels: |
+            org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
+            org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
+            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+            org.opencontainers.image.revision=${{ github.sha }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/main.yml

@@ -0,0 +1,97 @@
+name: Build and Publish
+
+on:
+  push:
+    branches:
+      - master
+      - java8
+      - openj9
+      - openj9-11
+      - adopt11
+      - test/*
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[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"
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run tests
+        run: |
+          tests/test.sh
+  build:
+    needs:
+      - test
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Prepare
+      id: prep
+      run: |
+        DOCKER_IMAGE=itzg/minecraft-server
+        VERSION=edge
+        if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION=${GITHUB_REF#refs/tags/}
+        fi
+        if [[ $GITHUB_REF == refs/heads/* ]]; then
+          VERSION=${GITHUB_REF#refs/heads/}
+          if [[ $VERSION == master ]]; then
+            VERSION=latest
+          fi
+        fi
+        TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
+        echo ::set-output name=tags::${TAGS}
+        echo ::set-output name=cache_from::${TAGS}
+        echo ::set-output name=version::${VERSION//\//-}
+        echo ::set-output name=cache_version::${VERSION//\//-}
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
+          ${{ runner.os }}-buildx-
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Build and push
+      id: docker_build
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./Dockerfile
+        # ensure latest base image is used
+        pull: true
+        # publish
+        push: true
+        # tags determined by prep step
+        tags: ${{ steps.prep.outputs.tags }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache
+        labels: |
+          org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
+          org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+          org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
+          org.opencontainers.image.revision=${{ github.sha }}
+
+    - name: Image digest
+      run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/pr.yml

@@ -0,0 +1,16 @@
+name: Validate PR
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run tests
+        run: |
+          tests/test.sh

DEVELOPMENT.md

@@ -0,0 +1,74 @@
+## Adding a server type
+
+Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps:
+
+1. Copy an existing "start-deploy*" script, such as [start-deployMohist](start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
+2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-finalSetupWorld` at the end of the script 
+3. Develop and test the changes using the [iterative process described below](#iterative-script-development)
+4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](start-configuration)
+5. Add a section to the [README](README.md). It is recommended to copy-modify an existing section to retain a similar wording and level of detail
+6. [Submit a pull request](https://github.com/itzg/docker-minecraft-server/pulls)
+
+## Iterative script development
+
+Individual scripts can be iteratively developed, debugged, and tested using the following procedure.
+
+First, build a baseline of the image to include the packages needed by existing or new scripts:
+
+```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.
+
+```shell script
+docker run -it --rm -v ${PWD}:/scripts -e SCRIPTS=/scripts/ --entrypoint bash mc-dev
+```
+
+From within the container you can run individual scripts via the attached `/scripts/` path; however, be sure to set any environment variables expected by the scripts by either `export`ing them manually:
+
+```shell script
+export VANILLA_VERSION=1.12.2
+/scripts/start-magma
+```
+
+...or pre-pending script execution:
+
+```shell script
+VANILLA_VERSION=1.12.2 /scripts/start-magma
+```
+
+> NOTE: You may want to temporarily add an `exit` statement near the end of your script to isolate execution to just the script you're developing.
+
+## Multi-base-image variants
+
+Several base-image variants are maintained in order to offer choices in JDK provider and version. The variants are maintained in their respective branches:
+- openj9 
+- openj9-nightly
+- adopt11
+- adopt13
+- multiarch
+
+The [docker-versions-create.sh](docker-versions-create.sh) script is configured with the branches to maintain and is used to merge changes from the master branch into the mulit-base variant branches. The script also manages git tagging the master branch along with the merged branches. So a typical use of the script would be like:
+
+```shell script
+./docker-versions-create.sh -s -t 1.2.0
+```
+
+> Most often the major version will be bumped unless a bug or hotfix needs to be published in which case the patch version should be incremented.
+
+> The build and publishing of those branches and their tags is currently performed within Docker Hub.
+
+## multiarch support
+
+The [multiarch branch](https://github.com/itzg/docker-minecraft-server/tree/multiarch) supports running the image on amd64, arm64, and armv7 (aka RaspberryPi). Unlike the mainline branches, it is based on Ubuntu 18.04 since the openjdk package provided by Ubuntu includes full JIT support on all of the processor types.
+
+The multiarch images are built and published by [a Github action](https://github.com/itzg/docker-minecraft-server/actions?query=workflow%3A%22Build+and+publish+multiarch%22), which [is configured in that branch](https://github.com/itzg/docker-minecraft-server/blob/multiarch/.github/workflows/build-multiarch.yml).
+
+## Generating release notes
+
+The following git command can be used to provide the bulk of release notes content:
+
+```shell script
+git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="- %s" 1.1.0..1.2.0
+```

Dockerfile

@@ -1,6 +1,6 @@
-FROM adoptopenjdk/openjdk13:alpine-jre
+FROM openjdk:8u212-jre-alpine
 
-LABEL maintainer "itzg"
+LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
 RUN apk add --no-cache -U \
   openssl \
@@ -15,15 +15,18 @@ RUN apk add --no-cache -U \
   mysql-client \
   tzdata \
   rsync \
-  nano
-
-HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT
+  nano \
+  sudo \
+  knock \
+  ttf-dejavu
 
 RUN addgroup -g 1000 minecraft \
   && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
   && mkdir -m 777 /data \
   && chown minecraft:minecraft /data /home/minecraft
 
+COPY files/sudoers* /etc/sudoers.d
+
 EXPOSE 25565 25575
 
 # hook into docker BuildKit --platform support
@@ -45,11 +48,11 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=0.1.7 --var app=mc-monitor --file {{.app}} \
+ --var version=0.7.1 --var app=mc-monitor --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.4.3 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.5.0 --var app=mc-server-runner --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
@@ -63,14 +66,23 @@ COPY server.properties /tmp/server.properties
 COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
-ENTRYPOINT [ "/start" ]
+STOPSIGNAL SIGTERM
 
 ENV UID=1000 GID=1000 \
-  MEMORY="1G" \
-  TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
-  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
-  REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_"
+  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  TYPE=VANILLA VERSION=LATEST \
+  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
+  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
+  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
 COPY start* /
+COPY health.sh /
+ADD files/autopause /autopause
+
 RUN dos2unix /start* && chmod +x /start*
+RUN dos2unix /health.sh && chmod +x /health.sh
+RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
+
+ENTRYPOINT [ "/start" ]
+HEALTHCHECK --start-period=1m CMD /health.sh

build-multiarch.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# manually purge any pre-existing manifest list
-# since docker manifest command lacks a "remove" operation
-rm -rf ~/.docker/manifests/docker.io_itzg_minecraft-server-multiarch
-
-export DOCKER_BUILDKIT=1
-
-docker build --platform linux/arm64 -t itzg/minecraft-server:arm64 .
-docker push itzg/minecraft-server:arm64
-
-armv7tag=armv7-buildkit
-armv7workDir=/tmp/armv7-$$
-git worktree add $armv7workDir armv7
-# sub-shell for build of armv7
-(
-  cd $armv7workDir
-  docker build --platform linux/arm/v7 -t itzg/minecraft-server:$armv7tag .
-  docker push itzg/minecraft-server:$armv7tag
-)
-git worktree remove $armv7workDir
-
-docker pull itzg/minecraft-server
-# use the rpi build one for now since armv7-buildkit is giving ABI mismatch on curl
-docker pull itzg/minecraft-server:armv7
-
-docker manifest create itzg/minecraft-server:multiarch \
-  itzg/minecraft-server \
-  itzg/minecraft-server:armv7 \
-  itzg/minecraft-server:arm64
-
-docker manifest inspect itzg/minecraft-server:multiarch
-
-docker manifest push -p itzg/minecraft-server:multiarch

development/update-multiarch.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-manifest="itzg/minecraft-server:multiarch"
-
-for t in latest rpi3 aarch64; do
-    docker pull itzg/minecraft-server:$t
-done
-
-docker manifest create --amend ${manifest} \
-  itzg/minecraft-server:aarch64 \
-  itzg/minecraft-server:latest \
-  itzg/minecraft-server:rpi3
-
-docker manifest annotate --os linux --arch amd64 ${manifest} itzg/minecraft-server:latest
-docker manifest annotate --os linux --arch arm64 ${manifest} itzg/minecraft-server:aarch64
-docker manifest annotate --os linux --arch arm --variant v7 ${manifest} itzg/minecraft-server:rpi3
-
-docker manifest push ${manifest}

docker-compose.yml

@@ -10,19 +10,7 @@ services:
       - "mc:/data"
     environment:
       EULA: "TRUE"
-      CONSOLE: "false"
-      ENABLE_RCON: "true"
-      RCON_PASSWORD: "testing"
-      RCON_PORT: 28016
     restart: always
-  rcon:
-    image: itzg/rcon
-    ports:
-      - "4326:4326"
-      - "4327:4327"
-    volumes:
-      - "rcon:/opt/rcon-web-admin/db"
 
 volumes:
-  mc:
-  rcon:
+  mc: {}

docker-versions-create.sh

@@ -1,7 +1,17 @@
 #!/bin/bash
 #set -x
 # Use this variable to indicate a list of branches that docker hub is watching
-branches_list=('openj9' 'openj9-nightly' 'adopt11' 'adopt13' 'multiarch' 'armv7')
+branches_list=(
+  'java8'
+  'java8-multiarch'
+  'openj9'
+  'openj9-11'
+  'adopt11'
+  'java15'
+  'java15-openj9'
+  'multiarch'
+  'multiarch-latest'
+  )
 
 function TrapExit {
   echo "Checking out back in master"
@@ -10,12 +20,32 @@ function TrapExit {
 
 batchMode=false
 
-while getopts "b" arg
+while getopts "hbt:s" arg
 do
   case $arg in
     b)
       batchMode=true
       ;;
+    t)
+      tag=${OPTARG}
+      ;;
+    s)
+      tagArgs="-s -m 'Signed during docker-versions-create"
+      ;;
+    h)
+      echo "
+Usage $0 [options]
+
+Options:
+  -b      enable batch mode, which avoids interactive prompts and causes script to fail immediately
+          when any merge fails
+  -t TAG  tag and push the current revision on master with the given tag
+          and apply respective tags to each branch
+  -s      enable signed tags
+  -h      display this help and exit
+"
+      exit
+      ;;
     *)
       echo "Unsupported arg $arg"
       exit 2
@@ -34,6 +64,10 @@ test -d ./.git || { echo ".git folder was not found. Please start this script fr
 git checkout master
 git pull --all || { echo "Can't pull the repo!"; \
   exit 1; }
+if [[ $tag ]]; then
+  git tag $tag
+  git push origin $tag
+fi
 
 git_branches=$(git branch -a)
 
@@ -57,6 +91,10 @@ for branch in "${branches_list[@]}"; do
         git commit -m "Auto merge branch with master" -a
         # push may fail if remote doesn't have this branch yet. In this case - sending branch
         git push || git push -u origin "$branch" || { echo "Can't push changes to the origin."; exit 1; }
+        if [[ $tag ]]; then
+          git tag "$tag-$branch"
+          git push origin "$tag-$branch"
+        fi
       elif ${batchMode}; then
         status=$?
         echo "Git merge failed in batch mode"

examples/docker-compose-autopause.yml

@@ -0,0 +1,18 @@
+version: '3.8'
+
+services:
+  minecraft:
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565"
+    volumes:
+      - "mc:/data"
+    environment:
+      EULA: "TRUE"
+      ENABLE_AUTOPAUSE: "TRUE"
+      OVERRIDE_SERVER_PROPERTIES: "TRUE"
+      MAX_TICK_TIME: "-1"
+    restart: always
+
+volumes:
+  mc: {}

examples/docker-compose-curseforge.yml

@@ -2,10 +2,12 @@ version: '3.2'
 
 services:
   mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
+    volumes:
+    - ./modpacks:/modpacks:ro
     environment:
       EULA: "true"
-      TYPE: FTB
-      FTB_SERVER_MOD: https://minecraft.curseforge.com/projects/all-the-mods-expert-remastered/files/2493900/download
+      TYPE: CURSEFORGE
+      CF_SERVER_MOD: /modpacks/SkyFactory_4_Server_4.1.0.zip
     ports:
       - 25565:25565

examples/docker-compose-curseinstance.yml

@@ -1,20 +0,0 @@
-version: "3.7"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    volumes:
-      # Attach .../Curse/Minecraft/Instances for use at /instances
-      - ./Instances:/instances:ro
-      # Attach /data as usual
-      - ./ServerData:/data
-    environment:
-      EULA: "TRUE"
-      # Modpacks generally need more memory, so let's give at 2 GB
-      MEMORY: 2G
-      # Use new CURSE_INSTANCE type
-      TYPE: CURSE_INSTANCE
-      # Reference directory of or full path to minecraftinstance.json
-      CURSE_INSTANCE_JSON: /instances/FTB Presents SkyFactory 3

examples/docker-compose-forge.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     ports:
     # expose the Minecraft server port outside of container
     - 25565:25565

examples/docker-compose-ftb.yml

@@ -1,16 +0,0 @@
-version: '3.2'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: FTB
-      FTB_SERVER_MOD: https://www.feed-the-beast.com/projects/ftb-presents-skyfactory-3/files/2481284
-    ports:
-      - 25565:25565
-    volumes:
-      - mc-ftb:/data
-
-volumes:
-  mc-ftb:

examples/docker-compose-ftba.yml

@@ -0,0 +1,23 @@
+version: "3.7"
+
+services:
+  mc:
+    # FTBA support is only available in non-Alpine images
+    image: itzg/minecraft-server:java8-multiarch
+    ports:
+      # expose the Minecraft server port outside of container
+      - 25565:25565
+    environment:
+      # REQUIRED for all types
+      EULA: "TRUE"
+      # Set server type (vs the default of vanilla)
+      TYPE: FTBA
+      # Use Pack ID from https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/
+      FTB_MODPACK_ID: "31"
+    volumes:
+      # use a named, managed volume for data volume
+      - mc_ftb:/data
+
+volumes:
+  # declared the named volume, but use default/local storage engine
+  mc_ftb: {}

examples/docker-compose-paper.yml

@@ -7,11 +7,12 @@ services:
       EULA: "true"
       TYPE: PAPER
       VERSION: 1.9.4
-    command: --noconsole
+      # needed for Paper versions before 1.14
+      CONSOLE: "false"
     ports:
       - 25565:25565
     volumes:
       - mc-paper:/data
 
 volumes:
-  mc-paper:
+  mc-paper:

examples/docker-compose-simple.yml

@@ -0,0 +1,12 @@
+version: "3"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - 25565:25565
+    environment:
+      EULA: "TRUE"
+    volumes:
+      # attach the relative directory 'data' to the container's /data path
+      - ./data:/data

examples/docker-compose-spongeforge.yml

@@ -5,7 +5,7 @@ version: '3'
 
 services:
   minecraft:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     ports:
       - "25565:25565"
     volumes:

examples/docker-compose-world-download.yml

@@ -0,0 +1,11 @@
+version: "3.7"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - 25565:25565
+    environment:
+      EULA: "TRUE"
+      VERSION: 1.7.2
+      WORLD: https://www.minecraftmaps.com/survival-maps/cube-survival/download

examples/modpacks/.gitignore

@@ -0,0 +1 @@
+*.zip

examples/modpacks/README.md

@@ -0,0 +1,3 @@
+Place server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
+
+The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/2787018>.

files/autopause/autopause-daemon.sh

@@ -0,0 +1,122 @@
+#!/bin/bash
+
+. /autopause/autopause-fcns.sh
+
+. ${SCRIPTS:-/}start-utils
+
+
+autopause_error_loop() {
+  logAutopause "Available interfaces within the docker container:"
+  INTERFACES=$(echo /sys/class/net/*)
+  INTERFACES=${INTERFACES//\/sys\/class\/net\//}
+  logAutopause "  $INTERFACES"
+  logAutopause "Please set the environment variable AUTOPAUSE_KNOCK_INTERFACE to the interface that handles incoming connections."
+  logAutopause "If unsure which interface to choose, run the ifconfig command in the container."
+  logAutopause "Autopause failed to initialize. This log entry will be printed every 30 minutes."
+  while :
+  do
+    sleep 1800
+    logAutopause "Autopause failed to initialize."
+  done
+}
+
+# wait for java process to be started
+while :
+do
+  if java_process_exists ; then
+    break
+  fi
+  sleep 0.1
+done
+
+# check for interface existence
+if [[ -z "$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
+  logAutopause "AUTOPAUSE_KNOCK_INTERFACE variable must not be empty!"
+  autopause_error_loop
+fi
+if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
+  logAutopause "Selected interface \"$AUTOPAUSE_KNOCK_INTERFACE\" does not exist!"
+  autopause_error_loop
+fi
+
+sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
+if [ $? -ne 0 ] ; then
+  logAutopause "Failed to start knockd daemon."
+  logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
+  autopause_error_loop
+fi
+
+STATE=INIT
+
+while :
+do
+  case X$STATE in
+  XINIT)
+    # Server startup
+    if mc_server_listening ; then
+      TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_INIT))
+      logAutopause "MC Server listening for connections - stopping in $AUTOPAUSE_TIMEOUT_INIT seconds"
+      STATE=K
+    fi
+    ;;
+  XK)
+    # Knocked
+    if java_clients_connected ; then
+      logAutopause "Client connected - waiting for disconnect"
+      STATE=E
+    else
+      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
+        logAutopause "No client connected since startup / knocked - stopping"
+        /autopause/pause.sh
+        STATE=S
+      fi
+    fi
+    ;;
+  XE)
+    # Established
+    if ! java_clients_connected ; then
+      TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_EST))
+      logAutopause "All clients disconnected - stopping in $AUTOPAUSE_TIMEOUT_EST seconds"
+      STATE=I
+    fi
+    ;;
+  XI)
+    # Idle
+    if java_clients_connected ; then
+      logAutopause "Client reconnected - waiting for disconnect"
+      STATE=E
+    else
+      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
+        logAutopause "No client reconnected - stopping"
+        /autopause/pause.sh
+        STATE=S
+      fi
+    fi
+    ;;
+  XS)
+    # Stopped
+    if rcon_client_exists ; then
+      /autopause/resume.sh
+    fi
+    if java_running ; then
+      if java_clients_connected ; then
+        logAutopause "Client connected - waiting for disconnect"
+        STATE=E
+      else
+        TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_KN))
+        logAutopause "Server was knocked - waiting for clients or timeout"
+        STATE=K
+      fi
+    fi
+    ;;
+  *)
+    logAutopause "Error: invalid state: $STATE"
+    ;;
+  esac
+  if [[ "$STATE" == "S" ]] ; then
+    # before rcon times out
+    sleep 2
+  else
+    sleep $AUTOPAUSE_PERIOD
+  fi
+done

files/autopause/autopause-fcns.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+current_uptime() {
+  echo $(awk '{print $1}' /proc/uptime | cut -d . -f 1)
+}
+
+java_running() {
+  [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
+}
+
+java_process_exists() {
+  [[ -n "$(ps -a -o comm | grep 'java')" ]]
+}
+
+rcon_client_exists() {
+  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
+}
+
+mc_server_listening() {
+  [[ -n $(netstat -tln | grep -e "0.0.0.0:$SERVER_PORT" -e ":::$SERVER_PORT" | grep LISTEN) ]]
+}
+
+java_clients_connected() {
+  local connections
+  connections=$(netstat -tn | grep ":$SERVER_PORT" | grep ESTABLISHED)
+  if [[ -z "$connections" ]] ; then
+    return 1
+  fi
+  IFS=$'\n'
+  connections=($connections)
+  unset IFS
+  # check that at least one external address is not localhost
+  # remember, that the host network mode does not work with autopause because of the knockd utility
+  for (( i=0; i<${#connections[@]}; i++ ))
+  do
+    if [[ ! $(echo "${connections[$i]}" | awk '{print $5}') =~ ^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$ ]] ; then
+      # not localhost
+      return 0
+    fi
+  done
+  return 1
+}

files/autopause/knockd-config.cfg

@@ -0,0 +1,12 @@
+[options]
+ logfile = /dev/null
+[unpauseMCServer-server]
+ sequence = 25565
+ seq_timeout = 1
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
+ tcpflags = syn
+[unpauseMCServer-rcon]
+ sequence = 25575
+ seq_timeout = 1
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
+ tcpflags = syn

files/autopause/pause.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+. /start-utils
+
+if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
+  # save world
+  rcon-cli save-all >/dev/null
+
+  # wait until mc-monitor is no longer connected to the server
+  while :
+  do
+    if [[ -z "$(netstat -nt | grep "127.0.0.1:$SERVER_PORT" | grep 'ESTABLISHED')" ]]; then
+      break
+    fi
+    sleep 0.1
+  done
+
+  # finally pause the process
+  logAutopauseAction "Pausing Java process"
+  pkill -STOP java
+fi

files/autopause/resume.sh

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

files/sudoers-mc

@@ -0,0 +1,2 @@
+%minecraft ALL=(ALL) NOPASSWD:/usr/bin/pkill
+%minecraft ALL=(ALL) NOPASSWD:/usr/sbin/knockd

health.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+if isTrue "${DISABLE_HEALTHCHECK}"; then
+  echo "Healthcheck disabled"
+  exit 0
+elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }')" =~ ^T.*$ ]]; then
+  echo "Java process suspended by Autopause function"
+  exit 0
+else
+  mc-monitor status --host localhost --port $SERVER_PORT
+  exit $?
+fi

server.properties

@@ -37,3 +37,15 @@ motd=A Minecraft Server powered by Docker
 generator-settings=
 rcon.password=
 max-world-size=29999984
+broadcast-console-to-ops=true
+broadcast-rcon-to-ops=true
+enable-jmx-monitoring=false
+sync-chunk-writes=true
+enable-status=true
+entity-broadcast-range-percentage=100
+function-permission-level=2
+network-compression-threshold=256
+op-permission-level=4
+prevent-proxy-connections=false
+use-native-transport=true
+enforce-whitelist=false

start

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 umask 0002
 chmod g+w /data
 
-if [ $(id -u) = 0 ]; then
+if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
   runAsUser=minecraft
   runAsGroup=minecraft
 
@@ -40,7 +40,7 @@ if [ $(id -u) = 0 ]; then
     echo 'hosts: files dns' > /etc/nsswitch.conf
   fi
 
-  exec su-exec ${runAsUser}:${runAsGroup} /start-configuration $@
+  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
 else
-  exec /start-configuration $@
+  exec ${SCRIPTS:-/}start-configuration $@
 fi

start-autopause

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+log "Autopause functionality enabled"
+
+cp /autopause/knockd-config.cfg /tmp/knockd-config.cfg
+
+# update server port to listen to
+regseq="^\s*sequence\s*=\s*$SERVER_PORT\s*$"
+linenum=$(grep -nm1 sequence /tmp/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /tmp/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $SERVER_PORT/" /tmp/knockd-config.cfg
+  log "Updated server port in knockd config"
+fi
+# update rcon port to listen to
+regseq="^\s*sequence\s*=\s*$RCON_PORT\s*$"
+linenum=$(grep -nm2 sequence /tmp/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /tmp/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $RCON_PORT/" /tmp/knockd-config.cfg
+  log "Updated rcon port in knockd config"
+fi
+
+if ! [[ $AUTOPAUSE_PERIOD =~ ^[0-9]+$ ]]; then
+  AUTOPAUSE_PERIOD=10
+  export AUTOPAUSE_PERIOD
+  log "Warning: AUTOPAUSE_PERIOD is not numeric, set to 10 (seconds)"
+fi
+if [ "$AUTOPAUSE_PERIOD" -eq "0" ] ; then
+  AUTOPAUSE_PERIOD=10
+  export AUTOPAUSE_PERIOD
+  log "Warning: AUTOPAUSE_PERIOD must not be 0, set to 10 (seconds)"
+fi
+if ! [[ $AUTOPAUSE_TIMEOUT_KN =~ ^[0-9]+$ ]] ; then
+  AUTOPAUSE_TIMEOUT_KN=120
+  export AUTOPAUSE_TIMEOUT_KN
+  log "Warning: AUTOPAUSE_TIMEOUT_KN is not numeric, set to 120 (seconds)"
+fi
+if ! [[ $AUTOPAUSE_TIMEOUT_EST =~ ^[0-9]+$ ]] ; then
+  AUTOPAUSE_TIMEOUT_EST=3600
+  export AUTOPAUSE_TIMEOUT_EST
+  log "Warning: AUTOPAUSE_TIMEOUT_EST is not numeric, set to 3600 (seconds)"
+fi
+if ! [[ $AUTOPAUSE_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
+  AUTOPAUSE_TIMEOUT_INIT=600
+  export AUTOPAUSE_TIMEOUT_INIT
+  log "Warning: AUTOPAUSE_TIMEOUT_INIT is not numeric, set to 600 (seconds)"
+fi
+if [[ "$AUTOPAUSE_KNOCK_INTERFACE" == "lo" ]] ; then
+  log "Warning: AUTOPAUSE_KNOCK_INTERFACE is set to the local loopback interface."
+  log "         This is not advisable, as incoming connections are likely not picked up there."
+  log "         Continuing with this setting."
+fi
+
+if [[ -n "$MAX_TICK_TIME" && "$MAX_TICK_TIME" != "-1" ]] ; then
+  log "Warning: MAX_TICK_TIME is non-default, for autopause to work properly, this check should be disabled (-1 for versions >= 1.8.1)"
+elif [[ -z "$MAX_TICK_TIME" ]] ; then
+  if versionLessThan 1.8.1; then
+    # 10 years
+    MAX_TICK_TIME=315360000000
+  else
+    MAX_TICK_TIME=-1
+  fi
+  export MAX_TICK_TIME
+fi
+
+/autopause/autopause-daemon.sh &

start-configuration

@@ -1,6 +1,12 @@
 #!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+
+: ${EULA:=}
+: ${PROXY:=}
+: ${RCON_PASSWORD_FILE:=}
 
 shopt -s nullglob
 
@@ -8,8 +14,7 @@ shopt -s nullglob
 export HOME=/data
 
 if [ ! -e /data/eula.txt ]; then
-  EULA="${EULA,,}"
-  if [ "$EULA" != "true" ]; then
+  if ! isTrue "$EULA"; then
     log ""
     log "Please accept the Minecraft EULA at"
     log "  https://account.mojang.com/documents/minecraft_eula"
@@ -19,12 +24,7 @@ if [ ! -e /data/eula.txt ]; then
     exit 1
   fi
 
-  echo "# Generated via Docker on $(date)" > /data/eula.txt
-
-  if ! echo "eula=$EULA" >> /data/eula.txt; then
-    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
-    exit 2
-  fi
+  writeEula
 fi
 
 
@@ -40,11 +40,32 @@ rm /data/.verify_access || true
 if [[ $PROXY ]]; then
     export http_proxy="$PROXY"
     export https_proxy="$PROXY"
+    export JAVA_TOOL_OPTIONS+="-Djava.net.useSystemProxies=true"
     log "INFO: Giving proxy time to startup..."
     sleep 5
 fi
 
-export SERVER_PROPERTIES=/data/server.properties
+if [[ $RCON_PASSWORD_FILE ]]; then
+    log ""
+    if [ ! -e ${RCON_PASSWORD_FILE} ]; then
+	log "Initial RCON password file ${RCON_PASSWORD_FILE} does not seems to exist."
+	log "Please ensure your configuration."
+	log "If you are using Docker Secrets feature, please check this for further information: "
+	log " https://docs.docker.com/engine/swarm/secrets"
+	log ""
+	exit 1
+    else
+	RCON_PASSWORD=$(cat ${RCON_PASSWORD_FILE})
+	export RCON_PASSWORD
+    fi
+    log ""
+fi
+
+if ! which java > /dev/null; then
+  log "Fixing PATH to include java"
+  PATH="${PATH}:/usr/bin"
+fi
+
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
 
 case "X$VERSION" in
@@ -54,11 +75,8 @@ case "X$VERSION" in
   XSNAPSHOT|Xsnapshot)
     VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
   ;;
-  X[1-9]*)
-    VANILLA_VERSION=$VERSION
-  ;;
   *)
-    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
+    VANILLA_VERSION=$VERSION
   ;;
 esac
 export VANILLA_VERSION
@@ -68,55 +86,81 @@ cd /data || exit 1
 
 export ORIGINAL_TYPE=${TYPE^^}
 
+if isTrue "${ENABLE_AUTOPAUSE}"; then
+  ${SCRIPTS:-/}start-autopause
+fi
+
 log "Resolving type given ${TYPE}"
 case "${TYPE^^}" in
   *BUKKIT|SPIGOT)
-    exec /start-deployBukkitSpigot "$@"
+    exec ${SCRIPTS:-/}start-deployBukkitSpigot "$@"
   ;;
 
   PAPER)
-    exec /start-deployPaper "$@"
+    exec ${SCRIPTS:-/}start-deployPaper "$@"
   ;;
 
   TUINITY)
-    exec /start-deployTuinity "$@"
+    exec ${SCRIPTS:-/}start-deployTuinity "$@"
   ;;
 
   FORGE)
-    exec /start-deployForge "$@"
+    exec ${SCRIPTS:-/}start-deployForge "$@"
   ;;
 
   FABRIC)
-    exec /start-deployFabric "$@"
+    exec ${SCRIPTS:-/}start-deployFabric "$@"
   ;;
 
   FTB|CURSEFORGE)
-    exec /start-deployFTB "$@"
+    exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 
   VANILLA)
-    exec /start-deployVanilla "$@"
+    exec ${SCRIPTS:-/}start-deployVanilla "$@"
   ;;
 
   SPONGEVANILLA)
-    exec /start-deploySpongeVanilla "$@"
+    exec ${SCRIPTS:-/}start-deploySpongeVanilla "$@"
   ;;
 
   CUSTOM)
-    exec /start-deployCustom "$@"
+    exec ${SCRIPTS:-/}start-deployCustom "$@"
   ;;
 
   CURSE_INSTANCE)
-    exec /start-validateCurseInstance "$@"
+    exec ${SCRIPTS:-/}start-validateCurseInstance "$@"
   ;;
 
   MAGMA)
-    exec /start-magma "$@"
+    exec ${SCRIPTS:-/}start-deployMagma "$@"
+  ;;
+
+  MOHIST)
+    exec ${SCRIPTS:-/}start-deployMohist "$@"
+  ;;
+
+  CATSERVER)
+    exec ${SCRIPTS:-/}start-deployCatserver "$@"
+  ;;
+
+  PURPUR)
+    exec ${SCRIPTS:-/}start-deployPurpur "$@"
+  ;;
+
+  YATOPIA)
+    exec ${SCRIPTS:-/}start-deployYatopia "$@"
+  ;;
+  
+   AIRPLANE)
+    exec ${SCRIPTS:-/}start-deployAirplane "$@"
   ;;
 
   *)
       log "Invalid type: '$TYPE'"
-      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
+      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
+      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR"
+      log "         CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE"
       exit 1
   ;;
 

start-deployAirplane

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
+
+JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
+
+if [ "${JAVA_VER}" != "8" ] && [ "${JAVA_VER}" != "11" ]; then
+  log "ERROR: Airplane server type only supports Java versions 8 and 11"
+  exit 1
+fi
+
+if [ "${VERSION}" != "LATEST" ]; then
+  log "ERROR: Airplane server type only supports VERSION=LATEST"
+  exit 1
+fi
+
+export SERVER=airplane-${VANILLA_VERSION}-jdk${JAVA_VER}.jar
+
+if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
+    downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JAVA_VER}/launcher-airplane.jar"
+    log "Downloading Airplane from $downloadUrl ..."
+    curl -fsSL -o "$SERVER" "$downloadUrl"
+    if [ ! -f "$SERVER" ]; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export TYPE=SPIGOT
+export SKIP_LOG4J_CONFIG=true
+
+exec ${SCRIPTS:-/}start-spiget "$@"

start-deployBukkitSpigot

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
 
 set -e
 
@@ -58,20 +59,41 @@ function downloadSpigot {
       ;;
   esac
 
+  if [[ ${VERSION^^} = LATEST ]]; then
+    VANILLA_VERSION=$(restify https://getbukkit.org/download/spigot --attribute='property=og:title' | jq -r '.[0] | .attributes | select(.property == "og:title") | .content | split(" ") | .[-1]')
+  fi
+
   if [[ -z $downloadUrl ]]; then
     downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
   fi
 
+  setServerVar
+  if [ -f $SERVER ]; then
+    # tell curl to only download when newer
+    curlArgs="-z $SERVER"
+  fi
+  if isDebugging; then
+    curlArgs="$curlArgs -v"
+  fi
   log "Downloading $match from $downloadUrl ..."
-  curl -fsSL -o $SERVER "$downloadUrl"
+  curl -fsSL -o $SERVER $curlArgs "$downloadUrl"
   if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
     cat <<EOF
 
 ERROR: failed to download from $downloadUrl
        Visit https://getbukkit.org/download/${getbukkitFlavor} to lookup the
-       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-LATEST
+       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-latest.
+       Click into the version entry to find the **exact** version, because something
+       like "1.8" is not sufficient according to their download naming.
 
 EOF
+
+    if isDebugging && [[ $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
+      cat $SERVER
+    fi
+
+    # remove invalid download
+    rm $SERVER
     exit 3
   fi
 
@@ -79,27 +101,28 @@ EOF
   export JVM_OPTS
 }
 
+function setServerVar {
+  case "$TYPE" in
+    *BUKKIT|*bukkit)
+      export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
+      ;;
+    *)
+      export SERVER=spigot_server-${VANILLA_VERSION}.jar
+      ;;
+  esac
+}
 
-case "$TYPE" in
-  *BUKKIT|*bukkit)
-    export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
-    ;;
-  *)
-    export SERVER=spigot_server-${VANILLA_VERSION}.jar
-    ;;
-esac
-
-if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-   if isTrue "$BUILD_SPIGOT_FROM_SOURCE" || isTrue "$BUILD_FROM_SOURCE"; then
-     buildSpigotFromSource
-   else
-     downloadSpigot
-   fi
+if isTrue "$BUILD_SPIGOT_FROM_SOURCE" || isTrue "$BUILD_FROM_SOURCE"; then
+  setServerVar
+  if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+    buildSpigotFromSource
+  fi
+else
+  downloadSpigot
 fi
 
 # Normalize on Spigot for operations below
 export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true
 
-# Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-spiget "$@"

start-deployCF

@@ -0,0 +1,238 @@
+#!/bin/bash
+
+set -e
+
+. ${SCRIPTS:-/}start-utils
+
+loadForgeVars() {
+  cfgFile=${1?}
+  pat='^([^#;][^=]+)=[:space:]*([^;]*)'
+  while read -r line || [[ -n "$line" ]] ; do
+      if [[ $line =~ $pat ]]; then
+          #echo "MATCHED $line"
+          k=${BASH_REMATCH[1]}
+          v=${BASH_REMATCH[2]}
+          case $k in
+            FORGEURL)
+              forgeInstallerUrl="$v"
+              ;;
+          esac
+      fi
+  done < "$cfgFile"
+}
+
+isDebugging && set -x
+
+: ${FTB_BASE_DIR:=${CF_BASE_DIR:-/data/FeedTheBeast}}
+export FTB_BASE_DIR
+
+legacyJavaFixerUrl=https://ftb.forgecdn.net/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
+export TYPE=FEED-THE-BEAST
+
+FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
+
+log "Looking for Feed-The-Beast / CurseForge server modpack."
+requireVar FTB_SERVER_MOD
+
+if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
+  if ! [ -f "${FTB_SERVER_MOD}" ]; then
+    log "ERROR unable to find requested modpack file ${FTB_SERVER_MOD}"
+    exit 2
+  fi
+
+  needsInstall=true
+  installMarker=/data/.curseforge-installed
+  if [ -f $installMarker ]; then
+    if [ "$(cat $installMarker)" != "${FTB_SERVER_MOD}" ]; then
+      log "Upgrading modpack"
+
+      serverJar=$(find ${FTB_BASE_DIR} -not -name "forge*installer.jar" -name "forge*.jar")
+      if [[ "${serverJar}" ]]; then
+        rm -rf $(dirname "${serverJar}")/{mods,*.jar,libraries,resources,scripts,config}
+      fi
+    else
+      needsInstall=false
+    fi
+  fi
+
+  if $needsInstall; then
+    log "Unpacking FTB server modpack ${FTB_SERVER_MOD} ..."
+    mkdir -p ${FTB_BASE_DIR}
+    unzip -o "${FTB_SERVER_MOD}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
+
+    serverJar=$(find ${FTB_BASE_DIR}  -path "*/libraries/*" -prune -type f -o  -not -name "forge*installer.jar" -name "forge*.jar")
+    if [[ -z "$serverJar" ]]; then
+
+      if [ -f "${FTB_BASE_DIR}/settings.cfg" ]; then
+        loadForgeVars "${FTB_BASE_DIR}/settings.cfg"
+
+        if [[ $forgeInstallerUrl ]]; then
+          forgeInstallerJar="${FTB_BASE_DIR}/forge-installer.jar"
+          if ! curl -fsSL -o "$forgeInstallerJar" "$forgeInstallerUrl" ; then
+            log "ERROR failed to download Forge installer from $forgeInstallerUrl"
+            exit 2
+          fi
+        fi
+      else
+        forgeInstallerJar=$(find "${FTB_BASE_DIR}" -name "forge*installer.jar")
+      fi
+
+      if [[ -z "${forgeInstallerJar}" ]]; then
+        log "ERROR Unable to find forge installer in modpack"
+        log "      or download using modpack config."
+        log "      Make sure you downloaded the server files."
+        exit 2
+      fi
+
+      log "Installing forge server"
+      (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer)
+    fi
+
+    echo "${FTB_SERVER_MOD}" > $installMarker
+  fi
+
+  export SERVER=$(find ${FTB_BASE_DIR}  -path "*/libraries/*" -prune -type f -o  -not -name "forge*installer.jar" -name "forge*.jar")
+  if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
+    log "ERROR unable to locate installed forge server jar"
+    isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
+    exit 2
+  fi
+
+  export FTB_DIR=$(dirname "${SERVER}")
+
+  exec ${SCRIPTS:-/}start-finalSetupWorld $@
+fi
+
+entryScriptExpr="
+  -name ServerStart.sh
+  -o -name serverstart.sh
+  -o -name ServerStartLinux.sh
+  -o -name LaunchServer.sh
+  -o -name server-start.sh
+  -o -name startserver.sh
+  -o -name StartServer.sh
+  "
+
+if [[ -d ${FTB_BASE_DIR} ]]; then
+  startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
+  if [[ $startScriptCount > 1 ]]; then
+    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
+    exit 2
+  fi
+else
+  startScriptCount=0
+fi
+
+# only download and install if a mod pack isn't already installed
+# also check for the start script rather than just the folder
+# this allows saving just the world separate from the rest of the data directory
+if [[ $startScriptCount = 0 ]]; then
+  srv_modpack=${FTB_SERVER_MOD}
+  if isURL "${srv_modpack}"; then
+      case $srv_modpack in
+        https://www.feed-the-beast.com/*/download|https://www.curseforge.com/minecraft/modpacks/*/download/*/file)
+          ;;
+        https://www.curseforge.com/minecraft/modpacks/*/download/*)
+          srv_modpack=${srv_modpack}/file;;
+        https://www.feed-the-beast.com/*)
+          srv_modpack=${srv_modpack}/download;;
+      esac
+      file=$(basename $(dirname $srv_modpack))
+      downloaded=/data/${file}.zip
+      if [ ! -e $downloaded ]; then
+        log "Downloading FTB modpack...
+  $srv_modpack -> $downloaded"
+        curl -sSL -o $downloaded $srv_modpack
+      fi
+      srv_modpack=$downloaded
+  fi
+  if [[ "${srv_modpack:0:5}" == "data/" ]]; then
+      # Prepend with "/"
+      srv_modpack="/${srv_modpack}"
+  fi
+  if [[ ! "${srv_modpack:0:1}" == "/" ]]; then
+      # If not an absolute path, assume file is in "/data"
+      srv_modpack=/data/${srv_modpack}
+  fi
+  if [[ ! -f "${srv_modpack}" ]]; then
+      log "FTB server modpack ${srv_modpack} not found."
+      exit 2
+  fi
+  if [[ ! "${srv_modpack: -4}" == ".zip" ]]; then
+      log "FTB server modpack ${srv_modpack} is not a zip archive."
+      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
+      exit 2
+  fi
+
+  log "Unpacking FTB server modpack ${srv_modpack} ..."
+  mkdir -p ${FTB_BASE_DIR}
+  unzip -o "${srv_modpack}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
+
+  installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f -name install.sh)
+  if [[ "$installScript" ]]; then
+    (
+      cd "$(dirname "${installScript}")"
+      chmod +x ./install.sh
+      log "Running included install.sh"
+      ./install.sh
+    )
+  fi
+fi
+
+if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
+
+    # Allow up to 2 levels since some modpacks have a top-level directory named
+    # for the modpack
+    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
+    if [[ "$forgeJar" ]]; then
+      export FTB_BASE_DIR=$(dirname "${forgeJar}")
+      log "No entry script found, so building one for ${forgeJar}"
+      cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
+#!/bin/sh
+. ./settings-local.sh
+java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
+EOF
+      chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
+    else
+      log "Please make sure you are using the server version of the FTB modpack!"
+      exit 2
+    fi
+fi
+
+scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
+if [[ $scriptCount = 0 ]]; then
+    log "Please make sure you are using the server version of the FTB modpack!"
+    exit 2
+elif [[ $scriptCount > 1 ]]; then
+    log "Ambigous startup scripts in FTB modpack!"
+    log "found:"
+    find ${FTB_BASE_DIR} $entryScriptExpr
+    exit 2
+fi
+
+export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
+
+export FTB_DIR=$(dirname "${FTB_SERVER_START}")
+chmod a+x "${FTB_SERVER_START}"
+grep fml.queryResult=confirm "${FTB_SERVER_START}" > /dev/null || \
+    sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${FTB_SERVER_START}"
+sed -i 's/.*read.*Restart now/#\0/' "${FTB_SERVER_START}"
+legacyJavaFixerPath="${FTB_DIR}/mods/legacyjavafixer.jar"
+
+if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e "${legacyJavaFixerPath}" ]; then
+  log "Installing legacy java fixer to ${legacyJavaFixerPath}"
+  curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
+fi
+
+if [ -e "${FTB_DIR}/FTBInstall.sh" ]; then
+  pushd "${FTB_DIR}"
+  sh FTBInstall.sh
+  popd
+elif [ -e "${FTB_DIR}/Install.sh" ]; then
+  pushd "${FTB_DIR}"
+  sh Install.sh
+  popd
+fi
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployCatserver

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -o pipefail
+set -e
+
+latestAsset=$(
+  curl -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/latest | \
+    jq '.assets[] | select(.name | match(".*-universal.jar"))'
+)
+
+if [[ -z "${latestAsset}" ]]; then
+  log "ERROR: latest release of Catserver is missing universal.jar asset"
+  exit 1
+fi
+
+isDebugging && log "Latest asset ${latestAsset}"
+latestJarName=$(echo ${latestAsset} | jq --raw-output '.name')
+latestJarId=$(echo ${latestAsset} | jq --raw-output '.id')
+
+
+export SERVER="/data/${latestJarName}"
+
+if [ ! -f ${SERVER} ]; then
+  log "Downloading ${latestJarName}"
+  curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/assets/${latestJarId}
+fi
+
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"

start-deployCustom

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
 
 if isURL ${CUSTOM_SERVER}; then
   filename=$(basename ${CUSTOM_SERVER})
@@ -17,15 +18,19 @@ if isURL ${CUSTOM_SERVER}; then
   fi
 
 elif [[ -f ${CUSTOM_SERVER} ]]; then
-  log "Using custom server jar at ${CUSTOM_SERVER} ..."
+  export SERVER=${CUSTOM_SERVER}
+
+elif [[ ${GENERIC_PACK} ]]; then
+  log "Using custom server jar from generic pack at ${CUSTOM_SERVER} ..."
   export SERVER=${CUSTOM_SERVER}
 
 else
   log "CUSTOM_SERVER is not properly set to a URL or existing jar file"
   exit 2
+
 fi
 
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployFTB

@@ -1,133 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-export FTB_BASE_DIR=/data/FeedTheBeast
-legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
-export TYPE=FEED-THE-BEAST
-
-FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
-
-log "Looking for Feed-The-Beast / CurseForge server modpack."
-if [[ -z $FTB_SERVER_MOD ]]; then
-    log "Environment variable FTB_SERVER_MOD not set."
-    log "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
-    log "(And place the modpack in the /data directory.)"
-    exit 2
-fi
-
-entryScriptExpr="-name ServerStart.sh -o -name ServerStartLinux.sh -o -name LaunchServer.sh"
-
-if [[ -d ${FTB_BASE_DIR} ]]; then
-  startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
-  if [[ $startScriptCount > 1 ]]; then
-    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
-    exit 2
-  fi
-else
-  startScriptCount=0
-fi
-
-# only download and install if a mod pack isn't already installed
-# also check for the start script rather than just the folder
-# this allows saving just the world separate from the rest of the data directory
-if [[ $startScriptCount = 0 ]]; then
-  srv_modpack=${FTB_SERVER_MOD}
-  if isURL ${srv_modpack}; then
-      case $srv_modpack in
-        https://www.feed-the-beast.com/*/download|https://www.curseforge.com/minecraft/modpacks/*/download/*/file)
-          ;;
-        https://www.curseforge.com/minecraft/modpacks/*/download/*)
-          srv_modpack=${srv_modpack}/file;;
-        https://www.feed-the-beast.com/*)
-          srv_modpack=${srv_modpack}/download;;
-      esac
-      file=$(basename $(dirname $srv_modpack))
-      downloaded=/data/${file}.zip
-      if [ ! -e $downloaded ]; then
-        log "Downloading FTB modpack...
-  $srv_modpack -> $downloaded"
-        curl -sSL -o $downloaded $srv_modpack
-      fi
-      srv_modpack=$downloaded
-  fi
-  if [[ ${srv_modpack:0:5} == "data/" ]]; then
-      # Prepend with "/"
-      srv_modpack=/${srv_modpack}
-  fi
-  if [[ ! ${srv_modpack:0:1} == "/" ]]; then
-      # If not an absolute path, assume file is in "/data"
-      srv_modpack=/data/${srv_modpack}
-  fi
-  if [[ ! -f ${srv_modpack} ]]; then
-      log "FTB server modpack ${srv_modpack} not found."
-      exit 2
-  fi
-  if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
-      log "FTB server modpack ${srv_modpack} is not a zip archive."
-      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
-      exit 2
-  fi
-
-  log "Unpacking FTB server modpack ${srv_modpack} ..."
-  mkdir -p ${FTB_BASE_DIR}
-  unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
-fi
-
-if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
-
-    # Allow up to 2 levels since some modpacks have a top-level directory named
-    # for the modpack
-    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
-    if [[ "$forgeJar" ]]; then
-      export FTB_BASE_DIR=$(dirname "${forgeJar}")
-      log "No entry script found, so building one for ${forgeJar}"
-      cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
-#!/bin/sh
-. ./settings-local.sh
-java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
-EOF
-      chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
-    else
-      log "Please make sure you are using the server version of the FTB modpack!"
-      exit 2
-    fi
-fi
-
-scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
-if [[ $scriptCount = 0 ]]; then
-    log "Please make sure you are using the server version of the FTB modpack!"
-    exit 2
-elif [[ $scriptCount > 1 ]]; then
-    log "Ambigous startup scripts in FTB modpack!"
-    log "found:"
-    find ${FTB_BASE_DIR} $entryScriptExpr
-    exit 2
-fi
-
-export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
-
-export FTB_DIR=$(dirname "${FTB_SERVER_START}")
-chmod a+x "${FTB_SERVER_START}"
-grep fml.queryResult=confirm ${FTB_SERVER_START} > /dev/null || \
-    sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${FTB_SERVER_START}"
-sed -i 's/.*read.*Restart now/#\0/' "${FTB_SERVER_START}"
-legacyJavaFixerPath="${FTB_DIR}/mods/legacyjavafixer.jar"
-
-if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e "${legacyJavaFixerPath}" ]; then
-  log "Installing legacy java fixer to ${legacyJavaFixerPath}"
-  curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
-fi
-
-if [ -e "${FTB_DIR}/FTBInstall.sh" ]; then
-  pushd "${FTB_DIR}"
-  sh FTBInstall.sh
-  popd
-elif [ -e "${FTB_DIR}/Install.sh" ]; then
-  pushd "${FTB_DIR}"
-  sh Install.sh
-  popd
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@

start-deployFabric

@@ -1,42 +1,40 @@
 #!/bin/bash
 set -eu
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export TYPE=FABRIC
 
 FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
 FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
-FABRICVERSION=${FABRICVERSION:-LATEST}
+FABRIC_INSTALLER_VERSION=${FABRIC_INSTALLER_VERSION:-${FABRICVERSION:-LATEST}}
 if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
   log "Checking Fabric version information."
-  case $FABRICVERSION in
+  case $FABRIC_INSTALLER_VERSION in
     LATEST)
-      FABRIC_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-      ;;
-
-    *)
-      FABRIC_VERSION=$FABRICVERSION
+      FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
       ;;
   esac
 
-  FABRIC_INSTALLER="/tmp/fabric-installer-$FABRIC_VERSION.jar"
+  FABRIC_INSTALLER="/tmp/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+  markerVersion=$FABRIC_INSTALLER_VERSION
 
 elif [[ -z $FABRIC_INSTALLER ]]; then
   FABRIC_INSTALLER="/tmp/fabric-installer.jar"
+  markerVersion=custom
 elif [[ ! -e $FABRIC_INSTALLER ]]; then
   log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
   exit 2
 fi
 
-installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${FABRIC_VERSION:-manual}"
+installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${markerVersion}"
 
 debug Checking for installMarker ${installMarker}
 if [[ ! -e $installMarker ]]; then
   if [[ ! -e $FABRIC_INSTALLER ]]; then
     if [[ -z $FABRIC_INSTALLER_URL ]]; then
-      log "Downloading $FABRIC_VERSION"
-      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/$FABRIC_VERSION/fabric-installer-$FABRIC_VERSION.jar"
+      log "Downloading installer version $FABRIC_INSTALLER_VERSION"
+      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
       log "...trying $downloadUrl"
       curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
     else
@@ -49,14 +47,17 @@ if [[ ! -e $installMarker ]]; then
   fi
 
   if isDebugging; then
-    debug "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER with mcversion ${VANILLA_VERSION}"
+    debug "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
   else
-    log "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
+    log "Installing Fabric using $FABRIC_INSTALLER"
   fi
   tries=3
   set +e
   while ((--tries >= 0)); do
-    java -jar $FABRIC_INSTALLER server -mcversion $VANILLA_VERSION -downloadMinecraft
+    java -jar $FABRIC_INSTALLER server \
+      -mcversion $VANILLA_VERSION \
+      -downloadMinecraft \
+      -dir /data
     if [[ $? == 0 ]]; then
       break
     fi
@@ -75,4 +76,4 @@ else
 fi
 
 # Contineut to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployForge

@@ -1,8 +1,9 @@
 #!/bin/bash
 
-. /start-utils
-
+. ${SCRIPTS:-/}start-utils
 export TYPE=FORGE
+: ${FORGEVERSION:=RECOMMENDED}
+isDebugging && set -x
 
 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
   norm=$VANILLA_VERSION
@@ -45,6 +46,8 @@ elif [[ -z $FORGE_INSTALLER ]]; then
 elif [[ ! -e $FORGE_INSTALLER ]]; then
   log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
   exit 2
+else
+  shortForgeVersion=$VANILLA_VERSION-custom
 fi
 
 installMarker="/data/.forge-installed-$shortForgeVersion"
@@ -97,7 +100,11 @@ if [ ! -e $installMarker ]; then
   log "Finding installed server jar..."
   unset -v latest
   for file in *forge*.jar; do
-    [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
+    if ! [[ $file =~ installer ]]; then
+      if [[ -z $latest ]] || [[ $file -nt $latest ]]; then
+        latest=$file
+      fi
+    fi
   done
   if [[ -z $latest ]]; then
     log "Unable to derive server jar for Forge"
@@ -113,4 +120,4 @@ else
 fi
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployMagma

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
 
@@ -15,4 +15,4 @@ fi
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployMohist

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -o pipefail
+set -e
+isDebugging && set -x
+
+requireVar VANILLA_VERSION
+: ${MOHIST_BUILD:=lastSuccessfulBuild}
+
+mohistJobs=https://ci.codemc.io/job/Mohist-Community/job/
+mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
+
+if ! curl -X HEAD -o /dev/null -fsSL "${mohistJob}"; then
+  log "ERROR: mohist builds do not exist for ${VANILLA_VERSION}"
+  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
+  log "       and set VERSION accordingly"
+  exit 1
+fi
+
+buildRelPath=$(
+  curl -fsSL "${mohistJob}${MOHIST_BUILD}/api/json" |
+    jq -r '.artifacts[0].relativePath'
+)
+
+baseName=$(basename "${buildRelPath}")
+if [[ ${baseName} != *-server.jar* ]]; then
+  log "ERROR: mohist build for ${VANILLA_VERSION} is not a valid server jar, found ${baseName}"
+  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
+  log "       and set VERSION accordingly"
+  exit 1
+fi
+
+export SERVER="/data/${baseName}"
+
+if [ ! -f ${SERVER} ]; then
+  log "Downloading ${baseName}"
+  curl -o "${SERVER}" -fsSL "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
+fi
+
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"

start-deployPaper

@@ -1,23 +1,79 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+set -o pipefail
+isDebugging && set -x
 
-: ${PAPERBUILD:=latest}
-export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar
+if [[ $PAPER_DOWNLOAD_URL ]]; then
+  export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
 
-if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/${PAPERBUILD}/download}
-    log "Downloading Paper $VANILLA_VERSION (build $PAPERBUILD) from $downloadUrl ..."
-    curl -fsSL -o "$SERVER" "$downloadUrl"
-    if [ ! -f "$SERVER" ]; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
+  if [ -f "$SERVER" ]; then
+    zarg=(-z "$SERVER")
+  fi
+
+  echo "Preparing custom PaperMC jar from $PAPER_DOWNLOAD_URL"
+
+  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PAPER_DOWNLOAD_URL}"
+else
+  # PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
+
+  build=${PAPERBUILD:=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
+   | jq '.builds[-1]')}
+  case $? in
+    0)
+      ;;
+    22)
+      versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
+      if [[ $VERSION = LATEST ]]; then
+          VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
+          log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
+          # re-execute the current script with the newly computed version
+          exec "$0" "$@"
+      fi
+      log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
+      log "       Set VERSION to one of the following: "
+      log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
+      exit 1
+      ;;
+    *)
+      echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
+      exit 1
+      ;;
+  esac
+  if [ $? != 0 ]; then
+    echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
+    exit 1
+  fi
+
+  export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \
+   | jq -r '.downloads.application.name')
+  if [ $? != 0 ]; then
+    echo "ERROR: failed to lookup PaperMC download file from version=${VANILLA_VERSION} build=${build}"
+    exit 1
+  fi
+
+  if [ -f "$SERVER" ]; then
+    zarg=(-z "$SERVER")
+  fi
+
+  log "Removing old PaperMC versions ..."
+  shopt -s nullglob
+  for f in paper-*.jar; do
+    [[ $f != $SERVER ]] && rm $f
+  done
+
+  log "Downloading PaperMC $VANILLA_VERSION (build $build) ..."
+  curl -fsSL -o "$SERVER" "${zarg[@]}" \
+    "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}/downloads/${SERVER}" \
+    -H  "accept: application/java-archive"
+  if [ $? != 0 ]; then
+    echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
+    exit 1
+  fi
 fi
 
-# Normalize on Spigot for operations below
+# Normalize on Spigot for downstream operations
 export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true
 
-# Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-spiget "$@"

start-deployPurpur

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
+
+: ${VANILLA_VERSION:?}
+: ${PURPUR_BUILD:=LATEST}
+: ${FORCE_REDOWNLOAD:=false}
+
+if [[ ${PURPUR_BUILD} == LATEST ]]; then
+  PURPUR_BUILD=$(curl -fsSL "https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}" |
+    jq -r '.builds.latest' || echo "")
+  if [[ -z ${PURPUR_BUILD} ]]; then
+    log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
+    log "       Please check if a download is available at https://purpur.pl3x.net/downloads/"
+    exit 3
+  fi
+fi
+
+export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
+
+if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
+    downloadUrl="https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
+    log "Downloading Purpur from $downloadUrl ..."
+    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export TYPE=SPIGOT
+export SKIP_LOG4J_CONFIG=true
+
+exec ${SCRIPTS:-/}start-spiget "$@"

start-deploySpongeVanilla

@@ -1,8 +1,10 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export TYPE=spongevanilla
+: ${SPONGEBRANCH:=STABLE}
+: ${SPONGEVERSION:=}
 
 # Parse branch
 log "Choosing branch for Sponge"
@@ -36,4 +38,4 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
 fi
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployTuinity

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if [ "${VERSION}" != "LATEST" ]; then
   log "ERROR: Tunity server type only supports VERSION=LATEST"
@@ -20,8 +20,7 @@ if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
     fi
 fi
 
-# Normalize on Spigot for operations below
+# Normalize on Spigot for later operations
 export TYPE=SPIGOT
 
-# Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-spiget "$@"

start-deployVanilla

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
 set -o pipefail
 
 export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"
@@ -25,6 +26,9 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   if [ $result != 0 ]; then
     log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
     exit 1
+  elif [ $serverDownloadUrl = null ]; then
+    log "ERROR version $VANILLA_VERSION does not provide a server download"
+    exit 1
   fi
 
   debug "Downloading server from $serverDownloadUrl"
@@ -39,5 +43,7 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   fi
 fi
 
+isDebugging && ls -l
+
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployYatopia

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
+
+: ${VANILLA_VERSION:?}
+: ${RELEASE:=stable}
+: ${FORCE_REDOWNLOAD:=false}
+
+requireEnum RELEASE stable latest
+
+export SERVER="yatopia-${RELEASE}-${VANILLA_VERSION}.jar"
+
+if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
+    downloadUrl="https://api.yatopiamc.org/v2/${RELEASE}Build/download?branch=ver/${VANILLA_VERSION}"
+    log "Downloading Yatopia from $downloadUrl ..."
+    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export TYPE=SPIGOT
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-finalSetup01World

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if [ $TYPE = "FEED-THE-BEAST" ]; then
-  worldDest=$FTB_BASE_DIR/$LEVEL
-else
-  worldDest=/data/$LEVEL
-fi
-
-# If no world exists and a URL for a world is supplied, download it and unpack
-if [[ "$WORLD" ]] && [ ! -d "$worldDest" ]; then
-case "X$WORLD" in
-  X[Hh][Tt][Tt][Pp]*)
-    log "Downloading world from $WORLD"
-    curl -sSL -o - "$WORLD" > /data/world.zip
-    log "Unzipping world"
-    unzip -o -q /data/world.zip
-    rm -f /data/world.zip
-    if [ ! -d $worldDest ]; then
-      log World directory not found
-      for i in /data/*/level.dat; do
-        if [ -f "$i" ]; then
-          d=`dirname "$i"`
-          log Renaming world directory from $d
-          mv -f "$d" $worldDest
-        fi
-      done
-    fi
-    if [ "$TYPE" = "SPIGOT" ]; then
-      # Reorganise if a Spigot server
-      log "Moving End and Nether maps to Spigot location"
-      [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "/data/${LEVEL}_the_end"
-      [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
-    fi
-    ;;
-  *)
-    if [[ -d "$WORLD" ]]; then
-      if [[ ! -d "$worldDest" ]]; then
-        log "Cloning world directory from $WORLD ..."
-        cp -r "$WORLD" "$worldDest"
-      else
-        log "Skipping clone from $WORLD since $worldDest exists"
-      fi
-    else
-      log "World cloning source '$WORLD' doesn't seem to exist"
-      exit 1
-    fi
-    ;;
-esac
-fi
-
-exec /start-finalSetup02Modpack $@

start-finalSetup05EnvVariables

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if [ "${REPLACE_ENV_VARIABLES^^}" = "TRUE" ]; then
-  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
-  while IFS='=' read -r name value ; do
-    # check if name of env variable matches the prefix
-    # sanity check environment variables to avoid code injections
-    if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] \
-        && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] \
-        && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then
-      # Read content from file environment
-      if [[ $name = *"_FILE" ]] && [[ -f $value ]]; then
-        name="${name/_FILE/}"
-        value=$(<$value)
-      fi
-
-      log "Replacing $name with $value ..."
-      find /data/ -type f \
-          \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
-          -or -name "*.conf" -or -name "*.properties" \) \
-          -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
-    fi
-  done < <(env)
-fi
-
-exec /start-minecraftFinalSetup $@

start-finalSetupEnvVariables

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${ENV_VARIABLE_PREFIX:=CFG_}
+
+if isTrue "${REPLACE_ENV_VARIABLES}"; then
+  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX ..."
+
+  # File excludes
+  fileExcludes=
+  for f in ${REPLACE_ENV_VARIABLES_EXCLUDES}; do
+    fileExcludes="${fileExcludes} -not -name $f"
+  done
+
+  # Directory excludes (recursive)
+  dirExcludes=$(join_by " -o -path " ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS})
+  if [[ $dirExcludes ]]; then
+    dirExcludes=" -type d ( -path ${dirExcludes} ) -prune -o"
+  fi
+
+  isDebugging && echo "Using find file exclusions: $fileExcludes"
+  isDebugging && echo "Using find directory exclusions: $dirExcludes"
+
+  for name in $(compgen -v $ENV_VARIABLE_PREFIX); do
+    # check if name of env variable matches the prefix
+    # sanity check environment variables to avoid code injections
+    # Read content from file environment
+    if [[ $name = *"_FILE" ]]; then
+      value=$(<${!name})
+      name="${name%_FILE}"
+    else
+      value=${!name}
+    fi
+
+    log "Replacing $name with $value ..."
+
+    value=${value//\\/\\\\}
+    value=${value//#/\\#}
+
+    find /data/ \
+        $dirExcludes \
+        -type f \
+        \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
+        -or -name "*.conf" -or -name "*.properties" -or -name "*.hjson" -or -name "*.json" \) \
+        $fileExcludes \
+        -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
+  done
+fi
+
+exec ${SCRIPTS:-/}start-minecraftFinalSetup $@

start-finalSetupModconfig

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 # If supplied with a URL for a config (simple zip of configurations), download it and unpack
 if [[ "$MODCONFIG" ]]; then
@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi
 
-exec /start-finalSetup04ServerProperties $@
+exec ${SCRIPTS:-/}start-finalSetupMounts $@

start-finalSetupModpack

@@ -1,80 +1,109 @@
 #!/bin/bash
 
-set -e
+set -e -o pipefail
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+if isDebugging; then
+  set -x
+fi
 
 #  CURSE_URL_BASE used in manifest downloads below
 CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
 
 # Remove old mods/plugins
-if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
-  if [ "$TYPE" = "SPIGOT" ]; then
-    rm -rf /data/plugins/*
+if isTrue ${REMOVE_OLD_MODS}; then
+  remove_mods_dest="/data/mods"
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER)
+      remove_mods_dest="/data/plugins"
+      ;;
+  esac
+
+  # only try to remove existing mods dir
+  if [ -d "$remove_mods_dest" ]; then
+    log "Removing old mods in $remove_mods_dest..."
+    find $remove_mods_dest -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
   else
-    rm -rf /data/mods/*
+    log "Directory $remove_mods_dest does not exist; removing nothing."
   fi
 fi
 
 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack
 if [[ "$MODPACK" ]]; then
-EFFECTIVE_MODPACK_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
-case "X$EFFECTIVE_MODPACK_URL" in
-  X[Hh][Tt][Tt][Pp]*.zip)
+  if isURL "${MODPACK}"; then
+    if [[ "${MODPACK}" == *.zip ]]; then
+      downloadUrl="${MODPACK}"
+    else
+      downloadUrl=$(curl -Ls -o /dev/null -w %{effective_url} $MODPACK)
+      if ! [[ $downloadUrl == *.zip ]]; then
+        log "ERROR Invalid URL given for MODPACK: $downloadUrl resolved from $MODPACK"
+        log "      Must be HTTP or HTTPS and a ZIP file"
+        exit 1
+      fi
+    fi
+
     log "Downloading mod/plugin pack via HTTP"
-    log "  from $EFFECTIVE_MODPACK_URL ..."
-    if ! curl -sSL -o /tmp/modpack.zip "$EFFECTIVE_MODPACK_URL"; then
-      log "ERROR: failed to download from $EFFECTIVE_MODPACK_URL"
+    log "  from $downloadUrl ..."
+    if ! curl -sSL -o /tmp/modpack.zip "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl"
       exit 2
     fi
 
     if [ "$TYPE" = "SPIGOT" ]; then
       mkdir -p /data/plugins
       if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
+        log "ERROR: failed to unzip the modpack from $downloadUrl"
       fi
     else
       mkdir -p /data/mods
       if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
+        log "ERROR: failed to unzip the modpack from $downloadUrl"
       fi
     fi
     rm -f /tmp/modpack.zip
-    ;;
-  *)
-    log "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
-    ;;
-esac
+
+  else
+    log "ERROR Invalid URL given for MODPACK: $MODPACK"
+    exit 1
+  fi
 fi
 
 # If supplied with a URL for a plugin download it.
 if [[ "$MODS" ]]; then
-for i in ${MODS//,/ }
-do
-  EFFECTIVE_MOD_URL=$(curl -Ls -o /dev/null -w %{url_effective} $i)
-  case "X$EFFECTIVE_MOD_URL" in
-    X[Hh][Tt][Tt][Pp]*.jar)
-      log "Downloading mod/plugin via HTTP"
-      log "  from $EFFECTIVE_MOD_URL ..."
-      if ! curl -sSL -o /tmp/${EFFECTIVE_MOD_URL##*/} $EFFECTIVE_MOD_URL; then
-        log "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
-        exit 2
-      fi
+  if [ "$TYPE" = "SPIGOT" ]; then
+    out_dir=/data/plugins
+  else
+    out_dir=/data/mods
+  fi
+  mkdir -p "$out_dir"
 
-      if [ "$TYPE" = "SPIGOT" ]; then
-        mkdir -p /data/plugins
-        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/plugins/${EFFECTIVE_MOD_URL##*/}
+  for i in ${MODS//,/ }
+  do
+    if isURL $i; then
+      log "Downloading mod/plugin $i ..."
+      if isValidFileURL jar "$i"; then
+        if ! curl -fsSL -o "${out_dir}/$(getFilenameFromUrl "${i}")" "${i}"; then
+          log "ERROR: failed to download from $i into $out_dir"
+          exit 2
+        fi
       else
-        mkdir -p /data/mods
-        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/mods/${EFFECTIVE_MOD_URL##*/}
+        effective_url=$(resolveEffectiveUrl "$i")
+        if isValidFileURL jar "${effective_url}"; then
+          out_file=$(getFilenameFromUrl "${effective_url}")
+          if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
+            log "ERROR: failed to download from $i into $out_dir"
+            exit 2
+          fi
+        else
+          log "ERROR: $effective_url resolved from $i is not a valid jar URL"
+          exit 2
+        fi
       fi
-      rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
-      ;;
-    *)
-      log "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
-      ;;
-  esac
-done
+    else
+      log "ERROR Invalid URL given in MODS: $i"
+      exit 2
+    fi
+  done
 fi
 
 if [[ "$MANIFEST" ]]; then
@@ -82,7 +111,7 @@ if [[ "$MANIFEST" ]]; then
         EFFECTIVE_MANIFEST_FILE=$MANIFEST
     elif isURL "$MANIFEST"; then
         EFFECTIVE_MANIFEST_FILE=/tmp/manifest.json
-        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MANIFEST)
+        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{effective_url} $MANIFEST)
         curl -Ls -o $EFFECTIVE_MANIFEST_FILE "$EFFECTIVE_MANIFEST_URL"
     else
         log "MANIFEST='$MANIFEST' is not a valid manifest url or location"
@@ -103,7 +132,7 @@ case "X$EFFECTIVE_MANIFEST_FILE" in
       do
         if [ ! -f $MOD_DIR/${p}_${f}.jar ]
         then
-          redirect_url="$(curl -Ls -o /dev/null -w %{url_effective} ${CURSE_URL_BASE}/${p})"
+          redirect_url="$(curl -Ls -o /dev/null -w %{effective_url} ${CURSE_URL_BASE}/${p})"
           url="$redirect_url/download/${f}/file"
           log Downloading curseforge mod $url
           #  Manifest usually doesn't have mod names. Using id should be fine, tho
@@ -122,17 +151,17 @@ fi
 
 if [[ "${GENERIC_PACK}" ]]; then
   if isURL "${GENERIC_PACK}"; then
-    generic_pack_url=${GENERIC_PACK}
-    GENERIC_PACK=/tmp/$(basename ${generic_pack_url})
-    log "Downloading generic pack from ${generic_pack_url} ..."
-    curl -fsSL -o ${GENERIC_PACK} ${generic_pack_url}
+    log "Downloading generic pack ..."
+    curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"
+    GENERIC_PACK=/tmp/generic_pack.zip
   fi
 
   sum_file=/data/.generic_pack.sum
   if ! sha256sum -c ${sum_file} -s 2> /dev/null; then
     base_dir=/tmp/generic_pack_base
     mkdir -p ${base_dir}
-    unzip -q -d ${base_dir} ${GENERIC_PACK}
+    isDebugging && ls -l "${GENERIC_PACK}"
+    unzip -q -d ${base_dir} "${GENERIC_PACK}"
     if [ -f /data/manifest.txt ]; then
       log "Manifest exists from older generic pack, cleaning up ..."
       while read f; do
@@ -150,8 +179,8 @@ if [[ "${GENERIC_PACK}" ]]; then
     for d in $(find ${base_dir} -type d); do mkdir -p "$(sed "s#${base_dir}#/data#" <<< $d)"; done
     for f in $(find ${base_dir} -type f); do cp -f "$f" "$(sed "s#${base_dir}#/data#" <<< $f)"; done
     rm -rf ${base_dir}
-    sha256sum ${GENERIC_PACK} > ${sum_file}
+    sha256sum "${GENERIC_PACK}" > ${sum_file}
   fi
 fi
 
-exec /start-finalSetup03Modconfig $@
+exec ${SCRIPTS:-/}start-finalSetupModconfig $@

start-finalSetupMounts

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${PLUGINS_SYNC_UPDATE:=true}
+
+isDebugging && set -x
+
+if [ -d /plugins ]; then
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER|MAGMA)
+      mkdir -p /data/plugins
+      log "Copying plugins over..."
+      if isTrue ${PLUGINS_SYNC_UPDATE}; then
+        updateArg="--update"
+      fi
+      # Copy plugins over using rsync to allow deeply nested updates of plugins
+      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
+      ;;
+  esac
+fi
+
+# If any modules have been provided, copy them over
+: ${COPY_MODS_DEST:="/data/mods"}
+
+if [ -d /mods ]; then
+  log "Copying any mods over..."
+  mkdir -p $COPY_MODS_DEST
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods/ $COPY_MODS_DEST
+fi
+
+: ${COPY_CONFIG_DEST:="/data/config"}
+
+if [ -d /config ]; then
+  log "Copying any configs from /config to $COPY_CONFIG_DEST"
+  mkdir -p $COPY_CONFIG_DEST
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST
+fi
+
+exec ${SCRIPTS:-/}start-finalSetupServerProperties $@

start-finalSetupServerProperties

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+
+: ${SERVER_PROPERTIES:=/data/server.properties}
 
 # FUNCTIONS
 function setServerProp {
@@ -12,10 +14,15 @@ function setServerProp {
       TRUE|FALSE)
         var=${var,,} ;;
     esac
-    log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-    sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
+    if grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
+      log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
+      sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
+    else
+      log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
+      echo "${prop}=${var//\\/\\\\}" >> "$SERVER_PROPERTIES"
+    fi
   else
-    log "Skip setting ${prop}"
+    isDebugging && log "Skip setting ${prop}"
   fi
 }
 
@@ -24,6 +31,10 @@ function customizeServerProps {
     log "Creating whitelist"
     setServerProp "whitelist" "true"
     setServerProp "white-list" "true"
+  else
+    log "Disabling whitelist"
+    setServerProp "whitelist" "false"
+    setServerProp "white-list" "false"
   fi
 
   # If not provided, generate a reasonable default message-of-the-day,
@@ -69,7 +80,7 @@ function customizeServerProps {
   setServerProp "max-world-size" "$MAX_WORLD_SIZE"
   setServerProp "level-name" "$LEVEL"
   setServerProp "level-seed" "$SEED"
-  setServerProp "pvp" "$PVP"
+  setServerProp "pvp" "${PVP}"
   setServerProp "generator-settings" "$GENERATOR_SETTINGS"
   setServerProp "online-mode" "$ONLINE_MODE"
   setServerProp "allow-flight" "$ALLOW_FLIGHT"
@@ -77,6 +88,18 @@ function customizeServerProps {
   setServerProp "resource-pack" "$RESOURCE_PACK"
   setServerProp "resource-pack-sha1" "$RESOURCE_PACK_SHA1"
   setServerProp "player-idle-timeout" "$PLAYER_IDLE_TIMEOUT"
+  setServerProp "broadcast-console-to-ops" "$BROADCAST_CONSOLE_TO_OPS"
+  setServerProp "broadcast-rcon-to-ops" "$BROADCAST_RCON_TO_OPS"
+  setServerProp "enable-jmx-monitoring" "$ENABLE_JMX"
+  setServerProp "sync-chunk-writes" "$SYNC_CHUNK_WRITES"
+  setServerProp "enable-status" "$ENABLE_STATUS"
+  setServerProp "entity-broadcast-range-percentage" "$ENTITY_BROADCAST_RANGE_PERCENTAGE"
+  setServerProp "function-permission-level" "$FUNCTION_PERMISSION_LEVEL"
+  setServerProp "network-compression-threshold" "$NETWORK_COMPRESSION_THRESHOLD"
+  setServerProp "op-permission-level" "$OP_PERMISSION_LEVEL"
+  setServerProp "prevent-proxy-connections" "$PREVENT_PROXY_CONNECTIONS"
+  setServerProp "use-native-transport" "$USE_NATIVE_TRANSPORT"
+  setServerProp "enforce-whitelist" "$ENFORCE_WHITELIST"
 
   if [ -n "$DIFFICULTY" ]; then
     case $DIFFICULTY in
@@ -180,4 +203,18 @@ else
   log "server.properties already created, skipping"
 fi
 
-exec /start-finalSetup05EnvVariables $@
+if isTrue "${ENABLE_AUTOPAUSE}"; then
+  current_max_tick=$( grep 'max-tick-time' "$SERVER_PROPERTIES" | sed -r 's/( )+//g' | awk -F= '{print $2}' )
+  if (( $current_max_tick > 0 && $current_max_tick < 86400000 )); then
+    log "Warning: The server.properties for the server doesn't have the Server Watchdog (effectively) disabled."
+    log "Warning (cont): Autopause functionality resuming the process might trigger the Watchdog and restart the server completely."
+    log "Warning (cont): Set the max-tick-time property to a high value (or disable the Watchdog with value -1 for versions 1.8.1+)."
+  fi
+fi
+
+if isDebugging; then
+  log "DEBUG Dumping server.properties"
+  cat /data/server.properties
+fi
+
+exec ${SCRIPTS:-/}start-finalSetupEnvVariables $@

start-finalSetupWorld

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -e
+isDebugging && set -x
+
+: ${LEVEL:=world}
+export LEVEL
+
+if [ $TYPE = "FEED-THE-BEAST" ]; then
+  worldDest=$FTB_DIR/$LEVEL
+else
+  worldDest=/data/$LEVEL
+fi
+
+if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] ); then
+  if isTrue "${FORCE_WORLD_COPY}"; then
+    log "Removing existing world data in $worldDest ${worldDest}_nether ${worldDest}_the_end"
+    rm -rf "$worldDest" \
+      "${worldDest}_nether" \
+      "${worldDest}_the_end"
+  fi
+
+  if isURL $WORLD; then
+    curl -fsSL "$WORLD" -o /tmp/world.zip
+    zipSrc=/tmp/world.zip
+  elif [[ "$WORLD" =~ .*\.zip ]]; then
+    zipSrc="$WORLD"
+  fi
+
+  if [[ "$zipSrc" ]]; then
+    log "Unzipping world"
+
+    # Stage contents so that the correct subdirectory can be picked off
+    mkdir -p /tmp/world-data
+    (cd /tmp/world-data && unzip -o -q "$zipSrc")
+
+    if [ "$TYPE" = "SPIGOT" ]; then
+      baseDirs=$(find /tmp/world-data -name "level.dat" -not -path "*_nether*" -not -path "*_the_end*" -exec dirname "{}" \;)
+    else
+      baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
+    fi
+
+    count=$(echo "$baseDirs" | wc -l)
+    if [[ $count -gt 1 ]]; then
+      baseDir="$(echo "$baseDirs" | sed -n ${WORLD_INDEX:-1}p)"
+      baseName=$(basename "$baseDir")
+      log "WARN multiple levels found, picking: $baseName"
+    elif [[ $count -gt 0 ]]; then
+      baseDir="$baseDirs"
+    else
+      log "ERROR invalid world content"
+      exit 1
+    fi
+    rsync --remove-source-files --recursive --delete "$baseDir/" "$worldDest"
+    if [ "$TYPE" = "SPIGOT" ]; then
+      log "Copying end and nether ..."
+      [ -d "${baseDir}_nether" ] && rsync --remove-source-files --recursive --delete "${baseDir}_nether/" "${worldDest}_nether"
+      [ -d "${baseDir}_the_end" ] && rsync --remove-source-files --recursive --delete "${baseDir}_the_end/" "${worldDest}_the_end"
+    fi
+  else
+    log "Cloning world directory from $WORLD ..."
+    rsync --recursive --delete "${WORLD%/}"/ "$worldDest"
+  fi
+
+  if [ "$TYPE" = "SPIGOT" ]; then
+    # Reorganise if a Spigot server
+    log "Moving End and Nether maps to Spigot location"
+    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "${worldDest}_the_end"
+    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "${worldDest}_nether"
+  fi
+fi
+
+exec ${SCRIPTS:-/}start-finalSetupModpack $@

start-minecraftFinalSetup

@@ -1,42 +1,53 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
 
 if [ -n "$OPS" ]; then
-  log "Setting/adding ops"
-  rm -rf /data/ops.txt.converted
+  log "Updating ops"
+  rm -f /data/ops.txt.converted
   echo $OPS | awk -v RS=, '{print}' > /data/ops.txt
 fi
+if isTrue "${OVERRIDE_OPS}"; then
+  log "Recreating ops.json file at server startup"
+  rm -f /data/ops.json
+fi
 
 if [ -n "$WHITELIST" ]; then
-  log "Setting whitelist"
-  rm -rf /data/white-list.txt.converted
+  log "Updating whitelist"
+  rm -f /data/white-list.txt.converted
   echo $WHITELIST | awk -v RS=, '{print}' > /data/white-list.txt
 fi
+if isTrue "${OVERRIDE_WHITELIST}"; then
+  log "Recreating whitelist.json file at server startup"
+  rm -f /data/whitelist.json
+fi
 
-if [ -n "$ICON" -a ! -e server-icon.png ]; then
-  log "Using server icon from $ICON..."
-  # Not sure what it is yet...call it "img"
-  curl -sSL -o /tmp/icon.img $ICON
-  specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
-  if [ "$specs" = "PNG 64x64" ]; then
-    mv /tmp/icon.img /data/server-icon.png
+if [ -n "$ICON" ]; then
+    if [ ! -e server-icon.png ] || [ "${OVERRIDE_ICON}" == "TRUE" ]; then
+      log "Using server icon from $ICON..."
+      # Not sure what it is yet...call it "img"
+      curl -sSL -o /tmp/icon.img $ICON
+      specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
+      if [ "$specs" = "PNG 64x64" ]; then
+        mv /tmp/icon.img /data/server-icon.png
+      else
+        log "Converting image to 64x64 PNG..."
+        convert /tmp/icon.img -resize 64x64! /data/server-icon.png
+      fi
+    fi
+fi
+
+if isTrue ${ENABLE_ROLLING_LOGS:-false}; then
+  # Set up log configuration
+  LOGFILE="/data/log4j2.xml"
+  if [ ! -e "$LOGFILE" ]; then
+    log "Creating log4j2.xml in ${LOGFILE}"
+    cp /tmp/log4j2.xml "$LOGFILE"
   else
-    log "Converting image to 64x64 PNG..."
-    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
+    log "log4j2.xml already created, skipping"
   fi
-fi
-
-if ! isTrue ${SKIP_LOG4J_CONFIG}; then
-# Set up log configuration
-LOGFILE="/data/log4j2.xml"
-if [ ! -e "$LOGFILE" ]; then
-  log "Creating log4j2.xml in ${LOGFILE}"
-  cp /tmp/log4j2.xml "$LOGFILE"
-else
-  log "log4j2.xml already created, skipping"
-fi
-JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
+  JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
 fi
 
 # Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
@@ -49,44 +60,14 @@ for j in $JSON_FILES; do
   fi
 done
 
-
-# If any modules have been provided, copy them over
-if [ -d /mods ]; then
-  log "Copying any mods over..."
-  mkdir -p /data/mods
-  rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /mods /data
-fi
-
-[ -d /data/config ] || mkdir /data/config
-for c in /config/*
-do
-  if [ -f "$c" ]; then
-    log Copying configuration $(basename "$c")
-    cp -rf "$c" /data/config
-  fi
-done
-
-case ${TYPE} in
-  SPIGOT|BUKKIT|PAPER)
-    mkdir -p /data/plugins
-    if [ -d /plugins ]; then
-      log "Copying plugins over..."
-      # Copy plugins over using rsync to allow deeply nested updates of plugins
-      # only updates files if the source file is newer and print updated files
-      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /plugins /data
-    fi
-    ;;
-esac
-
-EXTRA_ARGS=""
 # Optional disable console
 if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
-  EXTRA_ARGS+="--noconsole"
+  EXTRA_ARGS+=" --noconsole"
 fi
 
 # Optional disable GUI for headless servers
 if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
-  EXTRA_ARGS="${EXTRA_ARGS} nogui"
+  EXTRA_ARGS+=" nogui"
 fi
 
 # put these prior JVM_OPTS at the end to give any memory settings there higher precedence
@@ -101,7 +82,6 @@ if [ -n "$JVM_DD_OPTS" ]; then
 fi
 
 if isTrue ${ENABLE_JMX}; then
-  : ${JMX_HOST:=0.0.0.0}
   : ${JMX_PORT:=7091}
   JVM_OPTS="${JVM_OPTS}
   -Dcom.sun.management.jmxremote.local.only=false
@@ -109,8 +89,8 @@ if isTrue ${ENABLE_JMX}; then
   -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT}
   -Dcom.sun.management.jmxremote.authenticate=false
   -Dcom.sun.management.jmxremote.ssl=false
-  -Dcom.sun.management.jmxremote.host=${JMX_HOST}
-  -Djava.rmi.server.hostname=${JMX_HOST}"
+  -Dcom.sun.management.jmxremote.host=${JMX_BINDING:-0.0.0.0}
+  -Djava.rmi.server.hostname=${JMX_HOST:-localhost}"
 
   log "JMX is enabled. Make sure you have port forwarding for ${JMX_PORT}"
 fi
@@ -164,51 +144,82 @@ if isTrue "${USE_LARGE_PAGES}"; then
   "
 fi
 
+if isTrue "${USE_FLARE_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UnlockDiagnosticVMOptions
+  -XX:+DebugNonSafepoints
+  "
+fi
+
 if isTrue "${DEBUG_MEMORY}"; then
   log "Memory usage and availability (in MB)"
   uname -a
   free -m
 fi
 
-mcServerRunnerArgs="--stop-duration 60s"
+JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
+
+function copyFilesForCurseForge() {
+  # copy player modification files unconditionally since their
+  # processing into json is additive anyway
+  [ -f /data/ops.txt ] && cp -f /data/ops.txt "${FTB_DIR}/"
+  [ -f /data/white-list.txt ] && cp -f /data/white-list.txt "${FTB_DIR}/"
+
+  if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
+    cp -f /data/server-icon.png "${FTB_DIR}/"
+  fi
+
+  cp -f /data/eula.txt "${FTB_DIR}/"
+}
+
+mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
-    JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
     if isTrue ${DEBUG_EXEC}; then
       set -x
     fi
     exec mc-server-runner ${mcServerRunnerArgs} \
       --cf-instance-file "${CURSE_INSTANCE_JSON}" \
       java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
+elif [[ ${TYPE} == "FEED-THE-BEAST" && "${SERVER}" ]]; then
+  copyFilesForCurseForge
+
+  cd "${FTB_DIR}"
+  log "Starting CurseForge server in ${FTB_DIR}..."
+  if isTrue ${DEBUG_EXEC}; then
+    set -x
+  fi
+  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
 elif [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
-    mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
+  mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
 
-    if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then
-      cp -f /data/ops.txt ${FTB_DIR}/
-    fi
+  copyFilesForCurseForge
 
-    if [ ! -e "${FTB_DIR}/whitelist.json" -a -e /data/white-list.txt ]; then
-      cp -f /data/white-list.txt ${FTB_DIR}/
-    fi
-
-    cp -f /data/eula.txt "${FTB_DIR}/"
-
-    cat > "${FTB_DIR}/settings-local.sh" <<EOF
+  cat > "${FTB_DIR}/settings-local.sh" <<EOF
 export MIN_RAM="${INIT_MEMORY}"
 export MAX_RAM="${MAX_MEMORY}"
 export JAVA_PARAMETERS="${JVM_XX_OPTS} -Xms${INIT_MEMORY} ${JVM_OPTS} $expandedDOpts"
 EOF
 
-    # patch CurseForge cfg file, if present
-    if [ -f "${FTB_DIR}/settings.cfg" ]; then
-      sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
-    fi
+  # patch CurseForge cfg file, if present
+  if [ -f "${FTB_DIR}/settings.cfg" ]; then
+    sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
+  fi
 
-    cd "${FTB_DIR}"
-    log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
-    if isTrue ${DEBUG_EXEC}; then
-      set -x
-    fi
-    exec mc-server-runner ${mcServerRunnerArgs} "${FTB_SERVER_START}"
+  cd "${FTB_DIR}"
+  log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
+
+  finalArgs=(
+    "${FTB_SERVER_START}"
+  )
+
+  if isTrue ${DEBUG_EXEC}; then
+    set -x
+  fi
+  if isTrue ${EXEC_DIRECTLY:-false}; then
+    "${finalArgs[@]}"
+  else
+    exec mc-server-runner ${mcServerRunnerArgs} "${finalArgs[@]}"
+  fi
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f /data/bootstrap.txt ]; then
@@ -216,9 +227,22 @@ else
   fi
 
   log "Starting the Minecraft server..."
-  JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
+
+  finalArgs=(
+    $JVM_XX_OPTS
+    $JVM_OPTS
+    $expandedDOpts
+    -jar $SERVER
+    "$@" $EXTRA_ARGS
+  )
+
   if isTrue ${DEBUG_EXEC}; then
     set -x
   fi
-  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $SERVER "$@" $EXTRA_ARGS
+
+  if isTrue ${EXEC_DIRECTLY:-false}; then
+    exec java "${finalArgs[@]}"
+  else
+    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
+  fi
 fi

start-spiget

@@ -0,0 +1,58 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+. ${SCRIPTS:-/}start-utils
+handleDebugMode
+
+: ${SPIGET_RESOURCES:=}
+
+containsJars() {
+  file=${1?}
+
+  pat='\.jar$'
+
+  while read -r line; do
+    if [[ $line =~ $pat ]]; then
+      return 0
+    fi
+  done <<< $(unzip -l "$file")
+
+  return 1
+}
+
+getResourceFromSpiget() {
+  resource=${1?}
+
+  log "Downloading resource ${resource} ..."
+
+  tmpfile="/tmp/${resource}.zip"
+  url="https://api.spiget.org/v2/resources/${resource}/download"
+  if ! curl -o "${tmpfile}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${url}"; then
+    log "ERROR failed to download resource '${resource}' from ${url}"
+    exit 2
+  fi
+
+  mkdir -p /data/plugins
+  if containsJars "${tmpfile}"; then
+    log "Extracting contents of resource ${resource} into plugins"
+    unzip -o -q -d /data/plugins "${tmpfile}"
+    rm "${tmpfile}"
+  else
+    log "Moving resource ${resource} into plugins"
+    mv "${tmpfile}" "/data/plugins/${resource}.jar"
+  fi
+
+}
+
+if [[ ${SPIGET_RESOURCES} ]]; then
+  log "Getting plugins via Spiget"
+  IFS=',' read -r -a resources <<< "${SPIGET_RESOURCES}"
+  for resource in "${resources[@]}"
+  do
+    getResourceFromSpiget "${resource}"
+  done
+fi
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-utils

@@ -1,6 +1,14 @@
 #!/bin/bash
 
-function isURL {
+function join_by() {
+  local d=$1
+  shift
+  echo -n "$1"
+  shift
+  printf "%s" "${@/#/$d}"
+}
+
+function isURL() {
   local value=$1
 
   if [[ ${value:0:8} == "https://" || ${value:0:7} == "http://" ]]; then
@@ -10,75 +18,159 @@ function isURL {
   fi
 }
 
-function isTrue {
+function isValidFileURL() {
+  suffix=${1:?Missing required suffix arg}
+  url=${2:?Missing required url arg}
+
+  [[ "$url" == http*://*.${suffix} || "$url" == http*://*.${suffix}\?* ]]
+}
+
+function resolveEffectiveUrl() {
+  url="${1:?Missing required url argument}"
+  if ! curl -Ls -o /dev/null -w %{url_effective} "$url"; then
+    log "ERROR failed to resolve effective URL from $url"
+    exit 2
+  fi
+}
+
+function getFilenameFromUrl() {
+  url="${1:?Missing required url argument}"
+  strippedOfQuery="${url%\?*}"
+  basename "$strippedOfQuery"
+}
+
+function isTrue() {
   local value=${1,,}
 
   result=
 
   case ${value} in
-    true|on)
-      result=0
-      ;;
-    *)
-      result=1
-      ;;
+  true | on)
+    result=0
+    ;;
+  *)
+    result=1
+    ;;
   esac
 
   return ${result}
 }
 
-function isDebugging {
-  if [[ -v DEBUG ]] && [[ ${DEBUG^^} = TRUE ]]; then
+function isDebugging() {
+  if isTrue "${DEBUG:-false}"; then
     return 0
   else
     return 1
   fi
 }
 
-function debug {
+function handleDebugMode() {
+  if isDebugging; then
+    set -x
+    extraCurlArgs=(-v)
+  fi
+}
+
+function debug() {
   if isDebugging; then
     log "DEBUG: $*"
   fi
 }
 
-function logn {
+function logn() {
   echo -n "[init] $*"
 }
 
-function log {
+function log() {
   echo "[init] $*"
 }
 
-function normalizeMemSize {
-  local scale=1
-  case ${1,,} in
-    *k)
-      scale=1024;;
-    *m)
-      scale=1048576;;
-    *g)
-      scale=1073741824;;
-  esac
-
-  val=${1:0: -1}
-  echo $(( val * scale ))
+function logAutopause() {
+  echo "[Autopause loop] $*"
 }
 
-function versionLessThan {
+function logAutopauseAction() {
+  echo "[$(date -Iseconds)] [Autopause] $*"
+}
+
+function normalizeMemSize() {
+  local scale=1
+  case ${1,,} in
+  *k)
+    scale=1024
+    ;;
+  *m)
+    scale=1048576
+    ;;
+  *g)
+    scale=1073741824
+    ;;
+  esac
+
+  val=${1:0:-1}
+  echo $((val * scale))
+}
+
+function versionLessThan() {
   local activeParts
-  IFS=. read -ra activeParts <<< "${VANILLA_VERSION}"
+  IFS=. read -ra activeParts <<<"${VANILLA_VERSION}"
 
   local givenParts
-  IFS=. read -ra givenParts <<< "$1"
+  IFS=. read -ra givenParts <<<"$1"
 
-  if (( ${#activeParts[@]} < 2 )); then
+  if ((${#activeParts[@]} < 2)); then
     return 1
   fi
 
-  if (( activeParts[0] < givenParts[0] )) || \
-     (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )); then
-    return 0
+  if ((${#activeParts[@]} == 2)); then
+    if ((activeParts[0] < givenParts[0])) ||
+      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])); then
+      return 0
+    else
+      return 1
+    fi
   else
-    return 1
+    if ((activeParts[0] < givenParts[0])) ||
+      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])) ||
+      ((activeParts[0] == givenParts[0] && activeParts[1] == givenParts[1] && activeParts[2] < givenParts[2])); then
+      return 0
+    else
+      return 1
+    fi
   fi
-}
+}
+
+requireVar() {
+  if [ ! -v $1 ]; then
+    log "ERROR: $1 is required to be set"
+    exit 1
+  fi
+  if [ -z "${!1}" ]; then
+    log "ERROR: $1 is required to be set"
+    exit 1
+  fi
+}
+
+requireEnum() {
+  var=${1?}
+  shift
+
+  for allowed in $*; do
+    if [[ ${!var} = $allowed ]]; then
+      return 0
+    fi
+  done
+
+  log "ERROR: $var must be set to one of $@"
+#  exit 1
+}
+
+function writeEula() {
+  if ! echo "# Generated via Docker
+# $(date)
+eula=${EULA,,}
+" >/data/eula.txt; then
+    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
+    exit 2
+  fi
+}

start-validateCurseInstance

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if ! [[ -v CURSE_INSTANCE_JSON ]]; then
   log "ERROR: CURSE_INSTANCE_JSON needs to be set"
@@ -15,4 +15,4 @@ fi
 log "Resolved CURSE_INSTANCE_JSON as ${CURSE_INSTANCE_JSON}"
 
 # Continue to Final Setup
-exec /start-finalSetup01World "$@"
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"

tests/docker-compose.test.yml

@@ -0,0 +1,17 @@
+version: "3.8"
+
+services:
+  sut:
+    depends_on:
+      - mc
+    image: itzg/mc-monitor:0.6.0
+    command: status --host mc --retry-interval 1s --retry-limit 120
+  mc:
+    restart: "no"
+    build:
+      context: ..
+      cache_from:
+      - itzg/minecraft-server:latest
+    environment:
+      EULA: "TRUE"
+

tests/test.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+cd $(dirname $0)
+
+failed=false
+args="-f docker-compose.test.yml"
+docker-compose $args run sut || failed=true
+echo "
+Result: failed=$failed"
+
+$failed && docker-compose $args logs mc
+docker-compose $args down -v
+
+if $failed; then
+  exit 1
+fi
+