Added procps to alpine image to resolve autopause compatibility (#1361)

Co-authored-by: christopher blodgett <christopher.blodgett@gmail.com>

.dockerignore

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

.editorconfig

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

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+
+#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/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,40 @@
+name: Bug Report
+description: File a bug report
+labels:
+  - bug
+  - status/needs triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug.
+        
+        Please double check some things first:
+        - Do you just have a question about something? If so, asking in the [Q&A Discussions](https://github.com/itzg/docker-minecraft-server/discussions/categories/q-a) or asking on [the Discord server](https://discord.gg/DXfKpjB) would be best.
+        - Is this bug happening after the `[init]` prefixed logs and after the log that says "Starting the Minecraft server"? If so, please report the bug with Mojang or the respective server provider.
+        - Are you seeing a performance problem? If so, that is typically outside the scope of the image setup mechanims. Ask a question as above or contact the respective server provider.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Describe the problem
+    validations:
+      required: true
+  - type: textarea
+    id: container
+    attributes:
+      label: Container definition
+      description: Please provide the compose file or run command used to create the container
+      value: |
+        ```
+        Paste run command or compose file here
+        ```
+  - type: textarea
+    id: logs
+    attributes:
+      label: Container logs
+      description: |
+        Please provide container logs from the start of the container, which will be the ones prefixed with `[init]`. It is even better if you can set the variable `DEBUG` to "true" and provide those debug container logs.
+      value: |
+        ```
+        Paste logs here
+        ```

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: Ask a question in discussions
+    url: https://github.com/itzg/docker-minecraft-server/discussions
+    about: Please ask questions here
+  - name: Ask a question on Discord
+    url: https://discord.gg/DXfKpjB
+    about: Please ask questions here

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,29 @@
+name: Enhancement Request
+description: Request an enhancement
+labels:
+  - enhancement
+  - status/needs triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to request an enhancement.
+        
+        Even if you plan on submitting a pull request with a contributed enhancement it is best to describe the enhancement here first. Somebody might already be working on a similar thing and could use your help.
+  - type: dropdown
+    id: type
+    attributes:
+      label: Enhancement Type
+      options:
+        - Improve an existing feature
+        - A completely new feature
+        - New server type
+        - Not sure
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the enhancement
+    validations:
+      required: true

.github/dependabot.yml

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

.github/no-response.yml

@@ -1,6 +0,0 @@
-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/release.yml

@@ -0,0 +1,4 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot

.github/workflows/build-multiarch.yml

@@ -2,24 +2,134 @@ name: Build and publish multiarch
 on:
   push:
     branches:
-      - multiarch
+      - master
+      - test/**
     tags:
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+"
+    paths-ignore:
+      - "*.md"
+      - "docs/**"
+      - "examples/**"
 
 jobs:
-  docker-buildx:
-    runs-on: ubuntu-latest
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        variant:
+          - java17
+          - java17-openj9
+          - java17-alpine
+          - java8
+          - java8-multiarch
+          - java8-openj9
+          - java11
+          - java11-openj9
+        include:
+          - variant: java17
+            baseImage: eclipse-temurin:17
+            platforms: linux/amd64,linux/arm/v7,linux/arm64
+            mcVersion: LATEST
+          - variant: java17-openj9
+            baseImage: ibm-semeru-runtimes:open-17-jdk
+            platforms: linux/amd64,linux/arm64
+            mcVersion: LATEST
+          - variant: java17-alpine
+            baseImage: eclipse-temurin:17-jdk-alpine
+            platforms: linux/amd64
+            mcVersion: LATEST
+          - variant: java8
+            baseImage: openjdk:8-jdk-alpine3.8
+            platforms: linux/amd64
+            mcVersion: 1.12.2
+          - variant: java8-multiarch
+            baseImage: eclipse-temurin:8-jdk
+            platforms: linux/amd64,linux/arm64
+            mcVersion: 1.12.2
+          - variant: java8-openj9
+            baseImage: ibm-semeru-runtimes:open-8-jdk
+            platforms: linux/amd64,linux/arm64
+            mcVersion: 1.12.2
+          - variant: java11
+            baseImage: adoptopenjdk:11-jdk-hotspot
+            platforms: linux/amd64,linux/arm/v7,linux/arm64
+            mcVersion: 1.16.5
+          - variant: java11-openj9
+            baseImage: ibm-semeru-runtimes:open-11-jdk
+            platforms: linux/amd64,linux/arm64
+            mcVersion: 1.16.5
+    env:
+      IMAGE_TO_TEST: ${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}
+    runs-on: ubuntu-20.04
     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
+        uses: actions/checkout@v2.4.0
         with:
-          publish: true
-          imageName: itzg/minecraft-server
-          tag: ${{ env.BRANCH_NAME }}
-          dockerHubUser: ${{ secrets.DOCKER_USER }}
-          dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}
+          # for build-files step
+          fetch-depth: 0
 
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # NOTE for forks: if your Docker Hub organization doesn't match your Github repo's,
+          # then the use of ${{ github.repository_owner }} will need to be replaced.
+          images: |
+            ${{ github.repository_owner }}/minecraft-server
+          tags: |
+            type=ref,event=tag,enable=${{ matrix.variant == 'java17' }}
+            type=ref,event=tag,suffix=-${{ matrix.variant }}
+            type=raw,value=${{ matrix.variant }}
+          flavor: |
+            latest=${{ matrix.variant == 'java17' }}
+          labels: |
+            org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1.2.0
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build for test
+        uses: docker/build-push-action@v2.9.0
+        with:
+          platforms: linux/amd64
+          tags: ${{ env.IMAGE_TO_TEST }}
+          # ensure latest base image is used
+          pull: true
+          # load into daemon for test usage in next step
+          load: true
+          push: false
+          build-args: |
+            BASE_IMAGE=${{ matrix.baseImage }}
+          cache-from: type=gha,scope=${{ matrix.variant }}
+          # no cache-to to avoid cross-cache update from next build step
+
+      - name: Run tests
+        env:
+          MINECRAFT_VERSION: ${{ matrix.mcVersion }}
+        run: |
+          tests/test.sh
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2.9.0
+        with:
+          platforms: ${{ matrix.platforms }}
+          push: ${{ github.ref_type == 'tag' || github.ref_name == 'master' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          # ensure latest base image is used
+          pull: true
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BASE_IMAGE=${{ matrix.baseImage }}
+            BUILD_FILES_REV=${{ steps.build-files-rev.outputs.REV }}
+          cache-from: type=gha,scope=${{ matrix.variant }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.variant }}

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: ContinuousIntegration
+
+on:
+  push:
+    branches:
+      - 'dev*'
+      - '!master'
+      - '!java*'
+      - '!multi*'
+    paths-ignore:
+      - "*.md"
+      - "docs/**"
+      - "examples/**"
+
+env:
+  IMAGE_TO_TEST: ${{ secrets.IMAGE_ORG }}/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
+  MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2.4.0
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build
+        uses: docker/build-push-action@v2.9.0
+        with:
+          context: .
+          platforms: linux/amd64
+          tags: ${{ env.IMAGE_TO_TEST }}
+          load: true
+          cache-from: type=gha
+
+      - name: Run Setup Only Tests
+        run: bash tests/setuponlytests/test.sh
+
+      # - name: Run Full Minecraft Service Tests
+      #   run: |
+      #     tests/fulltests/test.sh          

.github/workflows/discord.yml

@@ -0,0 +1,26 @@
+name: Discord notifications
+
+on:
+  workflow_run:
+    workflows: ["ContinuousIntegration", "Build and Publish", "Build and publish multiarch" ]
+    types:
+      - completed
+
+env:
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  discord:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: on-success
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "Github repo: ${{ github.repository }}\n- Branch: ${{ github.event.workflow_run.head_branch }}\n- [Link: to Actions](<${{ github.event.workflow_run.html_url }}>)\n- Status: 🎉  ${{ github.event.workflow_run.conclusion }}  🍏"
+      - name: on-failure
+        if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "Github repo: ${{ github.repository }}\n- Branch: ${{ github.event.workflow_run.head_branch }}\n- [Link: to Actions](<${{ github.event.workflow_run.html_url }}>)\n- Status: 🤔  ${{ github.event.workflow_run.conclusion }}  💣💥"

.github/workflows/generate-toc.yml

@@ -0,0 +1,21 @@
+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.4.0
+      - 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.13.1
+        with:
+          commit_message: "docs: Auto update markdown TOC"

.github/workflows/issue-label.yml

@@ -0,0 +1,33 @@
+name: Issue labels
+
+on:
+  issues:
+    types: [labeled, reopened, closed, deleted]
+
+env:
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_ISSUES_WEBHOOK }}
+
+jobs:
+  labelNotify:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: notify on label
+        if: > 
+          github.event.label.name == 'enhancement' 
+          || github.event.label.name == 'bug' 
+          || github.event.label.name == 'help wanted'
+          || github.event.label.name == 'priority/high'
+          || github.event.label.name == 'question'
+          || github.event.label.name == 'status/waiting on upstream'
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "[${{ github.event.issue.title }} (#${{ github.event.issue.number }})](<${{ github.event.issue.html_url }}>) added `${{ github.event.label.name }}` label"
+      - name: notify on action change
+        if: > 
+          github.event.action == 'closed'
+          || github.event.action == 'reopened'
+          || github.event.action == 'deleted'
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "[${{ github.event.issue.title }} (#${{ github.event.issue.number }})](<${{ github.event.issue.html_url }}>) has been `${{ github.event.action }}` by `${{ github.event.sender.login }}`"

.github/workflows/main.yml

@@ -1,47 +0,0 @@
-name: Build and Publish
-
-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"
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run tests
-        run: |
-          tests/test.sh
-  build:
-    needs:
-      - test
-    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: false
-        cache_froms: itzg/minecraft-server:latest
-        add_git_labels: true
-        labels: org.opencontainers.image.url=https://github.com/itzg/docker-minecraft-server,org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
-        push: true

.github/workflows/pr.yml

@@ -1,16 +1,64 @@
-name: Validate PR
+name: PullRequest
 
 on:
   pull_request:
     branches: [ master ]
+    types: [assigned, opened, synchronize, labeled]
+    paths-ignore:
+      - "*.md"
+      - "docs/**"
+      - "examples/**"
+
+env:
+  IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
+  MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.4.0
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build
+        uses: docker/build-push-action@v2.9.0
+        with:
+          context: .
+          platforms: linux/amd64
+          tags: ${{ env.IMAGE_TO_TEST }}
+          load: true
+          cache-from: type=gha
 
       - name: Run tests
         run: |
           tests/test.sh
+
+      - name: Gather Docker metadata
+        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            itzg/minecraft-server
+
+      - name: Login to DockerHub
+        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Push
+        if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
+        uses: docker/build-push-action@v2.9.0
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          pull: true
+          push: true
+          cache-from: type=gha
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/stale-check.yml

@@ -0,0 +1,25 @@
+name: Stale Check
+
+on:
+  schedule:
+    - cron: 0 2 * * *
+
+jobs:
+  check:
+    runs-on: ubuntu-20.04
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Process Stale Issues
+        uses: actions/stale@v4.1.0
+        with:
+          stale-issue-label: status/stale
+          stale-pr-label: status/stale
+          stale-issue-message: >
+            This issue is stale because it has been open 30 days with no activity. 
+            Please add a comment describing the reason to keep this issue open.
+          days-before-stale: 30
+          days-before-close: 5
+          exempt-issue-labels: 'enhancement,keep,status/needs triage,priority/high'
+

.gitignore

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

BUILDING.md

@@ -1,5 +1,11 @@
 Ensure buildx/BuildKit support is enabled and run:
 
-```
+```shell script
 docker buildx build --platform=linux/arm64 --platform=linux/arm/v7 --platform=linux/amd64 --tag itzg/minecraft-server:multiarch --push .
 ```
+
+To build for local testing, use:
+
+```shell script
+docker buildx build --platform=linux/amd64 --tag mc-multiarch --load .
+```

DEVELOPMENT.md

@@ -2,10 +2,10 @@
 
 Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps:
 
-1. Copy an existing "start-deploy*" script, such as [start-deployMohist](start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
-2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-finalSetupWorld` at the end of the script 
+1. Copy an existing "start-deploy*" script, such as [start-deployMohist](scripts/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 
 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)
+4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](scripts/start-configuration)
 5. Add a section to the [README](README.md). It is recommended to copy-modify an existing section to retain a similar wording and level of detail
 6. [Submit a pull request](https://github.com/itzg/docker-minecraft-server/pulls)
 
@@ -15,8 +15,28 @@ Individual scripts can be iteratively developed, debugged, and tested using the
 
 First, build a baseline of the image to include the packages needed by existing or new scripts:
 
-```shell script
-docker build -t mc-dev .
+PowerShell: (Example of building and testing ForgeAPI)
+```powershell
+$env:MODS_FORGEAPI_KEY='$2a$...'
+$env:FOLDER_TO_TEST="forgeapimods_projectids"
+$env:IMAGE_TO_TEST="mc-dev"
+docker build -t $env:IMAGE_TO_TEST .
+pushd "tests/setuponlytests/$env:FOLDER_TO_TEST/"
+docker-compose run mc
+docker-compose down --remove-orphans
+popd
+```
+
+Bash: (Example of building and testing ForgeAPI)
+```bash
+export MODS_FORGEAPI_KEY='$2a$...'
+export FOLDER_TO_TEST="forgeapimods_file"
+export IMAGE_TO_TEST="mc-dev"
+docker build -t $IMAGE_TO_TEST .
+pushd tests/setuponlytests/$FOLDER_TO_TEST/
+docker-compose run mc
+docker-compose down --remove-orphans
+popd
 ```
 
 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.
@@ -40,35 +60,33 @@ VANILLA_VERSION=1.12.2 /scripts/start-magma
 
 > NOTE: You may want to temporarily add an `exit` statement near the end of your script to isolate execution to just the script you're developing.
 
-## Multi-base-image variants
+## Using development copy of mc-image-helper
 
-Several base-image variants are maintained in order to offer choices in JDK provider and version. The variants are maintained in their respective branches:
-- openj9 
-- openj9-nightly
-- adopt11
-- adopt13
-- multiarch
+In the cloned copy of [`mc-image-helper`](https://github.com/itzg/mc-image-helper), create an up-to-date snapshot build of the tgz distribution using:
 
-The [docker-versions-create.sh](docker-versions-create.sh) script is configured with the branches to maintain and is used to merge changes from the master branch into the mulit-base variant branches. The script also manages git tagging the master branch along with the merged branches. So a typical use of the script would be like:
-
-```shell script
-./docker-versions-create.sh -s -t 1.2.0
+```shell
+./gradlew distTar
 ```
 
-> Most often the major version will be bumped unless a bug or hotfix needs to be published in which case the patch version should be incremented.
+Assuming [http-server](https://www.npmjs.com/package/http-server) is installed globally, start a static web server using:
 
-> The build and publishing of those branches and their tags is currently performed within Docker Hub.
+```shell
+http-server ./build/distributions -p 0
+```
 
-## multiarch support
+Note the port that was selected by http-server and pass the build arguments, such as:
 
-The [multiarch branch](https://github.com/itzg/docker-minecraft-server/tree/multiarch) supports running the image on amd64, arm64, and armv7 (aka RaspberryPi). Unlike the mainline branches, it is based on Ubuntu 18.04 since the openjdk package provided by Ubuntu includes full JIT support on all of the processor types.
+```shell
+--build-arg MC_HELPER_VERSION=1.8.1-SNAPSHOT \
+--build-arg MC_HELPER_BASE_URL=http://host.docker.internal:8080
+```
 
-The multiarch images are built and published by [a Github action](https://github.com/itzg/docker-minecraft-server/actions?query=workflow%3A%22Build+and+publish+multiarch%22), which [is configured in that branch](https://github.com/itzg/docker-minecraft-server/blob/multiarch/.github/workflows/build-multiarch.yml).
+Now the image can be built like normal and it will install mc-image-helper from the locally built copy.
 
 ## Generating release notes
 
 The following git command can be used to provide the bulk of release notes content:
 
 ```shell script
-git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="- %s" 1.1.0..1.2.0
+git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="* %s" 1.1.0..1.2.0
 ```

Dockerfile

@@ -1,29 +1,18 @@
-FROM ubuntu:18.04
+# syntax = docker/dockerfile:1.3
 
-LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
+ARG BASE_IMAGE=eclipse-temurin:17-jdk
+FROM ${BASE_IMAGE}
 
-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
+# CI system should set this to a hash or git revision of the build directory and it's contents to
+# ensure consistent cache updates.
+ARG BUILD_FILES_REV=1
+RUN --mount=target=/build,source=build \
+    REV=${BUILD_FILES_REV} /build/run.sh install-packages
 
-RUN addgroup --gid 1000 minecraft \
-  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+RUN --mount=target=/build,source=build \
+    REV=${BUILD_FILES_REV} /build/run.sh setup-user
 
-COPY files/sudoers* /etc/sudoers.d
+COPY --chmod=644 files/sudoers* /etc/sudoers.d
 
 EXPOSE 25565 25575
 
@@ -42,42 +31,49 @@ 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.4.7 --var app=rcon-cli --file {{.app}} \
- --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+  --var version=1.5.1 --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
+  --var version=0.10.3 --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
+  --var version=1.8.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
+  --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
+ARG MC_HELPER_VERSION=1.16.6
+ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}
+RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
+  | tar -C /usr/share -zxf - \
+  && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
 
 VOLUME ["/data"]
-COPY server.properties /tmp/server.properties
-COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
+STOPSIGNAL SIGTERM
+
 ENV UID=1000 GID=1000 \
   MEMORY="1G" \
-  TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
-  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
-  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10
+  TYPE=VANILLA VERSION=LATEST \
+  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
+  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0 \
+  ENABLE_AUTOSTOP=false AUTOSTOP_TIMEOUT_EST=3600 AUTOSTOP_TIMEOUT_INIT=1800 AUTOSTOP_PERIOD=10
 
-COPY start* /
-COPY health.sh /
-ADD files/autopause /autopause
+COPY --chmod=755 scripts/start* /
+COPY --chmod=755 bin/ /usr/local/bin/
+COPY --chmod=755 bin/mc-health /health.sh
+COPY --chmod=644 files/server.properties /tmp/server.properties
+COPY --chmod=644 files/log4j2.xml /tmp/log4j2.xml
+COPY --chmod=755 files/autopause /autopause
+COPY --chmod=755 files/autostop /autostop
 
-RUN dos2unix /start* && chmod +x /start*
-RUN dos2unix /health.sh && chmod +x /health.sh
-RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
+RUN dos2unix /start* /autopause/* /autostop/*
 
 ENTRYPOINT [ "/start" ]
-HEALTHCHECK --start-period=1m CMD /health.sh
+HEALTHCHECK --start-period=1m CMD mc-health

bin/mc-health

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

bin/mc-send-to-console

@@ -0,0 +1,15 @@
+#!/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
+
+gosu minecraft bash -c "echo $* > '${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}'"

build/alpine/install-packages.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+apk add --no-cache -U \
+    openssl \
+    imagemagick \
+    file \
+    lsof \
+    su-exec \
+    coreutils \
+    findutils \
+    procps \
+    shadow \
+    bash \
+    curl iputils \
+    git \
+    jq \
+    mysql-client \
+    tzdata \
+    rsync \
+    nano \
+    sudo \
+    knock \
+    ttf-dejavu \
+    tar \
+    zstd

build/alpine/setup-user.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+addgroup -g 1000 minecraft
+adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft

build/run.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+distro=$(cat /etc/os-release | grep -E "^ID=" | cut -d= -f2 | sed -e 's/"//g')
+
+"$(dirname "$0")/${distro}/$1".sh

build/ubuntu/install-packages.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+apt-get update
+
+DEBIAN_FRONTEND=noninteractive \
+apt-get install -y \
+  imagemagick \
+  file \
+  gosu \
+  sudo \
+  net-tools \
+  iputils-ping \
+  curl \
+  git \
+  jq \
+  dos2unix \
+  mysql-client \
+  tzdata \
+  rsync \
+  nano \
+  unzip \
+  zstd \
+  knockd \
+  ttf-dejavu
+
+apt-get clean

build/ubuntu/setup-user.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+addgroup --gid 1000 minecraft
+adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft

docker-versions-create.sh

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

examples/.gitignore

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

examples/docker-compose-autopause.yml

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

examples/docker-compose-autostop.yml

@@ -0,0 +1,20 @@
+version: '3.8'
+
+services:
+  minecraft:
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565"
+    volumes:
+      - "mc:/data"
+    environment:
+      EULA: "TRUE"
+      ENABLE_AUTOSTOP: "TRUE"
+      # More aggressive settings for demo purposes
+      AUTOSTOP_TIMEOUT_INIT: "30"
+      AUTOSTOP_TIMEOUT_EST: "20"
+    # Important not to auto-restart the server!!!
+    restart: "no"
+
+volumes:
+  mc: {}

examples/docker-compose-big.yml

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

examples/docker-compose-curseforge.yml

@@ -1,13 +1,19 @@
-version: '3.2'
+version: '3.8'
 
 services:
   mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:${IMAGE_TAG:-java8}
     volumes:
     - ./modpacks:/modpacks:ro
+    - data:/data
     environment:
       EULA: "true"
       TYPE: CURSEFORGE
-      CF_SERVER_MOD: /modpacks/SkyFactory_4_Server_4.1.0.zip
+      CF_SERVER_MOD: https://media.forgecdn.net/files/3482/169/Valhelsia+3-3.4.4-SERVER.zip
+#      CF_SERVER_MOD: https://media.forgecdn.net/files/3012/800/SkyFactory-4_Server_4.2.2.zip
+#      CF_SERVER_MOD: /modpacks/${MODPACK:-SkyFactory_4_Server_4.1.0.zip}
     ports:
-      - 25565:25565
+      - "25565:25565"
+
+volumes:
+  data: {}

examples/docker-compose-curseinstance.yml

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

examples/docker-compose-fabric.yml

@@ -0,0 +1,15 @@
+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,16 +1,17 @@
-version: "3.7"
+version: "3.8"
 
 services:
   mc:
     image: itzg/minecraft-server
     ports:
     # expose the Minecraft server port outside of container
-    - 25565:25565
+    - "25565:25565"
     environment:
       # REQUIRED for all types
       EULA: "TRUE"
       # Set server type (vs the default of vanilla)
       TYPE: FORGE
+      DEBUG: "true"
     volumes:
     # use a named, managed volume for data volume
     - mc_forge:/data

examples/docker-compose-ftba.yml

@@ -1,9 +1,9 @@
-version: "3.7"
+version: "3.8"
 
 services:
   mc:
-    # FTBA support is only available in multiarch image tag
-    image: itzg/minecraft-server:multiarch
+    # FTBA support is only available in non-Alpine images
+    image: itzg/minecraft-server:${IMAGE_TAG:-java8-multiarch}
     ports:
       # expose the Minecraft server port outside of container
       - 25565:25565
@@ -14,10 +14,11 @@ services:
       TYPE: FTBA
       # Use Pack ID from https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/
       FTB_MODPACK_ID: "31"
+      FTB_MODPACK_VERSION_ID: ""
     volumes:
       # use a named, managed volume for data volume
-      - mc_ftb:/data
+      - ftba:/data
 
 volumes:
   # declared the named volume, but use default/local storage engine
-  mc_ftb: {}
+  ftba: {}

examples/docker-compose-generic-pack.yml

@@ -0,0 +1,21 @@
+version: '3.8'
+
+services:
+  mc:
+    image: itzg/minecraft-server:${IMAGE_TAG:-latest}
+    volumes:
+    - data:/data
+    - ./modpacks:/modpacks:ro
+    environment:
+      EULA: "true"
+      TYPE: FORGE
+      DEBUG: "${DEBUG:-false}"
+      VERSION: ${VERSION:-1.17.1}
+      FORGEVERSION: ${FORGEVERSION:-37.0.90}
+      GENERIC_PACK: /modpacks/${MODPACK:-Server-Files-0.0.21.zip}
+      REMOVE_OLD_MODS: "${REMOVE_OLD_MODS:-false}"
+    ports:
+      - "25565:25565"
+
+volumes:
+  data: {}

examples/docker-compose-mods-file.yml

@@ -0,0 +1,19 @@
+version: '3.8'
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    environment:
+      EULA: "true"
+      TYPE: FORGE
+      VERSION: 1.15.2
+      MODS_FILE: /extras/mods.txt
+      REMOVE_OLD_MODS: "true"
+    ports:
+      - 25565:25565
+    volumes:
+      - data:/data
+      - ./mods.txt:/extras/mods.txt:ro
+
+volumes:
+  data:

examples/docker-compose-mohist.yml

@@ -0,0 +1,17 @@
+version: "3.8"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565"
+    environment:
+      EULA: "TRUE"
+      TYPE: MOHIST
+      VERSION: 1.12.2
+      DEBUG: "true"
+    volumes:
+      - data:/data
+
+volumes:
+  data: {}

examples/docker-compose-paper.yml

@@ -1,18 +1,19 @@
-version: '3.7'
-
+version: '3.8'
 services:
   mc:
     image: itzg/minecraft-server
+    container_name: paper
     environment:
       EULA: "true"
+      ENABLE_RCON: "true"
       TYPE: PAPER
-      VERSION: 1.9.4
-      # needed for Paper versions before 1.14
+      VIEW_DISTANCE: 10
+      MEMORY: 2G
       CONSOLE: "false"
     ports:
       - 25565:25565
     volumes:
       - mc-paper:/data
-
+    restart: unless-stopped
 volumes:
   mc-paper:

examples/docker-compose-proxied.yml

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

examples/docker-compose-rlcraft.yml

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

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

examples/docker-compose-spiget.yml

@@ -0,0 +1,17 @@
+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,11 +1,11 @@
-version: '3'
+version: '3.8'
 # 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.
 
 services:
   minecraft:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     ports:
       - "25565:25565"
     volumes:

examples/docker-compose-world-download.yml

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

examples/k8s/using-statefulset.yml

@@ -3,18 +3,18 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    app: example
-  name: example
+    app: mc-example
+  name: mc-example
 spec:
   replicas: 1
-  serviceName: example
+  serviceName: mc-example
   selector:
     matchLabels:
-      app: example
+      app: mc-example
   template:
     metadata:
       labels:
-        app: example
+        app: mc-example
     spec:
       containers:
         - name: mc
@@ -25,6 +25,18 @@ spec:
           volumeMounts:
             - mountPath: /data
               name: data
+          readinessProbe:
+            exec:
+              command:
+                - mc-monitor 
+                - status 
+                - --host 
+                - localhost 
+                - --port
+                - "25565"
+            initialDelaySeconds: 30
+            periodSeconds: 5
+            failureThreshold: 18
   volumeClaimTemplates:
     - metadata:
         name: data
@@ -39,12 +51,12 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    service: example
-  name: example
+    service: mc-example
+  name: mc-example
 spec:
   ports:
     - port: 25565
       targetPort: 25565
   selector:
-    app: example
-  type: LoadBalancer
+    app: mc-example
+  type: NodePort

examples/modpacks/README.md

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

examples/mods.txt

@@ -0,0 +1,80 @@
+https://edge.forgecdn.net/files/2965/233/Bookshelf-1.15.2-5.6.40.jar
+https://edge.forgecdn.net/files/2926/27/ProgressiveBosses-2.1.5-mc1.15.2.jar
+https://edge.forgecdn.net/files/3248/905/goblintraders-1.3.1-1.15.2.jar
+https://edge.forgecdn.net/files/3272/32/jei-1.15.2-6.0.3.16.jar
+https://edge.forgecdn.net/files/2871/647/ToastControl-1.15.2-3.0.1.jar
+https://edge.forgecdn.net/files/3101/903/Druidcraft-1.15-0.4.45.jar
+https://edge.forgecdn.net/files/2880/426/DefaultOptions_1.15.2-11.0.1.jar
+https://edge.forgecdn.net/files/2996/535/MekanismAdditions-1.15.2-9.10.9.422.jar
+https://edge.forgecdn.net/files/3147/275/blockcarpentry-1.15-0.8.2.jar
+https://edge.forgecdn.net/files/3005/715/refinedstorageaddons-0.6.3.jar
+https://edge.forgecdn.net/files/3140/146/rftoolsbase-1.15-1.1.10.jar
+https://edge.forgecdn.net/files/3236/649/cc-tweaked-1.15.2-1.95.3.jar
+https://edge.forgecdn.net/files/3048/970/light-overlay-4.7.2.jar
+https://edge.forgecdn.net/files/3015/904/randompatches-1.15.2-1.22.1.1.jar
+https://edge.forgecdn.net/files/3131/439/engineersdecor-1.15.2-1.1.4.jar
+https://edge.forgecdn.net/files/3051/255/carryon-1.15.2-1.13.0.5.jar
+https://edge.forgecdn.net/files/3175/752/EnderStorage-1.15.2-2.5.2.164-universal.jar
+https://edge.forgecdn.net/files/2997/84/Savage-and-Ravage-1.15.2-1.1.4.jar
+https://edge.forgecdn.net/files/3053/840/PackMenu-1.15.2-1.2.8.jar
+https://edge.forgecdn.net/files/3003/397/JEITweaker-1.15.2-1.0.1.3.jar
+https://edge.forgecdn.net/files/3069/489/absentbydesign-1.15.2-1.1.1.jar
+https://edge.forgecdn.net/files/2997/601/Upgrade-Aquatic-1.15.2-1.7.1.jar
+https://edge.forgecdn.net/files/2950/766/ReAuth-1.14-1.15-3.8.1.jar
+https://edge.forgecdn.net/files/3024/179/Powah-1.15.2-1.1.15.jar
+https://edge.forgecdn.net/files/3092/975/StorageDrawers-1.15.2-7.0.3.jar
+https://edge.forgecdn.net/files/2853/267/furniture-7.0.0-pre16-1.15.1.jar
+https://edge.forgecdn.net/files/2987/251/AppleSkin-mc1.15.2-forge-1.0.14.jar
+https://edge.forgecdn.net/files/2980/323/industrial-foregoing-1.15.2-2.3.3-e356e61.jar
+https://edge.forgecdn.net/files/3024/178/Lollipop-1.15.2-1.0.16.jar
+https://edge.forgecdn.net/files/3210/106/tablechair-1.4.jar
+https://edge.forgecdn.net/files/3047/358/xercapaint-1.15.2-3.3.jar
+https://edge.forgecdn.net/files/2873/657/BonsaiTrees-2.1.2.6.jar
+https://edge.forgecdn.net/files/2938/583/config-2-3.0.jar
+https://edge.forgecdn.net/files/2991/235/Waystones_1.15.2-6.0.2.jar
+https://edge.forgecdn.net/files/2957/23/OpenLoader-1.15.2-4.0.5.jar
+https://edge.forgecdn.net/files/3275/718/XaerosWorldMap_1.13.2_Forge_1.15.2.jar
+https://edge.forgecdn.net/files/2876/104/AI-Improvements-1.15.2-0.3.0.jar
+https://edge.forgecdn.net/files/3005/515/mysticallib-1.15.2-2.0.1.jar
+https://edge.forgecdn.net/files/3008/867/WAWLA-1.15.2-3.0.4.jar
+https://edge.forgecdn.net/files/2964/474/WailaHarvestability-mc1.15.2-1.1.12.jar
+https://edge.forgecdn.net/files/3103/508/Kiwi-1.15.2-2.8.5.jar
+https://edge.forgecdn.net/files/3128/662/Atum-1.15.2-2.1.12.jar
+https://edge.forgecdn.net/files/2988/910/Buzzier-Bees-1.15.2-1.5.2.jar
+https://edge.forgecdn.net/files/3030/627/u_team_core-1.15.2-3.0.2.169.jar
+https://edge.forgecdn.net/files/3003/984/SilentLib-1.15.2-4.6.6+59.jar
+https://edge.forgecdn.net/files/2968/353/refinedpipes-0.4.2.jar
+https://edge.forgecdn.net/files/3140/149/rftoolsbuilder-1.15-2.1.16.jar
+https://edge.forgecdn.net/files/3067/203/mightyarchitect-mc1.15.2_v0.5.jar
+https://edge.forgecdn.net/files/2980/153/EquipmentTooltips-1.15.2-1.4.3+14.jar
+https://edge.forgecdn.net/files/3103/510/FruitTrees-1.15.2-1.7.0.jar
+https://edge.forgecdn.net/files/2989/38/Atmospheric-1.15.2-1.4.1.jar
+https://edge.forgecdn.net/files/3096/836/rftoolscontrol-1.15-3.0.9.jar
+https://edge.forgecdn.net/files/2989/662/Enhanced-Mushrooms-1.15.2-v1.2.2.jar
+https://edge.forgecdn.net/files/3227/891/SimpleStorageNetwork-1.15.2-1.0.2.jar
+https://edge.forgecdn.net/files/3217/290/minecolonies-0.13.645-RELEASE-universal.jar
+https://edge.forgecdn.net/files/2935/384/SnowRealMagic-1.15.2-1.7.5.jar
+https://edge.forgecdn.net/files/2988/584/aiotbotania-1.15.2-1.2.3.jar
+https://edge.forgecdn.net/files/3255/408/mowziesmobs-1.5.15.jar
+https://edge.forgecdn.net/files/3062/510/HealthOverlay-1.15.2-1.0.2.jar
+https://edge.forgecdn.net/files/3023/121/neoncraft-1.1.jar
+https://edge.forgecdn.net/files/2997/617/Swamp-Expansion-1.15.2-1.7.3.jar
+https://edge.forgecdn.net/files/2980/252/titanium-1.15.2-2.4.2.jar
+https://edge.forgecdn.net/files/3152/946/rftoolsutility-1.15-2.1.20.jar
+https://edge.forgecdn.net/files/3083/277/swingthroughgrass-1.15.2-1.4.1.jar
+https://edge.forgecdn.net/files/3138/530/SilentGear-1.15.2-1.11.4+187.jar
+https://edge.forgecdn.net/files/3105/429/DarkUtilities-1.15.2-3.1.9.jar
+https://edge.forgecdn.net/files/3099/23/ImmersiveEngineering-1.15.2-4.1.1-125.jar
+https://edge.forgecdn.net/files/2856/529/FastFurnace-1.15.1-3.0.0.jar
+https://edge.forgecdn.net/files/2988/999/BiomesOPlenty-1.15.2-10.0.0.366-universal.jar
+https://edge.forgecdn.net/files/2989/95/The-Endergetic-Expansion-1.15.2-v1.3.2.jar
+https://edge.forgecdn.net/files/2993/960/FluxNetworks-1.15.2-5.0.3-4.jar
+https://edge.forgecdn.net/files/3028/611/ServerTabInfo-1.15.2-1.2.8.jar
+https://edge.forgecdn.net/files/3134/277/fairylights-3.0.15-1.15.2.jar
+https://edge.forgecdn.net/files/3048/54/useful_backpacks-1.15.2-1.10.3.77.jar
+https://edge.forgecdn.net/files/3273/515/mcw-trapdoors-1.0.2-mc1.15.2.jar
+https://edge.forgecdn.net/files/2986/639/CraftingTweaks_1.15.2-11.0.1.jar
+https://edge.forgecdn.net/files/3261/454/create-mc1.15.2_v0.3.1a.jar
+https://edge.forgecdn.net/files/3211/10/supermartijn642configlib-1.0.5-mc1.15.jar
+https://edge.forgecdn.net/files/2995/786/TerraForged-1.15.2-0.0.15.jar
+https://edge.forgecdn.net/files/2892/562/leavesdecayonotherleaves-1.1.jar

examples/vanilla-tweaks/docker-compose.yml

@@ -0,0 +1,27 @@
+version: "3.3"
+
+services:
+  vanillatweaks_file:
+    restart: "no"
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565/tcp"
+    environment:
+      EULA: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VANILLATWEAKS_FILE: /config/vanillatweaks-datapacks.json
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"
+    volumes:
+      - data:/data
+      - ./vanillatweaks-datapacks.json:/config/vanillatweaks-datapacks.json:ro
+  vanillatweaks_sharecode:
+    # port is set to 25566 to not conflict with vanillatweaks_file example
+    ports:
+      - "25566:25565/tcp"
+    restart: "no"
+    image: itzg/minecraft-server
+    environment:
+      EULA: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VANILLATWEAKS_SHARECODE: MGr52E
+      REMOVE_OLD_VANILLATWEAKS: "TRUE"

examples/vanilla-tweaks/vanillatweaks-datapacks.json

@@ -0,0 +1,15 @@
+{
+    "version": "1.18",
+    "packs": {
+        "survival": [
+            "graves",
+            "multiplayer sleep",
+            "afk display",
+            "armor statues",
+            "unlock all recipes",
+            "fast leaf decay",
+            "coordinates hud"
+        ],
+        "items": ["armored elytra"]
+    }
+}

files/autopause/autopause-daemon.sh

@@ -2,23 +2,48 @@
 
 . /autopause/autopause-fcns.sh
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
-sudo /usr/sbin/knockd -c /autopause/knockd-config.cfg -d
-if [ $? -ne 0 ] ; then
+
+autopause_error_loop() {
+  logAutopause "Available interfaces within the docker container:"
+  INTERFACES=$(echo /sys/class/net/*)
+  INTERFACES=${INTERFACES//\/sys\/class\/net\//}
+  logAutopause "  $INTERFACES"
+  logAutopause "Please set the environment variable AUTOPAUSE_KNOCK_INTERFACE to the interface that handles incoming connections."
+  logAutopause "If unsure which interface to choose, run the ifconfig command in the container."
+  logAutopause "Autopause failed to initialize. This log entry will be printed every 30 minutes."
   while :
   do
-    if [[ -n $(ps -o comm | grep java) ]] ; then
-      break
-    fi
-    sleep 0.1
+    sleep 1800
+    logAutopause "Autopause failed to initialize."
   done
+}
+
+# wait for java process to be started
+while :
+do
+  if java_process_exists ; then
+    break
+  fi
+  sleep 0.1
+done
+
+# check for interface existence
+if [[ -z "$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
+  logAutopause "AUTOPAUSE_KNOCK_INTERFACE variable must not be empty!"
+  autopause_error_loop
+fi
+if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
+  logAutopause "Selected interface \"$AUTOPAUSE_KNOCK_INTERFACE\" does not exist!"
+  autopause_error_loop
+fi
+
+sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
+if [ $? -ne 0 ] ; then
   logAutopause "Failed to start knockd daemon."
-  logAutopause "Possible cause: docker's host network mode."
-  logAutopause "Recreate without host mode or disable autopause functionality."
-  logAutopause "Stopping server."
-  killall -SIGTERM java
-  exit 1
+  logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
+  autopause_error_loop
 fi
 
 STATE=INIT

files/autopause/autopause-fcns.sh

@@ -1,38 +1,31 @@
 #!/bin/bash
 
 current_uptime() {
-  echo $(awk '{print $1}' /proc/uptime | cut -d . -f 1)
+  awk '{print $1}' /proc/uptime | cut -d . -f 1
 }
 
 java_running() {
-  [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
+  [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
+}
+
+java_process_exists() {
+  [[ -n "$(ps -ax -o comm | grep 'java')" ]]
 }
 
 rcon_client_exists() {
-  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
+  [[ -n "$(ps -ax -o comm | grep 'rcon-cli')" ]]
 }
 
 mc_server_listening() {
-  [[ -n $(netstat -tln | grep "0.0.0.0:$SERVER_PORT" | grep LISTEN) ]]
+  mc-monitor status --host localhost --port "$SERVER_PORT" --timeout 10s >& /dev/null
 }
 
 java_clients_connected() {
   local connections
-  connections=$(netstat -tn | grep ":$SERVER_PORT" | grep ESTABLISHED)
-  if [[ -z "$connections" ]] ; then
-    return 1
+  if java_running ; then
+    connections=$(mc-monitor status --host localhost --port "$SERVER_PORT" --show-player-count)
+  else
+    connections=0
   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
+  (( connections > 0 ))
 }

files/autopause/knockd-config.cfg

@@ -3,10 +3,13 @@
 [unpauseMCServer-server]
  sequence = 25565
  seq_timeout = 1
- command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
+ command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
  tcpflags = syn
 [unpauseMCServer-rcon]
  sequence = 25575
  seq_timeout = 1
- command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
+ command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
  tcpflags = syn
+[unpauseMCServer-bedrock]
+ sequence = 19132:udp
+ command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh

files/autopause/pause.sh

@@ -2,7 +2,7 @@
 
 . /start-utils
 
-if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
+if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
   # save world
   rcon-cli save-all >/dev/null
 
@@ -17,5 +17,5 @@ if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; th
 
   # finally pause the process
   logAutopauseAction "Pausing Java process"
-  killall -q -STOP java
+  pkill -STOP java
 fi

files/autopause/resume.sh

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

files/autostop/autostop-daemon.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# needed for the clients connected function residing in autopause
+. /autopause/autopause-fcns.sh
+
+. ${SCRIPTS:-/}start-utils
+
+# wait for java process to be started
+while :
+do
+  if java_process_exists ; then
+    break
+  fi
+  sleep 0.1
+done
+
+STATE=INIT
+
+while :
+do
+  case X$STATE in
+  XINIT)
+    # Server startup
+    if mc_server_listening ; then
+      TIME_THRESH=$(($(current_uptime)+$AUTOSTOP_TIMEOUT_INIT))
+      logAutostop "MC Server listening for connections - stopping in $AUTOSTOP_TIMEOUT_INIT seconds"
+      STATE=II
+    fi
+    ;;
+  XII)
+    # Initial idle
+    if java_clients_connected ; then
+      logAutostop "Client connected - waiting for disconnect"
+      STATE=E
+    else
+      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
+        logAutostop "No client connected since startup - stopping server"
+        /autostop/stop.sh
+        exit 0
+      fi
+    fi
+    ;;
+  XE)
+    # Established
+    if ! java_clients_connected ; then
+      TIME_THRESH=$(($(current_uptime)+$AUTOSTOP_TIMEOUT_EST))
+      logAutostop "All clients disconnected - stopping in $AUTOSTOP_TIMEOUT_EST seconds"
+      STATE=I
+    fi
+    ;;
+  XI)
+    # Idle
+    if java_clients_connected ; then
+      logAutostop "Client reconnected - waiting for disconnect"
+      STATE=E
+    else
+      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
+        logAutostop "No client reconnected - stopping"
+        /autostop/stop.sh
+        exit 0
+      fi
+    fi
+    ;;
+  *)
+    logAutostop "Error: invalid state: $STATE"
+    ;;
+  esac
+  sleep $AUTOSTOP_PERIOD
+done

files/autostop/stop.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. /start-utils
+
+logAutostopAction "Stopping Java process"
+kill -SIGTERM 1

files/log4j2.xml

@@ -4,7 +4,7 @@
         <Console name="SysOut" target="SYSTEM_OUT">
             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
         </Console>
-        <Queue name="ServerGuiConsole">
+        <Queue name="TerminalConsole">
             <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">
@@ -28,7 +28,7 @@
             </filters>
             <AppenderRef ref="SysOut"/>
             <AppenderRef ref="File"/>
-            <AppenderRef ref="ServerGuiConsole"/>
+            <AppenderRef ref="TerminalConsole"/>
         </Root>
     </Loggers>
 </Configuration>

files/sudoers-mc

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

health.sh

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

minecraft-server/README.md

@@ -1,4 +0,0 @@
-# Moved to top-level
-
-The contents of this directory have now been moved to the top level of
-[itzg/docker-minecraft-server](https://github.com/itzg/docker-minecraft-server).

scripts/start

@@ -1,11 +1,12 @@
 #!/bin/bash
 
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 
 umask 0002
 chmod g+w /data
 
-if [ $(id -u) = 0 ]; then
+if ! isTrue "${SKIP_SUDO:-false}" && [ "$(id -u)" = 0 ]; then
   runAsUser=minecraft
   runAsGroup=minecraft
 
@@ -24,28 +25,28 @@ if [ $(id -u) = 0 ]; then
     if [[ $GID != 0 ]]; then
       if [[ $GID != $(id -g minecraft) ]]; then
         log "Changing gid of minecraft to $GID"
-        groupmod -o -g $GID minecraft
+        groupmod -o -g "$GID" minecraft
       fi
     else
       runAsGroup=root
     fi
   fi
 
-  if [[ $(stat -c "%u" /data) != $UID ]]; then
+  if [[ $(stat -c "%u" /data) != "$UID" ]]; then
     log "Changing ownership of /data to $UID ..."
     chown -R ${runAsUser}:${runAsGroup} /data
   fi
 
-  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 $@
+  distro=$(getDistro)
+  if [[ $distro == alpine ]]; then
+    exec su-exec ${runAsUser}:${runAsGroup} "${SCRIPTS:-/}start-configuration" "$@"
+  else
+    exec gosu ${runAsUser}:${runAsGroup} "${SCRIPTS:-/}start-configuration" "$@"
+  fi
 else
-  exec ${SCRIPTS:-/}start-configuration $@
+  exec "${SCRIPTS:-/}start-configuration" "$@"
 fi

scripts/start-autopause

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

scripts/start-autostop

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+
+: "${SERVER_PORT:=25565}"
+export SERVER_PORT
+
+log "Autostop functionality enabled"
+
+isDebugging && set -x
+
+if ! [[ $AUTOSTOP_PERIOD =~ ^[0-9]+$ ]]; then
+  AUTOSTOP_PERIOD=10
+  export AUTOSTOP_PERIOD
+  log "Warning: AUTOSTOP_PERIOD is not numeric, set to 10 (seconds)"
+fi
+if [ "$AUTOSTOP_PERIOD" -eq "0" ] ; then
+  AUTOSTOP_PERIOD=10
+  export AUTOSTOP_PERIOD
+  log "Warning: AUTOSTOP_PERIOD must not be 0, set to 10 (seconds)"
+fi
+if ! [[ $AUTOSTOP_TIMEOUT_EST =~ ^[0-9]+$ ]] ; then
+  AUTOSTOP_TIMEOUT_EST=3600
+  export AUTOSTOP_TIMEOUT_EST
+  log "Warning: AUTOSTOP_TIMEOUT_EST is not numeric, set to 3600 (seconds)"
+fi
+if ! [[ $AUTOSTOP_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
+  AUTOSTOP_TIMEOUT_INIT=1800
+  export AUTOSTOP_TIMEOUT_INIT
+  log "Warning: AUTOSTOP_TIMEOUT_INIT is not numeric, set to 1800 (seconds)"
+fi
+
+/autostop/autostop-daemon.sh &

scripts/start-configuration

@@ -0,0 +1,214 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+
+: "${EULA:=}"
+: "${PROXY:=}"
+: "${RCON_PASSWORD_FILE:=}"
+
+shopt -s nullglob
+
+isDebugging && set -x
+
+#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
+  if ! isTrue "$EULA"; 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
+
+  writeEula
+fi
+
+if isTrue "${ENABLE_AUTOPAUSE}" && isTrue "${EXEC_DIRECTLY:-false}"; then
+    log "EXEC_DIRECTLY=true is incompatible with ENABLE_AUTOPAUSE=true"
+    exit 1
+fi
+
+if isTrue "${ENABLE_AUTOPAUSE}" && isTrue "${ENABLE_AUTOSTOP}"; then
+    log "ENABLE_AUTOPAUSE=true is incompatible with ENABLE_AUTOSTOP=true"
+    exit 1
+fi
+
+if [[ $PROXY ]]; then
+    export http_proxy="$PROXY"
+    export https_proxy="$PROXY"
+    export JAVA_TOOL_OPTIONS+="-Djava.net.useSystemProxies=true"
+    log "INFO: Giving proxy time to startup..."
+    sleep 5
+fi
+
+if [[ $RCON_PASSWORD_FILE ]]; then
+    log ""
+    if [ ! -e ${RCON_PASSWORD_FILE} ]; then
+	log "Initial RCON password file ${RCON_PASSWORD_FILE} does not seems to exist."
+	log "Please ensure your configuration."
+	log "If you are using Docker Secrets feature, please check this for further information: "
+	log " https://docs.docker.com/engine/swarm/secrets"
+	log ""
+	exit 1
+    else
+	RCON_PASSWORD=$(cat ${RCON_PASSWORD_FILE})
+	export RCON_PASSWORD
+    fi
+    log ""
+fi
+
+# Some Docker management UIs grab all the image declared variables and present them for configuration.
+# When upgrading images across Java versions, that creates a mismatch in PATH's expected by base image.
+if ! which java > /dev/null; then
+  log "ERROR: PATH should not be explicitly passed into the container"
+  log "       Remove configuration of that variable."
+  exit 1
+fi
+
+export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
+
+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
+  ;;
+  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=$VERSION
+  ;;
+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
+
+if isTrue "${ENABLE_AUTOSTOP}"; then
+  ${SCRIPTS:-/}start-autostop
+fi
+
+if versionLessThan 1.7; then
+  echo "
+MC_HEALTH_EXTRA_ARGS=(
+  --use-server-list-ping
+)
+  " > /data/.mc-health.env
+fi
+
+log "Resolving type given ${TYPE}"
+case "${TYPE^^}" in
+  *BUKKIT|SPIGOT)
+    exec "${SCRIPTS:-/}start-deployBukkitSpigot" "$@"
+  ;;
+
+  PAPER)
+    exec "${SCRIPTS:-/}start-deployPaper" "$@"
+  ;;
+
+  FORGE)
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployForge" "$@"
+  ;;
+
+  FABRIC)
+    exec "${SCRIPTS:-/}start-deployFabric" "$@"
+  ;;
+
+  FTBA)
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployFTBA" "$@"
+  ;;
+
+  FTB|CURSEFORGE)
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployCF" "$@"
+  ;;
+
+  VANILLA)
+    exec "${SCRIPTS:-/}start-deployVanilla" "$@"
+  ;;
+
+  SPONGEVANILLA)
+    exec "${SCRIPTS:-/}start-deploySpongeVanilla" "$@"
+  ;;
+
+  CUSTOM)
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployCustom" "$@"
+  ;;
+
+  MAGMA)
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployMagma" "$@"
+  ;;
+
+  MOHIST)
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployMohist" "$@"
+  ;;
+
+  CATSERVER)
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployCatserver" "$@"
+  ;;
+
+  PURPUR)
+    exec "${SCRIPTS:-/}start-deployPurpur" "$@"
+  ;;
+
+  AIRPLANE)
+    exec "${SCRIPTS:-/}start-deployAirplane" "$@"
+  ;;
+
+  PUFFERFISH)
+    exec "${SCRIPTS:-/}start-deployPufferfish" "$@"
+  ;;
+
+  CANYON)
+    exec "${SCRIPTS:-/}start-deployCanyon" "$@"
+  ;;
+
+  LIMBO)
+    exec "${SCRIPTS:-/}start-deployLimbo" "$@"
+  ;;
+
+  CRUCIBLE)
+    log "**********************************************************************"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
+    log "         since some mods require Java 8"
+    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
+    log "         can be fixed with java8"
+    log "**********************************************************************"
+    exec "${SCRIPTS:-/}start-deployCrucible" "$@"
+  ;;
+
+  *)
+      log "Invalid type: '$TYPE'"
+      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
+      log "         CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
+      log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, PUFFERFISH, CANYON, LIMBO, CRUCIBLE"
+      exit 1
+  ;;
+
+esac

scripts/start-deployAirplane

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -euo pipefail
+isDebugging && set -x
+
+IFS=$'\n\t'
+
+if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "PURPUR" ] ; then
+  log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=PURPUR."
+  exit 1
+fi
+
+: ${AIRPLANE_TYPE:=airplane}
+
+if [ "${VERSION}" = "LATEST" ] ; then
+  AIRPLANE_TYPE="airplane"
+fi
+
+if [ "${VERSION}" = "PURPUR" ]; then
+  AIRPLANE_TYPE="airplanepurpur"
+fi
+
+log "Using ${AIRPLANE_TYPE} 1.17.1 (1.18 unsupported - use Paper/Pufferfish/Purpur for newer versions)"
+
+export SERVER=${AIRPLANE_TYPE}-1.17.1.jar
+
+log "Removing old Airplane versions ..."
+shopt -s nullglob
+for f in airplane*.jar; do
+  [[ $f != $SERVER ]] && rm $f
+done
+
+if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
+    downloadUrl="https://airplane.gg/dl/launcher-${AIRPLANE_TYPE}1.17.1.jar"
+    log "Downloading Airplane from $downloadUrl ..."
+    if ! get -o "$SERVER" "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export FAMILY=SPIGOT
+
+exec "${SCRIPTS:-/}start-spiget" "$@"

scripts/start-deployBukkitSpigot

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

scripts/start-deployCF

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

scripts/start-deployCanyon

@@ -0,0 +1,48 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+isDebugging && set -x
+
+: "${CANYON_BUILD:=lastSuccessfulBuild}"
+
+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 FAMILY=SPIGOT
+
+exec ${SCRIPTS:-/}start-spiget "$@"

scripts/start-deployCatserver

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 set -o pipefail
 set -e
 
@@ -26,7 +27,6 @@ if [ ! -f ${SERVER} ]; then
   curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/assets/${latestJarId}
 fi
 
-export SKIP_LOG4J_CONFIG=true
+export FAMILY=HYBRID
 
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld "$@"
+exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployCrucible

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-$(dirname "$0")}/start-utils"
+set -o pipefail
+set -e
+isDebugging && set -x
+
+requireVar VANILLA_VERSION
+: "${CRUCIBLE_RELEASE:=latest}"
+
+crucibleReleasesUrl=https://api.github.com/repos/CrucibleMC/Crucible/releases
+if [[ ${CRUCIBLE_RELEASE^^} = LATEST ]]; then
+  crucibleReleaseUrl=${crucibleReleasesUrl}/latest
+else
+  crucibleReleaseUrl=${crucibleReleasesUrl}/tags/${CRUCIBLE_RELEASE}
+fi
+
+if ! downloadUrl=$(get --json-path "$.assets[?(@.name =~ /Crucible-${VANILLA_VERSION}-.*\.jar/)].browser_download_url" \
+    --accept "application/vnd.github.v3+json" "$crucibleReleaseUrl"); then
+  log "ERROR: failed to access ${CRUCIBLE_RELEASE} release of Crucible"
+  exit 1
+fi
+
+if [[ $downloadUrl = null ]]; then
+  log "ERROR: failed to locate Crucible jar for $VANILLA_VERSION from ${CRUCIBLE_RELEASE}"
+  exit 1
+fi
+
+log "Downloading Crucible from $downloadUrl"
+if ! SERVER=$(get --skip-existing --output-filename -o /data "$downloadUrl"); then
+  log "ERROR: failed to download Crucible jar from $downloadUrl"
+  exit 1
+fi
+
+librariesDir=/data/libraries
+if [ ! -d "$librariesDir" ]; then
+  if ! librariesUrl=$(get --json-path "$.assets[?(@.name == 'libraries.zip')].browser_download_url" \
+      --accept "application/vnd.github.v3+json" "$crucibleReleaseUrl"); then
+    log "ERROR: failed to access ${CRUCIBLE_RELEASE} release of Crucible for libraries"
+    exit 1
+  fi
+
+  log "Downloading Crucible libraries"
+  if ! get -o /tmp/libraries.zip "$librariesUrl"; then
+    log "ERROR: failed to download Crucible libraries from $librariesUrl"
+    exit 1
+  fi
+
+  if ! unzip /tmp/libraries.zip -d "$librariesDir"; then
+    log "ERROR: failed to unzip Crucible libraries"
+    exit 1
+  fi
+  rm /tmp/libraries.zip
+fi
+
+export SERVER
+export FAMILY=HYBRID
+
+exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"

scripts/start-deployCustom

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

scripts/start-deployFTBA

@@ -2,7 +2,8 @@
 
 ftbInstallMarker=".ftb-installed"
 
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 set -e
 
@@ -16,7 +17,7 @@ if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
   exit 1
 fi
 
-if ! [[ -v FTB_MODPACK_VERSION_ID ]]; then
+if [[ ! $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
@@ -30,7 +31,13 @@ if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MO
   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}"
+    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
     chmod +x "${ftbInstaller}"
   fi
 
@@ -41,30 +48,38 @@ if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MO
   rm -f forge*installer.jar
 
   echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker}
+
+  writeEula
+
+  # some modpacks result in --w----r-- permissions
+  chmod a+r version.json
 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)
+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
+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"
+  log "ERROR unable to locate the installed FTB server jar"
   ls *.jar
   exit 2
 fi
 
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@
+export FAMILY=FORGE
+
+exec ${SCRIPTS:-/}start-setupWorld $@

scripts/start-deployFabric

@@ -0,0 +1,50 @@
+#!/bin/bash
+set -eu
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+
+requireVar VANILLA_VERSION
+export TYPE=FABRIC
+: "${FABRIC_LAUNCHER_VERSION:=${FABRIC_INSTALLER_VERSION:-LATEST}}"
+: "${FABRIC_LAUNCHER:=}"
+: "${FABRIC_LAUNCHER_URL:=}"
+: "${FABRIC_LOADER_VERSION:=LATEST}"
+
+isDebugging && set -x
+
+# Custom fabric jar
+if [[ $FABRIC_LAUNCHER ]]; then
+  export SERVER=${FABRIC_LAUNCHER}
+# Custom fabric jar url
+elif [[ $FABRIC_LAUNCHER_URL ]]; then
+  export SERVER=fabric-server-$(echo -n "$FABRIC_LAUNCHER_URL" | mc-image-helper hash)
+# Official fabric launcher
+else
+  if [[ ${FABRIC_LAUNCHER_VERSION^^} = LATEST ]]; then
+    log "Checking Fabric Launcher version information."
+    FABRIC_LAUNCHER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
+  fi
+  if [[ ${FABRIC_LOADER_VERSION^^} = LATEST ]]; then
+    log "Checking Fabric Loader version information."
+    FABRIC_LOADER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-loader/maven-metadata.xml)
+  fi
+  export SERVER=fabric-server-mc.${VANILLA_VERSION}-loader.${FABRIC_LOADER_VERSION}-launcher.${FABRIC_LAUNCHER_VERSION}.jar
+  export FABRIC_LAUNCHER_URL="https://meta.fabricmc.net/v2/versions/loader/${VANILLA_VERSION}/${FABRIC_LOADER_VERSION}/${FABRIC_LAUNCHER_VERSION}/server/jar"
+fi
+
+if [[ ! -e ${SERVER} && ! -z ${FABRIC_LAUNCHER_URL} ]]; then
+  log "Downloading $FABRIC_LAUNCHER_URL ..."
+  if ! get -o "$SERVER" "$FABRIC_LAUNCHER_URL"; then
+    log "Failed to download from given location $FABRIC_LAUNCHER_URL"
+    exit 2
+  fi
+fi
+
+if [[ ! -e ${SERVER} ]]; then
+  log "$SERVER does not exist, cannot launch server!"
+  exit 1
+fi
+
+export FAMILY=FABRIC
+exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployForge

@@ -0,0 +1,157 @@
+#!/bin/bash
+
+: "${FORGEVERSION:=RECOMMENDED}"
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-$(dirname "$0")}/start-utils"
+isDebugging && set -x
+
+get_installer() {
+  if [[ -z $FORGE_INSTALLER_URL ]]; then
+    log "Downloading $normForgeVersion"
+
+    forgeFileNames="
+    $shortForgeVersion/forge-$shortForgeVersion-installer.jar
+    $normForgeVersion/forge-$normForgeVersion-installer.jar
+  "
+
+    for fn in $forgeFileNames; do
+      downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
+      log "...trying $downloadUrl"
+      if get -o "$FORGE_INSTALLER" "$downloadUrl"; then
+        return
+      fi
+    done
+    log "Unable to locate usable URL for $normForgeVersion"
+    exit 2
+ else
+    log "Downloading $FORGE_INSTALLER_URL ..."
+    if ! get -o "$FORGE_INSTALLER" "$FORGE_INSTALLER_URL"; then
+      log "Failed to download from given location $FORGE_INSTALLER_URL"
+      exit 2
+    fi
+  fi
+}
+
+install() {
+  if [ ! -e "$FORGE_INSTALLER" ]; then
+    get_installer "$normForgeVersion" "$shortForgeVersion"
+  fi
+
+  log "Installing Forge $shortForgeVersion. This might take a minute or two..."
+  mkdir -p mods
+  tries=3
+  while true; do
+    if ! java -jar "$FORGE_INSTALLER" --installServer &> forge-installer.log; then
+      if ((--tries <= 0)); then
+        cat forge-installer.log
+        log "
+ERROR Forge failed to install after several tries.
+"
+        exit 1
+      fi
+      log "Install failed. Trying again..."
+    else
+      break # out of this loop
+    fi
+  done
+  # NOTE $shortForgeVersion will be empty if installer location was given to us
+  log "Finding installed server jar..."
+  unset -v latest
+  # 1.17+ ?
+  if [ -f /data/run.sh ]; then
+    latest=/data/run.sh
+  # else pre 1.17
+  else
+    for file in *forge*.jar; do
+      if ! [[ $file =~ installer ]]; then
+        if [[ -z $latest ]] || [[ $file -nt $latest ]]; then
+          latest=$file
+        fi
+      fi
+    done
+  fi
+  if [[ -z $latest ]]; then
+    log "Unable to derive server jar for Forge"
+    exit 2
+  fi
+
+  export SERVER=$latest
+  log "Using server $SERVER"
+  debug "Writing install marker at $installMarker"
+  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
+
+    #################################################################################
+    promosUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
+
+    log "Checking Forge version information."
+    case $FORGEVERSION in
+      LATEST)
+        if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-latest']" "$promosUrl"); then
+          log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
+          log "       Refer to http://files.minecraftforge.net/ for supported versions"
+          exit 2
+        fi
+        ;;
+
+      RECOMMENDED)
+        if ! FORGE_VERSION=$(get -s --json-path ".promos['$VANILLA_VERSION-recommended']" "$promosUrl"); then
+          if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-latest']" "$promosUrl"); 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" ] || isTrue "${FORCE_REINSTALL:-false}"; then
+  install
+else
+  SERVER=$(cat "$installMarker")
+  export SERVER
+  if [ ! -e "$SERVER" ]; then
+    rm "$installMarker"
+    install
+  fi
+fi
+
+export FAMILY=FORGE
+
+exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployLimbo

@@ -0,0 +1,62 @@
+#!/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 FAMILY=LIMBO
+exec ${SCRIPTS:-/}start-setupWorld $@

scripts/start-deployMagma

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+isDebugging && set -x
+
+: "${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=$?)"
+  exit 1
+fi
+
+tagName=$(echo "${latestMeta}" | jq -r '.tag_name')
+markerFile=".magma-installed-${VANILLA_VERSION}-${tagName}"
+if [ -f "${markerFile}" ]; then
+  installedTagName=$(cat "${markerFile}")
+fi
+
+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
+
+export FAMILY=HYBRID
+
+exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployMohist

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-$(dirname "$0")}/start-utils"
+set -o pipefail
+set -e
+isDebugging && set -x
+
+requireVar VANILLA_VERSION
+: "${MOHIST_BUILD:=lastSuccessfulBuild}"
+
+mohistJobs=https://ci.codemc.io/job/MohistMC/job/
+mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
+
+if ! get --exists "${mohistJob}"; then
+  log "ERROR: mohist builds do not exist for ${VANILLA_VERSION}"
+  log "       check https://ci.codemc.io/job/MohistMC/ for available versions"
+  log "       and set VERSION accordingly"
+  exit 1
+fi
+
+buildRelPath=$(
+  get --json-path '$.artifacts[0].relativePath' "${mohistJob}${MOHIST_BUILD}/api/json"
+)
+
+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 "       and set VERSION accordingly"
+  exit 1
+fi
+
+export SERVER="/data/${baseName}"
+
+if [ ! -f "${SERVER}" ]; then
+  log "Downloading ${baseName}"
+  get -o "${SERVER}" "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
+fi
+
+export FAMILY=HYBRID
+
+exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"

scripts/start-deployPaper

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

scripts/start-deployPufferfish

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -euo pipefail
+isDebugging && set -x
+
+IFS=$'\n\t'
+
+if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.18" ] ; then
+  log "ERROR: Pufferfish server type only supports VERSION=LATEST, VERSION=1.18. Note that these are branches, not #.#.# versions."
+  exit 1
+fi
+
+: ${PUFFERFISH_BUILD:=lastSuccessfulBuild}
+
+if  [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.18" ]; then
+  PUFFERFISH_BRANCH="1.18"
+  PUFFERFISH_VERSION="1.18.1-R0.1"
+fi
+
+log "Using Pufferfish-${PUFFERFISH_BRANCH} branch"
+
+export SERVER=pufferfish-${PUFFERFISH_BRANCH}-${PUFFERFISH_BUILD}.jar
+
+log "Removing old Pufferfish versions ..."
+shopt -s nullglob
+for f in pufferfish-*.jar; do
+  [[ $f != $SERVER ]] && rm $f
+done
+
+if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
+    artifact="build/libs/pufferfish-paperclip-${PUFFERFISH_VERSION}-SNAPSHOT-reobf.jar"
+    downloadUrl="https://ci.pufferfish.host/job/Pufferfish-${PUFFERFISH_BRANCH}/${PUFFERFISH_BUILD}/artifact/${artifact}"
+    log "Downloading Pufferfish from $downloadUrl ..."
+    if ! get -o "$SERVER" "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export FAMILY=SPIGOT
+
+exec ${SCRIPTS:-/}start-spiget "$@"

scripts/start-deployPurpur

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

scripts/start-deploySpongeVanilla

@@ -3,6 +3,8 @@
 . ${SCRIPTS:-/}start-utils
 
 export TYPE=spongevanilla
+: ${SPONGEBRANCH:=STABLE}
+: ${SPONGEVERSION:=}
 
 # Parse branch
 log "Choosing branch for Sponge"
@@ -35,5 +37,5 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
 fi
 
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@
+export FAMILY=SPONGE
+exec ${SCRIPTS:-/}start-setupWorld "$@"

scripts/start-deployVanilla

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# shellcheck source=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
+  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')
+  result=$?
+  if [ $result != 0 ]; then
+    log "ERROR failed to obtain version manifest URL ($result)"
+    exit 1
+  fi
+  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}")
+  result=$?
+  if [ $result != 0 ]; then
+    log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
+    exit 1
+  elif [ "$serverDownloadUrl" = "null" ]; then
+    log "ERROR version $VANILLA_VERSION does not provide a server download"
+    exit 1
+  fi
+
+  debug "Downloading server from $serverDownloadUrl"
+  get -o "$SERVER" "$serverDownloadUrl"
+  result=$?
+  if [ $result != 0 ]; then
+    log "ERROR failed to download server from $serverDownloadUrl ($result)"
+    exit 1
+  fi
+fi
+
+if versionLessThan 1.6; then
+  if ! [[ -L /data/minecraft_server.jar && /data/minecraft_server.jar -ef "/data/$SERVER" ]]; then
+    rm -f /data/minecraft_server.jar
+    ln -s "/data/$SERVER" /data/minecraft_server.jar
+  fi
+  SERVER=minecraft_server.jar
+elif [[ -L /data/minecraft_server.jar ]]; then
+  rm -f /data/minecraft_server.jar
+fi
+
+isDebugging && ls -l
+export FAMILY=VANILLA
+exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-finalExec

@@ -0,0 +1,288 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+isDebugging && set -x
+
+if [ -n "$ICON" ]; then
+    if [ ! -e server-icon.png ] || [ "${OVERRIDE_ICON}" == "TRUE" ]; then
+      log "Using server icon from $ICON..."
+      # Not sure what it is yet...call it "img"
+      curl -sSL -o /tmp/icon.img $ICON
+      specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
+      if [ "$specs" = "PNG 64x64" ]; then
+        mv /tmp/icon.img /data/server-icon.png
+      else
+        log "Converting image to 64x64 PNG..."
+        convert /tmp/icon.img -resize 64x64! /data/server-icon.png
+      fi
+    fi
+fi
+
+canUseRollingLogs=true
+useFallbackJvmFlag=false
+
+patchLog4jConfig() {
+  file=${1?}
+  url=${2?}
+  if ! get -o "$file" "$url"; then
+    log "ERROR: failed to download corrected log4j config, fallback to JVM flag"
+    useFallbackJvmFlag=true
+    return 1
+  fi
+  JVM_OPTS="-Dlog4j.configurationFile=${file} ${JVM_OPTS}"
+  canUseRollingLogs=false
+}
+
+# Patch Log4j remote code execution vulnerability
+# See https://www.minecraft.net/en-us/article/important-message--security-vulnerability-java-edition
+if versionLessThan 1.7; then
+  : # No patch required here.
+elif isFamily VANILLA && versionLessThan 1.12; then
+  patchLog4jConfig log4j2_17-111.xml https://launcher.mojang.com/v1/objects/dd2b723346a8dcd48e7f4d245f6bf09e98db9696/log4j2_17-111.xml
+elif isFamily VANILLA && versionLessThan 1.17; then
+  patchLog4jConfig log4j2_112-116.xml https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml
+# See https://purpurmc.org/docs/Log4j/
+elif isType PURPUR && versionLessThan 1.17; then
+  patchLog4jConfig purpur_log4j2_1141-1165.xml https://purpurmc.org/docs/xml/purpur_log4j2_1141-1165.xml
+elif isType PURPUR && versionLessThan 1.18.1; then
+  patchLog4jConfig purpur_log4j2_117.xml https://purpurmc.org/docs/xml/purpur_log4j2_117.xml
+elif versionLessThan 1.18.1; then
+  useFallbackJvmFlag=true
+fi
+
+if ${useFallbackJvmFlag}; then
+  JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
+fi
+
+if isTrue ${ENABLE_ROLLING_LOGS:-false}; then
+  if ! ${canUseRollingLogs}; then
+    log "ERROR: Using rolling logs is currently not possible in the selected version due to CVE-2021-44228"
+    exit 1
+  fi
+  # Set up log configuration
+  LOGFILE="/data/log4j2.xml"
+  if [ ! -e "$LOGFILE" ]; then
+    log "Creating log4j2.xml in ${LOGFILE}"
+    cp /tmp/log4j2.xml "$LOGFILE"
+  else
+    log "log4j2.xml already created, skipping"
+  fi
+  JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
+fi
+
+# Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
+log "Checking for JSON files."
+JSON_FILES=$(find /data -maxdepth 1 -name '*.json')
+for j in $JSON_FILES; do
+  if [[ $(cat "$j" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') == "" ]]; then
+    log "Fixing JSON $j"
+    echo '[]' > $j
+  fi
+done
+
+# Optional disable console
+if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
+  EXTRA_ARGS+=" --noconsole"
+fi
+
+# Optional disable GUI for headless servers
+if [[ ${GUI,,} = false ]]; then
+  EXTRA_ARGS+=" nogui"
+fi
+
+: "${INIT_MEMORY:=${MEMORY}}"
+: "${MAX_MEMORY:=${MEMORY}}"
+
+expandedDOpts=
+if [ -n "$JVM_DD_OPTS" ]; then
+      for dopt in $JVM_DD_OPTS
+      do
+          expandedDOpts="${expandedDOpts} -D${dopt/:/=}"
+      done
+fi
+
+if isTrue ${ENABLE_JMX}; then
+  : ${JMX_PORT:=7091}
+  JVM_OPTS="${JVM_OPTS}
+  -Dcom.sun.management.jmxremote.local.only=false
+  -Dcom.sun.management.jmxremote.port=${JMX_PORT}
+  -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT}
+  -Dcom.sun.management.jmxremote.authenticate=false
+  -Dcom.sun.management.jmxremote.ssl=false
+  -Dcom.sun.management.jmxremote.host=${JMX_BINDING:-0.0.0.0}
+  -Djava.rmi.server.hostname=${JMX_HOST:-localhost}"
+
+  log "JMX is enabled. Make sure you have port forwarding for ${JMX_PORT}"
+fi
+
+if isTrue "${USE_AIKAR_FLAGS}"; then
+  # From https://mcflags.emc.gs/
+
+  if (( $(normalizeMemSize "${MAX_MEMORY}") >= $(normalizeMemSize 12g) )); then
+    log "Using Aikar's >12GB flags"
+    G1NewSizePercent=40
+    G1MaxNewSizePercent=50
+    G1HeapRegionSize=16M
+    G1ReservePercent=15
+    InitiatingHeapOccupancyPercent=20
+  else
+    log "Using Aikar's flags"
+    G1NewSizePercent=30
+    G1MaxNewSizePercent=40
+    G1HeapRegionSize=8M
+    G1ReservePercent=20
+    InitiatingHeapOccupancyPercent=15
+  fi
+
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UseG1GC
+  -XX:+ParallelRefProcEnabled
+  -XX:MaxGCPauseMillis=200
+  -XX:+UnlockExperimentalVMOptions
+  -XX:+DisableExplicitGC
+  -XX:+AlwaysPreTouch
+  -XX:G1NewSizePercent=${G1NewSizePercent}
+  -XX:G1MaxNewSizePercent=${G1MaxNewSizePercent}
+  -XX:G1HeapRegionSize=${G1HeapRegionSize}
+  -XX:G1ReservePercent=${G1ReservePercent}
+  -XX:G1HeapWastePercent=5
+  -XX:G1MixedGCCountTarget=4
+  -XX:InitiatingHeapOccupancyPercent=${InitiatingHeapOccupancyPercent}
+  -XX:G1MixedGCLiveThresholdPercent=90
+  -XX:G1RSetUpdatingPauseTimePercent=5
+  -XX:SurvivorRatio=32
+  -XX:+PerfDisableSharedMem
+  -XX:MaxTenuringThreshold=1
+  -Dusing.aikars.flags=https://mcflags.emc.gs
+  -Daikars.new.flags=true
+  "
+fi
+
+if isTrue "${USE_FLARE_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UnlockDiagnosticVMOptions
+  -XX:+DebugNonSafepoints
+  "
+fi
+
+if isTrue "${DEBUG_MEMORY}"; then
+  log "Memory usage and availability (in MB)"
+  uname -a
+  free -m
+fi
+
+if [[ ${INIT_MEMORY} || ${MAX_MEMORY} ]]; then
+  log "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
+  if [[ ${INIT_MEMORY} ]]; then
+    JVM_OPTS="-Xms${INIT_MEMORY} ${JVM_OPTS}"
+  fi
+  if [[ ${MAX_MEMORY} ]]; then
+    JVM_OPTS="-Xmx${MAX_MEMORY} ${JVM_OPTS}"
+  fi
+fi
+
+function copyFilesForCurseForge() {
+  # copy player modification files unconditionally since their
+  # processing into json is additive anyway
+  [ -f /data/ops.txt ] && cp -f /data/ops.txt "${FTB_DIR}/"
+  [ -f /data/white-list.txt ] && cp -f /data/white-list.txt "${FTB_DIR}/"
+
+  if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
+    cp -f /data/server-icon.png "${FTB_DIR}/"
+  fi
+
+  cp -f /data/eula.txt "${FTB_DIR}/"
+}
+
+mcServerRunnerArgs=(
+--stop-duration "${STOP_DURATION:-60}s"
+--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
+
+if [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
+  copyFilesForCurseForge
+
+  cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1)
+  log "Starting CurseForge server in ${FTB_DIR}..."
+  if isTrue ${DEBUG_EXEC}; then
+    set -x
+  fi
+  exec mc-server-runner ${bootstrapArgs} "${mcServerRunnerArgs[@]}" java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
+elif [[ ${TYPE} == "CURSEFORGE" ]]; then
+  mcServerRunnerArgs+=(--shell bash)
+
+  copyFilesForCurseForge
+
+  cat > "${FTB_DIR}/settings-local.sh" <<EOF
+export MIN_RAM="${INIT_MEMORY}"
+export MAX_RAM="${MAX_MEMORY}"
+export JAVA_PARAMETERS="${JVM_XX_OPTS} ${JVM_OPTS} $expandedDOpts"
+EOF
+
+  # patch CurseForge cfg file, if present
+  if [ -f "${FTB_DIR}/settings.cfg" ] && [[ ${MAX_MEMORY} ]]; then
+    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)
+  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
+
+  if isTrue ${DEBUG_EXEC}; then
+    set -x
+  fi
+  if isTrue ${EXEC_DIRECTLY:-false}; then
+    "${finalArgs[@]}"
+  else
+    exec mc-server-runner "${mcServerRunnerArgs[@]}" "${finalArgs[@]}"
+  fi
+elif [[ $SERVER =~ run.sh ]]; then
+  log "Using Forge supplied run.sh script..."
+  echo $JVM_XX_OPTS $JVM_OPTS $expandedDOpts > user_jvm_args.txt
+  if isTrue ${SETUP_ONLY:=false}; then
+    echo "SETUP_ONLY: bash ${SERVER}"
+    exit
+  fi
+  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER}"
+else
+  # If we have a bootstrap.txt file... feed that in to the server stdin
+  if [ -f /data/bootstrap.txt ]; then
+    bootstrapArgs="--bootstrap /data/bootstrap.txt"
+  fi
+
+  log "Starting the Minecraft server..."
+
+  finalArgs=(
+    $JVM_XX_OPTS
+    $JVM_OPTS
+    $expandedDOpts
+    -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
+
+  if isTrue "${EXEC_DIRECTLY:-false}"; then
+    exec java "${finalArgs[@]}"
+  else
+    exec mc-server-runner ${bootstrapArgs} "${mcServerRunnerArgs[@]}" java "${finalArgs[@]}"
+  fi
+fi
+

scripts/start-setupDatapack

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+: "${REMOVE_OLD_DATAPACKS:=false}"
+: "${DATAPACKS_FILE:=}"
+: "${REMOVE_OLD_DATAPACKS_DEPTH:=1} "
+: "${REMOVE_OLD_DATAPACKS_INCLUDE:=*.zip}"
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+isDebugging && set -x
+
+out_dir=/data/${LEVEL:-world}/datapacks
+
+# Remove old datapacks
+if isTrue "${REMOVE_OLD_DATAPACKS}" && [ -z "${DATAPACKS_FILE}" ]; then
+    if [ -d "$out_dir" ]; then
+    find "$out_dir" -mindepth 1 -maxdepth ${REMOVE_OLD_DATAPACKS_DEPTH:-16} -wholename "${REMOVE_OLD_DATAPACKS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_DATAPACKS_EXCLUDE:-}" -delete
+  fi
+fi
+
+if [[ "$DATAPACKS" ]]; then
+  mkdir -p "$out_dir"
+
+  for i in ${DATAPACKS//,/ }
+  do
+    if isURL "$i"; then
+      log "Downloading datapack $i ..."
+      if ! get -o "${out_dir}" "$i"; then
+        log "ERROR: failed to download from $i into $out_dir"
+        exit 2
+      fi
+    elif [[ -f "$i" && "$i" =~ .*\.zip ]]; then
+      log "Copying datapack 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 datapacks from $i ..."
+      cp "$i"/*.zip "${out_dir}"
+    else
+      log "ERROR Invalid URL or path given in DATAPACKS: $i"
+      exit 2
+    fi
+  done
+
+elif [[ "$DATAPACKS_FILE" ]]; then
+  if [ ! -f "$DATAPACKS_FILE" ]; then
+    log "ERROR: given DATAPACKS_FILE file does not exist"
+    exit 2
+  fi
+
+  mkdir -p "$out_dir"
+
+  args=(
+    -o "${out_dir}"
+    --log-progress-each
+    --skip-existing
+    --uris-file "${DATAPACKS_FILE}"
+  )
+  if isTrue "${REMOVE_OLD_DATAPACKS}"; then
+    args+=(
+    --prune-others "${REMOVE_OLD_DATAPACKS_INCLUDE}"
+    --prune-depth "${REMOVE_OLD_DATAPACKS_DEPTH}"
+    )
+  fi
+
+  if ! get "${args[@]}" ; then
+    log "ERROR: failed to retrieve one or more datapacks"
+    exit 1
+  fi
+fi
+
+exec "${SCRIPTS:-/}start-setupForgeApiMods" "$@"

scripts/start-setupEnvVariables

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${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-setupRbac" "$@"

scripts/start-setupForgeApiMods

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

scripts/start-setupModconfig

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