Auto-merging via docker-versions-create

#819

.github/FUNDING.yml

@@ -1,5 +0,0 @@
-
-#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-custom:
-  - https://www.buymeacoffee.com/itzg
-  - https://paypal.me/itzg

.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/build-multiarch.yml

@@ -2,58 +2,57 @@ name: Build and publish multiarch
 on:
   push:
     branches:
-      - master
-      - "*-multiarch"
-      - "multiarch*"
-      - java8-openj9
-      - java11*
-      - java16*
-      - test/*
+      - multiarch
+      - java8-multiarch
+      - multiarch-latest
+      - java15
+      - java15-openj9
+      - test/multiarch/*
     tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
-      - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
-      - "[0-9]+.[0-9]+.[0-9]+-java11*"
-      - "[0-9]+.[0-9]+.[0-9]+-java16*"
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
+      - "[0-9]+.[0-9]+.[0-9]+-java15"
 
 jobs:
   docker-buildx:
-    if: github.repository == 'itzg/docker-minecraft-server'
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.2.0
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            itzg/minecraft-server
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-          flavor: |
-            latest=${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=itzg/minecraft-server
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          fi
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=${GITHUB_REF#refs/heads/}
+            if [[ $VERSION == master ]]; then
+              VERSION=latest
+            fi
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=cache_from::${TAGS}
+          echo ::set-output name=version::${VERSION//\//-}
+          echo ::set-output name=cache_version::${VERSION//\//-}
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-
+            ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v1
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -63,25 +62,22 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.prep.outputs.tags }}
           # ensure latest base image is used
           pull: true
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-          labels: ${{ steps.meta.outputs.labels }}
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          labels: |
+            org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
+            org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
+            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+            org.opencontainers.image.revision=${{ github.sha }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
-
-      - # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-        name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/generate-toc.yml

@@ -1,21 +0,0 @@
-name: Generate README table of contents
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - README.md
-jobs:
-  generate:
-    if: github.repository == 'itzg/docker-minecraft-server'
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - run: |
-          curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
-          chmod a+x gh-md-toc
-          ./gh-md-toc --insert --no-backup README.md
-      - uses: stefanzweifel/git-auto-commit-action@v4.12.0
-        with:
-          commit_message: "docs: Auto update markdown TOC"

.github/workflows/main.yml

@@ -3,12 +3,14 @@ name: Build and Publish
 on:
   push:
     branches:
+      - master
       - java8
       - openj9
       - openj9-11
       - adopt11
-      - test/alpine/*
+      - test/*
     tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+-java8"
       - "[0-9]+.[0-9]+.[0-9]+-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
@@ -20,7 +22,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2
 
       - name: Run tests
         run: |
@@ -31,7 +33,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2
 
     - name: Prepare
       id: prep
@@ -49,17 +51,20 @@ jobs:
         fi
         TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
         echo ::set-output name=tags::${TAGS}
+        echo ::set-output name=cache_from::${TAGS}
         echo ::set-output name=version::${VERSION//\//-}
+        echo ::set-output name=cache_version::${VERSION//\//-}
 
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v1
 
     - name: Cache Docker layers
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
         restore-keys: |
+          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
           ${{ runner.os }}-buildx-
 
     - name: Login to DockerHub
@@ -70,7 +75,7 @@ jobs:
 
     - name: Build and push
       id: docker_build
-      uses: docker/build-push-action@v2.7.0
+      uses: docker/build-push-action@v2
       with:
         context: .
         file: ./Dockerfile
@@ -81,7 +86,7 @@ jobs:
         # tags determined by prep step
         tags: ${{ steps.prep.outputs.tags }}
         cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new
+        cache-to: type=local,dest=/tmp/.buildx-cache
         labels: |
           org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
           org.opencontainers.image.version=${{ steps.prep.outputs.version }}
@@ -90,11 +95,3 @@ jobs:
 
     - name: Image digest
       run: echo ${{ steps.docker_build.outputs.digest }}
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/pr.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2
 
       - name: Run tests
         run: |

.gitignore

@@ -1,4 +1,3 @@
 /data/
 /.idea/
-*.iml
-/gh-md-toc
+*.iml

DEVELOPMENT.md

@@ -3,7 +3,7 @@
 Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps:
 
 1. Copy an existing "start-deploy*" script, such as [start-deployMohist](start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
-2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-setupWorld` at the end of the script 
+2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-finalSetupWorld` at the end of the script 
 3. Develop and test the changes using the [iterative process described below](#iterative-script-development)
 4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](start-configuration)
 5. Add a section to the [README](README.md). It is recommended to copy-modify an existing section to retain a similar wording and level of detail

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-openj9
+FROM adoptopenjdk:8-jre-hotspot
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
@@ -9,7 +9,6 @@ RUN apt-get update \
     gosu \
     sudo \
     net-tools \
-    iputils-ping \
     curl wget \
     git \
     jq \
@@ -45,25 +44,22 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.5.1 --var app=rcon-cli --file {{.app}} \
+ --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.10.1 --var app=mc-monitor --file {{.app}} \
+ --var version=0.7.1 --var app=mc-monitor --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.8.0 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.5.0 --var app=mc-server-runner --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.6.1
-RUN curl -fsSL https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
-    | tar -C /usr/share -zxf - \
-    && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
+COPY mcstatus /usr/local/bin
 
 VOLUME ["/data"]
 COPY server.properties /tmp/server.properties
@@ -81,13 +77,12 @@ ENV UID=1000 GID=1000 \
   AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
 COPY start* /
-COPY bin/ /usr/local/bin/
-COPY bin/mc-health /health.sh
-
+COPY health.sh /
 ADD files/autopause /autopause
 
-RUN dos2unix /start* && chmod +x /start* \
-    && dos2unix /autopause/* && chmod +x /autopause/*.sh
+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 mc-health
+HEALTHCHECK --start-period=1m CMD /health.sh

bin/mc-send-to-console

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-: "${CONSOLE_IN_NAMED_PIPE:=/tmp/minecraft-console-in}"
-
-if [ $# = 0 ]; then
-  echo "ERROR: pass console commands as arguments"
-  exit 1
-fi
-
-if [ ! -p "${CONSOLE_IN_NAMED_PIPE}" ]; then
-  echo "ERROR: named pipe ${CONSOLE_IN_NAMED_PIPE} is missing"
-  exit 1
-fi
-
-echo "$@" > "${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}"

docker-versions-create.sh

@@ -4,11 +4,12 @@
 branches_list=(
   'java8'
   'java8-multiarch'
-  'java8-openj9'
-  'java11'
-  'java11-openj9'
-  'java16'
-  'java16-openj9'
+  'openj9'
+  'openj9-11'
+  'adopt11'
+  'java15'
+  'java15-openj9'
+  'multiarch'
   'multiarch-latest'
   )
 

examples/docker-compose-autopause.yml

@@ -12,10 +12,7 @@ services:
       ENABLE_AUTOPAUSE: "TRUE"
       OVERRIDE_SERVER_PROPERTIES: "TRUE"
       MAX_TICK_TIME: "-1"
-      # More aggressive settings for demo purposes
-      AUTOPAUSE_TIMEOUT_INIT: "30"
-      AUTOPAUSE_TIMEOUT_EST: "10"
-    restart: unless-stopped
+    restart: always
 
 volumes:
   mc: {}

examples/docker-compose-big.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3'
 
 services:
   minecraft:

examples/docker-compose-curseforge.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.2'
 
 services:
   mc:

examples/docker-compose-fabric.yml

@@ -1,15 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    image: ${IMAGE:-itzg/minecraft-server}
-    environment:
-      EULA: "true"
-      TYPE: FABRIC
-    ports:
-      - 25565:25565
-    volumes:
-      - fabric:/data
-
-volumes:
-  fabric: {}

examples/docker-compose-forge.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.7"
 
 services:
   mc:

examples/docker-compose-ftba.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.7"
 
 services:
   mc:

examples/docker-compose-paper.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.7'
 
 services:
   mc:

examples/docker-compose-proxied.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3'
 
 services:
   mc:

examples/docker-compose-rlcraft.yml

@@ -1,27 +0,0 @@
-version: '3.8'
-
-services:
-  rlcraft:
-    image: itzg/minecraft-server:java8
-    container_name: rlcraft
-    volumes:
-    - rlcraft-modpack:/modpacks:ro
-    - rlcraft-data:/data
-    environment:
-      EULA: "true"
-      TYPE: "FORGE"
-      VERSION: "1.12.2"
-      FORGEVERSION: "14.23.5.2855"
-      DIFFICULTY: "hard"
-      MAX_TICK_TIME: "-1"
-      VIEW_DISTANCE: "6"
-      ALLOW_FLIGHT: "true"
-      MEMORY: "4G"
-      GENERIC_PACK: "/modpacks/RLCraft_Server_Pack_1.12.2_Beta_v2.8.2.zip"
-    ports:
-      - 25565:25565
-    restart: unless-stopped
-
-volumes:
-  rlcraft-data:
-  rlcraft-modpack:

examples/docker-compose-simple.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3"
 
 services:
   mc:

examples/docker-compose-spiget.yml

@@ -1,17 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    # Only using IMAGE variable to allow for local testing
-    image: ${IMAGE:-itzg/minecraft-server}
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-      TYPE: SPIGOT
-      SPIGET_RESOURCES: 9089,34315,3836
-    volumes:
-      - data:/data
-
-volumes:
-  data: {}

examples/docker-compose-spongeforge.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3'
 # Forge with Sponge API support. THIS REQUIRES DOWNLOADING SPONGEFORGE.
 # Place the SpongeForge jar file in /data/mods. Other Forge mods go here as well.
 # Place Sponge mods in /data/mods/plugins. Yes, this is a directory inside the Forge mod directory. Do NOT use /data/plugins.

examples/docker-compose-world-download.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.7"
 
 services:
   mc:

examples/modpacks/README.md

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

files/autopause/autopause-fcns.sh

@@ -17,15 +17,26 @@ rcon_client_exists() {
 }
 
 mc_server_listening() {
-  mc-monitor status --host localhost --port $SERVER_PORT --timeout 10s >& /dev/null
+  [[ -n $(netstat -tln | grep -e "0.0.0.0:$SERVER_PORT" -e ":::$SERVER_PORT" | grep LISTEN) ]]
 }
 
 java_clients_connected() {
   local connections
-  if java_running ; then
-    connections=$(mc-monitor status --host localhost --port $SERVER_PORT --show-player-count)
-  else
-    connections=0
+  connections=$(netstat -tn | grep ":$SERVER_PORT" | grep ESTABLISHED)
+  if [[ -z "$connections" ]] ; then
+    return 1
   fi
-  (( $connections > 0 ))
+  IFS=$'\n'
+  connections=($connections)
+  unset IFS
+  # check that at least one external address is not localhost
+  # remember, that the host network mode does not work with autopause because of the knockd utility
+  for (( i=0; i<${#connections[@]}; i++ ))
+  do
+    if [[ ! $(echo "${connections[$i]}" | awk '{print $5}') =~ ^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$ ]] ; then
+      # not localhost
+      return 0
+    fi
+  done
+  return 1
 }

files/autopause/knockd-config.cfg

@@ -10,6 +10,3 @@
  seq_timeout = 1
  command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
  tcpflags = syn
-[unpauseMCServer-bedrock]
- sequence = 19132:udp
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh

health.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# shellcheck source=../start-utils
 . ${SCRIPTS:-/}start-utils
 
 if isTrue "${DISABLE_HEALTHCHECK}"; then

start-configuration

@@ -2,17 +2,14 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils
 
-: "${EULA:=}"
-: "${PROXY:=}"
-: "${RCON_PASSWORD_FILE:=}"
+: ${EULA:=}
+: ${PROXY:=}
+: ${RCON_PASSWORD_FILE:=}
 
 shopt -s nullglob
 
-isDebugging && set -x
-
 #umask 002
 export HOME=/data
 
@@ -66,16 +63,10 @@ export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.js
 
 case "X$VERSION" in
   X|XLATEST|Xlatest)
-    if ! VANILLA_VERSION=$(get --json-path '$.latest.release' "$VERSIONS_JSON"); then
-      log "ERROR: version lookup failed: $VANILLA_VERSION"
-      exit 1
-    fi
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
   ;;
   XSNAPSHOT|Xsnapshot)
-    if ! VANILLA_VERSION=$(get --json-path '$.latest.snapshot' "$VERSIONS_JSON"); then
-      log "ERROR: version lookup failed: $VANILLA_VERSION"
-      exit 1
-    fi
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
   ;;
   *)
     VANILLA_VERSION=$VERSION
@@ -102,15 +93,11 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployPaper "$@"
   ;;
 
+  TUINITY)
+    exec ${SCRIPTS:-/}start-deployTuinity "$@"
+  ;;
+
   FORGE)
-    if versionLessThan 1.17; then
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
-    fi
     exec ${SCRIPTS:-/}start-deployForge "$@"
   ;;
 
@@ -122,18 +109,12 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployFTBA "$@"
   ;;
 
-  FTB|CURSEFORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
+  CURSEFORGE|FTB)
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 
   VANILLA)
-    exec "${SCRIPTS:-/}start-deployVanilla" "$@"
+    exec ${SCRIPTS:-/}start-deployVanilla "$@"
   ;;
 
   SPONGEVANILLA)
@@ -164,23 +145,19 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployPurpur "$@"
   ;;
 
-  AIRPLANE)
+  YATOPIA)
+    exec ${SCRIPTS:-/}start-deployYatopia "$@"
+  ;;
+  
+   AIRPLANE)
     exec ${SCRIPTS:-/}start-deployAirplane "$@"
   ;;
 
-  CANYON)
-    exec ${SCRIPTS:-/}start-deployCanyon "$@"
-  ;;
-
-  LIMBO)
-    exec ${SCRIPTS:-/}start-deployLimbo "$@"
-  ;;
-
   *)
       log "Invalid type: '$TYPE'"
       log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
-      log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, CANYON, LIMBO"
+      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR"
+      log "         CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE"
       exit 1
   ;;
 

start-deployAirplane

@@ -5,38 +5,22 @@ IFS=$'\n\t'
 . ${SCRIPTS:-/}start-utils
 isDebugging && set -x
 
-if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.16" ] && [ "${VERSION}" != "1.17" ] && [ "${VERSION}" != "PURPUR" ] && [ "${VERSION}" != "PURPUR-1.16" ] ; then
-  log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=1.17, VERSION=1.16, VERSION=PURPUR or VERSION=PURPUR-1.16. Note that these are branches, not #.#.# versions."
+JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
+
+if [ "${JAVA_VER}" != "8" ] && [ "${JAVA_VER}" != "11" ]; then
+  log "ERROR: Airplane server type only supports Java versions 8 and 11"
   exit 1
 fi
 
-: ${AIRPLANE_BUILD:=lastSuccessfulBuild}
-: ${AIRPLANE_TYPE:=airplane}
-
-if  [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then
-  AIRPLANE_BRANCH="1.17"
+if [ "${VERSION}" != "LATEST" ]; then
+  log "ERROR: Airplane server type only supports VERSION=LATEST"
+  exit 1
 fi
 
-if [ "${VERSION}" = "1.16" ]; then
-  AIRPLANE_BRANCH="1.16"
-fi
+export SERVER=airplane-${VANILLA_VERSION}-jdk${JAVA_VER}.jar
 
-if [ "${VERSION}" = "PURPUR" ]; then
-  AIRPLANE_BRANCH="Purpur-1.17"
-  AIRPLANE_TYPE="airplanepurpur"
-fi
-
-if [ "${VERSION}" = "PURPUR-1.16" ]; then
-  AIRPLANE_BRANCH="Purpur-1.16"
-  AIRPLANE_TYPE="airplanepurpur"
-fi
-
-log "Using Airplane-${AIRPLANE_BRANCH} branch"
-
-export SERVER=airplane-${AIRPLANE_BRANCH}-${AIRPLANE_BUILD}.jar
-
-if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
-    downloadUrl="https://ci.tivy.ca/job/Airplane-${AIRPLANE_BRANCH}/${AIRPLANE_BUILD}/artifact/launcher-${AIRPLANE_TYPE}.jar"
+if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
+    downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JAVA_VER}/launcher-airplane.jar"
     log "Downloading Airplane from $downloadUrl ..."
     curl -fsSL -o "$SERVER" "$downloadUrl"
     if [ ! -f "$SERVER" ]; then

start-deployBukkitSpigot

@@ -64,11 +64,7 @@ function downloadSpigot {
   fi
 
   if [[ -z $downloadUrl ]]; then
-    if versionLessThan 1.16.5; then
-      downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
-    else
-      downloadUrl="https://download.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
-    fi
+    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
   fi
 
   setServerVar

start-deployCF

@@ -60,8 +60,8 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
     mkdir -p ${FTB_BASE_DIR}
     unzip -o "${FTB_SERVER_MOD}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 
-    serverJar=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
-    if [[ -z "$serverJar" ]]; then
+    SERVER=$(find ${FTB_BASE_DIR} -type f -not -name "forge*installer.jar" -name "forge*.jar")
+    if [[ -z "$SERVER" ]]; then
 
       if [ -f "${FTB_BASE_DIR}/settings.cfg" ]; then
         loadForgeVars "${FTB_BASE_DIR}/settings.cfg"
@@ -85,23 +85,23 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
       fi
 
       log "Installing forge server"
-      dirOfInstaller=$(dirname "${forgeInstallerJar}")
-      (cd "${dirOfInstaller}"; java -jar $(basename "${forgeInstallerJar}") --installServer)
+      (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer)
     fi
 
     echo "${FTB_SERVER_MOD}" > $installMarker
+    SERVER=$(find ${FTB_BASE_DIR} -type f -not -name "forge*installer.jar" -name "forge*.jar")
   fi
 
-  export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
   if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
     log "ERROR unable to locate installed forge server jar"
     isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
     exit 2
   fi
+  export SERVER
 
   export FTB_DIR=$(dirname "${SERVER}")
 
-  exec ${SCRIPTS:-/}start-setupWorld $@
+  exec ${SCRIPTS:-/}start-finalSetupWorld $@
 fi
 
 entryScriptExpr="
@@ -110,7 +110,6 @@ entryScriptExpr="
   -o -name ServerStartLinux.sh
   -o -name LaunchServer.sh
   -o -name server-start.sh
-  -o -name start-server.sh
   -o -name startserver.sh
   -o -name StartServer.sh
   "
@@ -185,7 +184,7 @@ if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
 
     # Allow up to 2 levels since some modpacks have a top-level directory named
     # for the modpack
-    forgeJar=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
+    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
     if [[ "$forgeJar" ]]; then
       export FTB_BASE_DIR=$(dirname "${forgeJar}")
       log "No entry script found, so building one for ${forgeJar}"
@@ -236,4 +235,5 @@ elif [ -e "${FTB_DIR}/Install.sh" ]; then
   popd
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployCanyon

@@ -1,54 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${CANYON_BUILD:=lastSuccessfulBuild}
-JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
-
-if [ "${JAVA_VER}" != "8" ]; then
-  log "ERROR: Canyon server type only supports Java version 8"
-  exit 1
-fi
-
-if [ "${VERSION}" != "b1.7.3" ]; then
-  log "ERROR: Canyon server type only supports VERSION=b1.7.3"
-  exit 1
-fi
-
-canyonJob="https://ci.velocitypowered.com/job/Canyon"
-
-buildRelPath=$(
-  curl -fsSL "${canyonJob}/${CANYON_BUILD}/api/json" |
-    jq -r '.artifacts[0].relativePath'
-)
-buildNumber=$(
-  curl -fsSL "${canyonJob}/${CANYON_BUILD}/api/json" |
-    jq -r '.number'
-)
-baseName=$(basename "${buildRelPath}")
-
-# Add build tag to non-tagged builds for version detection
-if [ ${baseName%.*} = 'canyon-server' ]; then
-    export SERVER=${baseName%.*}_build${buildNumber}.jar
-else
-    export SERVER="${baseName}"
-fi
-
-if [ ! -f "$SERVER" ]; then
-    downloadUrl="${canyonJob}/${CANYON_BUILD}/artifact/${buildRelPath}"
-    log "Downloading Canyon build ${buildNumber} from $downloadUrl ..."
-    curl -fsSL -o "$SERVER" "$downloadUrl"
-    if [ ! -f "$SERVER" ]; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-spiget "$@"

start-deployCatserver

@@ -29,4 +29,4 @@ fi
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"

start-deployCustom

@@ -32,4 +32,5 @@ fi
 
 export SKIP_LOG4J_CONFIG=true
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployFTBA

@@ -30,13 +30,7 @@ if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MO
   ftbInstaller=/data/ftb-installer
   if ! [[ -f "${ftbInstaller}" ]]; then
     log "Downloading FTB installer"
-    if [ "$(uname -m)" == "aarch64" ]; then
-      log "Downloading ARM installer"
-      curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/arm/linux -o "${ftbInstaller}"
-    else
-      log "Downloading x86 installer"
-      curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/linux -o "${ftbInstaller}"
-    fi
+    curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/linux -o "${ftbInstaller}"
     chmod +x "${ftbInstaller}"
   fi
 
@@ -58,14 +52,12 @@ fi
 
 isDebugging && cat version.json
 forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json)
-fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version' version.json)
 mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
 
 variants=(
   forge-${mcVersion}-${forgeVersion}.jar
   forge-${mcVersion}-${forgeVersion}-universal.jar
   forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
-  fabric-${mcVersion}-${fabricVersion}-server-launch.jar
 )
 for f in ${variants[@]}; do
   if [ -f $f ]; then
@@ -74,9 +66,10 @@ for f in ${variants[@]}; do
   fi
 done
 if ! [ -v SERVER ]; then
-  log "ERROR unable to locate the installed FTB server jar"
+  log "ERROR unable to locate the installed forge server jar"
   ls *.jar
   exit 2
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployFabric

@@ -1,46 +1,56 @@
 #!/bin/bash
 set -eu
 
-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils
 
-requireVar VANILLA_VERSION
 export TYPE=FABRIC
-export SERVER=fabric-server-${VANILLA_VERSION}.jar
 
-isDebugging && set -x
-
-if [[ ! -e ${SERVER} ]]; then
-
-  : ${FABRIC_INSTALLER:=}
-  : ${FABRIC_INSTALLER_URL:=}
-  : ${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}
-
-  if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-    log "Checking Fabric version information."
-    if [[ ${FABRIC_INSTALLER_VERSION^^} = LATEST ]]; then
+FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
+FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
+FABRIC_INSTALLER_VERSION=${FABRIC_INSTALLER_VERSION:-${FABRICVERSION:-LATEST}}
+if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
+  log "Checking Fabric version information."
+  case $FABRIC_INSTALLER_VERSION in
+    LATEST)
       FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-    fi
+      ;;
+  esac
 
-    FABRIC_INSTALLER="fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-    FABRIC_INSTALLER_URL="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-  elif [[ -z $FABRIC_INSTALLER ]]; then
-    FABRIC_INSTALLER="fabric-installer.jar"
-  elif [[ ! -e $FABRIC_INSTALLER ]]; then
-    log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
-    exit 2
-  fi
+  FABRIC_INSTALLER="/tmp/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+  markerVersion=$FABRIC_INSTALLER_VERSION
 
+elif [[ -z $FABRIC_INSTALLER ]]; then
+  FABRIC_INSTALLER="/tmp/fabric-installer.jar"
+  markerVersion=custom
+elif [[ ! -e $FABRIC_INSTALLER ]]; then
+  log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
+  exit 2
+fi
+
+installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${markerVersion}"
+
+debug Checking for installMarker ${installMarker}
+if [[ ! -e $installMarker ]]; then
   if [[ ! -e $FABRIC_INSTALLER ]]; then
-    log "Downloading $FABRIC_INSTALLER_URL ..."
-    if ! get -o "$FABRIC_INSTALLER" "$FABRIC_INSTALLER_URL"; then
-      log "Failed to download from given location $FABRIC_INSTALLER_URL"
-      exit 2
+    if [[ -z $FABRIC_INSTALLER_URL ]]; then
+      log "Downloading installer version $FABRIC_INSTALLER_VERSION"
+      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+      log "...trying $downloadUrl"
+      curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
+    else
+      log "Downloading $FABRIC_INSTALLER_URL ..."
+      if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
+        log "Failed to download from given location $FABRIC_INSTALLER_URL"
+        exit 2
+      fi
     fi
   fi
 
-  log "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
-
+  if isDebugging; then
+    debug "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
+  else
+    log "Installing Fabric using $FABRIC_INSTALLER"
+  fi
   tries=3
   set +e
   while ((--tries >= 0)); do
@@ -57,8 +67,13 @@ if [[ ! -e ${SERVER} ]]; then
     log "Fabric failed to install after several tries." >&2
     exit 10
   fi
+  export SERVER=fabric-server-launch.jar
+  log "Using server $SERVER"
+  echo $SERVER > $installMarker
 
-  mv fabric-server-launch.jar "${SERVER}"
+else
+  export SERVER=$(< $installMarker)
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Contineut to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployForge

@@ -1,39 +1,86 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
+export TYPE=FORGE
 : ${FORGEVERSION:=RECOMMENDED}
 isDebugging && set -x
 
-get_installer() {
-  if [[ -z $FORGE_INSTALLER_URL ]]; then
-    log "Downloading $normForgeVersion"
+if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
+  norm=$VANILLA_VERSION
 
-    forgeFileNames="
-    $normForgeVersion/forge-$normForgeVersion-installer.jar
-    $shortForgeVersion/forge-$shortForgeVersion-installer.jar
-  "
+  case $VANILLA_VERSION in
+    *.*.*)
+      norm=$VANILLA_VERSION ;;
+    *.*)
+      norm=${VANILLA_VERSION}.0 ;;
+  esac
 
-    for fn in $forgeFileNames; do
-      downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
-      log "...trying $downloadUrl"
-      if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
-        return
+  #################################################################################
+
+  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
+      FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]")
+      if [ $FORGE_VERSION = null ]; then
+        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
+        if [ $FORGE_VERSION = null ]; then
+          log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
+          log "       Refer to http://files.minecraftforge.net/ for supported versions"
+          exit 2
+        fi
       fi
-    done
-    log "Unable to locate usable URL for $normForgeVersion"
-    exit 2
- else
-    log "Downloading $FORGE_INSTALLER_URL ..."
-    if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
-      log "Failed to download from given location $FORGE_INSTALLER_URL"
-      exit 2
-    fi
-  fi
-}
+      ;;
 
-install() {
+    *)
+      FORGE_VERSION=$FORGEVERSION
+      ;;
+  esac
+
+  normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm
+  shortForgeVersion=$VANILLA_VERSION-$FORGE_VERSION
+
+  FORGE_INSTALLER="/tmp/forge-$shortForgeVersion-installer.jar"
+elif [[ -z $FORGE_INSTALLER ]]; then
+  FORGE_INSTALLER="/tmp/forge-installer.jar"
+elif [[ ! -e $FORGE_INSTALLER ]]; then
+  log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
+  exit 2
+else
+  shortForgeVersion=$VANILLA_VERSION-custom
+fi
+
+installMarker="/data/.forge-installed-$shortForgeVersion"
+
+if [ ! -e $installMarker ]; then
   if [ ! -e $FORGE_INSTALLER ]; then
-    get_installer $normForgeVersion $shortForgeVersion
+
+    if [[ -z $FORGE_INSTALLER_URL ]]; then
+      log "Downloading $normForgeVersion"
+
+      forgeFileNames="
+      $normForgeVersion/forge-$normForgeVersion-installer.jar
+      $shortForgeVersion/forge-$shortForgeVersion-installer.jar
+      END
+    "
+      for fn in $forgeFileNames; do
+        if [ $fn == END ]; then
+          log "Unable to compute URL for $normForgeVersion"
+          exit 2
+        fi
+        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
+        log "...trying $downloadUrl"
+        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
+          break
+        fi
+      done
+    else
+      log "Downloading $FORGE_INSTALLER_URL ..."
+      if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
+        log "Failed to download from given location $FORGE_INSTALLER_URL"
+        exit 2
+      fi
+    fi
   fi
 
   log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
@@ -67,69 +114,10 @@ install() {
   export SERVER=$latest
   log "Using server $SERVER"
   echo $SERVER > $installMarker
-}
 
-resolve_versions() {
-  if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
-    norm=$VANILLA_VERSION
-
-    case $VANILLA_VERSION in
-      *.*.*)
-        norm=$VANILLA_VERSION ;;
-      *.*)
-        norm=${VANILLA_VERSION}.0 ;;
-    esac
-
-    #################################################################################
-
-    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
-        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]")
-        if [ $FORGE_VERSION = null ]; then
-          FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
-          if [ $FORGE_VERSION = null ]; then
-            log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
-            log "       Refer to http://files.minecraftforge.net/ for supported versions"
-            exit 2
-          fi
-        fi
-        ;;
-
-      *)
-        FORGE_VERSION=$FORGEVERSION
-        ;;
-    esac
-
-    normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm
-    shortForgeVersion=$VANILLA_VERSION-$FORGE_VERSION
-
-    FORGE_INSTALLER="/tmp/forge-$shortForgeVersion-installer.jar"
-  elif [[ -z $FORGE_INSTALLER ]]; then
-    FORGE_INSTALLER="/tmp/forge-installer.jar"
-  elif [[ ! -e $FORGE_INSTALLER ]]; then
-    log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
-    exit 2
-  else
-    shortForgeVersion=$VANILLA_VERSION-${FORGE_INSTALLER_CUSTOM_VERSION:-custom}
-  fi
-}
-
-### main
-
-resolve_versions
-
-installMarker="/data/.forge-installed-$shortForgeVersion"
-
-if [ ! -e $installMarker ]; then
-  install
 else
   export SERVER=$(cat $installMarker)
-  if [ ! -e "$SERVER" ] && versionLessThan 1.17; then
-    rm "$installMarker"
-    install
-  fi
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployLimbo

@@ -1,63 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${LIMBO_BUILD:=LATEST}
-: ${FORCE_REDOWNLOAD:=false}
-: ${LIMBO_SCHEMA_FILENAME:=default.schem}
-: ${LEVEL:=Default;${LIMBO_SCHEMA_FILENAME}}
-# defaults to localhost, if this is not set
-: ${SERVER_IP:=0.0.0.0}
-
-export LEVEL SERVER_IP
-
-if [[ ${LIMBO_BUILD^^} == LATEST ]]; then
-  LIMBO_BUILD=lastStableBuild
-fi
-
-baseUrl="https://ci.loohpjames.com/job/Limbo/${LIMBO_BUILD}"
-buildInfoUrl="${baseUrl}/api/json"
-buildJson=$(curl -fsSL "${buildInfoUrl}")
-if [ $? != 0 ]; then
-  log "ERROR failed to get build info from ${buildInfoUrl} (status=$?)"
-  exit 1
-fi
-
-if [[ ${LIMBO_BUILD} = lastStableBuild ]]; then
-  LIMBO_BUILD=$(jq -r '.number' <<<${buildJson})
-  log "Resolved latest Limbo build to ${LIMBO_BUILD}"
-fi
-artifactPath=$(jq -r '.artifacts[] | select(.fileName|test("^Limbo-")) | .relativePath' <<<${buildJson})
-defaultSchemaPath=$(jq -r '.artifacts[] | select(.fileName|test(".*\\.schem")) | .relativePath' <<<${buildJson})
-
-export SERVER="limbo-${LIMBO_BUILD}.jar"
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="${baseUrl}/artifact/${artifactPath}"
-    log "Downloading Limbo from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-
-fi
-
-if [ ! -f "${LIMBO_SCHEMA_FILENAME}" ]; then
-  log "Downloading default schem file"
-  if ! curl -o "${LIMBO_SCHEMA_FILENAME}" -fsSL "${baseUrl}/artifact/${defaultSchemaPath}"; then
-      log "ERROR: failed to download schema file $baseUrl (status=$?)"
-      exit 3
-  fi
-fi
-
-if [[ ${LEVEL} != *\;* ]]; then
-  LEVEL="${LEVEL};${LIMBO_SCHEMA_FILENAME}"
-fi
-export LEVEL
-
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-setupWorld $@

start-deployMagma

@@ -1,92 +1,18 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-export SKIP_LOG4J_CONFIG=true
 
-isDebugging && set -x
+export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
 
-: ${VANILLA_VERSION?}
-# stable, dev
-: ${MAGMA_CHANNEL:=stable}
-
-
-magmaDownloadServer() {
-  url=${1?}
-  tagName=${2?}
-  markerFile=${3?}
-
-  export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
-
-  log "Downloading Magma server file for ${VANILLA_VERSION} @ ${tagName}"
-  if ! curl -o /data/magma-server-${VANILLA_VERSION}.jar -fsSL "$url"; then
-    log "ERROR failed to download Magma server from $url (status=$?)"
-    exit 1
-  fi
-
-  echo -n "$SERVER" > "$markerFile"
-}
-
-magmaHandleInstaller() {
-  url=${1?}
-  tagName=${2?}
-  markerFile=${3?}
-
-  installerFile="magma-installer-${VANILLA_VERSION}-${tagName}.jar"
-  log "Downloading Magma installer file for ${VANILLA_VERSION} @ ${tagName}"
-  if ! curl -o "$installerFile" -fsSL "$url"; then
-    log "ERROR failed to download Magma installer from $url (status=$?)"
-    exit 1
-  fi
-
-  echo "forge" > "$markerFile"
-
-  export FORGE_INSTALLER="$installerFile"
-  export FORGE_INSTALLER_CUSTOM_VERSION="$tagName"
-
-  # now hand off the rest to forge
-  exec ${SCRIPTS:-/}start-deployForge "$@"
-}
-
-latestMeta=$(curl -fsSL https://api.magmafoundation.org/api/resources/Magma/${VANILLA_VERSION}/${MAGMA_CHANNEL}/latest || exit $?)
-if [ $? != 0 ]; then
-  log "ERROR failed to locate latest Magma info for ${VANILLA_VERSION} in channel ${MAGMA_CHANNEL} (error=$?)"
+# 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
 
-tagName=$(echo "${latestMeta}" | jq -r '.tag_name')
-markerFile=".magma-installed-${VANILLA_VERSION}-${tagName}"
-if [ -f "${markerFile}" ]; then
-  installedTagName=$(cat "${markerFile}")
-fi
+export SKIP_LOG4J_CONFIG=true
 
-if [ ! -f "${markerFile}" ]; then
-
-  if versionLessThan 1.16; then
-    assetType=server
-  else
-    assetType=installer
-  fi
-
-  assetUrl=$(echo "${latestMeta}" | jq -r ".assets | .[].browser_download_url | select(test(\"${assetType}\"))")
-  if [ $? != 0 ] || [ -z "$assetUrl" ]; then
-    log "ERROR failed to extract ${assetType} asset type for ${VANILLA_VERSION} in channel ${MAGMA_CHANNEL}"
-    exit 1
-  fi
-
-  if [[ ${assetType} = server ]]; then
-    magmaDownloadServer "$assetUrl" "$tagName" "$markerFile"
-  else
-    magmaHandleInstaller "$assetUrl" "$tagName" "$markerFile"
-  fi
-else
-  export SERVER=$(cat "${markerFile}")
-
-  if [[ $SERVER == "forge" ]]; then
-    export FORGE_INSTALLER="magma-installer-${VANILLA_VERSION}-${tagName}.jar"
-    export FORGE_INSTALLER_CUSTOM_VERSION="$tagName"
-    # now hand off the rest to forge
-    exec ${SCRIPTS:-/}start-deployForge "$@"
-  fi
-fi
-
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployMohist

@@ -8,12 +8,12 @@ isDebugging && set -x
 requireVar VANILLA_VERSION
 : ${MOHIST_BUILD:=lastSuccessfulBuild}
 
-mohistJobs=https://ci.codemc.io/job/MohistMC/job/
+mohistJobs=https://ci.codemc.io/job/Mohist-Community/job/
 mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
 
 if ! curl -X HEAD -o /dev/null -fsSL "${mohistJob}"; then
   log "ERROR: mohist builds do not exist for ${VANILLA_VERSION}"
-  log "       check https://ci.codemc.io/job/MohistMC/ for available versions"
+  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
   log "       and set VERSION accordingly"
   exit 1
 fi
@@ -26,7 +26,7 @@ buildRelPath=$(
 baseName=$(basename "${buildRelPath}")
 if [[ ${baseName} != *-server.jar* ]]; then
   log "ERROR: mohist build for ${VANILLA_VERSION} is not a valid server jar, found ${baseName}"
-  log "       check https://ci.codemc.io/job/MohistMC/ for available versions"
+  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
   log "       and set VERSION accordingly"
   exit 1
 fi
@@ -40,4 +40,5 @@ fi
 
 export SKIP_LOG4J_CONFIG=true
 
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"

start-deployPurpur

@@ -10,7 +10,7 @@ isDebugging && set -x
 : ${FORCE_REDOWNLOAD:=false}
 
 if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  PURPUR_BUILD=$(curl -fsSL "https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}" |
+  PURPUR_BUILD=$(curl -fsSL "https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}" |
     jq -r '.builds.latest' || echo "")
   if [[ -z ${PURPUR_BUILD} ]]; then
     log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
@@ -22,7 +22,7 @@ fi
 export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
 
 if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
+    downloadUrl="https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
     log "Downloading Purpur from $downloadUrl ..."
     if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
       log "ERROR: failed to download from $downloadUrl (status=$?)"

start-deploySpongeVanilla

@@ -37,4 +37,5 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployTuinity

@@ -0,0 +1,26 @@
+#!/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 later operations
+export TYPE=SPIGOT
+
+exec ${SCRIPTS:-/}start-spiget "$@"

start-deployVanilla

@@ -1,39 +1,41 @@
 #!/bin/bash
 
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}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
+if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   log "Downloading $SERVER ..."
   debug "Finding version manifest for $VANILLA_VERSION"
-  versionManifestUrl=$(get 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url')
+  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
     log "ERROR failed to obtain version manifest URL ($result)"
     exit 1
   fi
-  if [ "$versionManifestUrl" = "null" ]; then
+  if [ $versionManifestUrl = "null" ]; then
     log "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
     exit 1
   fi
   debug "Found version manifest at $versionManifestUrl"
 
-  serverDownloadUrl=$(get --json-path '$.downloads.server.url' "${versionManifestUrl}")
+  serverDownloadUrl=$(curl -fsSL ${versionManifestUrl} | jq --raw-output '.downloads.server.url')
   result=$?
   if [ $result != 0 ]; then
     log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
     exit 1
-  elif [ "$serverDownloadUrl" = "null" ]; then
+  elif [ $serverDownloadUrl = null ]; then
     log "ERROR version $VANILLA_VERSION does not provide a server download"
     exit 1
   fi
 
   debug "Downloading server from $serverDownloadUrl"
-  get -o "$SERVER" "$serverDownloadUrl"
+  if isDebugging; then
+    verbose=-v
+  fi
+  curl $verbose -fsSL -o $SERVER $serverDownloadUrl
   result=$?
   if [ $result != 0 ]; then
     log "ERROR failed to download server from $serverDownloadUrl ($result)"
@@ -43,4 +45,5 @@ fi
 
 isDebugging && ls -l
 
-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployYatopia

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

start-finalSetupEnvVariables

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

start-finalSetupModconfig

@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi
 
-exec ${SCRIPTS:-/}start-setupMounts $@
+exec ${SCRIPTS:-/}start-finalSetupMounts $@

start-finalSetupModpack

@@ -2,7 +2,6 @@
 
 set -e -o pipefail
 
-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils
 if isDebugging; then
   set -x
@@ -23,7 +22,7 @@ if [[ "$MODPACK" ]]; then
     if [[ "${MODPACK}" == *.zip ]]; then
       downloadUrl="${MODPACK}"
     else
-      downloadUrl=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
+      downloadUrl=$(curl -Ls -o /dev/null -w %{effective_url} $MODPACK)
       if ! [[ $downloadUrl == *.zip ]]; then
         log "ERROR Invalid URL given for MODPACK: $downloadUrl resolved from $MODPACK"
         log "      Must be HTTP, HTTPS or FTP and a ZIP file"
@@ -37,28 +36,24 @@ if [[ "$MODPACK" ]]; then
       log "ERROR: failed to download from $downloadUrl"
       exit 2
     fi
-  elif [[ "$MODPACK" =~ .*\.zip ]]; then
-    if ! cp $MODPACK /tmp/modpack.zip; then
-      log "ERROR: failed to copy from $MODPACK"
-      exit 2
+
+    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 $downloadUrl"
+      fi
+    else
+      mkdir -p /data/mods
+      if ! unzip -o -d /data/mods /tmp/modpack.zip; then
+        log "ERROR: failed to unzip the modpack from $downloadUrl"
+      fi
     fi
+    rm -f /tmp/modpack.zip
+
   else
-    log "ERROR Invalid URL or Path given for MODPACK: $MODPACK"
+    log "ERROR Invalid URL given for MODPACK: $MODPACK"
     exit 1
   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 $downloadUrl"
-    fi
-  else
-    mkdir -p /data/mods
-    if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-      log "ERROR: failed to unzip the modpack from $downloadUrl"
-    fi
-  fi
-  rm -f /tmp/modpack.zip
 fi
 
 # If supplied with a URL for a plugin download it.
@@ -72,24 +67,28 @@ if [[ "$MODS" ]]; then
 
   for i in ${MODS//,/ }
   do
-    if isURL "$i"; then
+    if isURL $i; then
       log "Downloading mod/plugin $i ..."
-      if ! get -o "${out_dir}" "$i"; then
-        log "ERROR: failed to download from $i into $out_dir"
-        exit 2
+      if isValidFileURL jar "$i"; then
+        if ! curl -fsSL -o "${out_dir}/$(getFilenameFromUrl "${i}")" "${i}"; then
+          log "ERROR: failed to download from $i into $out_dir"
+          exit 2
+        fi
+      else
+        effective_url=$(resolveEffectiveUrl "$i")
+        if isValidFileURL jar "${effective_url}"; then
+          out_file=$(getFilenameFromUrl "${effective_url}")
+          if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
+            log "ERROR: failed to download from $i into $out_dir"
+            exit 2
+          fi
+        else
+          log "ERROR: $effective_url resolved from $i is not a valid jar URL"
+          exit 2
+        fi
       fi
-    elif [[ -f "$i" && "$i" =~ .*\.jar ]]; then
-      log "Copying plugin located at $i ..."
-      out_file=$(basename "$i")
-      if ! cp "$i" "${out_dir}/$out_file"; then
-        log "ERROR: failed to copy from $i into $out_dir"
-        exit 2
-      fi
-    elif [[ -d "$i" ]]; then
-      log "Copying plugin jars from $i ..."
-      cp "$i"/*.jar "${out_dir}"
     else
-      log "ERROR Invalid URL or path given in MODS: $i"
+      log "ERROR Invalid URL given in MODS: $i"
       exit 2
     fi
   done
@@ -141,10 +140,7 @@ fi
 if [[ "${GENERIC_PACK}" ]]; then
   if isURL "${GENERIC_PACK}"; then
     log "Downloading generic pack ..."
-    if ! curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"; then
-      log "ERROR: failed to download ${GENERIC_PACK}"
-      exit 2
-    fi
+    curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"
     GENERIC_PACK=/tmp/generic_pack.zip
   fi
 
@@ -175,4 +171,4 @@ if [[ "${GENERIC_PACK}" ]]; then
   fi
 fi
 
-exec ${SCRIPTS:-/}start-setupModconfig $@
+exec ${SCRIPTS:-/}start-finalSetupModconfig $@

start-finalSetupMounts

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

start-finalSetupServerProperties

@@ -19,7 +19,7 @@ function setServerProp {
       sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
     else
       log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
-      echo "${prop}=${var}" >> "$SERVER_PROPERTIES"
+      echo "${prop}=${var//\\/\\\\}" >> "$SERVER_PROPERTIES"
     fi
   else
     isDebugging && log "Skip setting ${prop}"
@@ -27,7 +27,7 @@ function setServerProp {
 }
 
 function customizeServerProps {
-  if [ -n "$WHITELIST" ] || isTrue ${ENABLE_WHITELIST:-false}; then
+  if [ -n "$WHITELIST" ]; then
     log "Creating whitelist"
     setServerProp "whitelist" "true"
     setServerProp "white-list" "true"
@@ -56,7 +56,7 @@ function customizeServerProps {
   setServerProp "server-name" "$SERVER_NAME"
   setServerProp "server-ip" "$SERVER_IP"
   setServerProp "server-port" "$SERVER_PORT"
-  setServerProp "motd" "$(echo $MOTD | mc-image-helper asciify)"
+  setServerProp "motd" "$MOTD"
   setServerProp "allow-nether" "$ALLOW_NETHER"
   setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"
   setServerProp "enable-command-block" "$ENABLE_COMMAND_BLOCK"
@@ -100,7 +100,6 @@ function customizeServerProps {
   setServerProp "prevent-proxy-connections" "$PREVENT_PROXY_CONNECTIONS"
   setServerProp "use-native-transport" "$USE_NATIVE_TRANSPORT"
   setServerProp "enforce-whitelist" "$ENFORCE_WHITELIST"
-  setServerProp "simulation-distance" "$SIMULATION_DISTANCE"
 
   if [ -n "$DIFFICULTY" ]; then
     case $DIFFICULTY in
@@ -218,4 +217,4 @@ if isDebugging; then
   cat "${SERVER_PROPERTIES}"
 fi
 
-exec ${SCRIPTS:-/}start-setupEnvVariables $@
+exec ${SCRIPTS:-/}start-finalSetupEnvVariables $@

start-finalSetupWorld

@@ -71,4 +71,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
   fi
 fi
 
-exec ${SCRIPTS:-/}start-setupModpack $@
+exec ${SCRIPTS:-/}start-finalSetupModpack $@

start-minecraftFinalSetup

@@ -172,32 +172,25 @@ function copyFilesForCurseForge() {
   cp -f /data/eula.txt "${FTB_DIR}/"
 }
 
-mcServerRunnerArgs=(
---stop-duration "${STOP_DURATION:-60}s"
---named-pipe "${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}"
-)
-if [[ ${STOP_SERVER_ANNOUNCE_DELAY} ]]; then
-  mcServerRunnerArgs+=(--stop-server-announce-delay "${STOP_SERVER_ANNOUNCE_DELAY}s")
-fi
-
+mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
     if isTrue ${DEBUG_EXEC}; then
       set -x
     fi
-    exec mc-server-runner "${mcServerRunnerArgs[@]}" \
+    exec mc-server-runner ${mcServerRunnerArgs} \
       --cf-instance-file "${CURSE_INSTANCE_JSON}" \
       java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
 elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
   copyFilesForCurseForge
 
-  cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1)
+  cd "${FTB_DIR}"
   log "Starting CurseForge server in ${FTB_DIR}..."
   if isTrue ${DEBUG_EXEC}; then
     set -x
   fi
-  exec mc-server-runner ${bootstrapArgs} "${mcServerRunnerArgs[@]}" java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
+  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
 elif [[ ${TYPE} == "CURSEFORGE" ]]; then
-  mcServerRunnerArgs+=(--shell bash)
+  mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
 
   copyFilesForCurseForge
 
@@ -212,15 +205,12 @@ EOF
     sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
   fi
 
-  cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1)
+  cd "${FTB_DIR}"
   log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
 
-  finalArgs="${FTB_SERVER_START}"
-
-  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: ${finalArgs}"
-    exit
-  fi
+  finalArgs=(
+    "${FTB_SERVER_START}"
+  )
 
   if isTrue ${DEBUG_EXEC}; then
     set -x
@@ -228,12 +218,8 @@ EOF
   if isTrue ${EXEC_DIRECTLY:-false}; then
     "${finalArgs[@]}"
   else
-    exec mc-server-runner "${mcServerRunnerArgs[@]}" "${finalArgs[@]}"
+    exec mc-server-runner ${mcServerRunnerArgs} "${finalArgs[@]}"
   fi
-elif [[ -x run.sh ]]; then
-  log "Using Forge supplied run.sh script..."
-  echo $JVM_XX_OPTS $JVM_OPTS $expandedDOpts > user_jvm_args.txt
-  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash run.sh
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f /data/bootstrap.txt ]; then
@@ -246,15 +232,10 @@ else
     $JVM_XX_OPTS
     $JVM_OPTS
     $expandedDOpts
-    -jar "$SERVER"
+    -jar $SERVER
     "$@" $EXTRA_ARGS
   )
 
-  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: java ${finalArgs[*]}"
-    exit
-  fi
-
   if isTrue ${DEBUG_EXEC}; then
     set -x
   fi
@@ -262,7 +243,6 @@ else
   if isTrue ${EXEC_DIRECTLY:-false}; then
     exec java "${finalArgs[@]}"
   else
-    exec mc-server-runner ${bootstrapArgs} "${mcServerRunnerArgs[@]}" java "${finalArgs[@]}"
+    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
   fi
 fi
-

start-setupEnvVariables

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-set -e
-
-: ${REPLACE_ENV_IN_PLACE:=${REPLACE_ENV_VARIABLES:-false}}
-: ${REPLACE_ENV_PATHS:=/data}
-: ${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}
-: ${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}
-: ${REPLACE_ENV_VARIABLES_EXCLUDES:=}
-: ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}
-: ${PATCH_DEFINITIONS:=}
-: ${DEBUG:=false}
-
-if isTrue "${REPLACE_ENV_IN_PLACE}"; then
-  log "Replacing env variables in ${REPLACE_ENV_PATHS} that match the prefix $REPLACE_ENV_VARIABLE_PREFIX ..."
-
-  mc-image-helper --debug=${DEBUG} interpolate \
-    --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-    --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-    --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    "${REPLACE_ENV_PATHS[@]}"
-fi
-
-if [[ ${PATCH_DEFINITIONS} ]]; then
-  log "Applying patch definitions from ${PATCH_DEFINITIONS}"
-  mc-image-helper --debug=${DEBUG} patch \
-    --patch-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    "${PATCH_DEFINITIONS}"
-fi
-
-exec ${SCRIPTS:-/}start-finalExec $@

start-setupMounts

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-: ${SYNC_SKIP_NEWER_IN_DESTINATION:=${PLUGINS_SYNC_UPDATE:-true}}
-: ${REPLACE_ENV_DURING_SYNC:=true}
-: ${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}
-: ${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}
-: ${REPLACE_ENV_VARIABLES_EXCLUDES:=}
-: ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}
-: ${DEBUG:=false}
-
-set -e
-isDebugging && set -x
-
-if isTrue ${SYNC_SKIP_NEWER_IN_DESTINATION}; then
-  updateArg="--skip-newer-in-destination"
-fi
-
-if isTrue ${REPLACE_ENV_DURING_SYNC}; then
-  subcommand=sync-and-interpolate
-else
-  subcommand=sync
-fi
-
-if [ -d /plugins ]; then
-  case ${TYPE} in
-    SPIGOT|BUKKIT|PAPER|MAGMA)
-      mkdir -p /data/plugins
-      log "Copying plugins over..."
-      mc-image-helper \
-        --debug=${DEBUG} ${subcommand} $updateArg \
-        --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-        --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-        --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-        --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-        /plugins /data/plugins
-      ;;
-  esac
-fi
-
-# If any modules have been provided, copy them over
-: ${COPY_MODS_DEST:="/data/mods"}
-
-if [ -d /mods ]; then
-  log "Copying any mods over..."
-  mc-image-helper \
-    --debug=${DEBUG} ${subcommand} $updateArg \
-    --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-    --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-    --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    /mods "${COPY_MODS_DEST}"
-fi
-
-: ${COPY_CONFIG_DEST:="/data/config"}
-
-if [ -d /config ]; then
-  log "Copying any configs from /config to ${COPY_CONFIG_DEST}"
-  mc-image-helper \
-    --debug=${DEBUG} ${subcommand} $updateArg \
-    --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-    --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-    --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    /config "${COPY_CONFIG_DEST}"
-fi
-
-exec ${SCRIPTS:-/}start-setupServerProperties $@

start-spiget

@@ -6,7 +6,6 @@ IFS=$'\n\t'
 handleDebugMode
 
 : ${SPIGET_RESOURCES:=}
-: ${SPIGET_DOWNLOAD_TOLERANCE:=5} # in minutes
 
 containsJars() {
   file=${1?}
@@ -27,49 +26,6 @@ getResourceFromSpiget() {
 
   log "Downloading resource ${resource} ..."
 
-  mkdir -p /data/plugins
-
-  versionfile="/data/plugins/.${resource}-version.json"
-  versionfileNew="/tmp/.${resource}-version.json"
-
-  if [ -f "$versionfile" ]; then
-    if [[ -n $(find "$versionfile" -mmin +${SPIGET_DOWNLOAD_TOLERANCE}) ]]; then
-      urlVersion="https://api.spiget.org/v2/resources/${resource}/versions/latest"
-      if ! curl -o "${versionfileNew}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${urlVersion}"; then
-        log "ERROR failed to download resource version meta data '${resource}' from ${urlVersion}"
-        exit 2
-      fi
-
-      installedVersion=$(jq -r '.name' $versionfile)
-      newVersion=$(jq -r '.name' $versionfileNew)
-      
-      if [ "$installedVersion" = "$newVersion" ]; then
-        log "resource '${resource}' not downloaded because installed version '${installedVersion}' already up to date ('${newVersion}')"
-        mv "${versionfileNew}" "${versionfile}"
-      else
-        if downloadResourceFromSpiget "${resource}"; then
-          mv "${versionfileNew}" "${versionfile}"
-        fi
-      fi
-    else
-      log "resource '${resource}' not checked because version meta file newer than '${SPIGET_DOWNLOAD_TOLERANCE}' minutes"
-    fi
-  else
-    if downloadResourceFromSpiget "${resource}"; then
-      urlVersion="https://api.spiget.org/v2/resources/${resource}/versions/latest"
-      if ! curl -o "${versionfileNew}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${urlVersion}"; then
-        log "ERROR failed to download resource version meta data '${resource}' from ${urlVersion}"
-        exit 2
-      fi
-      mv "${versionfileNew}" "${versionfile}"
-    fi
-  fi
-
-}
-
-downloadResourceFromSpiget() {
-  resource=${1?}
-
   tmpfile="/tmp/${resource}.zip"
   url="https://api.spiget.org/v2/resources/${resource}/download"
   if ! curl -o "${tmpfile}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${url}"; then
@@ -77,6 +33,7 @@ downloadResourceFromSpiget() {
     exit 2
   fi
 
+  mkdir -p /data/plugins
   if containsJars "${tmpfile}"; then
     log "Extracting contents of resource ${resource} into plugins"
     unzip -o -q -d /data/plugins "${tmpfile}"
@@ -101,4 +58,5 @@ if [[ ${SPIGET_RESOURCES} ]]; then
   done
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-utils

@@ -177,14 +177,6 @@ eula=${EULA,,}
 
 function removeOldMods {
   if [ -d "$1" ]; then
-    find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE:-}" -delete
+    find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
   fi
 }
-
-function get() {
-  local flags=()
-  if isTrue "${DEBUG_GET:-false}"; then
-    flags+=("--debug")
-  fi
-  mc-image-helper "${flags[@]}" get "$@"
-}

start-validateCurseInstance

@@ -14,4 +14,5 @@ fi
 
 log "Resolved CURSE_INSTANCE_JSON as ${CURSE_INSTANCE_JSON}"
 
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"

tests/docker-compose.test.yml

@@ -10,9 +10,6 @@ services:
     restart: "no"
     build:
       context: ..
-      args:
-        TARGETOS: linux
-        TARGETARCH: amd64
       cache_from:
       - itzg/minecraft-server:latest
     environment: