Added support for Java 7

.github/FUNDING.yml

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

.github/workflows/build-multiarch.yml

@@ -5,10 +5,11 @@ on:
       - master
       - "*-multiarch"
       - "multiarch*"
+      - java7
       - java8-openj9
       - java11*
       - java16*
-      - test/*
+      - test/multiarch/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
@@ -63,10 +64,10 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.6.1
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           # ensure latest base image is used

.github/workflows/generate-toc.yml

@@ -16,6 +16,6 @@ jobs:
           curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
           chmod a+x gh-md-toc
           ./gh-md-toc --insert --no-backup README.md
-      - uses: stefanzweifel/git-auto-commit-action@v4.12.0
+      - uses: stefanzweifel/git-auto-commit-action@v4.11.0
         with:
           commit_message: "docs: Auto update markdown TOC"

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
       - openj9
       - openj9-11
       - adopt11
-      - test/alpine/*
+      - test/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+-java8"
       - "[0-9]+.[0-9]+.[0-9]+-openj9"
@@ -70,7 +70,7 @@ jobs:
 
     - name: Build and push
       id: docker_build
-      uses: docker/build-push-action@v2.7.0
+      uses: docker/build-push-action@v2.6.1
       with:
         context: .
         file: ./Dockerfile

DEVELOPMENT.md

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:8-jre-openj9
+FROM openjdk:7-jre
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
@@ -6,10 +6,8 @@ RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
   apt-get install -y \
     imagemagick \
-    gosu \
     sudo \
     net-tools \
-    iputils-ping \
     curl wget \
     git \
     jq \
@@ -23,6 +21,42 @@ RUN apt-get update \
     ttf-dejavu \
     && apt-get clean
 
+# Procedure from https://github.com/tianon/gosu/blob/master/INSTALL.md#from-debian
+ENV GOSU_VERSION 1.14
+RUN set -eux; \
+# save list of currently installed packages for later so we can clean up
+	savedAptMark="$(apt-mark showmanual)"; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends ca-certificates wget; \
+	if ! command -v gpg; then \
+		apt-get install -y --no-install-recommends gnupg2 dirmngr; \
+	elif gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
+# "This package provides support for HKPS keyservers." (GnuPG 1.x only)
+		apt-get install -y --no-install-recommends gnupg-curl; \
+	fi; \
+	rm -rf /var/lib/apt/lists/*; \
+	\
+	dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
+	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
+	wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
+	\
+# verify the signature
+	export GNUPGHOME="$(mktemp -d)"; \
+	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+	command -v gpgconf && gpgconf --kill all || :; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+	\
+# clean up fetch dependencies
+	apt-mark auto '.*' > /dev/null; \
+	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	\
+	chmod +x /usr/local/bin/gosu; \
+# verify that the binary works
+	gosu --version; \
+	gosu nobody true
+
 RUN addgroup --gid 1000 minecraft \
   && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
 
@@ -45,25 +79,22 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.5.1 --var app=rcon-cli --file {{.app}} \
+ --var version=1.4.7 --var app=rcon-cli --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=0.10.1 --var app=mc-monitor --file {{.app}} \
+ --var version=0.7.1 --var app=mc-monitor --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.8.0 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.6.0 --var app=mc-server-runner --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.6.1
-RUN curl -fsSL https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
-    | tar -C /usr/share -zxf - \
-    && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
+COPY mcstatus /usr/local/bin
 
 VOLUME ["/data"]
 COPY server.properties /tmp/server.properties
@@ -81,13 +112,13 @@ ENV UID=1000 GID=1000 \
   AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
 COPY start* /
-COPY bin/ /usr/local/bin/
-COPY bin/mc-health /health.sh
-
+COPY health.sh /
 ADD files/autopause /autopause
 
-RUN dos2unix /start* && chmod +x /start* \
-    && dos2unix /autopause/* && chmod +x /autopause/*.sh
+RUN dos2unix /start* && chmod +x /start*
+RUN dos2unix /health.sh && chmod +x /health.sh
+RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
+
 
 ENTRYPOINT [ "/start" ]
-HEALTHCHECK --start-period=1m CMD mc-health
+HEALTHCHECK --start-period=1m CMD /health.sh

README.md

@@ -38,13 +38,14 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Examples](#examples)
       * [Amazon Web Services (AWS) Deployment](#amazon-web-services-aws-deployment)
       * [Using Docker Compose](#using-docker-compose)
-   * [Troubleshooting](#troubleshooting)
    * [Server types](#server-types)
       * [Running a Forge Server](#running-a-forge-server)
       * [Running a Bukkit/Spigot server](#running-a-bukkitspigot-server)
       * [Running a Paper server](#running-a-paper-server)
+      * [Running a Tuinity server](#running-a-tuinity-server)
       * [Running an Airplane server](#running-an-airplane-server)
       * [Running a Purpur server](#running-a-purpur-server)
+      * [Running a Yatopia server](#running-a-yatopia-server)
       * [Running a Magma server](#running-a-magma-server)
       * [Running a Mohist server](#running-a-mohist-server)
       * [Running a Catserver type server](#running-a-catserver-type-server)
@@ -70,7 +71,8 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Cloning world from a container path](#cloning-world-from-a-container-path)
       * [Overwrite world on start](#overwrite-world-on-start)
    * [Server configuration](#server-configuration)
-      * [Message of the Day](#message-of-the-day)
+      * [Server name](#server-name)
+      * [Server port](#server-port)
       * [Difficulty](#difficulty)
       * [Whitelist Players](#whitelist-players)
       * [Op/Administrator Players](#opadministrator-players)
@@ -95,18 +97,16 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [View Distance](#view-distance)
       * [Level Seed](#level-seed)
       * [Game Mode](#game-mode)
+      * [Message of the Day](#message-of-the-day)
       * [PVP Mode](#pvp-mode)
       * [Level Type and Generator Settings](#level-type-and-generator-settings)
       * [Custom Server Resource Pack](#custom-server-resource-pack)
       * [Level / World Save Name](#level--world-save-name)
       * [Online mode](#online-mode)
       * [Allow flight](#allow-flight)
-      * [Server name](#server-name)
-      * [Server port](#server-port)
       * [Other server property mappings](#other-server-property-mappings)
    * [Miscellaneous Options](#miscellaneous-options)
       * [Replacing variables inside configs](#replacing-variables-inside-configs)
-      * [Patching existing files](#patching-existing-files)
       * [Running with a custom server JAR](#running-with-a-custom-server-jar)
       * [Force re-download of the server file](#force-re-download-of-the-server-file)
       * [Running as alternate user/group ID](#running-as-alternate-usergroup-id)
@@ -116,20 +116,19 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Server Shutdown Options](#server-shutdown-options)
       * [OpenJ9 Specific Options](#openj9-specific-options)
       * [Enabling rolling logs](#enabling-rolling-logs)
-      * [Timezone Configuration](#timezone-configuration)
+   * [Timezone Configuration](#timezone-configuration)
       * [Enable Remote JMX for Profiling](#enable-remote-jmx-for-profiling)
       * [Enable Aikar's Flags](#enable-aikars-flags)
       * [HTTP Proxy](#http-proxy)
       * [Using "noconsole" option](#using-noconsole-option)
       * [Explicitly disable GUI](#explicitly-disable-gui)
       * [Stop Duration](#stop-duration)
-      * [Setup only](#setup-only)
    * [Autopause](#autopause)
       * [Description](#description)
       * [Enabling Autopause](#enabling-autopause)
    * [Running on RaspberryPi](#running-on-raspberrypi)
 
-<!-- Added by: runner, at: Sat Oct  9 16:34:51 UTC 2021 -->
+<!-- Added by: runner, at: Sun Aug 15 17:44:45 UTC 2021 -->
 
 <!--te-->
 
@@ -151,7 +150,8 @@ docker exec -i mc rcon-cli
 
 Note: The `-i` is required for interactive use of rcon-cli.
 
-To run a simple, one-shot command, such as stopping a Minecraft server, pass the command as arguments to `rcon-cli`, such as:
+To run a simple, one-shot command, such as stopping a Minecraft server, pass the command as
+arguments to `rcon-cli`, such as:
 
 ```
 docker exec mc rcon-cli stop
@@ -159,14 +159,6 @@ docker exec mc rcon-cli stop
 
 _The `-i` is not needed in this case._
 
-If rcon is disabled you can send commands by passing them as arguments to the packaged `mc-send-to-console` script. For example, a player can be op'ed in the container `mc` with: 
-
-```shell
-docker exec mc mc-send-to-console op player
-            |                     |
-            +- container name     +- Minecraft commands start here
-```
-
 In order to attach and interact with the Minecraft server, add `-it` when starting the container, such as
 
     docker run -d -it -p 25565:25565 --name mc itzg/minecraft-server
@@ -278,9 +270,9 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
 
-For example, to use Java version 16 on any supported architecture:
+For example, to use Java version 15 on any supported architecture:
 
-    docker run --name mc itzg/minecraft-server:java16
+    docker run --name mc itzg/minecraft-server:java15
 
 > Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation.
 
@@ -358,14 +350,6 @@ and in the same directory as that file run
 Now, go play...or adjust the `environment` section to configure
 this server instance.
 
-## Troubleshooting
-
-To troubleshoot the container initialization, such as when server files are pre-downloaded, set the environment variable `DEBUG` to `true`. The container logs will include **much more** output, and it is highly recommended including that output when reporting any [issues](https://github.com/itzg/docker-minecraft-server/issues).
-
-To troubleshoot just the command-line used to start the Minecraft server, set the environment variable `DEBUG_EXEC` to `true`.
-
-To troubleshoot any issues with memory allocation reported by the JVM, set the environment variable `DEBUG_MEMORY` to `true`.
-
 ## Server types
 
 ### Running a Forge Server
@@ -436,9 +420,17 @@ If you have attached a host directory to the `/data` volume, then you can instal
 
 [You can also auto-download plugins using `SPIGET_RESOURCES`.](#auto-downloading-spigotmcbukkitpapermc-plugins)
 
+### Running a Tuinity server
+
+A [Tuinity](https://github.com/Spottedleaf/Tuinity) server, which is a fork of Paper aimed at improving server performance at high playercounts.
+
+    -e TYPE=TUINITY
+
+> **NOTE** only `VERSION=LATEST` is supported
+
 ### Running an Airplane server
 
-An [Airplane](https://airplane.gg) server, which is "a stable, optimized, well supported 1.17 Paper fork."
+An [Airplane](https://github.com/TECHNOVE/Airplane) server, which is a fork of Tuinity aimed at further improving server performance at high playercounts.
 
     -e TYPE=AIRPLANE
 
@@ -451,7 +443,7 @@ Extra variables:
 
 ### Running a Purpur server
 
-A [Purpur](https://purpur.pl3x.net/) server, which is "drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and performance built on top of Airplane."
+A [Purpur](https://purpur.pl3x.net/) server, which is "a drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and high performance built on top of Tuinity."
 
     -e TYPE=PURPUR
 
@@ -460,6 +452,18 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "drop-in replacement for P
 Extra variables:
 - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use
 - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
+
+### Running a Yatopia server
+
+A [Yatopia](https://github.com/YatopiaMC/Yatopia) server, which is a "blazing fast Tuinity fork with best in class performance".
+
+    -e TYPE=YATOPIA
+
+> NOTE: the `VERSION` variable is used to locate the Yatopia version to download
+
+Extra variables:
+- `RELEASE=stable` : set to `stable` or `latest`
+- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
 - `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler
 
 ### Running a Magma server
@@ -642,20 +646,20 @@ then you apply a workaround by adding this to the run invocation:
 There are optional volume paths that can be attached to supply content to be copied into the data area:
 
 `/plugins`
-: contents are synchronized into `/data/plugins` for Bukkit related server types. Set `SYNC_SKIP_NEWER_IN_DESTINATION=false` if you want files from `/plugins` to take precedence over newer files in `/data/plugins`.
+: contents are copied into `/data/plugins` for Bukkit related server types. Set `PLUGINS_SYNC_UPDATE=false` if you want files from `/plugins` to take precedence over newer files in `/data/plugins`.
 
 `/mods`
-: contents are synchronized into `/data/mods` for Forge related server types. The destination can be changed by setting `COPY_MODS_DEST`.
+: contents are copied into `/data/mods` for Forge related server types
 
 `/config`
-: contents are synchronized into `/data/config` by default, but can be changed with `COPY_CONFIG_DEST`. For example, `-v ./config:/config -e COPY_CONFIG_DEST=/data` will allow you to copy over files like `bukkit.yml` and so on directly into the server directory. Set `SYNC_SKIP_NEWER_IN_DESTINATION=false` if you want files from `/config` to take precedence over newer files in `/data/config`.
-
-By default, the [environment variable processing](#replacing-variables-inside-configs) is performed on synchronized files that match the expected suffixes in `REPLACE_ENV_SUFFIXES` (by default "yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml") and are not excluded by `REPLACE_ENV_VARIABLES_EXCLUDES` and `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`. This processing can be disabled by setting `REPLACE_ENV_DURING_SYNC` to `false`.
+: contents are copied into `/data/config` by default, but can be changed with `COPY_CONFIG_DEST`
 
 If you want old mods/plugins to be removed before the content is brought over from those attach points, then add `-e REMOVE_OLD_MODS=TRUE`. You can fine tune the removal process by specifying the `REMOVE_OLD_MODS_INCLUDE` and `REMOVE_OLD_MODS_EXCLUDE` variables. By default, everything will be removed. You can also specify the `REMOVE_OLD_MODS_DEPTH` (default is 16) variable to only delete files up to a certain level.
 
 For example: `-e REMOVE_OLD_MODS=TRUE -e REMOVE_OLD_MODS_INCLUDE="*.jar" -e REMOVE_OLD_MODS_DEPTH=1` will remove all old jar files that are directly inside the `plugins/` or `mods/` directory.
 
+You can specify the destination of the files that are copied from `/mods` and `/config` by setting the `COPY_MODS_DEST` and `COPY_CONFIG_DEST`, where the default is `/data/mods` and `/data/config`. For example, `-v ./config:/config -e COPY_CONFIG_DEST=/data` will allow you to copy over files like `bukkit.yml` and so on directly into the server directory.
+
 These paths work well if you want to have a common set of modules in a separate location, but still have multiple worlds with different server requirements in either persistent volumes or a downloadable archive.
 
 > For more flexibility with mods/plugins preparation, you can declare directories to use in [the `MODS` variable](#downloadable-modplugin-pack-for-forge-bukkit-and-spigot-servers)
@@ -732,10 +736,6 @@ read-only volume attachment to ensure the clone source remains pristine.
 docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic
 ```
 
-The following diagram shows how this option can be used in a compose deployment with a relative directory:
-
-![](docs/world-copy-compose-project.drawio.png)
-
 ### Overwrite world on start
 The world will only be downloaded or copied if it doesn't exist already. Set `FORCE_WORLD_COPY=TRUE` to force overwrite the world on every server start.
 
@@ -754,25 +754,21 @@ This will reset any manual configuration of the `server.properties` file, so if
 you want to make any persistent configuration changes you will need to make sure
 you have properly set the proper environment variables in your docker run command (described below).
 
-### Message of the Day
+### Server name
 
-The message of the day, shown below each server entry in the client UI, can be changed with the `MOTD` environment variable, such as
+The server name (e.g. for bungeecord) can be set like:
 
-    -e MOTD="My Server"
+    docker run -d -e SERVER_NAME=MyServer ...
 
-If you leave it off, a default is computed from the server type and version, such as
+### Server port
 
-    A Paper Minecraft Server powered by Docker
+> **WARNING:** only change this value if you know what you're doing. It is only needed when using host networking and it is rare that host networking should be used. Use `-p` port mappings instead.
 
-That way you can easily differentiate between several servers you may have started.
+If you must, the server port can be set like:
 
-The section symbol (§) and other unicode characters are automatically converted to allow [formatting codes](https://minecraft.fandom.com/wiki/Formatting_codes) to be used consistently with all server versions. For example,
+    docker run -d -e SERVER_PORT=25566 ...
 
-     -e MOTD="A §l§cMinecraft§r §nserver"
-
-renders
-
-![](docs/motd-example.png)
+**however**, be sure to change your port mapping accordingly and be prepared for some features to break.
 
 ### Difficulty
 
@@ -786,8 +782,6 @@ values.
 
 ### Whitelist Players
 
-> **NOTE** it is very important to set this with servers exposed to the internet where you want only limited players to join.
-
 To whitelist players for your Minecraft server, pass the Minecraft usernames separated by commas via the `WHITELIST` environment variable, such as
 
     docker run -d -e WHITELIST=user1,user2 ...
@@ -820,7 +814,7 @@ The server icon which has been set doesn't get overridden by default. It can be
 
 ### Rcon
 
-To use rcon use the `ENABLE_RCON` and `RCON_PASSWORD` variables.
+To use rcon use the `ENABLE_RCON` and `RCON_PASSORD` variables.
 By default rcon port will be `25575` but can easily be changed with the `RCON_PORT` variable.
 
     docker run -d -e ENABLE_RCON=true -e RCON_PASSWORD=testing
@@ -963,6 +957,18 @@ For example:
 
     docker run -d -e MODE=creative ...
 
+### Message of the Day
+
+The message of the day, shown below each server entry in the UI, can be changed with the `MOTD` environment variable, such as
+
+    -e MOTD="My Server"
+
+If you leave it off, a default is computed from the server type and version, such as
+
+    A Paper Minecraft Server powered by Docker
+
+That way you can easily differentiate between several servers you may have started.
+
 ### PVP Mode
 
 By default, servers are created with player-vs-player (PVP) mode enabled. You can disable this with the `PVP`
@@ -994,10 +1000,6 @@ For example (just the `-e` bits):
 
     -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS=3;minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;2;'
 
-In Minecraft 1.13+ you need to pass json ([generator site](https://misode.github.io/world/)) like this (details see [here](https://github.com/itzg/docker-minecraft-server/issues/999#issuecomment-907849644)):
-
-    -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS={"biome":"minecraft:the_void","layers":[{"block":"minecraft:bedrock","height":1},{"block":"minecraft:stone","height":10},{"block":"minecraft:dirt","height":1}],"structures":{"structures":{}}}'
-
 ### Custom Server Resource Pack
 
 You can set a link to a custom resource pack and set it's checksum using the `RESOURCE_PACK` and `RESOURCE_PACK_SHA1` options respectively, the default is blank:
@@ -1030,22 +1032,6 @@ Allows users to use flight on your server while in Survival mode, if they have a
 
     -e ALLOW_FLIGHT=TRUE|FALSE
 
-### Server name
-
-The server name (e.g. for bungeecord) can be set like:
-
-    docker run -d -e SERVER_NAME=MyServer ...
-
-### Server port
-
-> **WARNING:** only change this value if you know what you're doing. It is only needed when using host networking and it is rare that host networking should be used. Use `-p` port mappings instead.
-
-If you must, the server port can be set like:
-
-    docker run -d -e SERVER_PORT=25566 ...
-
-**however**, be sure to change your port mapping accordingly and be prepared for some features to break.
-
 ### Other server property mappings
 
 | Environment Variable              | Server Property                   |
@@ -1064,7 +1050,6 @@ If you must, the server port can be set like:
 | USE_NATIVE_TRANSPORT              | use-native-transport              |
 | ENFORCE_WHITELIST                 | enforce-whitelist                 |
 | ENABLE_WHITELIST                  | white-list and whitelist          |
-| SIMULATION_DISTANCE               | simulation-distance               |
 
 ## Miscellaneous Options
 
@@ -1079,13 +1064,24 @@ in your config files after the container starts.
 For those cases there is the option to replace defined variables inside your configs
 with environment variables defined at container runtime.
 
-When the environment variable `REPLACE_ENV_IN_PLACE` is set to `true` (the default), the startup script will go through all files inside the container's `/data` path and replace variables that match the container's environment variables. Variables can instead (or in addition to) be replaced in files sync'ed from `/plugins`, `/mods`, and `/config` by setting `REPLACE_ENV_DURING_SYNC` to `true` (defaults to `false`). 
+If you set the enviroment variable `REPLACE_ENV_VARIABLES` to `TRUE` the startup script
+will go thru all files inside your `/data` volume and replace variables that match your
+defined environment variables. Variables that you want to replace need to be wrapped
+inside `${YOUR_VARIABLE}` curly brackets and prefixed with a dollar sign. This is the regular
+syntax for enviromment variables inside strings or config files.
 
-Variables that you want to replace need to be declared inside curly brackets and prefixed with a dollar sign, such as  `${CFG_YOUR_VARIABLE}`, which is same as many scripting languages.
+Optionally you can also define a prefix to only match predefined environment variables.
 
-You can also change `REPLACE_ENV_VARIABLE_PREFIX`, which defaults to "CFG_", to limit which environment variables are allowed to be used. For example, with "CFG_" as the prefix, the variable `${CFG_DB_HOST}` would be subsituted, but not `${DB_HOST}`.
+`ENV_VARIABLE_PREFIX="CFG_"` <-- this is the default prefix
 
-If you want to use a file for value (like when use secrets) you can add suffix `_FILE` to your variable name.
+If you want use file for value (like when use secrets) you can add suffix `_FILE` to your variable name (in  run command).
+
+There are some limitations to what characters you can use.
+
+| Type  | Allowed Characters  |
+| ----- | ------------------- |
+| Name  | `0-9a-zA-Z_-`       |
+| Value | `0-9a-zA-Z_-:/=?.+` |
 
 Variables will be replaced in files with the following extensions:
 `.yml`, `.yaml`, `.txt`, `.cfg`, `.conf`, `.properties`.
@@ -1135,6 +1131,14 @@ services:
       CFG_DB_HOST: "http://localhost:3306"
       CFG_DB_NAME: "minecraft"
       CFG_DB_PASSWORD_FILE: "/run/secrets/db_password"
+    restart: always
+  rcon:
+    image: itzg/rcon
+    ports:
+      - "4326:4326"
+      - "4327:4327"
+    volumes:
+      - "rcon:/opt/rcon-web-admin/db"
 
 volumes:
   mc:
@@ -1145,47 +1149,9 @@ secrets:
     file: ./db_password
 ```
 
-### Patching existing files
+The content of `db_password`:
 
-JSON path based patches can be applied to one or more existing files by setting the variable `PATCH_DEFINITIONS` to the path of a directory that contains one or more [patch definition json files](https://github.com/itzg/mc-image-helper#patchdefinition) or a [patch set json file](https://github.com/itzg/mc-image-helper#patchset).
-
-Variable placeholders in the patch values can be restricted by setting `REPLACE_ENV_VARIABLE_PREFIX`, which defaults to "CFG_".
-
-The following example shows a patch-set file were various fields in the `paper.yaml` configuration file can be modified and added:
-
-```json
-{
-  "patches": [
-    {
-      "file": "/data/paper.yml",
-      "ops": [
-        {
-          "$set": {
-            "path": "$.verbose",
-            "value": true
-          }
-        },
-        {
-          "$set": {
-            "path": "$.settings['velocity-support'].enabled",
-            "value": "${CFG_VELOCITY_ENABLED}",
-            "value-type": "bool"
-          }
-        },
-        {
-          "$put": {
-            "path": "$.settings",
-            "key": "my-test-setting",
-            "value": "testing"
-          }
-        }
-      ]
-    }
-  ]
-}
-```
-
-> **NOTES:** Only JSON and Yaml files can be patched at this time. TOML support is planned to be added next. Removal of comments and other cosmetic changes will occur when patched files are processed.
+    ug23u3bg39o-ogADSs
 
 ### Running with a custom server JAR
 
@@ -1285,7 +1251,7 @@ By default the vanilla log file will grow without limit. The logger can be recon
 
 > **NOTE** this will interfere with interactive/color consoles [as described in the section above](#interactive-and-color-console)
 
-### Timezone Configuration
+## Timezone Configuration
 
 You can configure the timezone to match yours by setting the `TZ` environment variable:
 
@@ -1344,10 +1310,6 @@ disable that by passing `-e GUI=FALSE`.
 
 When the container is signalled to stop, the Minecraft process wrapper will attempt to send a "stop" command via RCON or console and waits for the process to gracefully finish. By default it waits 60 seconds, but that duration can be configured by setting the environment variable `STOP_DURATION` to the number of seconds.
 
-### Setup only
-
-If you are using a host-attached data directory, then you can have the image setup the Minecraft server files and stop prior to launching the server process by setting `SETUP_ONLY` to `true`. 
-
 ## Autopause
 
 ### Description

bin/mc-send-to-console

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

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-rlcraft.yml

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

files/autopause/autopause-fcns.sh

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

files/autopause/knockd-config.cfg

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

health.sh

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

start-configuration

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

start-deployCF

@@ -101,7 +101,7 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
 
   export FTB_DIR=$(dirname "${SERVER}")
 
-  exec ${SCRIPTS:-/}start-setupWorld $@
+  exec ${SCRIPTS:-/}start-finalSetupWorld $@
 fi
 
 entryScriptExpr="
@@ -236,4 +236,5 @@ elif [ -e "${FTB_DIR}/Install.sh" ]; then
   popd
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployCatserver

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

start-deployCustom

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

start-deployFTBA

@@ -79,4 +79,5 @@ if ! [ -v SERVER ]; then
   exit 2
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployFabric

@@ -1,7 +1,6 @@
 #!/bin/bash
 set -eu
 
-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils
 
 requireVar VANILLA_VERSION
@@ -33,7 +32,7 @@ if [[ ! -e ${SERVER} ]]; then
 
   if [[ ! -e $FABRIC_INSTALLER ]]; then
     log "Downloading $FABRIC_INSTALLER_URL ..."
-    if ! get -o "$FABRIC_INSTALLER" "$FABRIC_INSTALLER_URL"; then
+    if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
       log "Failed to download from given location $FABRIC_INSTALLER_URL"
       exit 2
     fi
@@ -58,7 +57,8 @@ if [[ ! -e ${SERVER} ]]; then
     exit 10
   fi
 
-  mv fabric-server-launch.jar "${SERVER}"
+  mv fabric-server-launch.jar ${SERVER}
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployForge

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

start-deployLimbo

@@ -9,10 +9,6 @@ isDebugging && set -x
 : ${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
@@ -26,14 +22,11 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-if [[ ${LIMBO_BUILD} = lastStableBuild ]]; then
-  LIMBO_BUILD=$(jq -r '.number' <<<${buildJson})
-  log "Resolved latest Limbo build to ${LIMBO_BUILD}"
-fi
+PURPUR_BUILD=$(jq -r '.number' <<<${buildJson})
 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"
+export SERVER="purpur-${PURPUR_BUILD}.jar"
 
 if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
     downloadUrl="${baseUrl}/artifact/${artifactPath}"
@@ -53,11 +46,12 @@ if [ ! -f "${LIMBO_SCHEMA_FILENAME}" ]; then
   fi
 fi
 
-if [[ ${LEVEL} != *\;* ]]; then
+if [[ ${LEVEL} != "*;*" ]]; then
   LEVEL="${LEVEL};${LIMBO_SCHEMA_FILENAME}"
 fi
 export LEVEL
 
 export SKIP_LOG4J_CONFIG=true
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployMagma

@@ -89,4 +89,5 @@ else
   fi
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployMohist

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

start-deploySpongeVanilla

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

start-deployTuinity

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+if [ "${VERSION}" != "LATEST" ]; then
+  log "ERROR: Tuinity server type only supports VERSION=LATEST"
+  exit 1
+fi
+
+: ${TUINITY_BUILD:=lastSuccessfulBuild}
+export SERVER=tuinity-${VANILLA_VERSION}-${TUINITY_BUILD}.jar
+
+if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUINITY_BUILD}/artifact/tuinity-paperclip.jar"
+    log "Downloading Tuinity (build $TUINITY_BUILD) from $downloadUrl ..."
+    curl -fsSL -o "$SERVER" "$downloadUrl"
+    if [ ! -f "$SERVER" ]; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export TYPE=SPIGOT
+
+exec ${SCRIPTS:-/}start-spiget "$@"

start-deployVanilla

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

start-deployYatopia

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

start-finalSetupEnvVariables

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

start-finalSetupModconfig

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

start-finalSetupModpack

@@ -2,7 +2,6 @@
 
 set -e -o pipefail
 
-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils
 if isDebugging; then
   set -x
@@ -23,7 +22,7 @@ if [[ "$MODPACK" ]]; then
     if [[ "${MODPACK}" == *.zip ]]; then
       downloadUrl="${MODPACK}"
     else
-      downloadUrl=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
+      downloadUrl=$(curl -Ls -o /dev/null -w %{effective_url} $MODPACK)
       if ! [[ $downloadUrl == *.zip ]]; then
         log "ERROR Invalid URL given for MODPACK: $downloadUrl resolved from $MODPACK"
         log "      Must be HTTP, HTTPS or FTP and a ZIP file"
@@ -72,11 +71,25 @@ if [[ "$MODS" ]]; then
 
   for i in ${MODS//,/ }
   do
-    if isURL "$i"; then
+    if isURL $i; then
       log "Downloading mod/plugin $i ..."
-      if ! get -o "${out_dir}" "$i"; then
-        log "ERROR: failed to download from $i into $out_dir"
-        exit 2
+      if isValidFileURL jar "$i"; then
+        if ! curl -fsSL -o "${out_dir}/$(getFilenameFromUrl "${i}")" "${i}"; then
+          log "ERROR: failed to download from $i into $out_dir"
+          exit 2
+        fi
+      else
+        effective_url=$(resolveEffectiveUrl "$i")
+        if isValidFileURL jar "${effective_url}"; then
+          out_file=$(getFilenameFromUrl "${effective_url}")
+          if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
+            log "ERROR: failed to download from $i into $out_dir"
+            exit 2
+          fi
+        else
+          log "ERROR: $effective_url resolved from $i is not a valid jar URL"
+          exit 2
+        fi
       fi
     elif [[ -f "$i" && "$i" =~ .*\.jar ]]; then
       log "Copying plugin located at $i ..."
@@ -141,10 +154,7 @@ fi
 if [[ "${GENERIC_PACK}" ]]; then
   if isURL "${GENERIC_PACK}"; then
     log "Downloading generic pack ..."
-    if ! curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"; then
-      log "ERROR: failed to download ${GENERIC_PACK}"
-      exit 2
-    fi
+    curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"
     GENERIC_PACK=/tmp/generic_pack.zip
   fi
 
@@ -175,4 +185,4 @@ if [[ "${GENERIC_PACK}" ]]; then
   fi
 fi
 
-exec ${SCRIPTS:-/}start-setupModconfig $@
+exec ${SCRIPTS:-/}start-finalSetupModconfig $@

start-finalSetupMounts

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

start-finalSetupServerProperties

@@ -56,7 +56,7 @@ function customizeServerProps {
   setServerProp "server-name" "$SERVER_NAME"
   setServerProp "server-ip" "$SERVER_IP"
   setServerProp "server-port" "$SERVER_PORT"
-  setServerProp "motd" "$(echo $MOTD | mc-image-helper asciify)"
+  setServerProp "motd" "$MOTD"
   setServerProp "allow-nether" "$ALLOW_NETHER"
   setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"
   setServerProp "enable-command-block" "$ENABLE_COMMAND_BLOCK"
@@ -100,7 +100,6 @@ function customizeServerProps {
   setServerProp "prevent-proxy-connections" "$PREVENT_PROXY_CONNECTIONS"
   setServerProp "use-native-transport" "$USE_NATIVE_TRANSPORT"
   setServerProp "enforce-whitelist" "$ENFORCE_WHITELIST"
-  setServerProp "simulation-distance" "$SIMULATION_DISTANCE"
 
   if [ -n "$DIFFICULTY" ]; then
     case $DIFFICULTY in
@@ -218,4 +217,4 @@ if isDebugging; then
   cat "${SERVER_PROPERTIES}"
 fi
 
-exec ${SCRIPTS:-/}start-setupEnvVariables $@
+exec ${SCRIPTS:-/}start-finalSetupEnvVariables $@

start-finalSetupWorld

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

start-minecraftFinalSetup

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

start-setupEnvVariables

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

start-setupMounts

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

start-spiget

@@ -101,4 +101,5 @@ if [[ ${SPIGET_RESOURCES} ]]; then
   done
 fi
 
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-utils

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

start-validateCurseInstance

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