Auto-merging via docker-versions-create

# Conflicts:
#	Dockerfile
#	start-configuration

.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/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 +1,82 @@
-name: Test and Build multi-architecture
+name: Build and publish multiarch
 on:
   push:
     branches:
       - master
-      - test/**
+      - "*-multiarch"
+      - "multiarch*"
+      - java8-openj9
+      - java11*
+      - java16*
+      - test/multiarch/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
+      - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
+      - "[0-9]+.[0-9]+.[0-9]+-java11*"
+      - "[0-9]+.[0-9]+.[0-9]+-java16*"
     paths-ignore:
       - "*.md"
       - "docs/**"
       - "examples/**"
 
 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 != '' }}
+  docker-buildx:
     runs-on: ubuntu-20.04
+    env:
+      CACHE_NAME: java8-multiarch
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          # for build-files step
-          fetch-depth: 0
+        uses: actions/checkout@v2.3.4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
         with:
-          # NOTE for forks: if your Docker Hub organization doesn't match your Github repo's,
-          # then the use of ${{ github.repository_owner }} will need to be replaced.
           images: |
-            ${{ github.repository_owner }}/minecraft-server
+            itzg/minecraft-server
           tags: |
-            type=ref,event=tag,enable=${{ matrix.variant == 'java17' }}
-            type=ref,event=tag,suffix=-${{ matrix.variant }}
-            type=raw,value=${{ matrix.variant }}
+            type=ref,event=branch
+            type=ref,event=tag
+            type=edge,branch=master
           flavor: |
-            latest=${{ matrix.variant == 'java17' }}
-          labels: |
-            org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
+            latest=false
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2.1.6
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
+            ${{ runner.os }}-buildx-
 
       - 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
+        uses: docker/setup-qemu-action@v1.2.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
-        if: env.HAS_IMAGE_REPO_ACCESS
+        uses: docker/login-action@v1
         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
+        id: docker_build
+        uses: docker/build-push-action@v2.5.0
         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') 
-               )
-            }}
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           # ensure latest base image is used
           pull: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
           labels: ${{ 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 }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.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/generate-toc.yml

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

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

.github/workflows/pr.yml

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

.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,69 +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
-          - java8-multiarch
-        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
-            mcVersion: 1.18.2
-          - variant: java17-alpine
-            baseImage: eclipse-temurin:17-jre-alpine
-            platforms: linux/amd64
-            mcVersion: 1.18.2
-          - variant: java8-multiarch
-            baseImage: eclipse-temurin:8u312-b07-jre-focal
-            platforms: linux/amd64
-            mcVersion: 1.12.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 }}
-          DEBUG: ${{ runner.debug }}
-        run: |
-          tests/test.sh

.gitignore

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

DEVELOPMENT.md

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

Dockerfile

@@ -1,73 +1,89 @@
-# 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.22.7
-ARG MC_HELPER_RELEASE=v${MC_HELPER_VERSION}
-ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_RELEASE}
-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/log4j2.xml /image/log4j2.xml
-COPY --chmod=755 files/auto /auto
-
-RUN dos2unix /start* /auto/*
-
-ENTRYPOINT [ "/start" ]
-HEALTHCHECK --start-period=1m --interval=5s --retries=24 CMD mc-health
+FROM adoptopenjdk:8-jre-hotspot
+
+LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
+
+RUN apt-get update \
+  && DEBIAN_FRONTEND=noninteractive \
+  apt-get install -y \
+    imagemagick \
+    gosu \
+    sudo \
+    net-tools \
+    curl wget \
+    git \
+    jq \
+    dos2unix \
+    mysql-client \
+    tzdata \
+    rsync \
+    nano \
+    unzip \
+    knockd \
+    ttf-dejavu \
+    && apt-get clean
+
+RUN addgroup --gid 1000 minecraft \
+  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+
+COPY files/sudoers* /etc/sudoers.d
+
+EXPOSE 25565 25575
+
+# hook into docker BuildKit --platform support
+# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETVARIANT
+
+ARG EASY_ADD_VER=0.7.1
+ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
+RUN chmod +x /usr/bin/easy-add
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+  --var version=1.2.0 --var app=restify --file {{.app}} \
+  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.4.7 --var app=rcon-cli --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.7.1 --var app=mc-monitor --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.5.0 --var app=mc-server-runner --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+COPY mcstatus /usr/local/bin
+
+VOLUME ["/data"]
+COPY server.properties /tmp/server.properties
+COPY log4j2.xml /tmp/log4j2.xml
+WORKDIR /data
+
+STOPSIGNAL SIGTERM
+
+ENV UID=1000 GID=1000 \
+  MEMORY="1G" \
+  TYPE=VANILLA VERSION=LATEST \
+  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
+  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
+  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
+
+COPY start* /
+COPY health.sh /
+ADD files/autopause /autopause
+
+RUN dos2unix /start* && chmod +x /start*
+RUN dos2unix /health.sh && chmod +x /health.sh
+RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
+
+
+ENTRYPOINT [ "/start" ]
+HEALTHCHECK --start-period=1m CMD /health.sh

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

bin/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=../auto/autopause-fcns.sh
-. /auto/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

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

docker-compose.yml

@@ -1,16 +1,16 @@
-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"
+    restart: always
+
+volumes:
+  mc: {}

docker-versions-create.sh

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

examples/.gitignore

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

examples/docker-compose-autopause.yml

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

examples/docker-compose-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-curseforge.yml

@@ -2,20 +2,12 @@ version: '3.8'
 
 services:
   mc:
-    image: itzg/minecraft-server:${IMAGE_TAG:-java8}
+    image: itzg/minecraft-server:java8
     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-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

@@ -2,16 +2,15 @@ version: "3.8"
 
 services:
   mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     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

@@ -3,7 +3,7 @@ version: "3.8"
 services:
   mc:
     # FTBA support is only available in non-Alpine images
-    image: itzg/minecraft-server:${IMAGE_TAG:-java8-multiarch}
+    image: itzg/minecraft-server:java8-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-tnp5.yml

@@ -1,160 +0,0 @@
-version: '3.8'
-
-####################################################################
-#                         FORGE GENERIC_PACK                       #
-#                                                                  #
-# Date: 20220828                                                   #
-#                                                                  #
-# Mod: TNP Limitless 5 v2.19.0                                     #
-#                                                                  #
-# Notes: Verify that there is no EULA file in the modpack.zip      #
-#        if you do not delete it the EULA flag below will be       #
-#        overwritten when the modpack is copied and the server     #
-#        will not start.                                           #
-#                                                                  #
-####################################################################
-services:
-
-####################################################################
-#                         Service Name                             #
-#                                                                  #
-# Define Service Name here. If using RCON this name will be        #
-# referenced again as RWA_RCON_HOST below.                         #
-#                                                                  #
-# Example: 'name:' or 'mc_atm6:'                                   #
-####################################################################
-  mc_tnp5:
-
-####################################################################
-#                      Image & Container Name                      #
-#                                                                  #
-# Specify Image Name and Java Version. The 'image' will always be  #
-# 'itzg/minecraft-server' however the tag added to the end is      #
-# where you can specify the java version or container architecture.#
-# See readme.md for a full list.                                   #
-#                                                                  #
-# 'container_name:' This can be anything you like. This is the name#
-# that will show when you run 'docker ps' commands.                #
-####################################################################
-    image: itzg/minecraft-server
-    container_name: mc_tnp5
-
-####################################################################
-#                         Server Ports                             #
-#                                                                  #
-# Specify external port.                                           #
-####################################################################
-    ports:
-      - 25565:25565
-
-####################################################################
-#                   Automatic Server Restart                       #
-#                                                                  #
-# Define a restart policy here.                                    #
-#    - 'no' = Do not restart.                                      #
-#    - 'on-failure' = Restart if container exits because an error. #
-#    - 'always' = Regardless of stop reason.                       #
-#    - 'unless-stopped' = Similar to always except if stopped.     #
-####################################################################
-    restart: unless-stopped
-
-####################################################################
-#                     Volume and Folder Access                     #
-#                                                                  #
-# This section defines what folders and volumes you want to give   #
-# this container access to. It is recommended to leaves these set  #
-# to the default values unless you know what you are doing.        #
-#                                                                  #
-# Place your mod zip file in a folder called 'modpacks' in the     #
-# same directory you place this docker-compose file.               #
-#                                                                  #
-# Specify the data volume name or directory here as well.          #
-# In this example the volume name is 'data'. When docker creates   #
-# the volume it will add what ever name you give it here to the    #
-# end of the container name specified above. In this example it    #
-# would be named 'mc_atm6_data'. If you change this be sure to     #
-# update the volume name at the bottom of this config.             #
-####################################################################
-    volumes:
-      - ./modpacks:/modpacks:ro
-      - data:/data
-
-####################################################################
-#                             EULA                                 #
-#                                                                  #
-# Accept EULA by setting to "true"                                 #
-####################################################################
-    environment:
-      EULA: "true"
-
-####################################################################
-#                          FORGE INSTALL                           #
-#                                                                  #
-# Sets install type to FORGE and specifys the zip folder name      #
-# and location of your mod pack.                                   #
-#                                                                  #
-# TYPE: Defines the install type as FORGE                          #
-#                                                                  #
-# VERSION: Defines the version of MC the modpack is based on.      #
-#                                                                  #
-# FORGEVERSION: Defines the version of FORGE the modpack uses.     #
-#               This can usually be found in the modpack.zip as    #
-#               installer.jar                                      #
-#                                                                  #
-# GENERIC_PACK: Define where the modpack.zip is located.            #
-#                                                                  #
-# Place your mod zip file in a folder called 'modpacks' in the     #
-# same directory you place this docker-compose file.               #
-####################################################################
-      TYPE: FORGE
-      VERSION: 1.18.2
-      FORGEVERSION: 40.1.73
-      GENERIC_PACK: /modpacks/tnp5.zip
-
-####################################################################
-#                          Server Memory                           #
-#                                                                  #
-# Set Maximum amount of memory allowed for your server.            #
-####################################################################
-      MEMORY: "8G"
-
-####################################################################
-#                         Logging Options                          #
-#                                                                  #
-# Set to "true" to delete old logs                                 #
-####################################################################
-      ENABLE_ROLLING_LOGS: "true"
-
-####################################################################
-#                          Server Timezone                         #
-#                                                                  #
-# Specify server Timezone                                          #
-####################################################################
-      TZ: "America/New_York"
-
-####################################################################
-#                       Minecraft Game Options                     #
-#                                                                  #
-# List any game options you want to define here. A full list can   #
-# be found on the readme.md page on github.                        #
-####################################################################
-      OVERRIDE_SERVER_PROPERTIES: "true"
-      DIFFICULTY: "easy"
-      MAX_TICK_TIME: "-1"
-      VIEW_DISTANCE: "6"
-      ALLOW_FLIGHT: "true"
-      OPS: ""
-      VIEW_DISTANCE: 10
-      MAX_PLAYERS: 10
-      PVP: "false"
-      LEVEL_TYPE: "biomesoplenty"
-      MOTD: "Welcome Home"
-
-####################################################################
-#                            Volumes                               #
-#                                                                  #
-# Define data volume name here. You should leave this set to the   #
-# default.                                                         #
-####################################################################
-volumes:
-  data:

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-mods-mount.yml

@@ -1,21 +0,0 @@
-version: '3.8'
-
-services:
-  minecraft:
-    image: itzg/minecraft-server
-    volumes:
-      - data:/data
-      - ./mods:/mods
-    ports:
-      - "25565:25565"
-    environment:
-      EULA: "true"
-      TYPE: "FORGE"
-      VERSION: "1.19.2"
-      DEBUG: "true"
-      SETUP_ONLY: "true"
-    tty: True
-    stdin_open: True
-
-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,18 @@
 version: '3.8'
+
 services:
   mc:
     image: itzg/minecraft-server
-    container_name: paper
     environment:
       EULA: "true"
-      ENABLE_RCON: "true"
       TYPE: PAPER
-      VIEW_DISTANCE: 10
-      MEMORY: 2G
+      VERSION: 1.9.4
+      # needed for Paper versions before 1.14
       CONSOLE: "false"
     ports:
       - 25565:25565
     volumes:
       - mc-paper:/data
-    restart: unless-stopped
+
 volumes:
   mc-paper:

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

@@ -3,8 +3,6 @@ version: "3.8"
 services:
   mc:
     image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
     ports:
       - 25565:25565
     environment:

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.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/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/valhelsia2/docker-compose.yml

@@ -1,21 +0,0 @@
-version: '3.8'
-
-services:
-  mc:
-    image: itzg/minecraft-server:java8-multiarch
-    volumes:
-      - data:/data
-      - ./modpacks:/modpacks:ro
-    environment:
-      EULA: "true"
-      TYPE: FORGE
-      VERSION: "1.15.2"
-      GENERIC_PACK: /modpacks/Valhelsia_2-2.3.4-SERVER.zip
-      MEMORY: "2G"
-    ports:
-      - "25565:25565"
-    healthcheck:
-      test: NONE
-
-volumes:
-  data: {}

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/auto/autopause-fcns.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-current_uptime() {
-  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')" ]]
-}
-
-rcon_client_exists() {
-  [[ -n "$(ps -ax -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
-}
-
-java_clients_connected() {
-  (( $(java_clients_connections) > 0 ))
-}

files/auto/autostop-daemon.sh

@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# needed for the clients connected function residing in autopause
-. /auto/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"
-        /auto/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"
-        /auto/stop.sh
-        exit 0
-      fi
-    fi
-    ;;
-  *)
-    logAutostop "Error: invalid state: $STATE"
-    ;;
-  esac
-  sleep $AUTOSTOP_PERIOD
-done

files/auto/resume.sh

@@ -1,12 +0,0 @@
-#!/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
-  logAutopauseAction "Knocked from $1, resuming Java process"
-  echo "$1" > /var/log/knocked-source
-  pkill -CONT java
-fi

files/auto/stop.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-if isTrue "${DEBUG_AUTOSTOP}"; then
-  set -x
-fi
-
-logAutostopAction "Stopping Java process"
-if isTrue "${AUTOSTOP_PKILL_USE_SUDO:-false}"; then
-  sudo pkill -f --signal SIGTERM mc-server-runner
-else
-  pkill -f --signal SIGTERM mc-server-runner
-fi

files/autopause/autopause-daemon.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
 
-. /auto/autopause-fcns.sh
+. /autopause/autopause-fcns.sh
+
+. ${SCRIPTS:-/}start-utils
 
-# shellcheck source=../../scripts/start-utils
-. "${SCRIPTS:-/}start-utils"
-if isTrue "${DEBUG_AUTOPAUSE}"; then
-  set -x
-fi
 
 autopause_error_loop() {
   logAutopause "Available interfaces within the docker container:"
@@ -42,12 +39,7 @@ if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
   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[@]}"
+sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
 if [ $? -ne 0 ] ; then
   logAutopause "Failed to start knockd daemon."
   logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
@@ -58,13 +50,12 @@ 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,8 +66,8 @@ do
       STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client connected since startup / knocked - pausing"
-        /auto/pause.sh
+        logAutopause "No client connected since startup / knocked - stopping"
+        /autopause/pause.sh
         STATE=S
       fi
     fi
@@ -85,7 +76,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,8 +87,8 @@ do
       STATE=E
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client reconnected - pausing"
-        /auto/pause.sh
+        logAutopause "No client reconnected - stopping"
+        /autopause/pause.sh
         STATE=S
       fi
     fi
@@ -105,7 +96,7 @@ do
   XS)
     # Stopped
     if rcon_client_exists ; then
-      /auto/resume.sh
+      /autopause/resume.sh
     fi
     if java_running ; then
       if java_clients_connected ; then
@@ -113,11 +104,7 @@ do
         STATE=E
       else
         TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_KN))
-        from=unknown
-        if [ -e /var/log/knocked-source ]; then
-          from=$(cat /var/log/knocked-source)
-        fi
-        logAutopause "Server was knocked from $from - waiting for clients or timeout"
+        logAutopause "Server was knocked - waiting for clients or timeout"
         STATE=K
       fi
     fi
@@ -128,8 +115,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

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

files/autopause/knockd-config.cfg

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

files/autopause/pause.sh

@@ -1,9 +1,6 @@
 #!/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
   # save world

files/autopause/resume.sh

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

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/pkill
+%minecraft ALL=(ALL) NOPASSWD:/usr/sbin/knockd

health.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-# shellcheck source=../scripts/start-utils
-. "${SCRIPTS:-/}start-utils"
-if [ -f /data/.mc-health.env ]; then
-  . /data/.mc-health.env
-fi
+. ${SCRIPTS:-/}start-utils
 
 if isTrue "${DISABLE_HEALTHCHECK}"; then
   echo "Healthcheck disabled"
@@ -13,6 +9,6 @@ elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -ax -o stat,comm | grep 'java' |
   echo "Java process suspended by Autopause function"
   exit 0
 else
-  mc-monitor status "${MC_HEALTH_EXTRA_ARGS[@]}" --host localhost --port "${SERVER_PORT:-25565}"
+  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
-
-/auto/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-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-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,26 +0,0 @@
-#!/bin/bash
-
-: "${FORGEVERSION:=RECOMMENDED}"
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-$(dirname "$0")}/start-utils"
-isDebugging && set -x
-
-if ! mc-image-helper install-forge \
-  --output-directory=/data \
-  --results-file=/data/.run-forge.env \
-  --minecraft-version="${VANILLA_VERSION}" \
-  --forge-version="${FORGEVERSION}" \
-  --force-reinstall="${FORCE_REINSTALL:-false}"; then
-    log "ERROR failed to install forge"
-    exit 1
-fi
-
-# grab SERVER and export it
-set -a
-source /data/.run-forge.env
-set +a
-
-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-deployPufferfish

@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-set -euo pipefail
-isDebugging && set -x
-
-IFS=$'\n\t'
-
-if versionLessThan 1.17; then
-  log "ERROR: Pufferfish server type only supports versions 1.17, 1.18 or 1.19, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
-  exit 1
-fi
-
-: "${PUFFERFISH_BUILD:=lastSuccessfulBuild}"
-
-PUFFERFISH_BUILD_JSON=$(curl -X GET -s "https://ci.pufferfish.host/job/Pufferfish-${MAJOR_VANILLA_VERSION}/${PUFFERFISH_BUILD}/api/json")
-# Example: "url": "https://ci.pufferfish.host/job/Pufferfish-1.18/50/",
-PUFFERFISH_BUILD_URL=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.url // empty' )
-# Example: "fileName": "pufferfish-paperclip-1.18.2-R0.1-SNAPSHOT-reobf.jar",
-PUFFERFISH_BUILD_FILENAME=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.artifacts[].fileName // empty' )
-PUFFERFISH_BUILD_DOWNLOAD_URL="${PUFFERFISH_BUILD_URL}artifact/build/libs/${PUFFERFISH_BUILD_FILENAME}"
-
-# Setting server to the Jar filename for export.
-export SERVER=$PUFFERFISH_BUILD_FILENAME
-
-log "Removing old Pufferfish versions ..."
-shopt -s nullglob
-for f in pufferfish-*.jar; do
-  [[ $f != "$SERVER" ]] && rm "$f"
-done
-
-if [[ ! -f "$SERVER" ]] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
-    log "Downloading Pufferfish from $PUFFERFISH_BUILD_DOWNLOAD_URL ..."
-    if ! get -o "$SERVER" "$PUFFERFISH_BUILD_DOWNLOAD_URL"; then
-      log "ERROR: failed to download from $PUFFERFISH_BUILD_DOWNLOAD_URL (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export FAMILY=SPIGOT
-
-exec "${SCRIPTS:-/}start-spiget" "$@"

scripts/start-deployPurpur

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

scripts/start-deployQuilt

@@ -1,60 +0,0 @@
-#!/bin/bash
-set -eu
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-requireVar VANILLA_VERSION
-export TYPE=QUILT
-: "${QUILT_LAUNCHER:=}"
-: "${QUILT_LAUNCHER_URL:=}"
-: "${QUILT_INSTALLER_URL:=}"
-: "${QUILT_INSTALLER_VERSION:=LATEST}"
-: "${QUILT_LOADER_VERSION:=LATEST}"
-
-isDebugging && set -x
-
-# Custom quilt jar
-if [[ $QUILT_LAUNCHER ]]; then
-  export SERVER=${QUILT_LAUNCHER}
-# Custom quilt jar url
-elif [[ $QUILT_LAUNCHER_URL ]]; then
-  export SERVER=quilt-server-$(echo -n "$QUILT_LAUNCHER_URL" | mc-image-helper hash)
-# Official quilt installer
-else
-  if [[ ${QUILT_INSTALLER_VERSION^^} = LATEST ]]; then
-    log "Checking Quilt Installer version information."
-    QUILT_INSTALLER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/maven-metadata.xml)
-  fi
-  if [[ ${QUILT_LOADER_VERSION^^} = LATEST ]]; then
-    log "Checking Quilt Loader version information."
-    QUILT_LOADER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-loader/maven-metadata.xml)
-  fi
-  export INSTALLER=quilt-installer-${QUILT_INSTALLER_VERSION}.jar
-  export SERVER=quilt-server-${VANILLA_VERSION}-${QUILT_LOADER_VERSION}-launch.jar 
-  export QUILT_INSTALLER_URL="https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/${QUILT_INSTALLER_VERSION}/quilt-installer-${QUILT_INSTALLER_VERSION}.jar"
-fi
-
-if [[ ! -e ${SERVER} && ! -z ${QUILT_INSTALLER_URL} ]]; then
-  log "Downloading and installing $QUILT_INSTALLER_URL ..."
-  if ! get -o "$INSTALLER" "$QUILT_INSTALLER_URL"; then
-    log "Failed to download from given location $QUILT_INSTALLER_URL"
-    exit 2
-  fi
-  if ! java -jar ${INSTALLER} install server ${VANILLA_VERSION} ${QUILT_LOADER_VERSION} --install-dir=./ --download-server; then
-    log "Failed to install $INSTALLER"
-    exit 2
-  fi
-  if ! mv quilt-server-launch.jar ${SERVER}; then
-    log "Failed to rename $SERVER"
-    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-deployVanilla

@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
-set -o pipefail
-
-export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"
-
-if [ ! -e "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  log "Locating download for $SERVER ..."
-  debug "Finding version manifest for $VANILLA_VERSION"
-  versionManifestUrl=$(get 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url')
-  result=$?
-  if [ $result != 0 ]; then
-    log "ERROR: failed to obtain version manifest URL ($result)"
-    exit 1
-  fi
-  if [ "$versionManifestUrl" = "null" ]; then
-    log "ERROR: couldn't find a matching manifest entry for $VANILLA_VERSION"
-    exit 1
-  fi
-  debug "Found version manifest at $versionManifestUrl"
-
-  if ! serverDownloadUrl=$(get --json-path '$.downloads.server.url' "${versionManifestUrl}"); then
-    log "ERROR: failed to obtain version manifest from $versionManifestUrl ($result)"
-    exit 1
-  elif [ "$serverDownloadUrl" = "null" ]; then
-    log "ERROR: there is not a server download for version $VANILLA_VERSION"
-    exit 1
-  fi
-
-  debug "Downloading server from $serverDownloadUrl"
-  get -o "$SERVER" "$serverDownloadUrl"
-  result=$?
-  if [ $result != 0 ]; then
-    log "ERROR: failed to download server from $serverDownloadUrl ($result)"
-    exit 1
-  fi
-fi
-
-if versionLessThan 1.6; then
-  if ! [[ -L /data/minecraft_server.jar && /data/minecraft_server.jar -ef "/data/$SERVER" ]]; then
-    rm -f /data/minecraft_server.jar
-    ln -s "/data/$SERVER" /data/minecraft_server.jar
-  fi
-  SERVER=minecraft_server.jar
-elif [[ -L /data/minecraft_server.jar ]]; then
-  rm -f /data/minecraft_server.jar
-fi
-
-isDebugging && ls -l
-export FAMILY=VANILLA
-exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-finalExec

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

scripts/start-rconcmds

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-: "${RCON_CMDS_STARTUP:=}"
-: "${RCON_CMDS_ON_CONNECT:=}"
-: "${RCON_CMDS_ON_DISCONNECT:=}"
-: "${RCON_CMDS_FIRST_CONNECT:=}"
-: "${RCON_CMDS_LAST_DISCONNECT:=}"
-: "${RCON_CMDS_PERIOD:=10}"
-: "${SERVER_PORT:=25565}"
-export RCON_CMDS_STARTUP
-export RCON_CMDS_ON_CONNECT
-export RCON_CMDS_ON_DISCONNECT
-export RCON_CMDS_FIRST_CONNECT
-export RCON_CMDS_LAST_DISCONNECT
-export RCON_CMDS_PERIOD
-export SERVER_PORT
-
-log "Rcon cmds functionality enabled"
-
-isDebugging && set -x
-
-if ! [[ $RCON_CMDS_PERIOD =~ ^[0-9]+$ ]]; then
-  RCON_CMDS_PERIOD=10
-  export RCON_CMDS_PERIOD
-  log "Warning: RCON_CMDS_PERIOD is not numeric, set to 10 (seconds)"
-fi
-if [ "$RCON_CMDS_PERIOD" -eq "0" ] ; then
-  RCON_CMDS_PERIOD=10
-  export RCON_CMDS_PERIOD
-  log "Warning: RCON_CMDS_PERIOD must not be 0, set to 10 (seconds)"
-fi
-
-/usr/local/bin/rcon-cmds-daemon.sh &

scripts/start-setupDatapack

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

scripts/start-setupEnvVariables

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

scripts/start-setupForgeApiMods

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

scripts/start-setupModpack

@@ -1,294 +0,0 @@
-#!/bin/bash
-
-set -e -o pipefail
-
-: "${REMOVE_OLD_MODS:=false}"
-: "${MODS_FILE:=}"
-: "${REMOVE_OLD_MODS_DEPTH:=1} "
-: "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
-sum_file=/data/.generic_pack.sum
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
-
-#  CURSE_URL_BASE used in manifest downloads below
-CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
-
-# Remove old mods/plugins
-if isTrue "${REMOVE_OLD_MODS}" && [ -z "${MODS_FILE}" ]; then
-  removeOldMods /data/mods
-  removeOldMods /data/plugins
-  rm -f "$sum_file"
-fi
-
-function handlePackwiz() {
-  # If packwiz url passed, bootstrap packwiz and update mods before other modpack processing
-  if [[ "${PACKWIZ_URL:-}" ]]; then
-    if ! packwizInstaller=$(mc-image-helper maven-download \
-                           --maven-repo=https://maven.packwiz.infra.link/repository/release/ \
-                           --group=link.infra.packwiz --artifact=packwiz-installer --classifier=dist \
-                           --skip-existing); then
-      log "ERROR: failed to get packwiz installer"
-      exit 1
-    fi
-
-    log "Running packwiz installer against URL: ${PACKWIZ_URL}"
-    if ! java -cp "${packwizInstaller}" link.infra.packwiz.installer.Main -s server "${PACKWIZ_URL}"; then
-      log "ERROR failed to run packwiz installer"
-      exit 1
-    fi
-  fi
-}
-
-function handleModpackListOrFile() {
-# If supplied with a URL for a modpack (simple zip of jars), download it and unpack
-if [[ "$MODPACK" ]]; then
-  if isURL "${MODPACK}"; then
-    log "Downloading mod/plugin pack"
-    if ! get -o /tmp/modpack.zip "${MODPACK}"; then
-      log "ERROR: failed to download from ${MODPACK}"
-      exit 2
-    fi
-  elif [[ "$MODPACK" =~ .*\.zip ]]; then
-    if ! cp "$MODPACK" /tmp/modpack.zip; then
-      log "ERROR: failed to copy from $MODPACK"
-      exit 2
-    fi
-  else
-    log "ERROR Invalid URL or Path given for MODPACK: $MODPACK"
-    exit 1
-  fi
-
-  if [ "$FAMILY" = "SPIGOT" ]; then
-    mkdir -p /data/plugins
-    if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-      log "ERROR: failed to unzip the modpack from ${MODPACK}"
-    fi
-  else
-    mkdir -p /data/mods
-    if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-      log "ERROR: failed to unzip the modpack from ${MODPACK}"
-    fi
-  fi
-  rm -f /tmp/modpack.zip
-
-elif [[ "$MODS" ]]; then
-  if [ "$FAMILY" = "SPIGOT" ]; then
-    out_dir=/data/plugins
-  else
-    out_dir=/data/mods
-  fi
-  mkdir -p "$out_dir"
-
-  for i in ${MODS//,/ }
-  do
-    if isURL "$i"; then
-      log "Downloading mod/plugin $i ..."
-      if ! get --skip-up-to-date -o "${out_dir}" "$i"; then
-        log "ERROR: failed to download from $i into $out_dir"
-        exit 2
-      fi
-    elif [[ -f "$i" && "$i" =~ .*\.jar ]]; then
-      log "Copying plugin located at $i ..."
-      out_file=$(basename "$i")
-      if ! cp "$i" "${out_dir}/$out_file"; then
-        log "ERROR: failed to copy from $i into $out_dir"
-        exit 2
-      fi
-    elif [[ -d "$i" ]]; then
-      log "Copying plugin jars from $i ..."
-      cp "$i"/*.jar "${out_dir}"
-    else
-      log "ERROR Invalid URL or path given in MODS: $i"
-      exit 2
-    fi
-  done
-
-elif [[ "$MODS_FILE" ]]; then
-  if [ ! -f "$MODS_FILE" ]; then
-    log "ERROR: given MODS_FILE file does not exist"
-    exit 2
-  fi
-
-  if [ "$FAMILY" = "SPIGOT" ]; then
-    out_dir=/data/plugins
-  else
-    out_dir=/data/mods
-  fi
-  mkdir -p "$out_dir"
-
-  args=(
-    -o "${out_dir}"
-    --log-progress-each
-    --skip-up-to-date
-    --uris-file "${MODS_FILE}"
-  )
-  if isTrue "${REMOVE_OLD_MODS}"; then
-    args+=(
-    --prune-others "${REMOVE_OLD_MODS_INCLUDE}"
-    --prune-depth "${REMOVE_OLD_MODS_DEPTH}"
-    )
-  fi
-
-  if ! get "${args[@]}" ; then
-    log "ERROR: failed to retrieve one or more mods"
-    exit 1
-  fi
-fi
-}
-
-function handleCurseForgeManifest() {
-if [[ "$MANIFEST" ]]; then
-    if [[ -e "$MANIFEST" ]]; then
-        EFFECTIVE_MANIFEST_FILE=$MANIFEST
-    elif isURL "$MANIFEST"; then
-        EFFECTIVE_MANIFEST_FILE=/tmp/manifest.json
-        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w "%{effective_url}" "$MANIFEST")
-        curl -Ls -o $EFFECTIVE_MANIFEST_FILE "$EFFECTIVE_MANIFEST_URL"
-    else
-        log "MANIFEST='$MANIFEST' is not a valid manifest url or location"
-        exit 2
-    fi
-
-case "X$EFFECTIVE_MANIFEST_FILE" in
-  X*.json)
-    if [ -f "${EFFECTIVE_MANIFEST_FILE}" ]; then
-      MOD_DIR=${FTB_BASE_DIR:-/data}/mods
-      if [ ! -d "$MOD_DIR" ]
-      then
-        log "Creating mods dir $MOD_DIR"
-        mkdir -p "$MOD_DIR"
-      fi
-      log "Starting manifest download..."
-      jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)' "${EFFECTIVE_MANIFEST_FILE}" | while read -r p f
-      do
-        if [ ! -f $MOD_DIR/${p}_${f}.jar ]
-        then
-          redirect_url="$(curl -Ls -o /dev/null -w "%{effective_url}" "${CURSE_URL_BASE}/${p}")"
-          url="$redirect_url/download/${f}/file"
-          log Downloading curseforge mod $url
-          #  Manifest usually doesn't have mod names. Using id should be fine, tho
-          curl -sSL "${url}" -o $MOD_DIR/${p}_${f}.jar
-        fi
-      done
-    else
-      log "Could not find manifest file, insufficient privileges, or malformed path."
-    fi
-    ;;
-  *)
-    log "Invalid manifest file for modpack. Please make sure it is a .json file."
-    ;;
-esac
-fi
-}
-
-function genericPacks() {
-  : "${GENERIC_PACKS:=${GENERIC_PACK}}"
-  : "${GENERIC_PACKS_PREFIX:=}"
-  : "${GENERIC_PACKS_SUFFIX:=}"
-
-  if [[ "${GENERIC_PACKS}" ]]; then
-    IFS=',' read -ra packs <<< "${GENERIC_PACKS}"
-
-    packFiles=()
-    for packEntry in "${packs[@]}"; do
-      pack="${GENERIC_PACKS_PREFIX}${packEntry}${GENERIC_PACKS_SUFFIX}"
-      if isURL "${pack}"; then
-        mkdir -p /data/packs
-        log "Downloading generic pack from $pack"
-        if ! outfile=$(get -o /data/packs --output-filename --skip-up-to-date "$pack"); then
-          log "ERROR: failed to download $pack"
-          exit 2
-        fi
-        packFiles+=("$outfile")
-      else
-        packFiles+=("$pack")
-      fi
-    done
-
-    isDebugging && [ -f "$sum_file}" ] && cat "$sum_file"
-
-    log "Checking if generic packs are up to date"
-    if isTrue "${SKIP_GENERIC_PACK_UPDATE_CHECK:-false}" && [ -f "$sum_file" ]; then
-      log "Skipping generic pack update check"
-    elif isTrue "${FORCE_GENERIC_PACK_UPDATE}" || ! checkSum "${sum_file}"; then
-      log "Generic pack(s) are out of date. Re-applying..."
-
-      original_base_dir=/data/.tmp/generic_pack_base
-      base_dir=$original_base_dir
-      rm -rf "${base_dir}"
-      mkdir -p "${base_dir}"
-      for pack in "${packFiles[@]}"; do
-        isDebugging && ls -l "${pack}"
-        extract "${pack}" "${base_dir}"
-      done
-
-      # recalculate the actual base directory of content
-      if ! base_dir=$(mc-image-helper find \
-          --max-depth=3 --type=directory --name=mods,plugins,config \
-          --only-shallowest --fail-no-matches --format '%h' \
-          "$base_dir"); then
-        log "ERROR: Unable to find content base of generic packs ${GENERIC_PACKS}. Directories:"
-        mc-image-helper find --name=* --max-depth=3 --type=directory --format '- %P' "$original_base_dir"
-        exit 1
-      fi
-
-      if [ -f /data/manifest.txt ]; then
-        log "Manifest exists from older generic pack, cleaning up ..."
-        while read -r f; do
-          rm -rf "/data/${f}"
-        done < /data/manifest.txt
-        # prune empty dirs
-        find /data -mindepth 1 -depth -type d -empty -delete
-        rm -f /data/manifest.txt
-      fi
-
-      log "Writing generic pack manifest ... "
-      find "${base_dir}" -type f -printf "%P\n" > /data/manifest.txt
-
-      log "Applying generic pack ..."
-      cp -R -f "${base_dir}"/* /data
-      rm -rf $original_base_dir
-
-      log "Saving generic pack(s) checksum"
-      sha1sum "${packFiles[@]}" > "${sum_file}"
-      if isDebugging; then
-        cat "$sum_file"
-      fi
-    fi
-  fi
-}
-
-function modrinthProjects() {
-  : "${MODRINTH_PROJECTS:=}"
-  : "${MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES:=true}"
-  : "${MODRINTH_ALLOWED_VERSION_TYPE:=release}"
-
-  if [[ $MODRINTH_PROJECTS ]] && isFamily HYBRID FORGE FABRIC; then
-    if isFamily HYBRID FORGE; then
-      loader=forge
-    else
-      loader="${FAMILY,,}"
-    fi
-    mc-image-helper modrinth \
-      --output-directory=/data \
-      --projects="${MODRINTH_PROJECTS}" \
-      --game-version="${VANILLA_VERSION}" \
-      --loader="$loader" \
-      --download-optional-dependencies="$MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES" \
-      --allowed-version-type="$MODRINTH_ALLOWED_VERSION_TYPE"
-  fi
-}
-
-handlePackwiz
-
-handleModpackListOrFile
-
-handleCurseForgeManifest
-
-genericPacks
-
-modrinthProjects
-
-exec "${SCRIPTS:-/}start-setupModconfig" "$@"

scripts/start-setupMounts

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

scripts/start-setupRbac

@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
-
-if versionLessThan 1.7.6; then
-  opsFile=ops.txt
-  whitelistFile=white-list.txt
-else
-  opsFile=ops.json
-  whitelistFile=whitelist.json
-fi
-
-function process_user_file() {
-  local output=$1
-  local source=$2
-
-  if isURL "$source"; then
-    log "Downloading $output from $source"
-    if ! get -o "/data/$output" "$source"; then
-      log "ERROR: failed to download from $source"
-      exit 2
-    fi
-  else
-    log "Copying $output from $source"
-    if ! cp "$source" "/data/$output"; then
-      log "ERROR: failed to copy from $source"
-      exit 1
-    fi
-  fi
-}
-
-function process_user_csv() {
-  local output=$1
-  local list=$2
-  local playerDataList
-
-  if [[ "$output" == *"ops"* ]]; then
-    # Extra data for ops.json
-    userData='{"uuid": .id, "name": .username, "level": 4}'
-  else
-    userData='{"uuid": .id, "name": .username}'
-  fi
-
-  log "Updating ${output%.*}"
-  for i in ${list//,/ }
-  do
-    if [ -e "$output" ] && grep -q "$i" "$output"; then
-      log "$i already present in $output, skipping"
-      continue
-    fi
-    if ! playerData=$(get "https://playerdb.co/api/player/minecraft/$i" | jq -re ".data.player"); then
-      log "WARNING: Could not lookup user $i for ${output} addition"
-    else
-      playerDataList=$playerDataList$(echo "$playerData" | jq -r "$userData")
-    fi
-  done
-  local newUsers=$(echo "$playerDataList" | jq -s .)
-  if [[ $output =~ .*\.txt ]]; then
-    # username list for txt config (Minecraft <= 1.7.5)
-    echo $newUsers | jq -r '.[].name' >> "/data/${output}"
-    sort -u /data/${output} -o /data/${output}
-  elif [ -e /data/${output} ]; then
-    # Merge with existing json file
-    local currentUsers=$(cat "/data/${output}")
-    jq --argjson current "$currentUsers" --argjson new "$newUsers" -n '$new + $current | unique_by(.uuid)' > "/data/${output}"
-  else
-    # New json file
-    echo $newUsers > "/data/${output}"
-  fi
-}
-
-if isTrue "${OVERRIDE_OPS}"; then
-  log "Recreating ${opsFile} file at server startup"
-  rm -f /data/${opsFile}
-fi
-if [ -n "${OPS_FILE}" ] && [ ! -e "/data/${opsFile}" ]; then
-  process_user_file ${opsFile} "$OPS_FILE"
-fi
-if [ -n "${OPS}" ]; then
-  process_user_csv ${opsFile} "$OPS"
-fi
-
-if isTrue "${OVERRIDE_WHITELIST}"; then
-  log "Recreating ${whitelistFile} file at server startup"
-  rm -f /data/${whitelistFile}
-fi
-if [ -n "${WHITELIST_FILE}" ] && [ ! -e "/data/${whitelistFile}" ]; then
-  process_user_file ${whitelistFile} "$WHITELIST_FILE"
-fi
-if [ -n "${WHITELIST}" ]; then
-  process_user_csv ${whitelistFile} "$WHITELIST"
-fi
-
-
-
-exec "${SCRIPTS:-/}start-finalExec" "$@"

scripts/start-setupServerProperties

@@ -1,248 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-: "${SERVER_PROPERTIES:=/data/server.properties}"
-: "${ENABLE_RCON:=true}"
-
-# FUNCTIONS
-function setServerPropValue {
-  local prop=$1
-  local value=$2
-  # normalize booleans
-  case ${value^^} in
-    TRUE|FALSE)
-      value=${value,,} ;;
-  esac
-  if [[ $prop =~ password ]]; then
-    showValue="*****"
-  else
-    showValue="$value"
-  fi
-  if [ -f "$SERVER_PROPERTIES" ] && grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
-    debug "Setting ${prop} to '${showValue}' in ${SERVER_PROPERTIES}"
-    sed -i "/^${prop}\s*=/ c ${prop}=${value//\\/\\\\}" "$SERVER_PROPERTIES"
-  else
-    debug "Adding ${prop} with '${showValue}' in ${SERVER_PROPERTIES}"
-    echo "${prop}=${value}" >> "$SERVER_PROPERTIES"
-  fi
-}
-
-function setServerProp {
-  local prop=$1
-  local varName=$2
-
-  if [ -v $varName ]; then
-    setServerPropValue "$prop" "${!varName}"
-  fi
-}
-
-function customizeServerProps {
-  # Whitelist processing
-  if [ -n "$WHITELIST" ] || [ -n "$WHITELIST_FILE" ] || isTrue "${ENABLE_WHITELIST:-false}"; then
-    log "Enabling whitelist functionality"
-    setServerPropValue "white-list" "true"
-    setServerPropValue "enforce-whitelist" "true"
-  else
-    log "Disabling whitelist functionality"
-    setServerPropValue "white-list" "false"
-    setServerProp "enforce-whitelist" ENFORCE_WHITELIST
-  fi
-
-  # If not provided, generate a reasonable default message-of-the-day,
-  # which shows up in the server listing in the client
-  if ! [ -v MOTD ]; then
-    # snapshot is the odd case where we have to look at version to identify that label
-    if [[ ${ORIGINAL_TYPE} == "VANILLA" && ${VERSION} == "SNAPSHOT" ]]; then
-      label=SNAPSHOT
-    else
-      label=${ORIGINAL_TYPE}
-    fi
-
-    # Convert label to title-case
-    label=${label,,}
-    label=${label^}
-    MOTD="A ${label} Minecraft Server powered by Docker"
-  fi
-
-  # normalize MOTD
-  if [[ ${TYPE^^} = LIMBO ]]; then
-    if [[ $MOTD ]] && ! [[ $MOTD =~ ^{ ]]; then
-      MOTD="{\"text\":\"${MOTD}\"}"
-    fi
-  fi
-
-  setServerProp "server-name" SERVER_NAME
-  setServerProp "server-ip" SERVER_IP
-  setServerProp "server-port" SERVER_PORT
-  setServerProp "allow-nether" ALLOW_NETHER
-  setServerProp "announce-player-achievements" ANNOUNCE_PLAYER_ACHIEVEMENTS
-  setServerProp "enable-command-block" ENABLE_COMMAND_BLOCK
-  setServerProp "spawn-animals" SPAWN_ANIMALS
-  setServerProp "spawn-monsters" SPAWN_MONSTERS
-  setServerProp "spawn-npcs" SPAWN_NPCS
-  setServerProp "spawn-protection" SPAWN_PROTECTION
-  setServerProp "generate-structures" GENERATE_STRUCTURES
-  setServerProp "view-distance" VIEW_DISTANCE
-  setServerProp "hardcore" HARDCORE
-  setServerProp "snooper-enabled" SNOOPER_ENABLED
-  setServerProp "max-build-height" MAX_BUILD_HEIGHT
-  setServerProp "force-gamemode" FORCE_GAMEMODE
-  setServerProp "max-tick-time" MAX_TICK_TIME
-  setServerProp "enable-query" ENABLE_QUERY
-  setServerProp "query.port" QUERY_PORT
-  setServerProp "enable-rcon" ENABLE_RCON
-  setServerProp "rcon.password" RCON_PASSWORD
-  setServerProp "rcon.port" RCON_PORT
-  setServerProp "max-players" MAX_PLAYERS
-  setServerProp "max-world-size" MAX_WORLD_SIZE
-  setServerProp "level-name" LEVEL
-  setServerProp "level-seed" SEED
-  setServerProp "pvp" PVP
-  setServerProp "generator-settings" GENERATOR_SETTINGS
-  setServerProp "online-mode" ONLINE_MODE
-  setServerProp "allow-flight" ALLOW_FLIGHT
-  setServerProp "resource-pack" RESOURCE_PACK
-  setServerProp "resource-pack-sha1" RESOURCE_PACK_SHA1
-  setServerProp "require-resource-pack" RESOURCE_PACK_ENFORCE
-  setServerProp "player-idle-timeout" PLAYER_IDLE_TIMEOUT
-  setServerProp "broadcast-console-to-ops" BROADCAST_CONSOLE_TO_OPS
-  setServerProp "broadcast-rcon-to-ops" BROADCAST_RCON_TO_OPS
-  setServerProp "enable-jmx-monitoring" ENABLE_JMX
-  setServerProp "sync-chunk-writes" SYNC_CHUNK_WRITES
-  setServerProp "enable-status" ENABLE_STATUS
-  setServerProp "entity-broadcast-range-percentage" ENTITY_BROADCAST_RANGE_PERCENTAGE
-  setServerProp "function-permission-level" FUNCTION_PERMISSION_LEVEL
-  setServerProp "network-compression-threshold" NETWORK_COMPRESSION_THRESHOLD
-  setServerProp "op-permission-level" OP_PERMISSION_LEVEL
-  setServerProp "prevent-proxy-connections" PREVENT_PROXY_CONNECTIONS
-  setServerProp "use-native-transport" USE_NATIVE_TRANSPORT
-  setServerProp "simulation-distance" SIMULATION_DISTANCE
-  setServerProp "previews-chat" PREVIEWS_CHAT
-  setServerProp "enforce-secure-profile" ENFORCE_SECURE_PROFILE
-  setServerPropValue "motd" "$(echo "$MOTD" | mc-image-helper asciify)"
-  [[ $LEVEL_TYPE ]] && setServerPropValue "level-type" "${LEVEL_TYPE^^}"
-
-  if [ -n "$DIFFICULTY" ]; then
-    case ${DIFFICULTY,,} in
-      peaceful|0)
-        if versionLessThan 1.13; then
-          DIFFICULTY=0
-        else
-          DIFFICULTY=peaceful
-        fi
-        ;;
-      easy|1)
-        if versionLessThan 1.13; then
-          DIFFICULTY=1
-        else
-          DIFFICULTY=easy
-        fi
-        ;;
-      normal|2)
-        if versionLessThan 1.13; then
-          DIFFICULTY=2
-        else
-          DIFFICULTY=normal
-        fi
-        ;;
-      hard|3)
-        if versionLessThan 1.13; then
-          DIFFICULTY=3
-        else
-          DIFFICULTY=hard
-        fi
-        ;;
-      *)
-        log "DIFFICULTY must be peaceful, easy, normal, or hard."
-        exit 1
-        ;;
-    esac
-    setServerPropValue "difficulty" "$DIFFICULTY"
-  fi
-
-  if [ -n "$MODE" ]; then
-    log "Setting mode"
-    case ${MODE,,} in
-      su*|0)
-        if versionLessThan 1.13; then
-          MODE=0
-        else
-          MODE=survival
-        fi
-        ;;
-      c*|1)
-        if versionLessThan 1.13; then
-          MODE=1
-        else
-          MODE=creative
-        fi
-        ;;
-      a*|2)
-        if versionLessThan 1.13; then
-          MODE=2
-        else
-          MODE=adventure
-        fi
-        ;;
-      sp*|3)
-        if versionLessThan 1.13; then
-          MODE=3
-        else
-          MODE=spectator
-        fi
-        ;;
-      *)
-        log "ERROR: Invalid game mode: $MODE"
-        exit 1
-        ;;
-    esac
-    setServerPropValue "gamemode" "$MODE"
-  fi
-}
-
-# Deploy server.properties file
-if [[ ${TYPE} == "CURSEFORGE" ]]; then
-  export SERVER_PROPERTIES="${FTB_DIR}/server.properties"
-  log "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
-fi
-
-if ! isTrue "${SKIP_SERVER_PROPERTIES:-false}"; then
-  if [ ! -e "$SERVER_PROPERTIES" ]; then
-    log "Creating server properties in ${SERVER_PROPERTIES}"
-    customizeServerProps
-  elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
-      case ${OVERRIDE_SERVER_PROPERTIES^^} in
-        TRUE|1)
-          log "Updating server properties in ${SERVER_PROPERTIES}"
-          customizeServerProps
-          ;;
-        *)
-          log "server.properties already created, skipping"
-          ;;
-      esac
-  else
-    log "server.properties already created, skipping"
-  fi
-else
-  log "Skipping setup of server.properties"
-fi
-
-if isTrue "${ENABLE_AUTOPAUSE}"; then
-  if [ -f "$SERVER_PROPERTIES" ]; then
-    current_max_tick=$( grep 'max-tick-time' "$SERVER_PROPERTIES" | sed -r 's/( )+//g' | awk -F= '{print $2}' )
-    if (( current_max_tick > 0 && current_max_tick < 86400000 )); then
-      log "Warning: The server.properties for the server doesn't have the Server Watchdog (effectively) disabled."
-      log "         Autopause functionality resuming the process might trigger the Watchdog and restart the server completely."
-      log "         Set the MAX_TICK_TIME env variable (or max-tick-time property) to a high value (or disable the Watchdog with value -1 for versions 1.8.1+)."
-    fi
-  fi
-fi
-
-if isTrue "${DUMP_SERVER_PROPERTIES:-false}"; then
-  log "DEBUG Dumping server.properties"
-  cat "${SERVER_PROPERTIES}"
-fi
-
-exec "${SCRIPTS:-/}start-setupEnvVariables" "$@"

scripts/start-setupVanillaTweaks

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e -o pipefail
-
-: "${VANILLATWEAKS_FILE:=}"
-: "${VANILLATWEAKS_SHARECODE:=}"
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-if [[ ${VANILLATWEAKS_FILE} || ${VANILLATWEAKS_SHARECODE} ]]; then
-  mc-image-helper vanillatweaks \
-    --output-directory="/data" \
-    --world-subdir="${LEVEL:-world}" \
-    --share-codes="$VANILLATWEAKS_SHARECODE" \
-    --pack-files="$VANILLATWEAKS_FILE"
-fi
-
-exec "${SCRIPTS:-/}start-setupDatapack" "$@"

scripts/start-setupWorld

@@ -1,126 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-set -e
-isDebugging && set -x
-
-if [ "$TYPE" = "CURSEFORGE" ]; then
-  worldDest=$FTB_DIR/${LEVEL:-world}
-else
-  worldDest=/data/${LEVEL:-world}
-fi
-
-if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] ); then
-  if isTrue "${FORCE_WORLD_COPY}"; then
-    log "Removing existing world data in $worldDest ${worldDest}_nether ${worldDest}_the_end"
-    rm -rf "$worldDest" \
-      "${worldDest}_nether" \
-      "${worldDest}_the_end"
-  fi
-
-  if isURL "$WORLD"; then
-    log "Downloading world from $WORLD"
-    if ! get -o /tmp/world.bin "$WORLD"; then
-      log "ERROR: failed to download world from $WORLD"
-      exit 1
-    fi
-    WORLD=/tmp/world.bin
-  fi
-
-  if [ -f "$WORLD" ]; then
-    log "Extracting world"
-
-    # Stage contents so that the correct subdirectory can be picked off
-    mkdir -p /tmp/world-data
-    if ! extract "$WORLD" /tmp/world-data; then
-      log "ERROR extracting world from $WORLD"
-      exit 1
-    fi
-
-    baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
-
-    if ! [[ $baseDirs ]]; then
-      log "ERROR world content is not valid since level.dat could not be found"
-      exit 2
-    fi
-
-    count=$(echo "$baseDirs" | wc -l)
-    if [[ $count -gt 1 ]]; then
-      baseDirsNoSpigotSuffix=$(echo "$baseDirs" | sed -re 's:(_nether|_the_end)/?$::' | sort -u)
-      if [ $(echo "$baseDirsNoSpigotSuffix" | wc -l) -eq 1 ]; then
-        baseDir="$baseDirsNoSpigotSuffix"
-        baseName=$(basename "$baseDir")
-        log "Found Spigot naming conventions, taking $baseName as main dimension"
-      else
-        baseDir="$(echo "$baseDirs" | sed -n ${WORLD_INDEX:-1}p)"
-        baseName=$(basename "$baseDir")
-        log "WARN multiple levels found, picking: $baseName"
-      fi
-    elif [[ $count -gt 0 ]]; then
-      baseDir="$baseDirs"
-    else
-      log "ERROR invalid world content"
-      exit 1
-    fi
-
-    if [ -d "${baseDir}_nether/DIM-1" ]; then
-      if [ -d "$baseDir/DIM-1" ]; then
-        log "WARN found Nether dimension in both $baseDir and ${baseDir}_nether, picking ${baseDir}_nether"
-        rm -r "$baseDir/DIM-1"
-      fi
-    fi
-    if [ -d "${baseDir}_the_end/DIM1" ]; then
-      if [ -d "$baseDir/DIM1" ]; then
-        log "WARN found End dimension in both $baseDir and ${baseDir}_the_end, picking ${baseDir}_the_end"
-        rm -r "$baseDir/DIM1"
-      fi
-    fi
-
-    log "Copying world..."
-    rsync --remove-source-files --recursive --delete "$baseDir/" "$worldDest"
-
-    if [ "$FAMILY" = "SPIGOT" ]; then
-      if [ -d "${baseDir}_nether" ]; then
-        log "Copying Spigot Nether..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_nether/" "${worldDest}_nether"
-      elif [ -d "$worldDest/DIM-1" ]; then
-        log "Moving Nether to Spigot location..."
-        mkdir -p "${worldDest}_nether"
-        mv -f "$worldDest/DIM-1" "${worldDest}_nether/"
-      fi
-      if [ -d "${baseDir}_the_end" ]; then
-        log "Copying Spigot End..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_the_end/" "${worldDest}_the_end"
-      elif [ -d "$worldDest/DIM1" ]; then
-        log "Moving End to Spigot location..."
-        mkdir -p "${worldDest}_the_end"
-        mv -f "$worldDest/DIM1" "${worldDest}_the_end/"
-      fi
-    else
-      if [ -d "${baseDir}_nether/DIM-1" ]; then
-        log "Copying Spigot Nether to vanilla location..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_nether/DIM-1" "${worldDest}/"
-      fi
-      if [ -d "${baseDir}_the_end/DIM1" ]; then
-        log "Copying Spigot End to vanilla location..."
-        rsync --remove-source-files --recursive --delete "${baseDir}_the_end/DIM1" "${worldDest}/"
-      fi
-    fi
-  elif [ -d "$WORLD" ]; then
-    log "Cloning world directory from $WORLD ..."
-    rsync --recursive --delete "${WORLD%/}"/ "$worldDest"
-  else
-    log "ERROR: world file/directory $WORLD is missing"
-    exit 1
-  fi
-
-  if [ "$FAMILY" = "SPIGOT" ]; then
-    # Reorganise if a Spigot server
-    log "Moving End and Nether maps to Spigot location"
-    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "${worldDest}_the_end"
-    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "${worldDest}_nether"
-  fi
-fi
-
-exec "${SCRIPTS:-/}start-setupVanillaTweaks" "$@"