ci: added multiarch tags to triggers

# Conflicts:
#	Dockerfile
#	README.md
#	start
#	start-configuration
#	start-deployFTB

.circleci/config.yml

@@ -1,17 +0,0 @@
-version: 2
-jobs:
-  minecraft_server:
-    docker:
-      - image: circleci/buildpack-deps:18.04
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build image
-          command: docker build -t mc:$CIRCLE_BUILD_NUM minecraft-server
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - minecraft_server

.dockerignore

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

.editorconfig

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

.github/no-response.yml

@@ -0,0 +1,6 @@
+daysUntilClose: 14
+responseRequiredLabel: "status/waiting on feedback"
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  after requesting feedback. Please feel free to re-open this issue if the
+  scenario still exists and provide a comment with more information.

.github/workflows/build-multiarch.yml

@@ -0,0 +1,25 @@
+name: Build and publish multiarch
+on:
+  push:
+    branches:
+      - multiarch
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
+
+jobs:
+  docker-buildx:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.2.0
+      - name: Get branch name
+        uses: nelonoel/branch-name@v1
+      - name:  Docker Buildx
+        uses: ilteoood/docker_buildx@1.0.4
+        with:
+          publish: true
+          imageName: itzg/minecraft-server
+          tag: ${{ env.BRANCH_NAME }}
+          dockerHubUser: ${{ secrets.DOCKER_USER }}
+          dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}
+

.github/workflows/main.yml

@@ -0,0 +1,39 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Build non-multiarch branches/tags
+
+on:
+  push:
+    branches:
+      - master
+      - openj9
+      - openj9-nightly
+      - adopt11
+      - adopt13
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+-openj9"
+      - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt11"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt13"
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
+      with:
+        repository: itzg/minecraft-server
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        tag_with_ref: true
+        tag_with_sha: true
+        cache_froms: itzg/minecraft-server:latest
+        add_git_labels: true
+        push: false

.gitignore

@@ -1,2 +1,3 @@
-*.iml
-.idea
+/data/
+/.idea/
+*.iml

BUILDING.md

@@ -0,0 +1,5 @@
+Ensure buildx/BuildKit support is enabled and run:
+
+```
+docker buildx build --platform=linux/arm64 --platform=linux/arm/v7 --platform=linux/amd64 --tag itzg/minecraft-server:multiarch --push .
+```

DEVELOPMENT.md

@@ -0,0 +1,28 @@
+Individual scripts can be iteratively developed 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.

Dockerfile

@@ -0,0 +1,84 @@
+FROM ubuntu:18.04
+
+LABEL maintainer "itzg"
+
+RUN apt-get update \
+  && DEBIAN_FRONTEND=noninteractive \
+  apt-get install -y \
+    openjdk-8-jre-headless \
+    imagemagick \
+    gosu \
+    curl wget \
+    jq \
+    dos2unix \
+    mysql-client \
+    tzdata \
+    rsync \
+    nano \
+    unzip \
+    knockd \
+    ttf-dejavu \
+    && apt-get clean
+
+RUN addgroup --gid 1000 minecraft \
+  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+
+COPY files/sudoers* /etc/sudoers.d
+
+EXPOSE 25565 25575
+
+# hook into docker BuildKit --platform support
+# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETVARIANT
+
+ARG EASY_ADD_VER=0.7.1
+ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
+RUN chmod +x /usr/bin/easy-add
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+  --var version=1.2.0 --var app=restify --file {{.app}} \
+  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.4.7 --var app=rcon-cli --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.7 --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}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+COPY mcstatus /usr/local/bin
+
+VOLUME ["/data"]
+COPY server.properties /tmp/server.properties
+COPY log4j2.xml /tmp/log4j2.xml
+WORKDIR /data
+
+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_" \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10
+
+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

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-pkgs=ubuntu-openjdk-7
-pkgs="$pkgs minecraft-server"
-pkgs="$pkgs titan-gremlin"
-
-for p in $pkgs
-do
-  docker build -t itzg/$p $p
-done

circle.yml

@@ -1,11 +0,0 @@
-machine:
-  services:
-    - docker
-    
-test:
-  override:
-    - ./build
-    
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/4726bb683d8aed018486

docker-versions-create.sh

@@ -0,0 +1,120 @@
+#!/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')
+
+function TrapExit {
+  echo "Checking out back in master"
+  git checkout master
+}
+
+batchMode=false
+
+while getopts "hbt:" arg
+do
+  case $arg in
+    b)
+      batchMode=true
+      ;;
+    t)
+      tag=${OPTARG}
+      ;;
+    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
+  -h      display this help and exit
+"
+      exit
+      ;;
+    *)
+      echo "Unsupported arg $arg"
+      exit 2
+      ;;
+  esac
+done
+
+${batchMode} && echo "Using batch mode"
+
+trap TrapExit EXIT SIGTERM
+
+test -d ./.git || { echo ".git folder was not found. Please start this script from root directory of the project!";
+  exit 1; }
+
+# Making sure we are in master
+git checkout master
+git pull --all || { echo "Can't pull the repo!"; \
+  exit 1; }
+if [[ $tag ]]; then
+  git tag $tag
+  git push origin $tag
+fi
+
+git_branches=$(git branch -a)
+
+for branch in "${branches_list[@]}"; do
+  if [[ "$git_branches" != *"$branch"* ]]; then
+    echo "Can't update $branch because I can't find it in the list of branches."
+    exit 1
+  else
+    echo "Branch $branch found. Working with it."
+    git checkout "$branch" || { echo "Can't checkout into the branch. Don't know the cause."; \
+      exit 1; }
+    proceed='False'
+    while [[ "$proceed" == "False" ]]; do
+      # Ensure local branch is aligned with remote since docker-versions-create may have been run elsewhere
+      git pull
+
+      if git merge -m 'Auto-merging via docker-versions-create' master; then
+        proceed="True"
+        echo "Branch $branch updated to current master successfully"
+        # pushing changes to remote for this branch
+        git commit -m "Auto merge branch with master" -a
+        # push may fail if remote doesn't have this branch yet. In this case - sending branch
+        git push || git push -u origin "$branch" || { echo "Can't push changes to the origin."; exit 1; }
+        if [[ $tag ]]; then
+          git tag "$tag-$branch"
+          git push origin "$tag-$branch"
+        fi
+      elif ${batchMode}; then
+        status=$?
+        echo "Git merge failed in batch mode"
+        exit ${status}
+        # and trap exit gets us back to master
+      else
+        cat<<EOL
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Master merge in the branch $branch encountered an error!
+You may try to fix the error and merge again. (Commit changes)
+Or skip this branch merge completely.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+EOL
+        printf "Should we try again? (y):"
+        read -r answer
+        if [[ "$answer" == '' ]] || [[ "$answer" == 'y' ]] || [[ "$answer" == 'Y' ]]; then
+          # If you use non-local editor or files are changed in repo
+          cat <<EOL
+
+The following commands may encounter an error!
+This is completely fine if the changes were made locally and remote branch doesn't know about them.
+
+EOL
+          # Updating branch from remote before trying again
+          git checkout master
+          git fetch --all
+          git pull -a
+          git checkout "$branch"
+          continue
+        else
+          break
+        fi
+      fi
+    done
+  fi
+
+done

examples/README.md

@@ -0,0 +1,3 @@
+# Deployment Examples
+
+This directory contains various deployment examples of the [itzg/minecraft-server](https://hub.docker.com/r/itzg/minecraft-server/) Docker image.

examples/docker-compose-curseforge.yml

@@ -0,0 +1,13 @@
+version: '3.2'
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    volumes:
+    - ./modpacks:/modpacks:ro
+    environment:
+      EULA: "true"
+      TYPE: CURSEFORGE
+      CF_SERVER_MOD: /modpacks/SkyFactory_4_Server_4.1.0.zip
+    ports:
+      - 25565:25565

examples/docker-compose-curseinstance.yml

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,23 @@
+version: "3.7"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    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: FORGE
+    volumes:
+    # use a named, managed volume for data volume
+    - mc_forge:/data
+    # attach local host directory "mods" in same directory as this compose file
+    # all mods in this directory get copied into /data/mods at startup
+    - ./mods:/mods:ro
+
+volumes:
+  # declared the named volume, but use default/local storage engine
+  mc_forge: {}

examples/docker-compose-ftba.yml

@@ -0,0 +1,23 @@
+version: "3.7"
+
+services:
+  mc:
+    # FTBA support is only available in multiarch image tag
+    image: itzg/minecraft-server: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-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/k8s/using-statefulset.yml

@@ -0,0 +1,50 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  labels:
+    app: example
+  name: example
+spec:
+  replicas: 1
+  serviceName: example
+  selector:
+    matchLabels:
+      app: example
+  template:
+    metadata:
+      labels:
+        app: example
+    spec:
+      containers:
+        - name: mc
+          image: itzg/minecraft-server
+          env:
+            - name: EULA
+              value: "TRUE"
+          volumeMounts:
+            - mountPath: /data
+              name: data
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 1Gi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    service: example
+  name: example
+spec:
+  ports:
+    - port: 25565
+      targetPort: 25565
+  selector:
+    app: example
+  type: LoadBalancer

examples/k8s/vanilla-deployment.yml

@@ -33,6 +33,22 @@ spec:
         ports:
         - containerPort: 25565
           name: main
+        readinessProbe:
+          exec:
+            command:
+            - mcstatus
+            - localhost
+            - ping
+          initialDelaySeconds: 5
+          periodSeconds: 5
+        livenessProbe:
+          exec:
+            command:
+            - mcstatus
+            - localhost
+            - ping
+          initialDelaySeconds: 5
+          periodSeconds: 5
         volumeMounts:
         - name: mc-data
           mountPath: /data

examples/modpacks/.gitignore

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

examples/modpacks/README.md

@@ -0,0 +1,3 @@
+Please 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>.

examples/paper-build-plugins/Dockerfile

@@ -0,0 +1,5 @@
+FROM itzg/minecraft-server
+
+ENV TYPE=PAPER
+
+COPY plugins/*.jar /plugins/

examples/paper-build-plugins/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3.7'
+
+services:
+  mc:
+    build: .
+    environment:
+      EULA: "TRUE"
+    ports:
+    - 25565:25565
+    stdin_open: true
+    tty: true

examples/paper-build-plugins/plugins/.gitignore

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

examples/paper-build-plugins/plugins/README.md

@@ -0,0 +1 @@
+Download Bukkit/Spigot plugin jars, such as [WorldEdit](https://dev.bukkit.org/projects/worldedit/files) and place them here. At image build time the `COPY` step will place those jars in `/plugins`. At container startup, the contents of `/plugins` are sync'ed into `/data/plugins` for use with Bukkit/Spigot/Paper server types.

files/autopause/autopause-daemon.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+
+. /autopause/autopause-fcns.sh
+
+. /start-utils
+
+sudo /usr/sbin/knockd -c /autopause/knockd-config.cfg -d
+if [ $? -ne 0 ] ; then
+  while :
+  do
+    if [[ -n $(ps -o comm | grep java) ]] ; then
+      break
+    fi
+    sleep 0.1
+  done
+  logAutopause "Failed to start knockd daemon."
+  logAutopause "Possible cause: docker's host network mode."
+  logAutopause "Recreate without host mode or disable autopause functionality."
+  logAutopause "Stopping server."
+  killall -SIGTERM java
+  exit 1
+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,38 @@
+#!/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.*$ ]]
+}
+
+rcon_client_exists() {
+  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
+}
+
+mc_server_listening() {
+  [[ -n $(netstat -tln | grep "0.0.0.0:$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}') =~ ^\s*127\.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"
+  killall -q -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"
+  killall -q -CONT java
+fi

files/sudoers-mc

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

gitblit/Dockerfile

@@ -1,26 +0,0 @@
-FROM java:8
-
-LABEL maintainer "itzg"
-
-ENV GITBLIT_VERSION 1.7.1
-
-RUN wget -qO /tmp/gitblit.tgz http://dl.bintray.com/gitblit/releases/gitblit-$GITBLIT_VERSION.tar.gz
-
-RUN tar -C /opt -xvf /tmp/gitblit.tgz && \
-    rm /tmp/gitblit.tgz
-
-VOLUME ["/data"]
-
-ADD start.sh /start
-
-ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \
-    GITBLIT_HTTPS_PORT=443 \
-    GITBLIT_HTTP_PORT=80 \
-    GITBLIT_BASE_FOLDER=/data \
-    GITBLIT_ADMIN_USER=admin \
-    GITBLIT_INITIAL_REPO=
-WORKDIR $GITBLIT_PATH
-
-EXPOSE 80 443
-
-ENTRYPOINT ["/start"]

gitblit/README.md

@@ -1,46 +0,0 @@
-Provides a ready-to-use instance of [GitBlit](http://gitblit.com/).
-
-## Basic usage
-
-Start the GitBlit container using
-
-    docker run -d -p 80:80 -p 443:443 --name gitblit itzg/gitblit
-
-Access its web interface at the mapped HTTP (80) or HTTPS (443) port of the
-Docker host. Login with the default credentials __admin__ / __admin__ .
-
-
-## Data volume
-
-In order to allow for future upgrades, run the container with a volume mount of `/data`, such as:
-
-    -v /tmp/gitblit-data:/data
-
-## Initial repository creation
-
-As a convenience for cluster configuration management with git
-(such as with [Spring Cloud Config](https://cloud.spring.io/spring-cloud-config/)),
-you may specify the name of an initial repository to be owned by the 'admin' user.
-This can be enabled by passing the name of that repository via the environment
-variable `GITBLIT_INITIAL_REPO`, such as
-
-    -e GITBLIT_INITIAL_REPO=default
-
-## Create repositories with content
-
-In addition to the approach above, you can push repostories with existing
-content by attaching them to sub-directories of `/repos`, such as
-
-    docker run -v $HOME/git/example:/repos/example ...
-
-## Custom configuration
-
-You can add or override any of the `*.properties` files for configuring GitBlit,
-typically `gitblit.properties`, by placing those files in a volume attached at
-`/config`, such as
-
-    -v $(pwd)/extra-config:/config
-
-The property files in that configuration directory will be renamed with the
-suffix `.applied` to avoid overwriting manually modified configuration on
-the next container startup.

gitblit/start.sh

@@ -1,103 +0,0 @@
-#!/bin/bash
-
-apply_base_data() {
-  contents=`ls $GITBLIT_BASE_FOLDER|wc -l`
-
-  if [ $contents = "0" ]; then
-    cp -r $GITBLIT_PATH/data/* $GITBLIT_BASE_FOLDER
-  fi
-}
-
-apply_config() {
-    cp -rf /config/* $GITBLIT_BASE_FOLDER
-}
-
-create_repo() {
-  local repo_dir=$GITBLIT_BASE_FOLDER/git/$1.git
-  mkdir -p $repo_dir
-  cd $repo_dir
-
-  git init --bare
-
-  echo "
-[gitblit]
-        description =
-        originRepository =
-        owner = $GITBLIT_ADMIN_USER
-        acceptNewPatchsets = true
-        acceptNewTickets = true
-        mergeTo = master
-        useIncrementalPushTags = false
-        allowForks = true
-        accessRestriction = PUSH
-        authorizationControl = AUTHENTICATED
-        verifyCommitter = false
-        showRemoteBranches = false
-        isFrozen = false
-        skipSizeCalculation = false
-        skipSummaryMetrics = false
-        federationStrategy = FEDERATE_THIS
-        isFederated = false
-        gcThreshold =
-        gcPeriod = 0
-" >> config
-
-  git config --replace-all core.logallrefupdates false
-
-  echo "
-CREATING repository '$1' with:
-* read/clone access for all
-* push access for authenticated users"
-
-  RET="file://$repo_dir"
-}
-
-apply_repos() {
-  for rdir in /repos/*; do
-    if [ -e $rdir/.git ]; then
-      r=$(basename $rdir)
-      create_repo $r
-      local url=$RET
-      cd $rdir
-      echo "* pushed existing content"
-      git push --all $url
-    fi
-
-  done
-}
-
-create_initial_repo() {
-  if [ -d $GITBLIT_INITIAL_REPO ]; then
-    return
-  fi
-
-  create_repo $GITBLIT_INITIAL_REPO
-}
-
-shopt -s nullglob
-if [ ! -f /var/local/gitblit_firststart ]; then
-    FIRSTSTART=1
-else
-    FIRSTSTART=0
-fi
-
-if [ $FIRSTSTART = 1 ]; then
-  apply_base_data
-
-  echo "
-Applying configuration from /config
-"
-  apply_config
-  touch /var/local/gitblit_firststart
-fi
-
-
-if [[ -n $GITBLIT_INITIAL_REPO ]]; then
-  create_initial_repo
-fi
-apply_repos
-
-cd $GITBLIT_PATH
-$JAVA_HOME/bin/java -jar $GITBLIT_PATH/gitblit.jar \
-  --httpsPort $GITBLIT_HTTPS_PORT --httpPort $GITBLIT_HTTP_PORT \
-  --baseFolder $GITBLIT_BASE_FOLDER

health.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+if 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

jekyll-github-pages/.gitignore

@@ -1 +0,0 @@
-/site

jekyll-github-pages/Dockerfile

@@ -1,23 +0,0 @@
-FROM ubuntu:trusty
-
-LABEL maintainer "itzg"
-
-ENV APT_GET_UPDATE 2014-09-18
-
-RUN apt-get update
-RUN apt-get -y upgrade
-
-RUN apt-get -y install ruby ruby-dev make patch nodejs
-RUN gem install bundler
-
-ADD Gemfile /tmp/Gemfile
-WORKDIR /tmp
-RUN bundle install
-
-ADD template /site-template
-
-VOLUME ["/site"]
-EXPOSE 4000
-
-ADD start.sh /start
-CMD ["/start"]

jekyll-github-pages/Gemfile

@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'github-pages'

jekyll-github-pages/README.md

@@ -1,14 +0,0 @@
-This container is pre-configured according to the 
-[GitHub Pages use of Jekyll](https://help.github.com/articles/using-jekyll-with-pages).
-
-It serves up the generated content on port 4000 and the site is generated from
-the container's `/site` volume. You can either bring your own site content or
-let it generate some VERY simple content along with the standard Jekyll directory
-layout.
-
-A typical way to run this:
-
-    docker run -it -p 4000:4000 -v $(pwd)/site:/site itzg/jekyll-github-pages
-
-where either it will load your content or initialize the content under
-`site` in your current working directory.

jekyll-github-pages/start.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ `ls /site/index.* 2> /dev/null | wc -l` = 0 ]; then
-  echo "Preparing /site with default content..."
-  cp -r /site-template/* /site
-fi
-
-if [ ! -e /site/Gemfile ]; then
-  cp /tmp/Gemfile /site/Gemfile
-fi
-
-cd /site
-bundle exec jekyll serve

jekyll-github-pages/template/_config.yml

@@ -1 +0,0 @@
-highlighter: pygments

jekyll-github-pages/template/_includes/footer.html

@@ -1,3 +0,0 @@
-<footer>
-  <i>Goodbye</i>
-</footer>

jekyll-github-pages/template/_includes/header.html

@@ -1,3 +0,0 @@
-<header>
-  <h1>{{ page.title }}</h1>
-</header>

jekyll-github-pages/template/_includes/top.html

@@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="en-US">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-  <title>{{ page.title }}</title>
-
-  <!-- Latest compiled and minified CSS -->
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-
-  <!-- Optional theme -->
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
-
-  <!-- Latest compiled and minified JavaScript -->
-  <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-</head>

jekyll-github-pages/template/_layouts/default.html

@@ -1,12 +0,0 @@
-{% include top.html %}
-
-<body>
-
-  {% include header.html %}
-
-  {{ content }}
-
-  {% include footer.html %}
-
-</body>
-</html>

jekyll-github-pages/template/index.html

@@ -1,6 +0,0 @@
----
-layout: default
-title: Powered by Jekyll
-overview: true
----
-This is where the content goes.

jenkins/Dockerfile

@@ -1,17 +0,0 @@
-FROM java:openjdk-8u102-jdk
-
-LABEL maintainer "itzg"
-
-RUN apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y \
-  graphviz \
-  && apt-get clean
-
-ENV JENKINS_HOME=/data
-
-VOLUME ["/data", "/root", "/opt/jenkins"]
-EXPOSE 8080 38252
-
-COPY download-and-start.sh /opt/download-and-start
-
-CMD ["/opt/download-and-start"]

jenkins/README.md

@@ -1,51 +0,0 @@
-A self-upgrading [Jenkins CI](http://jenkins-ci.org/) server
-
-# Basic Usage
-
-To start Jenkins with the latest version:
-
-    ID=$(docker run -d -p 8080:8080 itzg/jenkins)
-
-At a later time, you can upgrade by restarting the container:
-
-    docker stop $ID
-    docker start $ID
-
-# Attaching host directory to Jenkins home directory
-
-The Jenkins home directory is attachable at `/data`, so attaching to a host volume
-would be:
-
-    ID=$(docker run -d -p 8080:8080 -v /SOME_HOST_DIR:/data itzg/jenkins
-
-# Enabling Jenkins slave agents
-
-By default, Jenkins will pick a random port to allow slave nodes launched
-by JNLP. Since Docker networking is basically a firewall, a random port
-won't work for us. Instead the fixed port **38252** was chosen (arbitrarily)
-to be exposed by the container.
-
-Launch your Jenkins container using
-
-    ID=$(docker run -d -p 8080:8080 -p 38252:38252 itzg/jenkins)
-
-and configure the port in the Global Security settings:
-
-![](http://i.imgur.com/PhQiEHy.png)
-
-# Image Parameters
-
-## Volumes
-
-* `/data` - a majority of the Jenkins content is maintained here, such as workspaces
-* `/root` - some tools, such as Maven, utilize the home directory for default repository storage
-* `/opt/jenkins` - the installed distribution is expanded here
-
-## Ports
-
-* `8080` - for the web UI
-* `38252` - for slave incoming JMX access
-
-## Environment Variables
-
-* `JENKINS_OPTS` - passed to the initial Java invocation of Jenkins

jenkins/download-and-start.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-mirrorUrl=http://mirrors.jenkins-ci.org/war/latest/jenkins.war
-url=$(curl -s --head $mirrorUrl|awk -F': ' '$1 == "Location" { print $2 }' | sed 's/[[:space:]]*$//')
-version=$(echo $url | sed 's#.*/war/\(.*\)/jenkins.war#\1#')
-
-mkdir -p /opt/jenkins
-trackingFile=/opt/jenkins/INSTALLED
-
-installed=
-if [ -f $trackingFile ]; then
-  installed=$(cat $trackingFile)
-  echo "Version installed is $installed"
-fi
-
-if [ $version != "$installed" ]; then
-  echo "Downloading $version from '$url'"
-  while ! curl -s -o /opt/jenkins/jenkins.war "$url"
-  do
-    echo "Trying again in 5 seconds"
-    sleep 5
-  done
-
-  echo $version > $trackingFile
-fi
-
-
-cd /opt/jenkins
-exec java $JENKINS_OPTS -jar jenkins.war

log4j2.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="com.mojang.util">
+    <Appenders>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+        </Console>
+        <Queue name="ServerGuiConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+            </Policies>
+            <DefaultRolloverStrategy>
+                <Delete basePath="logs">
+                    <IfFileName glob="*.log.gz" />
+                    <IfLastModified age="7d" />
+                </Delete>
+            </DefaultRolloverStrategy>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="SysOut"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="ServerGuiConsole"/>
+        </Root>
+    </Loggers>
+</Configuration>

mcstatus

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+echo "WARNING: mcstatus is deprecated; calling mc-monitor instead"
+
+##### mcstatus shim for mc-monitor
+# handles translating calls to
+#   mcstatus (host:port) (command)
+# where the actual command is ignore, but is typically ping or status
+
+addr="$1"
+
+IFS=':'
+read -a parts <<< "${addr}"
+if [[ ${#parts[*]} -gt 1 ]]; then
+  exec mc-monitor status --host ${parts[0]} --port ${parts[1]}
+else
+  exec mc-monitor status --host ${parts[0]}
+fi

minecraft-server/.dockerignore

@@ -1 +0,0 @@
-data

minecraft-server/.editorconfig

@@ -1,2 +0,0 @@
-[start-*]
-indent_size = 2

minecraft-server/.gitignore

@@ -1 +0,0 @@
-/data/

minecraft-server/Dockerfile

@@ -1,85 +0,0 @@
-FROM openjdk:8u212-jre-alpine
-
-LABEL maintainer "itzg"
-
-RUN apk add --no-cache -U \
-  openssl \
-  imagemagick \
-  lsof \
-  su-exec \
-  shadow \
-  bash \
-  curl iputils wget \
-  git \
-  jq \
-  mysql-client \
-  tzdata \
-  rsync \
-  nano \
-  python python-dev py2-pip
-
-RUN pip install mcstatus yq
-
-HEALTHCHECK CMD mcstatus localhost:$SERVER_PORT ping
-
-RUN addgroup -g 1000 minecraft \
-  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
-  && mkdir -m 777 /data /mods /config /plugins \
-  && chown minecraft:minecraft /data /config /mods /plugins /home/minecraft
-
-EXPOSE 25565 25575
-
-RUN echo 'hosts: files dns' > /etc/nsswitch.conf
-
-ARG RESTIFY_VER=1.1.6
-ARG RCON_CLI_VER=1.4.6
-ARG MC_SERVER_RUNNER_VER=1.3.2
-ARG TOF_BUILDTOOLS_VER=1.2.0
-ARG ARCH=amd64
-
-ADD https://github.com/itzg/restify/releases/download/${RESTIFY_VER}/restify_${RESTIFY_VER}_linux_${ARCH}.tar.gz /tmp/restify.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/restify.tgz restify && \
-  rm /tmp/restify.tgz
-
-ADD https://github.com/itzg/rcon-cli/releases/download/${RCON_CLI_VER}/rcon-cli_${RCON_CLI_VER}_linux_${ARCH}.tar.gz /tmp/rcon-cli.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/rcon-cli.tgz rcon-cli && \
-  rm /tmp/rcon-cli.tgz
-
-ADD https://github.com/itzg/mc-server-runner/releases/download/${MC_SERVER_RUNNER_VER}/mc-server-runner_${MC_SERVER_RUNNER_VER}_linux_${ARCH}.tar.gz /tmp/mc-server-runner.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/mc-server-runner.tgz mc-server-runner && \
-  rm /tmp/mc-server-runner.tgz
-
-ADD https://git.faldoria.de/tof/server/build-tools/-/jobs/artifacts/buildtools-${TOF_BUILDTOOLS_VER}/raw/target/ToF-BuildTools.jar?job=release-artifact /tmp/tof-buildtools/BuildTools.jar
-
-ONBUILD ARG BUILDTOOLS_OUTPUT=/plugins
-ONBUILD COPY *Dockerfile* *plugins.yml /tmp/tof-buildtools/
-ONBUILD RUN \
-  [ -d /tmp/tof-buildtools ] && \
-  [ $(find /tmp/tof-buildtools -type f -name plugins.yml | wc -l) -gt 0 ] && \
-  java -jar /tmp/tof-buildtools/BuildTools.jar \
-    --config "/tmp/tof-buildtools/plugins.yml" \
-    --configs "plugins.yml" \
-    --dir "/tmp/tof-buildtools/" \
-    --output ${BUILDTOOLS_OUTPUT} && \
-  chown -R minecraft:minecraft ${BUILDTOOLS_OUTPUT} && \
-  rm -fR /tmp/tof-buildtools/ || \
-  true
-
-COPY mcadmin.jq /usr/share
-RUN chmod +x /usr/local/bin/*
-
-VOLUME ["/data","/mods","/config"]
-COPY server.properties /tmp/server.properties
-WORKDIR /data
-
-ENTRYPOINT [ "/start" ]
-
-ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" 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 GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server" \
-  REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_"
-
-COPY start* /
-RUN dos2unix /start* && chmod +x /start*

minecraft-server/examples/ToF-build/Dockerfile

@@ -1,3 +0,0 @@
-FROM itzg/minecraft-server
-
-ENV TYPE=SPIGOT

minecraft-server/examples/ToF-build/plugins.yml

@@ -1,13 +0,0 @@
-plugins:
-  worldedit:
-    file: WorldEdit.jar
-    url: https://dev.bukkit.org/projects/worldedit/files/latest
-  FastAsyncWorldEdit:
-    file: FastAsyncWorldEdit.jar
-    url: https://empcraft.com/fawe/latest.php?bukkit
-  worldguard:
-    file: WorldGuard.jar
-    url: https://dev.bukkit.org/projects/worldguard/files/latest
-  citizens:
-    file: Citizens.jar
-    url: https://dev.bukkit.org/projects/citizens/files/latest

minecraft-server/examples/docker-compose-curseforge.yml

@@ -1,11 +0,0 @@
-version: '3.2'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: FTB
-      FTB_SERVER_MOD: https://minecraft.curseforge.com/projects/all-the-mods-expert-remastered/files/2493900/download
-    ports:
-      - 25565:25565

minecraft-server/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:

minecraft-server/mcadmin.jq

@@ -1,7 +0,0 @@
-.[] |
- select(.elements | length > 1) |
-  select(.elements[].elements[] | select(.class == "version" and .text == $version)) |
-   .elements[].elements[] |
-    select(.class|contains("server-jar")) |
-     .elements[] | select(.name="a") |
-      .href

minecraft-server/start

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-umask 0002
-chmod g+w /data
-
-if [ $(id -u) = 0 ]; then
-  if [[ -v UID && $UID != $(id -u) ]]; then
-    usermod -u $UID minecraft
-  fi
-  if [[ -v GID ]]; then
-    groupmod -o -g $GID minecraft
-  fi
-
-  if [[ $(stat -c "%u" /data) != $UID ]]; then
-    echo "Changing ownership of /data to $UID ..."
-    chown -R minecraft:minecraft /data
-  fi
-
-  exec su-exec minecraft:minecraft /start-configuration $@
-else
-  exec /start-configuration $@
-fi

minecraft-server/start-configuration

@@ -1,106 +0,0 @@
-#!/bin/bash
-
-shopt -s nullglob
-
-#umask 002
-export HOME=/data
-
-if [ ! -e /data/eula.txt ]; then
-  if [ "$EULA" != "" ]; then
-    echo "# Generated via Docker on $(date)" > eula.txt
-    echo "eula=$EULA" >> eula.txt
-    if [ $? != 0 ]; then
-      echo "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
-      exit 2
-    fi
-  else
-    echo ""
-    echo "Please accept the Minecraft EULA at"
-    echo "  https://account.mojang.com/documents/minecraft_eula"
-    echo "by adding the following immediately after 'docker run':"
-    echo "  -e EULA=TRUE"
-    echo ""
-    exit 1
-  fi
-fi
-
-echo "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
-
-if ! touch /data/.verify_access; then
-  echo "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
-  exit 2
-fi
-
-rm /data/.verify_access || true
-
-if [[ $PROXY ]]; then
-    export http_proxy="$PROXY"
-    export https_proxy="$PROXY"
-    echo "INFO: Giving proxy time to startup..."
-    sleep 5
-fi
-
-export SERVER_PROPERTIES=/data/server.properties
-export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
-
-echo "Checking version information."
-case "X$VERSION" in
-  X|XLATEST|Xlatest)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.release'`
-  ;;
-  XSNAPSHOT|Xsnapshot)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot'`
-  ;;
-  X[1-9]*)
-    export VANILLA_VERSION=$VERSION
-  ;;
-  *)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.release'`
-  ;;
-esac
-
-cd /data
-
-export ORIGINAL_TYPE=${TYPE^^}
-
-echo "Checking type information."
-case "${TYPE^^}" in
-  *BUKKIT|SPIGOT)
-    exec /start-deployBukkitSpigot $@
-  ;;
-
-  PAPER)
-    exec /start-deployPaper $@
-  ;;
-
-  FORGE)
-    exec /start-deployForge $@
-  ;;
-
-  FABRIC)
-    exec /start-deployFabric $@
-  ;;
-
-  FTB|CURSEFORGE)
-    exec /start-deployFTB $@
-  ;;
-
-  VANILLA)
-    exec /start-deployVanilla $@
-  ;;
-
-  SPONGEVANILLA)
-    exec /start-deploySpongeVanilla $@
-  ;;
-
-  CUSTOM)
-    exec /start-deployCustom $@
-  ;;
-
-  *)
-      echo "Invalid type: '$TYPE'"
-      echo "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
-      exit 1
-  ;;
-
-esac

minecraft-server/start-deployCustom

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if isURL ${CUSTOM_SERVER}; then
-  filename=$(basename ${CUSTOM_SERVER})
-  export SERVER=/data/${filename}
-
-  if [[ -f ${SERVER} ]] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    echo "Using previously downloaded jar at ${SERVER}"
-  else
-   echo "Downloading custom server jar from ${CUSTOM_SERVER} ..."
-   if ! curl -sSL -o ${SERVER} ${CUSTOM_SERVER}; then
-      echo "Failed to download from ${CUSTOM_SERVER}"
-      exit 2
-    fi
-  fi
-
-elif [[ -f ${CUSTOM_SERVER} ]]; then
-  echo "Using custom server jar at ${CUSTOM_SERVER} ..."
-  export SERVER=${CUSTOM_SERVER}
-
-else
-  echo "CUSTOM_SERVER is not properly set to a URL or existing jar file"
-  exit 2
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@

minecraft-server/start-deployPaper

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export SERVER=paper_server.jar
-if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/latest/download}
-    echo "Downloading Paper $VANILLA_VERSION from $downloadUrl ..."
-    curl -fsSL -o $SERVER "$downloadUrl"
-    if [ ! -f $SERVER ]; then
-      echo "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for operations below
-export TYPE=SPIGOT
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@

minecraft-server/start-finalSetup01World

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-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]*)
-    echo "Downloading world from $WORLD"
-    curl -sSL -o - "$WORLD" > /data/world.zip
-    echo "Unzipping world"
-    unzip -o -q /data/world.zip
-    rm -f /data/world.zip
-    if [ ! -d $worldDest ]; then
-      echo World directory not found
-      for i in /data/*/level.dat; do
-        if [ -f "$i" ]; then
-          d=`dirname "$i"`
-          echo Renaming world directory from $d
-          mv -f "$d" $worldDest
-        fi
-      done
-    fi
-    if [ "$TYPE" = "SPIGOT" ]; then
-      # Reorganise if a Spigot server
-      echo "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
-        echo "Cloning world directory from $WORLD ..."
-        cp -r $WORLD $worldDest
-      else
-        echo "Skipping clone from $WORLD since $worldDest exists"
-      fi
-    else
-      echo "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file"
-    fi
-    ;;
-esac
-fi
-
-exec /start-finalSetup02Modpack $@

minecraft-server/start-finalSetup02Modpack

@@ -1,108 +0,0 @@
-#!/bin/bash
-
-#  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/*
-  else
-    rm -rf /data/mods/*
-  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)
-    echo "Downloading mod/plugin pack via HTTP"
-    echo "  from $EFFECTIVE_MODPACK_URL ..."
-    if ! curl -sSL -o /tmp/modpack.zip "$EFFECTIVE_MODPACK_URL"; then
-      echo "ERROR: failed to download from $EFFECTIVE_MODPACK_URL"
-      exit 2
-    fi
-
-    if [ "$TYPE" = "SPIGOT" ]; then
-      mkdir -p /data/plugins
-      if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
-      fi
-    else
-      mkdir -p /data/mods
-      if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
-      fi
-    fi
-    rm -f /tmp/modpack.zip
-    ;;
-  *)
-    echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
-    ;;
-esac
-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)
-      echo "Downloading mod/plugin via HTTP"
-      echo "  from $EFFECTIVE_MOD_URL ..."
-      if ! curl -sSL -o /tmp/${EFFECTIVE_MOD_URL##*/} $EFFECTIVE_MOD_URL; then
-        echo "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
-        exit 2
-      fi
-
-      if [ "$TYPE" = "SPIGOT" ]; then
-        mkdir -p /data/plugins
-        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/plugins/${EFFECTIVE_MOD_URL##*/}
-      else
-        mkdir -p /data/mods
-        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/mods/${EFFECTIVE_MOD_URL##*/}
-      fi
-      rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
-      ;;
-    *)
-      echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
-      ;;
-  esac
-done
-fi
-
-if [[ "$MANIFEST" ]]; then
-EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MANIFEST)
-case "X$EFFECTIVE_MANIFEST_URL" in
-  X*.json)
-    if [ -f "${EFFECTIVE_MANIFEST_URL}" ]; then
-      MOD_DIR=${FTB_BASE_DIR:-/data}/mods
-      if [ ! -d "$MOD_DIR" ]
-      then
-        echo "Creating mods dir $MOD_DIR"
-        mkdir -p "$MOD_DIR"
-      fi
-      echo "Starting manifest download..."
-      cat "${EFFECTIVE_MANIFEST_URL}" | jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
-      do
-        if [ ! -f $MOD_DIR/${p}_${f}.jar ]
-        then
-          url="${CURSE_URL_BASE}/${p}/files/${f}/download"
-          echo Downloading curseforge mod $url
-          #  Manifest usually doesn't have mod names. Using id should be fine, tho
-          curl -sSL "${url}" -o $MOD_DIR/${p}_${f}.jar
-        fi
-      done
-    else
-      echo "Could not find manifest file, unsufficient privs, or malformed path."
-    fi
-    ;;
-  *)
-    echo "Invalid manifest file for modpack. Please make sure it is a .json file."
-    ;;
-esac
-fi
-
-exec /start-finalSetup03Modconfig $@

minecraft-server/start-finalSetup05EnvVariables

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ "$REPLACE_ENV_VARIABLES" = "TRUE" ]; then
-  echo "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
-        echo "Replacing $name with $value ..."
-        find /data/ -type f \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" -or -name "*.properties" \) -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
-    fi
-  done < <(env)
-fi
-
-exec /start-minecraftFinalSetup $@

minecraft-server/start-minecraftFinalSetup

@@ -1,129 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if [ -n "$OPS" -a ! -e ops.txt.converted ]; then
-  echo "Setting ops"
-  echo $OPS | awk -v RS=, '{print}' >> ops.txt
-fi
-
-if [ -n "$WHITELIST" -a ! -e white-list.txt.converted ]; then
-  echo "Setting whitelist"
-  echo $WHITELIST | awk -v RS=, '{print}' >> white-list.txt
-fi
-
-if [ -n "$ICON" -a ! -e server-icon.png ]; then
-  echo "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
-    echo "Converting image to 64x64 PNG..."
-    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
-  fi
-fi
-
-# Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
-echo "Checking for JSON files."
-JSON_FILES=$(find . -maxdepth 1 -name '*.json')
-for j in $JSON_FILES; do
-  if [[ $(python -c "print open('$j').read().strip()==''") = True ]]; then
-    echo "Fixing JSON $j"
-    echo '[]' > $j
-  fi
-done
-
-
-# If any modules have been provided, copy them over
-mkdir -p /data/mods
-if [ -d /mods ]; then
-  echo "Copying any mods over..."
-  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
-    echo Copying configuration `basename "$c"`
-    cp -rf "$c" /data/config
-  fi
-done
-
-mkdir -p /data/plugins
-if [ "$TYPE" = "SPIGOT" ]; then
-  if [ -d /plugins ]; then
-    echo "Copying any Bukkit 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
-fi
-
-EXTRA_ARGS=""
-# Optional disable console
-if [[ ${CONSOLE} = false || ${CONSOLE} = FALSE ]]; then
-  EXTRA_ARGS+="--noconsole"
-fi
-
-# Optional disable GUI for headless servers
-if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
-  EXTRA_ARGS="${EXTRA_ARGS} nogui"
-fi
-
-# put these prior JVM_OPTS at the end to give any memory settings there higher precedence
-echo "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
-
-expandedDOpts=
-if [ -n "$JVM_DD_OPTS" ]; then
-      for dopt in $JVM_DD_OPTS
-      do
-          expandedDOpts="${expandedDOpts} -D${dopt/:/=}"
-      done
-fi
-
-mcServerRunnerArgs="--stop-duration 60s"
-
-if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
-    if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then
-      cp -f /data/ops.txt ${FTB_DIR}/
-    fi
-
-    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
-export MIN_RAM="${INIT_MEMORY}"
-export MAX_RAM="${MAX_MEMORY}"
-export JAVA_PARAMETERS="-Xms${INIT_MEMORY} $expandedDOpts"
-EOF
-
-    # patch CurseForge cfg file, if present
-    if [ -f "${FTB_DIR}/settings.cfg" ]; then
-      sed -i "/MAX_RAM=.*/ c MAX_RAM=${MAX_MEMORY};" "${FTB_DIR}/settings.cfg"
-    fi
-
-    cd "${FTB_DIR}"
-    echo "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
-    if isTrue ${DEBUG_EXEC}; then
-      set -x
-    fi
-    exec mc-server-runner ${mcServerRunnerArgs} "${FTB_SERVER_START}"
-else
-  # If we have a bootstrap.txt file... feed that in to the server stdin
-  if [ -f /data/bootstrap.txt ]; then
-    bootstrapArgs="--bootstrap /data/bootstrap.txt"
-  fi
-
-  echo "Starting the Minecraft server..."
-  JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
-  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
-fi

minecraft-server/start-utils

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-function isURL {
-  local value=$1
-
-  if [[ ${value:0:8} == "https://" || ${value:0:7} = "http://" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function isTrue {
-  local value=${1,,}
-
-  result=
-
-  case ${value} in
-    true|on)
-      result=0
-      ;;
-    *)
-      result=1
-      ;;
-  esac
-
-  return ${result}
-}
-
-function isDebugging {
-  if [[ ${DEBUG^^} = TRUE ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function debug {
-  if isDebugging; then
-    echo "DEBUG: $*"
-  fi
-}

server.properties

@@ -22,6 +22,7 @@ snooper-enabled=true
 texture-pack=
 online-mode=true
 resource-pack=
+resource-pack-sha1=
 pvp=true
 difficulty=1
 enable-command-block=true

start

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+umask 0002
+chmod g+w /data
+
+if [ $(id -u) = 0 ]; then
+  runAsUser=minecraft
+  runAsGroup=minecraft
+
+  if [[ -v UID ]]; then
+    if [[ $UID != 0 ]]; then
+      if [[ $UID != $(id -u minecraft) ]]; then
+        log "Changing uid of minecraft to $UID"
+        usermod -u $UID minecraft
+      fi
+    else
+      runAsUser=root
+    fi
+  fi
+
+  if [[ -v GID ]]; then
+    if [[ $GID != 0 ]]; then
+      if [[ $GID != $(id -g minecraft) ]]; then
+        log "Changing gid of minecraft to $GID"
+        groupmod -o -g $GID minecraft
+      fi
+    else
+      runAsGroup=root
+    fi
+  fi
+
+  if [[ $(stat -c "%u" /data) != $UID ]]; then
+    log "Changing ownership of /data to $UID ..."
+    chown -R ${runAsUser}:${runAsGroup} /data
+  fi
+
+  if [[ $(stat -c "%u" /autopause) != $UID ]]; then
+    log "Changing ownership of /autopause to $UID ..."
+    chown -R ${runAsUser}:${runAsGroup} /autopause
+  fi
+
+  if [[ ${SKIP_NSSWITCH_CONF^^} != TRUE ]]; then
+    echo 'hosts: files dns' > /etc/nsswitch.conf
+  fi
+
+  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
+else
+  exec ${SCRIPTS:-/}start-configuration $@
+fi

start-autopause

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+log "Autopause functionality enabled"
+
+# update server port to listen to
+regseq="^\s*sequence\s*=\s*$SERVER_PORT\s*$"
+linenum=$(grep -nm1 sequence /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $SERVER_PORT/" /autopause/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 /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $RCON_PORT/" /autopause/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 [[ -n $MAX_TICK_TIME ]] ; 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)"
+else
+  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

@@ -0,0 +1,128 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+shopt -s nullglob
+
+#umask 002
+export HOME=/data
+
+log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
+
+if [ ! -e /data/eula.txt ]; then
+  EULA="${EULA,,}"
+  if [ "$EULA" != "true" ]; then
+    log ""
+    log "Please accept the Minecraft EULA at"
+    log "  https://account.mojang.com/documents/minecraft_eula"
+    log "by adding the following immediately after 'docker run':"
+    log "  -e EULA=TRUE"
+    log ""
+    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
+fi
+
+
+if [[ $PROXY ]]; then
+    export http_proxy="$PROXY"
+    export https_proxy="$PROXY"
+    log "INFO: Giving proxy time to startup..."
+    sleep 5
+fi
+
+export SERVER_PROPERTIES=/data/server.properties
+export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
+
+case "X$VERSION" in
+  X|XLATEST|Xlatest)
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
+  ;;
+  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')
+  ;;
+esac
+export VANILLA_VERSION
+log "Resolved version given ${VERSION} into ${VANILLA_VERSION}"
+
+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 ${SCRIPTS:-/}start-deployBukkitSpigot "$@"
+  ;;
+
+  PAPER)
+    exec ${SCRIPTS:-/}start-deployPaper "$@"
+  ;;
+
+  TUINITY)
+    exec ${SCRIPTS:-/}start-deployTuinity "$@"
+  ;;
+
+  FORGE)
+    exec ${SCRIPTS:-/}start-deployForge "$@"
+  ;;
+
+  FABRIC)
+    exec ${SCRIPTS:-/}start-deployFabric "$@"
+  ;;
+
+  FTBA)
+    exec ${SCRIPTS:-/}start-deployFTB "$@"
+  ;;
+
+  CURSEFORGE|FTB)
+    exec ${SCRIPTS:-/}start-deployCF "$@"
+  ;;
+
+  VANILLA)
+    exec ${SCRIPTS:-/}start-deployVanilla "$@"
+  ;;
+
+  SPONGEVANILLA)
+    exec ${SCRIPTS:-/}start-deploySpongeVanilla "$@"
+  ;;
+
+  CUSTOM)
+    exec ${SCRIPTS:-/}start-deployCustom "$@"
+  ;;
+
+  CURSE_INSTANCE)
+    exec ${SCRIPTS:-/}start-validateCurseInstance "$@"
+  ;;
+
+  MAGMA)
+    exec ${SCRIPTS:-/}start-magma "$@"
+  ;;
+
+  MOHIST)
+    exec ${SCRIPTS:-/}start-mohist "$@"
+  ;;
+
+  *)
+      log "Invalid type: '$TYPE'"
+      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
+      exit 1
+  ;;
+
+esac

start-deployBukkitSpigot

@@ -1,23 +1,44 @@
 #!/bin/bash
 
+. ${SCRIPTS:-/}start-utils
+
 set -e
 
 function buildSpigotFromSource {
-  echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
+  if [[ ${TYPE^^} = *BUKKIT ]] && ! versionLessThan "1.14"; then
+    log "ERR craftbukkit build is only supported for versions less than 1.14"
+    exit 1
+  fi
+
+  log "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
+  rm -rf /data/temp
   mkdir /data/temp
   cd /data/temp
 
   jvmOpts="-Xms${INIT_MEMORY:-$MEMORY} -Xmx${MAX_MEMORY:-$MEMORY}"
 
+  logn ''
   curl -sSL -o /data/temp/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \
-    java $jvmOpts -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done"
-  if ! mv spigot-*.jar /data/spigot_server.jar; then
-    echo "ERR failed to build Spigot"
-    cat /data/spigot_build.log
-    exit 1
-  fi
-  mv craftbukkit-*.jar /data/craftbukkit_server.jar
-  echo "Cleaning up"
+    java $jvmOpts -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; log "done"
+
+  case ${TYPE^^} in
+    SPIGOT)
+      if ! mv spigot-*.jar /data/${SERVER}; then
+        log "ERR failed to build Spigot"
+        cat /data/spigot_build.log
+        exit 1
+      fi
+      ;;
+    *BUKKIT)
+      if ! mv craftbukkit-*.jar /data/${SERVER}; then
+        log "ERR failed to build Spigot"
+        cat /data/spigot_build.log
+        exit 1
+      fi
+      ;;
+  esac
+
+  log "Cleaning up"
   rm -rf /data/temp
   cd /data
 }
