Auto-merging via docker-versions-create

.dockerignore

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

.editorconfig

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

.gitattributes

@@ -1,2 +1,17 @@
-# Auto detect text files and perform LF normalization
-* text=lf
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.github/FUNDING.yml

@@ -1,4 +0,0 @@
-github: itzg
-custom:
-  - https://www.buymeacoffee.com/itzg
-  - https://paypal.me/itzg

.github/ISSUE_TEMPLATE/bug.yml

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

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

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

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

.github/no-response.yml

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

.github/release.yml

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

.github/workflows/build-multiarch.yml

@@ -1,176 +0,0 @@
-name: Test and Build multi-architecture
-on:
-  push:
-    branches:
-      - master
-      - test/**
-    tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        variant:
-          - java17
-          - java17-graalvm-ce
-          - java17-jdk
-          - java17-openj9
-          - java17-alpine
-          - java8
-          - java8-graalvm-ce
-          - java8-multiarch
-          - java8-openj9
-          - java8-jdk
-          - java11
-          - java11-openj9
-          - java11-jdk
-        include:
-        # JAVA 17:
-          - variant: java17
-            # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343
-            baseImage: eclipse-temurin:17-jre-focal
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: 1.18.2
-          - variant: java17-graalvm-ce
-            baseImage: ghcr.io/graalvm/graalvm-ce:ol8-java17
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.18.2
-          - variant: java17-jdk
-            baseImage: eclipse-temurin:17-focal
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: 1.18.2
-          - variant: java17-openj9
-            baseImage: ibm-semeru-runtimes:open-17-jre
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.18.2
-          - variant: java17-alpine
-            baseImage: eclipse-temurin:17-jre-alpine
-            platforms: linux/amd64
-            mcVersion: 1.18.2
-        # JAVA 11:
-          - variant: java11
-            baseImage: adoptopenjdk:11-jre-hotspot
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: 1.16.5
-          - variant: java11-jdk
-            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-jre
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.16.5
-        # JAVA 8: NOTE: Unable to go past 8u312 because of Forge dependencies
-          - variant: java8
-            baseImage: openjdk:8-jre-alpine3.9
-            platforms: linux/amd64
-            mcVersion: 1.12.2
-          - variant: java8-graalvm-ce
-            baseImage: ghcr.io/graalvm/graalvm-ce:java8
-            platforms: linux/amd64
-            mcVersion: 1.12.2
-          - variant: java8-multiarch
-            baseImage: eclipse-temurin:8u312-b07-jre-focal
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-          - variant: java8-jdk
-            baseImage: eclipse-temurin:8u312-b07-jdk-focal
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-          - variant: java8-openj9
-            baseImage: ibm-semeru-runtimes:open-8u312-b07-jre
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-    env:
-      IMAGE_TO_TEST: ${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}
-      HAS_IMAGE_REPO_ACCESS: ${{ secrets.DOCKER_USER != '' && secrets.DOCKER_PASSWORD != '' }}
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          # for build-files step
-          fetch-depth: 0
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        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@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
-
-      - name: Build for test
-        uses: docker/build-push-action@v3.1.1
-        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 }}
-          VARIANT: ${{ matrix.variant }}
-          MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
-        run: |
-          tests/test.sh
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        if: env.HAS_IMAGE_REPO_ACCESS
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3.1.1
-        if: github.actor == github.repository_owner
-        with:
-          platforms: ${{ matrix.platforms }}
-          push: >
-            ${{ 
-            github.ref_type == 'tag' 
-            || github.ref_name == 'master' 
-            || ( github.event_name == 'pull_request' 
-                 && env.HAS_IMAGE_REPO_ACCESS 
-                 && contains(github.event.pull_request.labels.*.name, 'ci/push-image') 
-               )
-            }}
-          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/discord.yml

@@ -1,26 +0,0 @@
-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/issue-label.yml

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

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

.github/workflows/stale-check.yml

@@ -1,25 +0,0 @@
-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@v5
-        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'
-

.github/workflows/verify-pr.yml

@@ -1,63 +0,0 @@
-name: Verify PR
-on:
-  pull_request:
-    branches: [ master ]
-    types: [assigned, opened, synchronize, labeled]
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        variant:
-          - java17
-          - java17-alpine
-        include:
-        # JAVA 17:
-          - variant: java17
-            # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343
-            baseImage: eclipse-temurin:17-jre-focal
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: 1.18.2
-          - variant: java17-alpine
-            baseImage: eclipse-temurin:17-jre-alpine
-            platforms: linux/amd64
-            mcVersion: 1.18.2
-    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@v3
-        with:
-          # for build-files step
-          fetch-depth: 0
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build for test
-        uses: docker/build-push-action@v3.1.1
-        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 }}
-
-      - name: Run tests
-        env:
-          MINECRAFT_VERSION: ${{ matrix.mcVersion }}
-          VARIANT: ${{ matrix.variant }}
-          MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
-        run: |
-          tests/test.sh

.gitignore

@@ -1,6 +1,3 @@
-.vscode
 /data/
 /.idea/
-*.iml
-/gh-md-toc
-personal-build-and-develop.*
+*.iml

BUILDING.md

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

@@ -1,55 +1,15 @@
-## Adding a server type
-
-Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps:
-
-1. Copy an existing "start-deploy*" script, such as [start-deployMohist](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](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)
-
-## Iterative script development
-
-Individual scripts can be iteratively developed, debugged, and tested using the following procedure.
+Individual scripts can be iteratively developed and tested using the following procedure.
 
 First, build a baseline of the image to include the packages needed by existing or new scripts:
 
-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 -v --remove-orphans
-popd
-```
-
-PowerShell: Building different images of Java for testing
-```powershell
-$env:BASE_IMAGE='eclipse-temurin:8u312-b07-jre'
-$env:IMAGE_TO_TEST="mc-dev"
-docker build --build-arg BASE_IMAGE=$env:BASE_IMAGE -t $env:IMAGE_TO_TEST .
-```
-
-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 -v --remove-orphans
-popd
+```shell script
+docker build -t mc-dev .
 ```
 
 Using the baseline image, an interactive container can be started to iteratively run the scripts to be developed. By attaching the current workspace directory, you can use the local editor of your choice to iteratively modify scripts while using the container to run them.
 
 ```shell script
-docker run -it --rm -v ${PWD}:/scripts -e SCRIPTS=/scripts/ --entrypoint bash mc-dev
+docker run -it --rm -v ${PWD}:/scripts -e SCRIPTS=/scripts/ --entrypoint bash mc-dev 
 ```
 
 From within the container you can run individual scripts via the attached `/scripts/` path; however, be sure to set any environment variables expected by the scripts by either `export`ing them manually:
@@ -66,34 +26,3 @@ 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.
-
-## Using development copy of mc-image-helper
-
-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:
-
-```shell
-./gradlew distTar
-```
-
-Assuming [http-server](https://www.npmjs.com/package/http-server) is installed globally, start a static web server using:
-
-```shell
-http-server ./build/distributions -p 8080
-```
-
-Note the port that was selected by http-server and pass the build arguments, such as:
-
-```shell
---build-arg MC_HELPER_VERSION=1.8.1-SNAPSHOT \
---build-arg MC_HELPER_BASE_URL=http://host.docker.internal:8080
-```
-
-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
-```

Dockerfile

@@ -1,75 +1,86 @@
-# syntax = docker/dockerfile:1.3
-
-ARG BASE_IMAGE=eclipse-temurin:17-jre-focal
-FROM ${BASE_IMAGE}
-
-# 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 --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} /build/run.sh setup-user
-
-COPY --chmod=644 files/sudoers* /etc/sudoers.d
-
-EXPOSE 25565 25575
-
-# hook into docker BuildKit --platform support
-# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
-
-ARG EASY_ADD_VER=0.7.1
-ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
-RUN chmod +x /usr/bin/easy-add
-
-RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=1.2.0 --var app=restify --file {{.app}} \
-  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
-
-RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=1.6.0 --var app=rcon-cli --file {{.app}} \
-  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
-
-RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=0.10.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.8.1 --var app=mc-server-runner --file {{.app}} \
-  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
-
-RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
-  --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
-  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
-
-ARG MC_HELPER_VERSION=1.20.3
-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"]
-WORKDIR /data
-
-STOPSIGNAL SIGTERM
-
-# End user MUST set EULA and change RCON_PASSWORD
-ENV TYPE=VANILLA VERSION=LATEST EULA="" UID=1000 GID=1000 RCON_PASSWORD=minecraft
-
-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
-COPY --chmod=755 files/rconcmds /rconcmds
-
-RUN dos2unix /start* /autopause/* /autostop/* /rconcmds/*
-
-ENTRYPOINT [ "/start" ]
-HEALTHCHECK --start-period=1m --interval=5s --retries=24 CMD mc-health
+FROM adoptopenjdk/openjdk11:alpine-jre
+
+LABEL maintainer "itzg"
+
+RUN apk add --no-cache -U \
+  openssl \
+  imagemagick \
+  lsof \
+  su-exec \
+  shadow \
+  bash \
+  curl iputils wget \
+  git \
+  jq \
+  mysql-client \
+  tzdata \
+  rsync \
+  nano \
+  sudo \
+  knock \
+  ttf-dejavu
+
+RUN addgroup -g 1000 minecraft \
+  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
+  && mkdir -m 777 /data \
+  && chown minecraft:minecraft /data /home/minecraft
+
+COPY files/sudoers* /etc/sudoers.d
+
+EXPOSE 25565 25575
+
+# hook into docker BuildKit --platform support
+# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+ARG TARGETVARIANT=""
+
+ARG EASY_ADD_VER=0.7.1
+ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
+RUN chmod +x /usr/bin/easy-add
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+  --var version=1.2.0 --var app=restify --file {{.app}} \
+  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.4.7 --var app=rcon-cli --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.7 --var app=mc-monitor --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.4.3 --var app=mc-server-runner --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+COPY mcstatus /usr/local/bin
+
+VOLUME ["/data"]
+COPY server.properties /tmp/server.properties
+COPY log4j2.xml /tmp/log4j2.xml
+WORKDIR /data
+
+ENV UID=1000 GID=1000 \
+  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
+  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
+  LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
+  REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_" \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10
+
+COPY start* /
+COPY health.sh /
+ADD files/autopause /autopause
+
+RUN dos2unix /start* && chmod +x /start*
+RUN dos2unix /health.sh && chmod +x /health.sh
+RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
+
+ENTRYPOINT [ "/start" ]
+HEALTHCHECK --start-period=1m CMD /health.sh

bin/mc-health

@@ -1,18 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/bin/bash
-. "/start-utils"
-: "${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
-
-if [ "$(id -u)" = 0 ]; then
-  if [[ $(getDistro) == alpine ]]; then
-    exec su-exec minecraft bash -c "echo $* > '${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}'"
-  else
-    exec gosu minecraft bash -c "echo $* > '${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}'"
-  fi
-else
-  echo "$@" >"${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}"
-fi

build-multiarch.sh

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

build/alpine/install-packages.sh

@@ -1,26 +0,0 @@
-#!/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 \
-    tar \
-    zstd

build/alpine/setup-user.sh

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

build/ol/install-gosu.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [[ $(uname -m) == "aarch64" ]]; then 
-    curl -sL -o /bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-arm64
-    chmod +x /bin/gosu
-elif [[ $(uname -m) == "x86_64" ]]; then 
-    curl -sL -o /bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-amd64
-    chmod +x /bin/gosu
-else
-    echo "Not supported!"
-    exit 1
-fi  

build/ol/install-packages.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -e
-
-microdnf install dnf -y
-
-dnf install 'dnf-command(config-manager)' -y
-dnf config-manager --set-enabled ol8_codeready_builder
-tee /etc/yum.repos.d/ol8-epel.repo<<EOF
-[ol8_developer_EPEL]
-name= Oracle Linux \$releasever EPEL (\$basearch)
-baseurl=https://yum.oracle.com/repo/OracleLinux/OL8/developer/EPEL/\$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=1
-EOF
-dnf update -y
-
-dnf install -y ImageMagick \
-  file \
-  sudo \
-  net-tools \
-  iputils \
-  curl \
-  git \
-  jq \
-  dos2unix \
-  mysql \
-  procps-ng \
-  tzdata \
-  rsync \
-  nano \
-  unzip \
-  zstd \
-  lbzip2 \
-  knock
-
-bash /build/ol/install-gosu.sh

build/ol/setup-user.sh

@@ -1,2 +0,0 @@
-groupadd --gid 1000 minecraft
-useradd --system --shell /bin/false --uid 1000 -g minecraft --home /data minecraft

build/run.sh

@@ -1,7 +0,0 @@
-#!/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

@@ -1,28 +0,0 @@
-#!/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 \
-  lbzip2 \
-  knockd
-
-apt-get clean

build/ubuntu/setup-user.sh

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

development/update-multiarch.sh

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

docker-compose.yml

@@ -1,16 +1,28 @@
-version: "3.8"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-    ports:
-      - "25565:25565"
-    volumes:
-      - data:/data
-    stdin_open: true
-    tty: true
-    restart: unless-stopped
-volumes:
-  data: {}
+version: '3'
+# Other docker-compose examples in /examples
+
+services:
+  minecraft:
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565"
+    volumes:
+      - "mc:/data"
+    environment:
+      EULA: "TRUE"
+      CONSOLE: "false"
+      ENABLE_RCON: "true"
+      RCON_PASSWORD: "testing"
+      RCON_PORT: 28016
+    restart: always
+  rcon:
+    image: itzg/rcon
+    ports:
+      - "4326:4326"
+      - "4327:4327"
+    volumes:
+      - "rcon:/opt/rcon-web-admin/db"
+
+volumes:
+  mc:
+  rcon:

docker-versions-create.sh

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

examples/.gitignore

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

examples/docker-compose-autopause.yml

@@ -1,21 +0,0 @@
-version: '3.8'
-
-services:
-  minecraft:
-    image: itzg/minecraft-server
-    ports:
-      - "25565:25565"
-    volumes:
-      - "mc:/data"
-    environment:
-      EULA: "TRUE"
-      ENABLE_AUTOPAUSE: "TRUE"
-      OVERRIDE_SERVER_PROPERTIES: "TRUE"
-      MAX_TICK_TIME: "-1"
-      # More aggressive settings for demo purposes
-      AUTOPAUSE_TIMEOUT_INIT: "30"
-      AUTOPAUSE_TIMEOUT_EST: "10"
-    restart: unless-stopped
-
-volumes:
-  mc: {}

examples/docker-compose-autostop.yml

@@ -1,20 +0,0 @@
-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.8'
+version: '3'
 
 services:
   minecraft:

examples/docker-compose-curseforge.yml

@@ -1,21 +1,13 @@
-version: '3.8'
+version: '3.2'
 
 services:
   mc:
-    image: itzg/minecraft-server:${IMAGE_TAG:-java8}
+    image: itzg/minecraft-server
     volumes:
     - ./modpacks:/modpacks:ro
-    - data:/data
     environment:
       EULA: "true"
       TYPE: CURSEFORGE
-      CF_SERVER_MOD: /modpacks/SIMPLE-SERVER-FILES-0.3.20.zip
-#      CF_SERVER_MOD: /modpacks/createlive3serverfiles+1.4.2.zip
-#      CF_SERVER_MOD: /modpacks/Valhelsia+3-3.5.1-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}
+      CF_SERVER_MOD: /modpacks/SkyFactory_4_Server_4.1.0.zip
     ports:
-      - "25565:25565"
-
-volumes:
-  data: {}
+      - 25565:25565

examples/docker-compose-curseinstance.yml

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

examples/docker-compose-fabric.yml

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

examples/docker-compose-forge.yml

@@ -1,17 +1,16 @@
-version: "3.8"
+version: "3.7"
 
 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.8"
+version: "3.7"
 
 services:
   mc:
-    # FTBA support is only available in non-Alpine images
-    image: itzg/minecraft-server:${IMAGE_TAG:-java8-multiarch}
+    # FTBA support is only available in multiarch image tag
+    image: itzg/minecraft-server:multiarch
     ports:
       # expose the Minecraft server port outside of container
       - 25565:25565
@@ -14,11 +14,10 @@ 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
-      - ftba:/data
+      - mc_ftb:/data
 
 volumes:
   # declared the named volume, but use default/local storage engine
-  ftba: {}
+  mc_ftb: {}

examples/docker-compose-generic-pack-atm7.yml

@@ -1,19 +0,0 @@
-version: '3.8'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    volumes:
-    - ./data:/data
-    - ./modpacks:/modpacks:ro
-    environment:
-      EULA: "true"
-      MEMORY: 2G
-      TYPE: FORGE
-      VERSION: 1.18.2
-      FORGEVERSION: 40.1.30
-      # Need to download Server-Files-0.4.13.zip and
-      # put it in modpacks directory next to this compose file
-      GENERIC_PACK: /modpacks/Server-Files-0.4.13.zip
-    ports:
-      - "25565:25565"

examples/docker-compose-generic-pack.yml

@@ -1,21 +0,0 @@
-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-magma.yml

@@ -1,17 +0,0 @@
-version: "3.8"
-
-services:
-  mc:
-    image: itzg/minecraft-server:java8
-    tty: true
-    stdin_open: true
-    ports:
-      - "25565:25565"
-    environment:
-      EULA: "TRUE"
-      TYPE: MAGMA
-      VERSION: 1.16.5
-    volumes:
-      - data:/data
-volumes:
-  data: {}

examples/docker-compose-modrinth.yml

@@ -1,18 +0,0 @@
-version: "3.8"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
-    ports:
-      - "25565:25565"
-    environment:
-      EULA: "TRUE"
-      TYPE: FABRIC
-      MODRINTH_PROJECTS: fallingtree
-    volumes:
-      - data:/data
-
-volumes:
-  data: {}

examples/docker-compose-mods-file.yml

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

@@ -1,17 +0,0 @@
-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,19 +1,17 @@
-version: '3.8'
+version: '3.7'
+
 services:
   mc:
     image: itzg/minecraft-server
-    container_name: paper
     environment:
       EULA: "true"
-      ENABLE_RCON: "true"
       TYPE: PAPER
-      VIEW_DISTANCE: 10
-      MEMORY: 2G
-      CONSOLE: "false"
+      VERSION: 1.9.4
+    command: --noconsole
     ports:
       - 25565:25565
     volumes:
       - mc-paper:/data
-    restart: unless-stopped
+
 volumes:
-  mc-paper:
+  mc-paper:

examples/docker-compose-proxied.yml

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

examples/docker-compose-rconcmd.yml

@@ -1,36 +0,0 @@
-version: '3'
-
-services:
-  minecraft:
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    ports:
-      - "25565:25565"
-    volumes:
-      - "mc:/data"
-    environment:
-      EULA: "TRUE"
-      TYPE: FABRIC
-      MODS_FORGEAPI_PROJECTIDS: 433175
-      MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
-      MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "TRUE"
-      REMOVE_OLD_FORGEAPI_MODS: "TRUE"
-      # YAML Heredoc, be sure to use '|-' this will remove the first newline and final new line.
-      # This is versus '|' that will leaving with two empty strings at top and bottom.
-      RCON_CMDS_STARTUP:  |-
-        /gamerule doFireTick false
-        /team add New
-        /team add Old
-        /chunky radius 1000
-        /chunky start
-      RCON_CMDS_ON_CONNECT: |-
-        /team join New @a[team=]
-        /give @a[team=New] birch_boat
-        /team join Old @a[team=New]
-      RCON_CMDS_FIRST_CONNECT: |-
-        /chunky pause
-      RCON_CMDS_LAST_DISCONNECT: |-
-        /kill @e[type=minecraft:boat]
-        /chunky continue
-    restart: unless-stopped
-volumes:
-  mc: {}

examples/docker-compose-rlcraft.yml

@@ -1,27 +0,0 @@
-version: '3.8'
-
-services:
-  mc:
-    image: itzg/minecraft-server:java8
-    volumes:
-    - data:/data
-    - ./modpacks:/modpacks:ro
-    environment:
-      EULA: "true"
-      TYPE: "FORGE"
-      VERSION: "1.12.2"
-      FORGEVERSION: "14.23.5.2860"
-      OVERRIDE_SERVER_PROPERTIES: "true"
-      DIFFICULTY: "hard"
-      MAX_TICK_TIME: "-1"
-      ALLOW_FLIGHT: "true"
-      ENABLE_COMMAND_BLOCK: "true"
-      VIEW_DISTANCE: "10"
-      MEMORY: "4G"
-      # Download from https://www.curseforge.com/minecraft/modpacks/rlcraft and place in modpacks subdir
-      GENERIC_PACK: "/modpacks/RLCraft+Server+Pack+1.12.2+-+Release+v2.9.1c.zip"
-    ports:
-      - 25565:25565
-
-volumes:
-  data:

examples/docker-compose-simple.yml

@@ -1,14 +0,0 @@
-version: "3.8"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
-    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

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

examples/docker-compose-spongeforge.yml

@@ -1,11 +1,11 @@
-version: '3.8'
+version: '3'
 # Forge with Sponge API support. THIS REQUIRES DOWNLOADING SPONGEFORGE.
 # Place the SpongeForge jar file in /data/mods. Other Forge mods go here as well.
 # Place Sponge mods in /data/mods/plugins. Yes, this is a directory inside the Forge mod directory. Do NOT use /data/plugins.
 
 services:
   minecraft:
-    image: itzg/minecraft-server:java8
+    image: itzg/minecraft-server
     ports:
       - "25565:25565"
     volumes:

examples/docker-compose-world-download.yml

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

examples/docker-compose.yml

@@ -1,16 +0,0 @@
-version: '3'
-# Other docker-compose examples in /examples
-
-services:
-  minecraft:
-    image: itzg/minecraft-server
-    ports:
-      - "25565:25565"
-    volumes:
-      - "mc:/data"
-    environment:
-      EULA: "TRUE"
-    restart: always
-
-volumes:
-  mc: {}

examples/k8s/using-statefulset.yml

@@ -3,18 +3,18 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    app: mc-example
-  name: mc-example
+    app: example
+  name: example
 spec:
   replicas: 1
-  serviceName: mc-example
+  serviceName: example
   selector:
     matchLabels:
-      app: mc-example
+      app: example
   template:
     metadata:
       labels:
-        app: mc-example
+        app: example
     spec:
       containers:
         - name: mc
@@ -25,18 +25,6 @@ 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
@@ -51,12 +39,12 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    service: mc-example
-  name: mc-example
+    service: example
+  name: example
 spec:
   ports:
     - port: 25565
       targetPort: 25565
   selector:
-    app: mc-example
-  type: NodePort
+    app: example
+  type: LoadBalancer

examples/k8s/vanilla-deployment.yml

@@ -35,17 +35,20 @@ spec:
           name: main
         readinessProbe:
           exec:
-            command: [ "/usr/local/bin/mc-monitor", "status", "--host", "localhost" ]
-          # Give it i + p * f seconds to be ready, so 120 seconds
-          initialDelaySeconds: 20
+            command:
+            - mcstatus
+            - localhost
+            - ping
+          initialDelaySeconds: 5
           periodSeconds: 5
-          failureThreshold: 20
-        # Monitor ongoing liveness
         livenessProbe:
           exec:
-            command: ["/usr/local/bin/mc-monitor", "status", "--host", "localhost"]
-          initialDelaySeconds: 120
-          periodSeconds: 60
+            command:
+            - mcstatus
+            - localhost
+            - ping
+          initialDelaySeconds: 5
+          periodSeconds: 5
         volumeMounts:
         - name: mc-data
           mountPath: /data

examples/modpacks/README.md

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

examples/mods.txt

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

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

@@ -1,15 +0,0 @@
-{
-    "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,69 +2,35 @@
 
 . /autopause/autopause-fcns.sh
 
-# shellcheck source=../../scripts/start-utils
-. "${SCRIPTS:-/}start-utils"
-if isTrue "${DEBUG_AUTOPAUSE}"; then
-  set -x
-fi
+. /start-utils
 
-autopause_error_loop() {
-  logAutopause "Available interfaces within the docker container:"
-  INTERFACES=$(echo /sys/class/net/*)
-  INTERFACES=${INTERFACES//\/sys\/class\/net\//}
-  logAutopause "  $INTERFACES"
-  logAutopause "Please set the environment variable AUTOPAUSE_KNOCK_INTERFACE to the interface that handles incoming connections."
-  logAutopause "If unsure which interface to choose, run the ifconfig command in the container."
-  logAutopause "Autopause failed to initialize. This log entry will be printed every 30 minutes."
+sudo /usr/sbin/knockd -c /autopause/knockd-config.cfg -d
+if [ $? -ne 0 ] ; then
   while :
   do
-    sleep 1800
-    logAutopause "Autopause failed to initialize."
+    if [[ -n $(ps -o comm | grep java) ]] ; then
+      break
+    fi
+    sleep 0.1
   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
-
-knockdArgs=(-c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE")
-if isTrue "${DEBUG_AUTOPAUSE}"; then
-  knockdArgs+=(-D)
-fi
-
-sudo /usr/sbin/knockd "${knockdArgs[@]}"
-if [ $? -ne 0 ] ; then
   logAutopause "Failed to start knockd daemon."
-  logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
-  autopause_error_loop
+  logAutopause "Possible cause: docker's host network mode."
+  logAutopause "Recreate without host mode or disable autopause functionality."
+  logAutopause "Stopping server."
+  killall -SIGTERM java
+  exit 1
 fi
 
 STATE=INIT
 
 while :
 do
-  isTrue "${DEBUG_AUTOPAUSE}" && log "DEBUG: autopause state = $STATE"
   case X$STATE in
   XINIT)
     # Server startup
     if mc_server_listening ; then
       TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_INIT))
-      logAutopause "MC Server listening for connections - pausing in $AUTOPAUSE_TIMEOUT_INIT seconds"
+      logAutopause "MC Server listening for connections - stopping in $AUTOPAUSE_TIMEOUT_INIT seconds"
       STATE=K
     fi
     ;;
@@ -75,7 +41,7 @@ do
       STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client connected since startup / knocked - pausing"
+        logAutopause "No client connected since startup / knocked - stopping"
         /autopause/pause.sh
         STATE=S
       fi
@@ -85,7 +51,7 @@ do
     # Established
     if ! java_clients_connected ; then
       TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_EST))
-      logAutopause "All clients disconnected - pausing in $AUTOPAUSE_TIMEOUT_EST seconds"
+      logAutopause "All clients disconnected - stopping in $AUTOPAUSE_TIMEOUT_EST seconds"
       STATE=I
     fi
     ;;
@@ -96,7 +62,7 @@ do
       STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client reconnected - pausing"
+        logAutopause "No client reconnected - stopping"
         /autopause/pause.sh
         STATE=S
       fi
@@ -124,8 +90,8 @@ do
   esac
   if [[ "$STATE" == "S" ]] ; then
     # before rcon times out
-    sleep 5
+    sleep 2
   else
-    sleep "$AUTOPAUSE_PERIOD"
+    sleep $AUTOPAUSE_PERIOD
   fi
 done

files/autopause/autopause-fcns.sh

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

files/autopause/knockd-config.cfg

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

files/autopause/pause.sh

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

files/autopause/resume.sh

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

files/autostop/autostop-daemon.sh

@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# needed for the clients connected function residing in autopause
-. /autopause/autopause-fcns.sh
-
-# shellcheck source=../../scripts/start-utils
-. "${SCRIPTS:-/}start-utils"
-if isTrue "${DEBUG_AUTOSTOP}"; then
-  set -x
-fi
-
-# wait for java process to be started
-while :
-do
-  if java_process_exists ; then
-    break
-  fi
-  sleep 0.1
-done
-
-STATE=INIT
-
-while :
-do
-  isTrue "${DEBUG_AUTOSTOP}" && log "DEBUG: autostop state = $STATE"
-  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

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-if isTrue "${DEBUG_AUTOSTOP}"; then
-  set -x
-fi
-
-logAutostopAction "Stopping Java process"
-kill -SIGTERM 1

files/rconcmds/rcon-cmds-daemon.sh

@@ -1,101 +0,0 @@
-#!/bin/bash
-
-: "${RCON_CMDS_STARTUP:=}"
-: "${RCON_CMDS_ON_CONNECT:=}"
-: "${RCON_CMDS_ON_DISCONNECT:=}"
-: "${RCON_CMDS_FIRST_CONNECT:=}"
-: "${RCON_CMDS_LAST_DISCONNECT:=}"
-: "${RCON_CMDS_PERIOD:=10}"
-
-# needed for the clients connected function residing in autopause
-# shellcheck source=/autopause/autopause-fcns.sh
-. /autopause/autopause-fcns.sh
-
-# shellcheck source=start-utils
-. ${SCRIPTS:-/}start-utils
-
-run_command(){
-  rcon_cmd="$1"
-  logRcon "running - $rcon_cmd"
-  output=$(rcon-cli "$rcon_cmd")
-  logRcon "$output"
-}
-
-
-# wait for java process to be started
-while :
-do
-  if java_process_exists ; then
-    break
-  fi
-  sleep 0.1
-done
-
-CLIENTCONNECTIONS=0
-STATE=INIT
-
-while :
-do
-  case X$STATE in
-  XINIT)
-    # Server startup
-    if mc_server_listening ; then
-      logRcon "MCServer is listening, running startup"
-      if [[ "$RCON_CMDS_STARTUP" ]]; then
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_STARTUP"
-      fi
-      if 
-        [[ -z "$RCON_CMDS_ON_CONNECT" ]] && 
-        [[ -z "$RCON_CMDS_ON_DISCONNECT" ]] && 
-        [[ -z "$RCON_CMDS_FIRST_CONNECT" ]] && 
-        [[ -z "$RCON_CMDS_LAST_DISCONNECT" ]]
-      then
-        logRcon "No addition rcon commands are given, stopping rcon cmd service"
-        exit 0
-      fi
-      STATE=II
-    fi
-    ;;
-  XII)
-    CURR_CLIENTCONNECTIONS=$(java_clients_connections)
-    # First client connection
-    # Setting priority run order: on first client connection is usually to STOP maintence, aka DO THIS FIRST
-    if (( CURR_CLIENTCONNECTIONS > 0 )) && (( CLIENTCONNECTIONS == 0 )) && [[ "$RCON_CMDS_FIRST_CONNECT" ]]; then
-        logRcon "First Clients has Connected, running first connect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_FIRST_CONNECT"
-    fi
-
-    # When a client joins
-    if (( CURR_CLIENTCONNECTIONS > CLIENTCONNECTIONS )) && [[ "$RCON_CMDS_ON_CONNECT" ]]; then
-        logRcon "Clients have Connected, running connect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_ON_CONNECT"
-    # When a client leaves
-    elif (( CURR_CLIENTCONNECTIONS < CLIENTCONNECTIONS )) && [[ "$RCON_CMDS_ON_DISCONNECT" ]]; then
-        logRcon "Clients have Disconnected, running disconnect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_ON_DISCONNECT"
-    fi
-
-    # Last client connection
-    # Setting priority run order: on last client connection is usually to START maintence, aka DO THIS LAST
-    if (( CURR_CLIENTCONNECTIONS == 0 )) && (( CLIENTCONNECTIONS > 0 )) && [[ "$RCON_CMDS_LAST_DISCONNECT" ]]; then
-        logRcon "ALL Clients have Disconnected, running last disconnect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_LAST_DISCONNECT"
-    fi
-    CLIENTCONNECTIONS=$CURR_CLIENTCONNECTIONS
-    ;;
-  *)
-    logRcon "Error: invalid state: $STATE"
-    ;;
-  esac
-  sleep "$RCON_CMDS_PERIOD"
-done

files/sudoers-mc

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

health.sh

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

log4j2.xml

@@ -4,22 +4,19 @@
         <Console name="SysOut" target="SYSTEM_OUT">
             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
         </Console>
-        <Queue name="TerminalConsole">
+        <Queue name="ServerGuiConsole">
             <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
         </Queue>
         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
             <Policies>
-                <!-- Based on filePattern resolution, so daily -->
                 <TimeBasedTriggeringPolicy />
-                <SizeBasedTriggeringPolicy size="100 MB" />
                 <OnStartupTriggeringPolicy />
             </Policies>
             <DefaultRolloverStrategy>
                 <Delete basePath="logs">
                     <IfFileName glob="*.log.gz" />
                     <IfLastModified age="7d" />
-                    <IfAccumulatedFileCount exceeds="20"/>
                 </Delete>
             </DefaultRolloverStrategy>
         </RollingRandomAccessFile>
@@ -31,7 +28,7 @@
             </filters>
             <AppenderRef ref="SysOut"/>
             <AppenderRef ref="File"/>
-            <AppenderRef ref="TerminalConsole"/>
+            <AppenderRef ref="ServerGuiConsole"/>
         </Root>
     </Loggers>
 </Configuration>

minecraft-server/README.md

@@ -0,0 +1,4 @@
+# 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-autostop

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-: "${SERVER_PORT:=25565}"
-: "${ENABLE_AUTOSTOP:=false}"
-: "${AUTOSTOP_TIMEOUT_EST:=3600}"
-: "${AUTOSTOP_TIMEOUT_INIT:=1800}"
-: "${AUTOSTOP_PERIOD:=10}"
-: "${DEBUG_AUTOSTOP:=false}"
-export SERVER_PORT
-export ENABLE_AUTOSTOP
-export AUTOSTOP_TIMEOUT_EST
-export AUTOSTOP_TIMEOUT_INIT
-export AUTOSTOP_PERIOD
-export DEBUG_AUTOSTOP
-
-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

@@ -1,260 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-: "${EULA:=}"
-: "${PROXY:=}"
-: "${ENABLE_AUTOPAUSE:=false}"
-: "${ENABLE_AUTOSTOP:=false}"
-: "${RCON_CMDS_STARTUP:=}"
-: "${RCON_CMDS_ON_CONNECT:=}"
-: "${RCON_CMDS_ON_DISCONNECT:=}"
-: "${RCON_CMDS_FIRST_CONNECT:=}"
-: "${RCON_CMDS_LAST_DISCONNECT:=}"
-: "${RCON_CMDS_PERIOD:=10}"
-: "${RCON_PASSWORD_FILE:=}"
-: "${RCON_PASSWORD:=minecraft}"
-: "${RCON_PORT:=25575}"
-export RCON_PASSWORD RCON_PORT
-
-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
-
-function fixJavaPath() {
-  # 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: your Docker provider has an annoying flaw where it"
-    log "       tries to set PATH even though the container establishes"
-    log "       a very specific value."
-    sleep 2
-    # now find where java might be
-    for d in /opt/java/openjdk/bin /usr/bin; do
-      if [ -x "${d}/java" ]; then
-        PATH="${PATH}:${d}"
-        return 0
-      fi
-    done
-    return 1
-  fi
-}
-
-if ! fixJavaPath; then
-  log "ERROR: could not locate path that contains java"
-  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
-MAJOR_VANILLA_VERSION=$(get_major_version "$VANILLA_VERSION")
-export MAJOR_VANILLA_VERSION
-log "Resolved version given ${VERSION} into ${VANILLA_VERSION} and major version ${MAJOR_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 
-  [[ "$RCON_CMDS_STARTUP" ]] ||
-  [[ "$RCON_CMDS_ON_CONNECT" ]] ||
-  [[ "$RCON_CMDS_ON_DISCONNECT" ]] || 
-  [[ "$RCON_CMDS_FIRST_CONNECT" ]] || 
-  [[ "$RCON_CMDS_LAST_DISCONNECT" ]]
-then
-  log "Starting RCON commands"
-  # shellcheck source=start-rconcmds
-  ${SCRIPTS:-/}start-rconcmds
-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" "$@"
-  ;;
-
-  QUILT)
-    exec "${SCRIPTS:-/}start-deployQuilt" "$@"
-  ;;
-  
-  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" "$@"
-  ;;
-
-  LOLISERVER)
-    evaluateJavaCompatibilityForForge
-    exec "${SCRIPTS:-/}start-deployLoliserver" "$@"
-  ;;
-
-  PURPUR)
-    exec "${SCRIPTS:-/}start-deployPurpur" "$@"
-  ;;
-
-  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, LOLISERVER, AIRPLANE, PUFFERFISH, CANYON, LIMBO, CRUCIBLE"
-      exit 1
-  ;;
-
-esac

scripts/start-deployCF

@@ -1,246 +0,0 @@
-#!/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://files.minecraftforge.net/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."
-if [[ ! $FTB_SERVER_MOD ]]; then
-    log "ERROR: CF_SERVER_MOD or FTB_SERVER_MOD is required to be set"
-    exit 1
-fi
-
-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
-
-
-findStartScript() {
-  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
-    -o -name run.sh
-    -o -name start.sh
-  )
-
-  if [ -d "${FTB_BASE_DIR}" ]; then
-    find "${FTB_BASE_DIR}" \( "${entryScriptExpr[@]}" \) -print -quit
-  fi
-}
-
-startScript=$(findStartScript)
-
-# 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 [[ ! $startScript ]]; 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 ""}'
-
-  installScriptExpr=(
-    -name install.sh
-    -o -name FTBInstall.sh
-    -o -name Install.sh
-  )
-
-  installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( "${installScriptExpr[@]}" \) -print -quit)
-  if [[ "$installScript" ]]; then
-    (
-      cd "$(dirname "${installScript}")"
-      chmod +x "${installScript}"
-      log "Running included $(basename "${installScript}"). This might take a minute or two..."
-      "${installScript}" > install.log
-    )
-  fi
-
-  startScript=$(findStartScript)
-fi
-
-# start script provided by unzipped+installed modpack?
-if [[ ! $startScript ]]; then
-  # no, then look for a forge jar to run
-
-  # 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
-    startScript="${FTB_BASE_DIR}/ServerStart.sh"
-    chmod +x "$startScript"
-  else
-    log "ERROR: Modpack missing start script and unable to find Forge jar to generate one"
-    exit 2
-  fi
-fi
-
-# Modpacks that use https://github.com/BloodyMods/ServerStarter will sometimes specify an
-# extra subpath where all the server files get installed. Need to transplant EULA file there.
-serverSetupConfig=$(find "${FTB_BASE_DIR}" -type f -name server-setup-config.yaml)
-if [[ $serverSetupConfig && $serverSetupConfig != "~" ]]; then
-  if baseInstallPath=$(mc-image-helper yaml-path --file "$serverSetupConfig" ".install.baseInstallPath"); then
-    resolvedBaseInstallPath="$(dirname "$serverSetupConfig")/${baseInstallPath}"
-    mkdir -p "$resolvedBaseInstallPath"
-
-    cp -n /data/eula.txt "${resolvedBaseInstallPath}/eula.txt"
-  fi
-fi
-
-FTB_SERVER_START="$startScript"
-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
-
-export FAMILY=FORGE
-exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployCanyon

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

scripts/start-deployCrucible

@@ -1,60 +0,0 @@
-#!/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-deployFTBA

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-ftbInstallMarker=".ftb-installed"
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
-set -e
-
-if [[ $(getDistro) = alpine ]]; then
-  log "ERROR: the FTBA installer is not supported on Alpine. Use the java8-multiarch image tag instead."
-  exit 1
-fi
-
-if ! [[ -v FTB_MODPACK_ID ]]; then
-  log "ERROR FTB_MODPACK_ID is required with TYPE=FTB"
-  exit 1
-fi
-
-if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
-  log "ERROR FTB_MODPACK_ID needs to be numeric"
-  exit 1
-fi
-
-if [[ ! $FTB_MODPACK_VERSION_ID ]]; then
-  if ! FTB_MODPACK_VERSION_ID=$(curl -fsSL https://api.modpacks.ch/public/modpack/${FTB_MODPACK_ID} | jq -r '.versions | sort_by(.updated)[-1].id'); then
-    log "ERROR unable to resolve latest modpack version ID for modpack ${FTB_MODPACK_ID}"
-    exit 1
-  fi
-elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
-  log "ERROR FTB_MODPACK_VERSION_ID needs to be numeric"
-  exit 1
-fi
-
-if ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
-  ftbInstaller=/data/ftb-installer
-  if ! [[ -f "${ftbInstaller}" ]]; then
-    log "Downloading FTB installer"
-    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
-
-  rm -rf forge*jar mods config libraries defaultconfigs changelogs
-
-  log "Installing modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID}"
-  ${ftbInstaller} ${FTB_MODPACK_ID} ${FTB_MODPACK_VERSION_ID} --noscript --auto
-  rm -f forge*installer.jar
-
-  echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker}
-
-  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|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"
-  run.sh
-)
-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 FTB server jar"
-  log "      Tried looking for ${variants[*]}"
-  exit 2
-fi
-
-export FAMILY=FORGE
-
-exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployFabric

@@ -1,50 +0,0 @@
-#!/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

@@ -1,160 +0,0 @@
-#!/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 Forge Installer $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 from $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
-
-  # reference issue #1459
-  rm -f run.sh
-
-  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']" --json-value-when-missing "" "$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 --json-path ".promos['$VANILLA_VERSION-recommended']" --json-value-when-missing "" "$promosUrl"); then
-          if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-latest']" --json-value-when-missing "" "$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

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

scripts/start-deployLoliserver

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-set -o pipefail
-set -e
-
-latestAsset=$(
-  curl -fsSL https://cdn.ci.loliidc.cn:30011/job/LoliServer-1.16.5/lastSuccessfulBuild/artifact/projects/LoliServer/build/libs | \
-    jq '.assets[] | select(.name | match(".*-server.jar"))'
-)
-
-if [[ -z "${latestAsset}" ]]; then
-  log "ERROR: latest release of Loliserver is missing server.jar asset"
-  exit 1
-fi
-
-isDebugging && log "Latest asset ${latestAsset}"
-latestJarName=$(echo ${latestAsset} | jq --raw-output '.name')
-latestJarId=$(echo ${latestAsset} | jq --raw-output '.id')
-
-
-export SERVER="/data/${latestJarName}"
-
-if [ ! -f ${SERVER} ]; then
-  log "Downloading ${latestJarName}"
-  curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://cdn.ci.loliidc.cn:30011/job/LoliServer-1.16.5/lastSuccessfulBuild/artifact/projects/LoliServer/build/libs/${latestJarId}
-fi
-
-export FAMILY=HYBRID
-
-exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployMagma

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
-
-: "${VANILLA_VERSION?}"
-
-if ! downloadUrl=$(get --json-path '$.link' "https://api.magmafoundation.org/api/v2/${VANILLA_VERSION}/latest"); then
-  log "ERROR failed to locate latest Magma download for ${VANILLA_VERSION}. Is that version supported?"
-  exit 1
-fi
-
-if ! SERVER=$(get --output-filename --skip-up-to-date --output /data "$downloadUrl"); then
-  log "ERROR: failed to download Magma server jar from $downloadUrl"
-  exit 1
-fi
-
-export SERVER
-export FAMILY=HYBRID
-
-exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-deployMohist

@@ -1,43 +0,0 @@
-#!/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

@@ -1,97 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-set -o pipefail
-handleDebugMode
-
-: "${PAPER_CUSTOM_JAR:=}"
-
-ourScript="$0"
-ourArgs=("$@")
-
-function handleMissingVersion() {
-  expectedVersion=${VANILLA_VERSION}
-  versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
-  if [[ $VERSION = LATEST ]]; then
-    tries=0
-    while ((tries++ < 5)); do
-      VANILLA_VERSION=$(echo "$versions" | jq -r ".versions[$((- tries))]")
-      if [[ $(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
-               | jq '.builds[-1]') != null ]]; then
-        log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
-        # re-execute the current script with the newly computed version
-        exec "$ourScript" "${ourArgs[@]}"
-     fi
-   done
-  fi
-  log "ERROR: ${expectedVersion} is not published by PaperMC"
-  log "       Set VERSION to one of the following: "
-  log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
-  exit 1
-}
-
-if [[ $PAPER_CUSTOM_JAR ]]; then
-  export SERVER="$PAPER_CUSTOM_JAR"
-elif [[ $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)
-      handleMissingVersion
-      ;;
-    *)
-      echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
-      exit 1
-      ;;
-  esac
-
-  if [[ $build = null ]]; then
-    handleMissingVersion
-  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 "$@"