@@ -37,18 +58,11 @@ function downloadSpigot {
       ;;
   esac
 
-  local downloadVersion
-  if [[ ${VERSION} == LATEST ]]; then
-    downloadVersion=${VANILLA_VERSION}
-  else
-    downloadVersion=${VERSION}
-  fi
-
   if [[ -z $downloadUrl ]]; then
-    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${downloadVersion}.jar"
+    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
   fi
 
-  echo "Downloading $match from $downloadUrl ..."
+  log "Downloading $match from $downloadUrl ..."
   curl -fsSL -o $SERVER "$downloadUrl"
   if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
     cat <<EOF
@@ -60,20 +74,23 @@ ERROR: failed to download from $downloadUrl
 EOF
     exit 3
   fi
+
+  JVM_OPTS="${JVM_OPTS} -DIReallyKnowWhatIAmDoingISwear"
+  export JVM_OPTS
 }
 
 
 case "$TYPE" in
   *BUKKIT|*bukkit)
-    export SERVER=craftbukkit_server.jar
+    export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
     ;;
   *)
-    export SERVER=spigot_server.jar
+    export SERVER=spigot_server-${VANILLA_VERSION}.jar
     ;;
 esac
 
 if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-   if [[ "$BUILD_SPIGOT_FROM_SOURCE" = TRUE || "$BUILD_SPIGOT_FROM_SOURCE" = true || "$BUILD_FROM_SOURCE" = TRUE || "$BUILD_FROM_SOURCE" = true ]]; then
+   if isTrue "$BUILD_SPIGOT_FROM_SOURCE" || isTrue "$BUILD_FROM_SOURCE"; then
      buildSpigotFromSource
    else
      downloadSpigot
@@ -82,6 +99,7 @@ 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-finalSetup01World $@

start-deployCF

@@ -4,15 +4,15 @@
 
 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
+export TYPE=CURSEFORGE
 
 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
 
-echo "Looking for Feed-The-Beast / CurseForge server modpack."
+log "Looking for CurseForge server modpack."
 if [[ -z $FTB_SERVER_MOD ]]; then
-    echo "Environment variable FTB_SERVER_MOD not set."
-    echo "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
-    echo "(And place the modpack in the /data directory.)"
+    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
 
@@ -21,7 +21,7 @@ entryScriptExpr="-name ServerStart.sh -o -name ServerStartLinux.sh -o -name Laun
 if [[ -d ${FTB_BASE_DIR} ]]; then
   startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
   if [[ $startScriptCount > 1 ]]; then
-    echo "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
+    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
     exit 2
   fi
 else
@@ -45,7 +45,7 @@ if [[ $startScriptCount = 0 ]]; then
       file=$(basename $(dirname $srv_modpack))
       downloaded=/data/${file}.zip
       if [ ! -e $downloaded ]; then
-        echo "Downloading FTB modpack...
+        log "Downloading FTB modpack...
   $srv_modpack -> $downloaded"
         curl -sSL -o $downloaded $srv_modpack
       fi
@@ -60,26 +60,28 @@ if [[ $startScriptCount = 0 ]]; then
       srv_modpack=/data/${srv_modpack}
   fi
   if [[ ! -f ${srv_modpack} ]]; then
-      echo "FTB server modpack ${srv_modpack} not found."
+      log "FTB server modpack ${srv_modpack} not found."
       exit 2
   fi
   if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
-      echo "FTB server modpack ${srv_modpack} is not a zip archive."
-      echo "Please set FTB_SERVER_MOD to a file with a .zip extension."
+      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
 
-  echo "Unpacking FTB server modpack ${srv_modpack} ..."
+  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
 
-    forgeJar=$(find ${FTB_BASE_DIR} -name 'forge*.jar' -a -not -name 'forge*installer')
+    # 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}")
-      echo "No entry script found, so building one for ${forgeJar}"
+      log "No entry script found, so building one for ${forgeJar}"
       cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
 #!/bin/sh
 . ./settings-local.sh
@@ -87,18 +89,18 @@ java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
 EOF
       chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
     else
-      echo "Please make sure you are using the server version of the FTB modpack!"
+      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
-    echo "Please make sure you are using the server version of the FTB modpack!"
+    log "Please make sure you are using the server version of the FTB modpack!"
     exit 2
 elif [[ $scriptCount > 1 ]]; then
-    echo "Ambigous startup scripts in FTB modpack!"
-    echo "found:"
+    log "Ambigous startup scripts in FTB modpack!"
+    log "found:"
     find ${FTB_BASE_DIR} $entryScriptExpr
     exit 2
 fi
@@ -107,12 +109,13 @@ export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
 
 export FTB_DIR=$(dirname "${FTB_SERVER_START}")
 chmod a+x "${FTB_SERVER_START}"
-sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${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
-  echo "Installing legacy java fixer to ${legacyJavaFixerPath}"
+  log "Installing legacy java fixer to ${legacyJavaFixerPath}"
   curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
 fi
 

start-deployCustom

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+if isURL ${CUSTOM_SERVER}; then
+  filename=$(basename ${CUSTOM_SERVER})
+  export SERVER=/data/${filename}
+
+  if [[ -f ${SERVER} ]] || [ -n "$FORCE_REDOWNLOAD" ]; then
+    log "Using previously downloaded jar at ${SERVER}"
+  else
+   log "Downloading custom server jar from ${CUSTOM_SERVER} ..."
+   if ! curl -sSL -o ${SERVER} ${CUSTOM_SERVER}; then
+      log "Failed to download from ${CUSTOM_SERVER}"
+      exit 2
+    fi
+  fi
+
+elif [[ -f ${CUSTOM_SERVER} ]]; then
+  log "Using custom server jar 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 ${SCRIPTS:-/}start-finalSetup01World $@

start-deployFTB

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+ftbInstallMarker=".ftb-installed"
+
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
+set -e
+
+if ! [[ -v FTB_MODPACK_ID ]]; then
+  log "ERROR FTB_MODPACK_ID is required with TYPE=FTB"
+  exit 1
+fi
+
+if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
+  log "ERROR FTB_MODPACK_ID needs to be numeric"
+  exit 1
+fi
+
+if ! [[ -v FTB_MODPACK_VERSION_ID ]]; then
+  if ! FTB_MODPACK_VERSION_ID=$(curl -fsSL https://api.modpacks.ch/public/modpack/${FTB_MODPACK_ID} | jq -r '.versions | sort_by(.updated)[-1].id'); then
+    log "ERROR unable to resolve latest modpack version ID for modpack ${FTB_MODPACK_ID}"
+    exit 1
+  fi
+elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
+  log "ERROR FTB_MODPACK_VERSION_ID needs to be numeric"
+  exit 1
+fi
+
+if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
+  ftbInstaller=/data/ftb-installer
+  if ! [[ -f "${ftbInstaller}" ]]; then
+    log "Downloading FTB installer"
+    curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/linux -o "${ftbInstaller}"
+    chmod +x "${ftbInstaller}"
+  fi
+
+  rm -rf forge*jar mods config libraries defaultconfigs changelogs
+
+  log "Installing modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID}"
+  ${ftbInstaller} ${FTB_MODPACK_ID} ${FTB_MODPACK_VERSION_ID} --noscript --auto
+  rm -f forge*installer.jar
+
+  echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker}
+else
+  log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go"
+fi
+
+isDebugging && cat version.json
+forgeVersion=$(jq -r '.targets[] | select(.name == "forge") | .version' version.json)
+mcVersion=$(jq -r '.targets[] | select(.name == "minecraft") | .version' version.json)
+
+variants=(
+  forge-${mcVersion}-${forgeVersion}.jar
+  forge-${mcVersion}-${forgeVersion}-universal.jar
+  forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
+)
+for f in ${variants[@]}; do
+  if [ -f $f ]; then
+    export SERVER=$f
+    break
+  fi
+done
+if ! [ -v SERVER ]; then
+  log "ERROR unable to locate the installed forge server jar"
+  ls *.jar
+  exit 2
+fi
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetup01World "$@"

start-deployFabric

@@ -1,5 +1,7 @@
 #!/bin/bash
-set -u
+set -eu
+
+. ${SCRIPTS:-/}start-utils
 
 export TYPE=FABRIC
 
@@ -7,11 +9,10 @@ FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
 FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
 FABRICVERSION=${FABRICVERSION:-LATEST}
 if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-  echo "Checking Fabric version information."
+  log "Checking Fabric version information."
   case $FABRICVERSION in
     LATEST)
-      curl -fsSL https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xq -c . > /tmp/fabric.json
-      FABRIC_VERSION=$(< /tmp/fabric.json jq -r ".metadata.versioning.release")
+      FABRIC_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
       ;;
 
     *)
@@ -24,44 +25,49 @@ if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
 elif [[ -z $FABRIC_INSTALLER ]]; then
   FABRIC_INSTALLER="/tmp/fabric-installer.jar"
 elif [[ ! -e $FABRIC_INSTALLER ]]; then
-  echo "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
+  log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
   exit 2
 fi
 
-installMarker=".fabric-installed-${FABRIC_VERSION:-manual}"
+installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${FABRIC_VERSION:-manual}"
 
+debug Checking for installMarker ${installMarker}
 if [[ ! -e $installMarker ]]; then
   if [[ ! -e $FABRIC_INSTALLER ]]; then
     if [[ -z $FABRIC_INSTALLER_URL ]]; then
-      echo "Downloading $FABRIC_VERSION"
+      log "Downloading $FABRIC_VERSION"
       downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/$FABRIC_VERSION/fabric-installer-$FABRIC_VERSION.jar"
-      echo "...trying $downloadUrl"
+      log "...trying $downloadUrl"
       curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
     else
-      echo "Downloading $FABRIC_INSTALLER_URL ..."
+      log "Downloading $FABRIC_INSTALLER_URL ..."
       if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
-        echo "Failed to download from given location $FABRIC_INSTALLER_URL"
+        log "Failed to download from given location $FABRIC_INSTALLER_URL"
         exit 2
       fi
     fi
   fi
 
-  echo "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
+  if isDebugging; then
+    debug "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER with mcversion ${VANILLA_VERSION}"
+  else
+    log "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
+  fi
   tries=3
   set +e
   while ((--tries >= 0)); do
-    java -jar $FABRIC_INSTALLER server -version $VANILLA_VERSION -downloadMinecraft
+    java -jar $FABRIC_INSTALLER server -mcversion $VANILLA_VERSION -downloadMinecraft
     if [[ $? == 0 ]]; then
       break
     fi
   done
   set -e
   if (($tries < 0)); then
-    echo "Fabric failed to install after several tries." >&2
+    log "Fabric failed to install after several tries." >&2
     exit 10
   fi
   export SERVER=fabric-server-launch.jar
-  echo "Using server $SERVER"
+  log "Using server $SERVER"
   echo $SERVER > $installMarker
 
 else
@@ -69,4 +75,4 @@ else
 fi
 
 # Contineut to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployForge

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. ${SCRIPTS:-/}start-utils
+
 export TYPE=FORGE
 
 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
@@ -14,7 +16,7 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
 
   #################################################################################
 
-  echo "Checking Forge version information."
+  log "Checking Forge version information."
   case $FORGEVERSION in
     RECOMMENDED)
       curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
@@ -22,8 +24,8 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
       if [ $FORGE_VERSION = null ]; then
         FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
         if [ $FORGE_VERSION = null ]; then
-          echo "ERROR: Version $VANILLA_VERSION is not supported by Forge"
-          echo "       Refer to http://files.minecraftforge.net/ for supported versions"
+          log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
+          log "       Refer to http://files.minecraftforge.net/ for supported versions"
           exit 2
         fi
       fi
@@ -41,17 +43,17 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
 elif [[ -z $FORGE_INSTALLER ]]; then
   FORGE_INSTALLER="/tmp/forge-installer.jar"
 elif [[ ! -e $FORGE_INSTALLER ]]; then
-  echo "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
+  log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
   exit 2
 fi
 
-installMarker=".forge-installed-$shortForgeVersion"
+installMarker="/data/.forge-installed-$shortForgeVersion"
 
 if [ ! -e $installMarker ]; then
   if [ ! -e $FORGE_INSTALLER ]; then
 
     if [[ -z $FORGE_INSTALLER_URL ]]; then
-      echo "Downloading $normForgeVersion"
+      log "Downloading $normForgeVersion"
 
       forgeFileNames="
       $normForgeVersion/forge-$normForgeVersion-installer.jar
@@ -60,25 +62,25 @@ if [ ! -e $installMarker ]; then
     "
       for fn in $forgeFileNames; do
         if [ $fn == END ]; then
-          echo "Unable to compute URL for $normForgeVersion"
+          log "Unable to compute URL for $normForgeVersion"
           exit 2
         fi
         downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
-        echo "...trying $downloadUrl"
+        log "...trying $downloadUrl"
         if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
           break
         fi
       done
     else
-      echo "Downloading $FORGE_INSTALLER_URL ..."
+      log "Downloading $FORGE_INSTALLER_URL ..."
       if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
-        echo "Failed to download from given location $FORGE_INSTALLER_URL"
+        log "Failed to download from given location $FORGE_INSTALLER_URL"
         exit 2
       fi
     fi
   fi
 
-  echo "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
+  log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
   mkdir -p mods
   tries=3
   while ((--tries >= 0)); do
@@ -88,22 +90,22 @@ if [ ! -e $installMarker ]; then
     fi
   done
   if (($tries < 0)); then
-    echo "Forge failed to install after several tries." >&2
+    log "Forge failed to install after several tries." >&2
     exit 10
   fi
   # NOTE $shortForgeVersion will be empty if installer location was given to us
-  echo "Finding installed server jar..."
+  log "Finding installed server jar..."
   unset -v latest
   for file in *forge*.jar; do
     [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
   done
   if [[ -z $latest ]]; then
-    echo "Unable to derive server jar for Forge"
+    log "Unable to derive server jar for Forge"
     exit 2
   fi
 
   export SERVER=$latest
-  echo "Using server $SERVER"
+  log "Using server $SERVER"
   echo $SERVER > $installMarker
 
 else
@@ -111,4 +113,4 @@ else
 fi
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployPaper

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${PAPERBUILD:=latest}
+export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar
+
+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
+fi
+
+# Normalize on Spigot for operations below
+export TYPE=SPIGOT
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deploySpongeVanilla

@@ -1,9 +1,11 @@
 #!/bin/bash
 
+. ${SCRIPTS:-/}start-utils
+
 export TYPE=spongevanilla
 
 # Parse branch
-echo "Choosing branch for Sponge"
+log "Choosing branch for Sponge"
 case "$SPONGEBRANCH" in
 
   EXPERIMENTAL|experimental|BLEEDING|bleeding)
@@ -18,7 +20,7 @@ esac
 
 # If not SPONGEVERSION selected, detect last version on selected branch
 if [ -z $SPONGEVERSION ]; then
-  echo "Choosing Version for Sponge"
+  log "Choosing Version for Sponge"
   if [ "$SPONGEBRANCH" == "stable" ]; then
     export SPONGEVERSION=`curl -fsSL https://dl-api.spongepowered.org/v1/org.spongepowered/$TYPE | jq -r '.buildTypes.stable.latest.version'`
   else
@@ -29,9 +31,9 @@ fi
 export SERVER="spongevanilla-$SPONGEVERSION.jar"
 
 if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  echo "Downloading $SERVER ..."
+  log "Downloading $SERVER ..."
   curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
 fi
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployTuinity

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+if [ "${VERSION}" != "LATEST" ]; then
+  log "ERROR: Tunity server type only supports VERSION=LATEST"
+  exit 1
+fi
+
+: ${TUNITY_BUILD:=lastSuccessfulBuild}
+export SERVER=tunity-${VANILLA_VERSION}-${TUNITY_BUILD}.jar
+
+if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUNITY_BUILD}/artifact/tuinity-paperclip.jar"
+    log "Downloading Tunity (build $TUNITY_BUILD) 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 operations below
+export TYPE=SPIGOT
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployVanilla

@@ -1,21 +1,22 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
 set -o pipefail
 
 export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"
 
 if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  echo "Downloading $SERVER ..."
+  log "Downloading $SERVER ..."
   debug "Finding version manifest for $VANILLA_VERSION"
   versionManifestUrl=$(curl -fsSL 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url')
   result=$?
   if [ $result != 0 ]; then
-    echo "ERROR failed to obtain version manifest URL ($result)"
+    log "ERROR failed to obtain version manifest URL ($result)"
     exit 1
   fi
   if [ $versionManifestUrl = "null" ]; then
-    echo "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
+    log "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
     exit 1
   fi
   debug "Found version manifest at $versionManifestUrl"
@@ -23,7 +24,7 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   serverDownloadUrl=$(curl -fsSL ${versionManifestUrl} | jq --raw-output '.downloads.server.url')
   result=$?
   if [ $result != 0 ]; then
-    echo "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
+    log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
     exit 1
   fi
 
@@ -34,10 +35,12 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   curl $verbose -fsSL -o $SERVER $serverDownloadUrl
   result=$?
   if [ $result != 0 ]; then
-    echo "ERROR failed to download server from $serverDownloadUrl ($result)"
+    log "ERROR failed to download server from $serverDownloadUrl ($result)"
     exit 1
   fi
 fi
 
+isDebugging && ls -l
+
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-finalSetup01World

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -e
+isDebugging && set -x
+
+if [ $TYPE = "FEED-THE-BEAST" ]; then
+  worldDest=$FTB_BASE_DIR/$LEVEL
+else
+  worldDest=/data/$LEVEL
+fi
+
+if [[ "$WORLD" ]] && [ ! -d "$worldDest" ]; then
+  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")
+
+    baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
+    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
+    mv "$baseDir" "$worldDest"
+  else
+    log "Cloning world directory from $WORLD ..."
+    cp -r "$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" "/data/${LEVEL}_the_end"
+    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
+  fi
+fi
+
+exec ${SCRIPTS:-/}start-finalSetup02Modpack $@

start-finalSetup02Modpack

@@ -0,0 +1,157 @@
+#!/bin/bash
+
+set -e
+
+. ${SCRIPTS:-/}start-utils
+
+#  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/*
+  else
+    rm -rf /data/mods/*
+  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)
+    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"
+      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"
+      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"
+      fi
+    fi
+    rm -f /tmp/modpack.zip
+    ;;
+  *)
+    log "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
+    ;;
+esac
+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
+        mkdir -p /data/plugins
+        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/plugins/${EFFECTIVE_MOD_URL##*/}
+      else
+        mkdir -p /data/mods
+        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/mods/${EFFECTIVE_MOD_URL##*/}
+      fi
+      rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
+      ;;
+    *)
+      log "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
+      ;;
+  esac
+done
+fi
+
+if [[ "$MANIFEST" ]]; then
+    if [[ -e "$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)
+        curl -Ls -o $EFFECTIVE_MANIFEST_FILE "$EFFECTIVE_MANIFEST_URL"
+    else
+        log "MANIFEST='$MANIFEST' is not a valid manifest url or location"
+        exit 2
+    fi
+
+case "X$EFFECTIVE_MANIFEST_FILE" in
+  X*.json)
+    if [ -f "${EFFECTIVE_MANIFEST_FILE}" ]; then
+      MOD_DIR=${FTB_BASE_DIR:-/data}/mods
+      if [ ! -d "$MOD_DIR" ]
+      then
+        log "Creating mods dir $MOD_DIR"
+        mkdir -p "$MOD_DIR"
+      fi
+      log "Starting manifest download..."
+      cat "${EFFECTIVE_MANIFEST_FILE}" | jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
+      do
+        if [ ! -f $MOD_DIR/${p}_${f}.jar ]
+        then
+          redirect_url="$(curl -Ls -o /dev/null -w %{url_effective} ${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
+          curl -sSL "${url}" -o $MOD_DIR/${p}_${f}.jar
+        fi
+      done
+    else
+      log "Could not find manifest file, unsufficient privs, or malformed path."
+    fi
+    ;;
+  *)
+    log "Invalid manifest file for modpack. Please make sure it is a .json file."
+    ;;
+esac
+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}
+  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}
+    if [ -f /data/manifest.txt ]; then
+      log "Manifest exists from older generic pack, cleaning up ..."
+      while read f; do
+        rm -rf "/data/${f}"
+      done < /data/manifest.txt
+      find /data/* -type d -exec rmdir --ignore-fail-on-non-empty {} +
+      rm -f /data/manifest.txt
+    fi
+    log "Writing generic pack manifest ... "
+    find ${base_dir} -type f -print0 | xargs -0 -I {} echo "{}" | sed "s#${base_dir}/##" > /data/manifest.txt
+    log "Applying generic pack ..."
+    IFS='
+'
+    set -f
+    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}
+  fi
+fi
+
+exec ${SCRIPTS:-/}start-finalSetup03Modconfig $@

start-finalSetup03Modconfig

@@ -1,11 +1,13 @@
 #!/bin/bash
 
+. ${SCRIPTS:-/}start-utils
+
 # If supplied with a URL for a config (simple zip of configurations), download it and unpack
 if [[ "$MODCONFIG" ]]; then
 case "X$MODCONFIG" in
   X[Hh][Tt][Tt][Pp]*[Zz][iI][pP])
-    echo "Downloading mod/plugin configs via HTTP"
-    echo "  from $MODCONFIG ..."
+    log "Downloading mod/plugin configs via HTTP"
+    log "  from $MODCONFIG ..."
     curl -sSL -o /tmp/modconfig.zip "$MODCONFIG"
     if [ "$TYPE" = "SPIGOT" ]; then
       mkdir -p /data/plugins
@@ -17,9 +19,9 @@ case "X$MODCONFIG" in
     rm -f /tmp/modconfig.zip
     ;;
   *)
-    echo "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
+    log "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
     ;;
 esac
 fi
 
-exec /start-finalSetup04ServerProperties $@
+exec ${SCRIPTS:-/}start-finalSetup04ServerProperties $@

start-finalSetup04ServerProperties

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. ${SCRIPTS:-/}start-utils
+
 # FUNCTIONS
 function setServerProp {
   local prop=$1
@@ -10,16 +12,16 @@ function setServerProp {
       TRUE|FALSE)
         var=${var,,} ;;
     esac
-    echo "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
+    log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
     sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
   else
-    echo "Skip setting ${prop}"
+    log "Skip setting ${prop}"
   fi
 }
 
 function customizeServerProps {
   if [ -n "$WHITELIST" ]; then
-    echo "Creating whitelist"
+    log "Creating whitelist"
     setServerProp "whitelist" "true"
     setServerProp "white-list" "true"
   fi
@@ -41,6 +43,7 @@ function customizeServerProps {
   fi
 
   setServerProp "server-name" "$SERVER_NAME"
+  setServerProp "server-ip" "$SERVER_IP"
   setServerProp "server-port" "$SERVER_PORT"
   setServerProp "motd" "$MOTD"
   setServerProp "allow-nether" "$ALLOW_NETHER"
@@ -49,6 +52,7 @@ function customizeServerProps {
   setServerProp "spawn-animals" "$SPAWN_ANIMALS"
   setServerProp "spawn-monsters" "$SPAWN_MONSTERS"
   setServerProp "spawn-npcs" "$SPAWN_NPCS"
+  setServerProp "spawn-protection" "$SPAWN_PROTECTION"
   setServerProp "generate-structures" "$GENERATE_STRUCTURES"
   setServerProp "view-distance" "$VIEW_DISTANCE"
   setServerProp "hardcore" "$HARDCORE"
@@ -70,23 +74,42 @@ function customizeServerProps {
   setServerProp "online-mode" "$ONLINE_MODE"
   setServerProp "allow-flight" "$ALLOW_FLIGHT"
   setServerProp "level-type" "${LEVEL_TYPE^^}"
+  setServerProp "resource-pack" "$RESOURCE_PACK"
+  setServerProp "resource-pack-sha1" "$RESOURCE_PACK_SHA1"
+  setServerProp "player-idle-timeout" "$PLAYER_IDLE_TIMEOUT"
 
   if [ -n "$DIFFICULTY" ]; then
     case $DIFFICULTY in
       peaceful|0)
-        DIFFICULTY=0
+        if versionLessThan 1.13; then
+          DIFFICULTY=0
+        else
+          DIFFICULTY=peaceful
+        fi
         ;;
       easy|1)
-        DIFFICULTY=1
+        if versionLessThan 1.13; then
+          DIFFICULTY=1
+        else
+          DIFFICULTY=easy
+        fi
         ;;
       normal|2)
-        DIFFICULTY=2
+        if versionLessThan 1.13; then
+          DIFFICULTY=2
+        else
+          DIFFICULTY=normal
+        fi
         ;;
       hard|3)
-        DIFFICULTY=3
+        if versionLessThan 1.13; then
+          DIFFICULTY=3
+        else
+          DIFFICULTY=hard
+        fi
         ;;
       *)
-        echo "DIFFICULTY must be peaceful, easy, normal, or hard."
+        log "DIFFICULTY must be peaceful, easy, normal, or hard."
         exit 1
         ;;
     esac
@@ -94,25 +117,39 @@ function customizeServerProps {
   fi
 
   if [ -n "$MODE" ]; then
-    echo "Setting mode"
+    log "Setting mode"
     MODE_LC=$( echo $MODE | tr '[:upper:]' '[:lower:]' )
     case $MODE_LC in
-      0|1|2|3)
+      su*|0)
+        if versionLessThan 1.13; then
+          MODE=0
+        else
+          MODE=survival
+        fi
         ;;
-      su*)
-        MODE=0
+      c*|1)
+        if versionLessThan 1.13; then
+          MODE=1
+        else
+          MODE=creative
+        fi
         ;;
-      c*)
-        MODE=1
+      a*|2)
+        if versionLessThan 1.13; then
+          MODE=2
+        else
+          MODE=adventure
+        fi
         ;;
-      a*)
-        MODE=2
-        ;;
-      sp*)
-        MODE=3
+      sp*|3)
+        if versionLessThan 1.13; then
+          MODE=3
+        else
+          MODE=spectator
+        fi
         ;;
       *)
-        echo "ERROR: Invalid game mode: $MODE"
+        log "ERROR: Invalid game mode: $MODE"
         exit 1
         ;;
     esac
@@ -123,11 +160,11 @@ function customizeServerProps {
 # Deploy server.properties file
 if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
   export SERVER_PROPERTIES=${FTB_DIR}/server.properties
-  echo "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
+  log "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
 fi
 
 if [ ! -e "$SERVER_PROPERTIES" ]; then
-  echo "Creating server.properties in ${SERVER_PROPERTIES}"
+  log "Creating server.properties in ${SERVER_PROPERTIES}"
   cp /tmp/server.properties "$SERVER_PROPERTIES"
   customizeServerProps
 elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
@@ -136,11 +173,25 @@ elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
         customizeServerProps
         ;;
       *)
-        echo "server.properties already created, skipping"
+        log "server.properties already created, skipping"
         ;;
     esac
 else
-  echo "server.properties already created, skipping"
+  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-finalSetup05EnvVariables $@

start-finalSetup05EnvVariables

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}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 ${SCRIPTS:-/}start-minecraftFinalSetup $@

start-magma

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
+
+# Always download since new updates of each base version are published frequently
+if ! curl -o /data/magma-server-${VANILLA_VERSION}.jar -fsSL \
+  https://api.magmafoundation.org/api/resources/Magma/${VANILLA_VERSION}/stable/latest/download; then
+  log "ERROR unable to download version ${VANILLA_VERSION} of Magma"
+  log "      Check https://magmafoundation.org/ for available versions"
+  exit 1
+fi
+
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetup01World $@