Update dependency itzg/mc-server-runner to v1.16.1

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -104,16 +104,14 @@ jobs:
             mcHelperVersion: 1.51.4-java8
         # JAVA 8: NOTE: Unable to go past 8u312 because of Forge dependencies
           - variant: java8
-            baseImage: eclipse-temurin:8u312-b07-jre-focal
+            baseImage: eclipse-temurin:8-jre
             platforms: linux/amd64,linux/arm/v7,linux/arm64
             mcVersion: 1.12.2
-            # Pin version for Java 8, also be sure to set in verify-pr.yml
             mcHelperVersion: 1.51.4-java8
           - variant: java8-jdk
-            baseImage: eclipse-temurin:8u312-b07-jdk-focal
+            baseImage: eclipse-temurin:8-jdk
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.12.2
-            # Pin version for Java 8, also be sure to set in verify-pr.yml
             mcHelperVersion: 1.51.4-java8
     env:
       # Assume they line up, but when forked change to your Docker Hub username
@@ -166,7 +164,7 @@ jobs:
         uses: docker/setup-buildx-action@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4.2.0
+        uses: docker/setup-qemu-action@v4.4.0
 
       - name: Build for test
         uses: docker/build-push-action@v7

.github/workflows/discord.yml

@@ -1,43 +0,0 @@
-name: Discord notifications
-
-on:
-  release:
-    types:
-      - published
-  workflow_run:
-    workflows: ["Build and Publish"]
-    types:
-      - completed
-
-env:
-  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-
-jobs:
-  discord:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    if: github.repository_owner == 'itzg'
-    steps:
-      - name: on-publish
-        if: github.event_name == 'release' && github.event.action == 'published'
-        uses: SethCohen/github-releases-to-discord@v1.20.0
-        with:
-          webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
-      - name: on-success
-        if: github.event.workflow_run.conclusion == 'success'
-        uses: Ilshidur/action-discord@master
-        with:
-          args: |
-            Github repo: ${{ github.repository }}
-            - Branch: ${{ github.event.workflow_run.head_branch }}
-            - [Link: to Actions](<${{ github.event.workflow_run.html_url }}>)
-            - 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 }}
-            - Branch: ${{ github.event.workflow_run.head_branch }}
-            - [Link: to Actions](<${{ github.event.workflow_run.html_url }}>)
-            - Status: 🤔  ${{ github.event.workflow_run.conclusion }}  💣💥

.github/workflows/verify-pr.yml

@@ -55,7 +55,8 @@ jobs:
             knockdRepoOrg: Metalcape/knock
         # JAVA 8:
           - variant: java8
-            baseImage: eclipse-temurin:8u312-b07-jre-focal
+            # make sure to track the base image version in build.yml
+            baseImage: eclipse-temurin:8-jre
             platforms: linux/amd64
             mcVersion: 1.12.2
             # For GLIBC_2.34 support
@@ -76,7 +77,7 @@ jobs:
         uses: docker/setup-buildx-action@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4.2.0
+        uses: docker/setup-qemu-action@v4.4.0
 
       - name: Confirm multi-arch build
         uses: docker/build-push-action@v7

Dockerfile

@@ -45,19 +45,19 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 # renovate: datasource=github-releases packageName=itzg/mc-monitor
-ARG MC_MONITOR_VERSION=0.17.1
+ARG MC_MONITOR_VERSION=1.18.3
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 # renovate: datasource=github-releases packageName=itzg/mc-server-runner
-ARG MC_SERVER_RUNNER_VERSION=1.15.2
+ARG MC_SERVER_RUNNER_VERSION=1.16.1
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 # renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose
-ARG MC_HELPER_VERSION=1.67.1
+ARG MC_HELPER_VERSION=1.73.0
 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1

build/ubuntu/install-packages.sh

@@ -28,7 +28,7 @@ apt-get install -y \
   zstd \
   lbzip2 \
   nfs-common \
-  libpcap0.8 \
+  'libpcap0.8*' \
   libnuma1 \
   libcap2-bin \
   jattach \

docs/configuration/misc-options.md

@@ -209,6 +209,22 @@ By default, the image finishes startup by exec'ing [mc-server-runner](https://gi
 > [!TIP]
 > The `SERVER_RUNNER` variable is expanded when passed to `exec` so that `mc-server-runner` can be wrapped by another executable that is mounted into the container.
 
+## Pre-start script
+
+To run something of your own after the image has finished setting up the server files and just before it starts the server, set `PRE_START_SCRIPT` to the path of an executable file that you have mounted into the container. The image runs it directly (not through a shell) and waits for it to finish. It runs as the user the server runs as, from the server's working directory, with the same environment the server gets. If it exits with a non-zero status, the container exits without starting the server.
+
+For example, a script that waits for plugin jars that another process is still downloading:
+
+```yaml
+    environment:
+      PRE_START_SCRIPT: /hooks/wait-for-plugins
+    volumes:
+      - ./hooks:/hooks:ro
+```
+
+> [!WARNING]
+> The image does not guarantee that any particular command is available to the script, and it may change between image versions. Keeping the script working is up to you.
+
 ## Enable Flare Flags
     
 To enable the JVM flags required to fully support the [Flare profiling suite](https://blog.airplane.gg/flare), set the following variable:

docs/misc/deployment/index.md

@@ -19,7 +19,7 @@
 
 ### Using the MASH playbook
 
-[The MASH Playbook](https://github.com/mother-of-all-self-hosting/mash-playbook) is a premade playbook with the option to deploy a [wide variety of open-source services](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/supported-services.md) to your server(s), including [docker-minecraft-server](https://github.com/XHawk87/ansible-role-minecraft), making it a good option if you want all the bells and whistles alongside your Minecraft server.
+[The MASH Playbook](https://github.com/mother-of-all-self-hosting/mash-playbook) is a premade playbook with the option to deploy a [wide variety of open-source services](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/supported-services.md) to your server(s), including [docker-minecraft-server](https://github.com/mother-of-all-self-hosting/ansible-role-minecraft), making it a good option if you want all the bells and whistles alongside your Minecraft server.
 - Check out the [Installation Guide](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/README.md) for the MASH playbook to get started.
 - You can then enable [Minecraft](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/minecraft.md) in your vars.yml.
 - Enable any supporting services that you might find useful, such as [user authentication](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/authelia.md), [remote backups](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/backup-borg.md), [email relay](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/exim-relay.md), [cron monitoring](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/healthchecks.md), [audio and video conferencing](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/jitsi.md), databases ([MariaDB](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/mariadb.md), [PostgresSQL](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/postgres.md)), [push notifications](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/ntfy.md), [uptime monitoring](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/uptime-kuma.md), [a website](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/wordpress.md), as well as installing any [extra files, folders, applications, services and running commands](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/auxiliary.md) automatically on deployment.

docs/misc/related-projects.md

@@ -33,3 +33,7 @@ An image that dockerizes [rcon-web-admin](https://github.com/rcon-web-admin/rcon
 ### [AutoStopper](https://github.com/Criseda/AutoStopper)
 
 A Velocity plugin that stops idle backend servers and wakes them when players connect, with readiness-aware Docker lifecycle management.
+
+### [Kobblestone](https://github.com/kobblestoneio/kobblestone)
+
+A Kubernetes operator for Minecraft that supports custom resource types to manage servers, routers, backups and more.

docs/mods-and-plugins/index.md

@@ -66,6 +66,8 @@ You can also specify the `REMOVE_OLD_MODS_DEPTH` (default is 16) variable to onl
 
 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.
 
+To remove all files in the `/data/config` directory before a modpack is downloaded and unpacked, set `REMOVE_OLD_CONFIGS=TRUE`. This is useful when a modpack update would otherwise override locally customized configuration files. The removal process can be fine tuned with `REMOVE_OLD_CONFIGS_INCLUDE` and `REMOVE_OLD_CONFIGS_EXCLUDE` (comma separated lists of file glob patterns, defaults to `*` so everything is removed) and `REMOVE_OLD_CONFIGS_DEPTH` (default 16). The target directory can be changed with `CONFIG_OUT_DIR` (default `/data/config`).
+
 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.
 
 !!! information "Multiple source directories"

docs/mods-and-plugins/modrinth.md

@@ -22,7 +22,8 @@ Where:
 
 - **Project** is the project slug or ID, see below
 - **Version** is the version ID (such as "Oa9ZDzZq") or number (such as "2.21.2"). When omitted, the latest release version will be selected. Using version ID will override Minecraft and loader compatibility checks.
-- **Release Type** is `release`, `beta`, or `alpha` indicating the latest version to select.
+- **Release Type** is `release`, `beta`, or `alpha` indicating the latest version to select. By default, the newest version that is the same or better release type is selected.
+  A `+` suffix can be used to indicate instead that the most "stable" version is selected. 
 - **Prefix** is `datapack`, `fabric`, `forge`, or `paper`
     - The `datapack` prefix is optional when running a vanilla server
     - The `fabric`, `forge`, and `paper` prefixes allow for installing mods/plugins that differ from server's `TYPE`. Using [Sinytra Connector](https://modrinth.com/mod/connector) is an example of this, where Fabric mods can be loaded into a NeoForge server.
@@ -46,18 +47,22 @@ Where:
 
     ![Version ID](../img/modrinth-version-id.drawio.png)
 
-### Examples
-            
-| Description                     | Example projects entry                                |
-|---------------------------------|-------------------------------------------------------|
-| Select latest version           | `fabric-api`                                          |
-| Select specific version         | `fabric-api:bQZpGIz0`<br/>`fabric-api:0.119.2+1.21.4` |
-| Select latest beta version      | `fabric-api:beta`                                     |
-| Latest version using project ID | `P7dR8mSH`                                            |
-| Latest version of datapack      | `datapack:terralith`                                  |
-| Specific version of datapack    | `datapack:terralith:2.5.5`                            |
-| Mod loader override             | `fabric:fabric-api`<br/>`fabric:fabric-api:bQZpGIz0`  |
-| Projects Listing File           | `@/path/to/modrinth-mods.txt`                         |
+!!! tip "Most stable release type"
+
+    As an example of using the `{release type}+` feature, [Concurrent Chunk Management for 1.12.11](https://modrinth.com/mod/c2me-fabric/versions?g=1.21.11) had a "release" version at "0.3.6.0.0" and then started publishing "alpha"s with "0.3.7+alpha.0.6+1.21.11". Using `c2me-fabric:alpha+` indicates that the newest "stable" is actually preferred, which is "0.3.6.0.0".
+    
+    ### Examples
+                
+    | Description                     | Example projects entry                                |
+    |---------------------------------|-------------------------------------------------------|
+    | Select latest version           | `fabric-api`                                          |
+    | Select specific version         | `fabric-api:bQZpGIz0`<br/>`fabric-api:0.119.2+1.21.4` |
+    | Select latest beta version      | `fabric-api:beta`                                     |
+    | Latest version using project ID | `P7dR8mSH`                                            |
+    | Latest version of datapack      | `datapack:terralith`                                  |
+    | Specific version of datapack    | `datapack:terralith:2.5.5`                            |
+    | Mod loader override             | `fabric:fabric-api`<br/>`fabric:fabric-api:bQZpGIz0`  |
+    | Projects Listing File           | `@/path/to/modrinth-mods.txt`                         |
 
 ### Notes
 

docs/requirements.txt

@@ -1,25 +1,25 @@
 click==8.5.0
 colorama==0.4.6
-deepmerge==3.0
+deepmerge==3.0.1
 ghp-import==2.1.0
-griffe==2.2.0
+griffe==2.3.0
 Jinja2==3.1.6
-Markdown==3.10.3
-MarkupSafe==3.0.3
+Markdown==3.11
+MarkupSafe==3.0.4
 mergedeep==1.3.4
 mkdocs==1.6.1
 mkdocs-autorefs==1.4.4
 mkdocs-get-deps==0.2.2
 mkdocstrings==1.0.6
-mkdocstrings-python==2.0.7
+mkdocstrings-python==2.0.9
 packaging==26.3
 pathspec==1.1.1
-platformdirs==4.11.5
+platformdirs==4.12.3
 Pygments==2.21.0
-pymdown-extensions==11.0.2
+pymdown-extensions==12.1
 python-dateutil==2.9.0.post0
 PyYAML==6.0.3
 pyyaml_env_tag==1.1
 six==1.17.0
 watchdog==6.0.0
-zensical==0.0.57
+zensical==0.0.67

docs/types-and-platforms/mod-platforms/auto-curseforge.md

@@ -284,6 +284,8 @@ If needing to iterate on the options above, set `CF_FORCE_SYNCHRONIZE` to "true"
 
 Modpack zip files typically include an `overrides` subdirectory that may contain config files, world data, and extra mod files. All of those files will be extracted into the `/data` path of the container. If any of those files, such as incompatible mods, need to be excluded from extraction, then the `CF_OVERRIDES_EXCLUSIONS` variable can be set with a comma or newline delimited list of ant-style paths ([see below](#ant-style-paths)) to exclude, relative to the overrides (or `/data`) directory.
 
+The exclude/include file can also declare `overridesExclusions` for a specific modpack. These ant-style paths are combined with `CF_OVERRIDES_EXCLUSIONS`. Project exclusions such as `CF_EXCLUDE_MODS` do not filter files bundled in overrides. Set `CF_FORCE_SYNCHRONIZE=true` to reapply changed exclusions to an existing installation.
+
 ### Ant-style paths
 
 Ant-style paths can include the following globbing/wildcard symbols:

docs/types-and-platforms/server-types/others.md

@@ -74,3 +74,68 @@ Alternatively, the final `-jar` invocation can be replaced by setting `CUSTOM_JA
     When using `docker run` make sure to quote the entire value since it has spaces in it, such as
 
         -e CUSTOM_JAR_EXEC="-cp worldedit.jar:Carpet-Server.jar net.minecraft.server.MinecraftServer"
+
+## Pumpkin
+
+A [Pumpkin](https://pumpkinmc.org/) server can be run by setting `TYPE` to `PUMPKIN`.
+
+Pumpkin is a Minecraft server written in Rust and is shipped as a single native executable instead of a Java jar. The image downloads the asset matching its architecture from the [latest release](https://github.com/Pumpkin-MC/Pumpkin/releases), so `VERSION` and the JVM memory and tuning variables do not apply.
+
+```shell
+docker run -d --pull=always -v /path/on/host:/data \
+    -p 25565:25565 -p 19132:19132/udp -e EULA=TRUE -e TYPE=PUMPKIN \
+    --name mc itzg/minecraft-server
+```
+
+Configuration options with defaults:
+
+- `FORCE_REDOWNLOAD`=false
+
+  Set to true to re-download the executable.
+
+Pumpkin is configured through `/data/pumpkin.toml`. The image creates that file on the first run and updates the settings below at each startup, leaving the remaining options in your file alone. Anything without a matching environment variable can be set by editing `pumpkin.toml` directly.
+
+| Variable                                            | Pumpkin setting                                                                    |
+| :-------------------------------------------------- | :--------------------------------------------------------------------------------- |
+| `MOTD`                                              | `networking.java.motd` and `networking.bedrock.motd`                               |
+| `MAX_PLAYERS`                                       | `networking.java.max_players` and `networking.bedrock.max_players`                 |
+| `ONLINE_MODE`                                       | `networking.java.online_mode` and `networking.bedrock.online_mode`                 |
+| `SERVER_PORT`                                       | `networking.java.address`                                                          |
+| `VIEW_DISTANCE`                                     | `networking.java.view_distance` and `networking.bedrock.view_distance`             |
+| `SIMULATION_DISTANCE`                               | `networking.java.simulation_distance` and `networking.bedrock.simulation_distance` |
+| `LEVEL`                                             | `default_level_name`                                                               |
+| `SEED`                                              | `seed`                                                                             |
+| `MODE`                                              | `default_gamemode`                                                                 |
+| `DIFFICULTY`                                        | `default_difficulty`                                                               |
+| `HARDCORE`                                          | `hardcore`                                                                         |
+| `ALLOW_NETHER`                                      | `allow_nether`                                                                     |
+| `FORCE_GAMEMODE`                                    | `force_gamemode`                                                                   |
+| `PVP`                                               | `pvp.enabled`                                                                      |
+| `OP_PERMISSION_LEVEL`                               | `op_permission_level`                                                              |
+| `SPAWN_PROTECTION`                                  | `spawn_protection`                                                                 |
+| `ACCEPTS_TRANSFERS`                                 | `accepts_transfers`                                                                |
+| `WHITELIST`, `WHITELIST_FILE` or `ENABLE_WHITELIST` | `white_list`                                                                       |
+| `ENFORCE_WHITELIST`                                 | `enforce_whitelist`                                                                |
+| `ENABLE_RCON`                                       | `networking.rcon.enabled`                                                          |
+| `RCON_PORT`                                         | `networking.rcon.address`                                                          |
+| `RCON_PASSWORD`                                     | `networking.rcon.password`                                                         |
+| `ENABLE_QUERY`                                      | `networking.query.enabled`                                                         |
+| `QUERY_PORT`                                        | `networking.query.address`                                                         |
+| `PREVENT_PROXY_CONNECTIONS`                         | `networking.java.authentication.prevent_proxy_connections`                         |
+| `RESOURCE_PACK`                                     | `resource_pack.java.url` and `resource_pack.java.enabled`                          |
+| `RESOURCE_PACK_SHA1`                                | `resource_pack.java.sha1`                                                          |
+| `RESOURCE_PACK_PROMPT`                              | `resource_pack.java.prompt_message`                                                |
+| `RESOURCE_PACK_ENFORCE`                             | `resource_pack.java.force`                                                         |
+| `LOG_LEVEL`                                         | `logging.level`                                                                    |
+
+!!! note
+
+    The first run adds every option Pumpkin knows about to `pumpkin.toml`, since Pumpkin fills in its own defaults for the settings the image does not manage.
+
+!!! note
+
+    Bedrock Edition players join on UDP port `19132`, which Pumpkin serves itself from the same world. That port has to be published, such as with `-p 19132:19132/udp`, since the image only declares `25565` with `EXPOSE`. See [examples/pumpkin](https://github.com/itzg/docker-minecraft-server/tree/master/examples/pumpkin) for a complete compose file.
+
+!!! note
+
+    Pumpkin is under heavy development, as the project itself states, so configuration and world formats can change between releases. Run it on a test server and keep backups.

docs/variables.md

@@ -288,6 +288,12 @@ alternatively, you can mount: <code>/etc/localtime:/etc/localtime:ro
             <td><code>false</code></td>
             <td>⬜️</td>
         </tr>
+        <tr>
+            <td><code>PRE_START_SCRIPT</code></td>
+            <td>Path to an executable run after setup and just before the server starts. The server is not started if it exits non-zero. See <a href="../configuration/misc-options/#pre-start-script">Pre-start script</a></td>
+            <td><code></code></td>
+            <td>⬜️</td>
+        </tr>
         <tr>
             <td><code>USE_FLARE_FLAGS</code></td>
             <td>To enable the JVM flags required to fully support the <a href="https://blog.airplane.gg/flare">Flare profiling suite</a>.</td>

examples/auto-curseforge/atm10/.gitignore

@@ -0,0 +1 @@
+cf-api-key*

examples/auto-curseforge/atm10/docker-compose-with-secret.yml

@@ -0,0 +1,34 @@
+name: atm10-with-secret-file
+
+secrets:
+  cf-api-key:
+    file: ./cf-api-key.txt
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    tty: true
+    stdin_open: true
+    ports:
+      - "25565:25565"
+    environment:
+      EULA: true
+      MOD_PLATFORM: AUTO_CURSEFORGE
+      CF_SLUG: all-the-mods-10
+      # Optional: select a specific version/file
+      # CF_FILENAME_MATCHER: "1.17"
+      CF_API_KEY_FILE: /run/secrets/cf-api-key
+      DEBUG: true
+      MEMORY: 4G
+      CF_OVERRIDES_EXCLUSIONS: |
+        # Not applicable for server side
+        shaderpacks/**
+    secrets:
+      - cf-api-key
+    volumes:
+      # Use managed volume by default, but can change to a relative path like
+      # ./data:/data
+      # to use a host directory
+      - mc-data:/data
+volumes:
+  mc-data:

examples/auto-curseforge/atm10/docker-compose.yml

@@ -8,10 +8,13 @@ services:
     environment:
       EULA: true
       MOD_PLATFORM: AUTO_CURSEFORGE
+      # Verified up to ATM10 8.1
       CF_SLUG: all-the-mods-10
       # Optional: select a specific version/file
       # CF_FILENAME_MATCHER: "1.17"
       MEMORY: 4G
+      CF_IGNORE_MISSING_FILES: |
+        config/ftbquests/quests/reward_tables/*.snbt
       CF_OVERRIDES_EXCLUSIONS: |
         # Not applicable for server side
         shaderpacks/**

examples/auto-curseforge/pixelmon/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mc:
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:java8
     ports:
       - "25565:25565"
     environment:

examples/auto-curseforge/po3/compose-pack-from-zip.yml

@@ -0,0 +1,35 @@
+name: po3-from-zip-file
+
+services:
+  minecraft:
+    stop_grace_period: 20s
+    image: itzg/minecraft-server:java8
+    container_name: po3
+    tty: true
+    stdin_open: true
+    # Can change to a relative path like
+    # ./server-files:/data
+    # to use a host directory
+    volumes:
+      - ./downloads:/downloads
+      - ./server:/data
+      # Uses managed volume by default
+      #- mc-data:/data
+    ports:
+      - "25565:25565"
+    restart: unless-stopped
+    environment:
+      EULA: true
+      MOD_PLATFORM: AUTO_CURSEFORGE
+      CF_MODPACK_ZIP: "/downloads/modpacks/PO3-3.5.0.zip"
+      CF_SLUG: "custom"
+      # Mod needed for this pack
+      CF_FORCE_INCLUDE_MODS: hwyla
+      CF_API_KEY: $XX$XX$X.XXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      MEMORY: 8G
+      OVERRIDE_SERVER_PROPERTIES: true
+      LEVEL_TYPE: botania-skyblock
+
+# Managed volume by default
+#volumes:
+  #mc-data:

examples/pumpkin/compose.yml

@@ -0,0 +1,14 @@
+services:
+  mc:
+    image: itzg/minecraft-server
+    tty: true
+    stdin_open: true
+    environment:
+      EULA: "true"
+      TYPE: PUMPKIN
+    ports:
+      - "25565:25565"
+      - "19132:19132/udp"
+    volumes:
+      - ./data:/data
+    restart: unless-stopped

examples/rlcraft/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mc:
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:java8
     environment:
       EULA: true
       MODPACK_PLATFORM: AUTO_CURSEFORGE

examples/valhelsia2/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mc:
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:java8
     volumes:
       - data:/data
       - ./modpacks:/modpacks:ro

files/cf-exclude-include.json

@@ -177,6 +177,7 @@
     "yungs-menu-tweaks",
     "zume"
   ],
+  "globalForceIncludes": ["simply-tooltips"],
   "modpacks": {
     "all-of-fabric-6": {
       "forceIncludes": ["revelationary"]
@@ -184,11 +185,14 @@
     "beyond-depth": {
       "forceIncludes": ["particular-reforged"]
     },
+    "craftoria": {
+      "forceIncludes": ["tmrv"]
+    },
     "create-arcane-engineering": {
       "forceIncludes": ["just-enough-resources-jer"]
     },
     "fantasy-minecraft-fabric": {
-      "forceIncludes": ["simply-tooltips", "icon-leading-tooltip"]
+      "forceIncludes": ["icon-leading-tooltip"]
     },
     "ftb-stoneblock-4": {
       "forceIncludes": [
@@ -202,6 +206,12 @@
         "mob-player-animator"
       ]
     },
+    "nuclear-tech-integrated": {
+      "overridesExclusions": [
+        "mods/custommainmenu-*.jar",
+        "mods/defaultworldgenerator-*.jar"
+      ]
+    },
     "reclamation-reclaim-the-world": {
       "forceIncludes": [
         "more-overlays-updated"

files/modrinth-exclude-include.json

@@ -105,7 +105,7 @@
     "Zoomify",
     "zume"
   ],
-  "globalForceIncludes": [],
+  "globalForceIncludes": ["/(^|/)simplytooltips-/", "/(^|/)s-lib-/"],
   "modpacks": {
     "cobbleverse": {
       "excludes": [

files/pumpkin-config-patch.json

@@ -0,0 +1,247 @@
+{
+  "patches": [
+    {
+      "file": "/data/pumpkin.toml",
+      "ops": [
+        {
+          "$set": {
+            "path": "$.seed",
+            "value": "${SEED}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.default_level_name",
+            "value": "${LEVEL}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.default_gamemode",
+            "value": "${PUMPKIN_GAMEMODE}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.default_difficulty",
+            "value": "${PUMPKIN_DIFFICULTY}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.op_permission_level",
+            "value": "${PUMPKIN_OP_PERMISSION_LEVEL}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.spawn_protection",
+            "value": "${PUMPKIN_SPAWN_PROTECTION}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.hardcore",
+            "value": "${PUMPKIN_HARDCORE}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.allow_nether",
+            "value": "${PUMPKIN_ALLOW_NETHER}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.force_gamemode",
+            "value": "${PUMPKIN_FORCE_GAMEMODE}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.white_list",
+            "value": "${PUMPKIN_WHITE_LIST}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.enforce_whitelist",
+            "value": "${PUMPKIN_ENFORCE_WHITELIST}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.accepts_transfers",
+            "value": "${PUMPKIN_ACCEPTS_TRANSFERS}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.logging.level",
+            "value": "${LOG_LEVEL}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.java.address",
+            "value": "${PUMPKIN_JAVA_ADDRESS}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.java.online_mode",
+            "value": "${PUMPKIN_ONLINE_MODE}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.java.max_players",
+            "value": "${PUMPKIN_MAX_PLAYERS}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.java.view_distance",
+            "value": "${PUMPKIN_VIEW_DISTANCE}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.java.simulation_distance",
+            "value": "${PUMPKIN_SIMULATION_DISTANCE}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.java.motd",
+            "value": "${MOTD}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.java.authentication.prevent_proxy_connections",
+            "value": "${PUMPKIN_PREVENT_PROXY_CONNECTIONS}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.bedrock.online_mode",
+            "value": "${PUMPKIN_ONLINE_MODE}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.bedrock.max_players",
+            "value": "${PUMPKIN_MAX_PLAYERS}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.bedrock.view_distance",
+            "value": "${PUMPKIN_VIEW_DISTANCE}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.bedrock.simulation_distance",
+            "value": "${PUMPKIN_SIMULATION_DISTANCE}",
+            "value-type": "int"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.bedrock.motd",
+            "value": "${MOTD}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.query.enabled",
+            "value": "${PUMPKIN_ENABLE_QUERY}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.query.address",
+            "value": "${PUMPKIN_QUERY_ADDRESS}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.rcon.enabled",
+            "value": "${PUMPKIN_ENABLE_RCON}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.rcon.address",
+            "value": "${PUMPKIN_RCON_ADDRESS}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.networking.rcon.password",
+            "value": "${RCON_PASSWORD}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.pvp.enabled",
+            "value": "${PUMPKIN_PVP}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.resource_pack.java.enabled",
+            "value": "${PUMPKIN_RESOURCE_PACK_ENABLED}",
+            "value-type": "bool"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.resource_pack.java.url",
+            "value": "${RESOURCE_PACK}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.resource_pack.java.sha1",
+            "value": "${RESOURCE_PACK_SHA1}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.resource_pack.java.prompt_message",
+            "value": "${RESOURCE_PACK_PROMPT}"
+          }
+        },
+        {
+          "$set": {
+            "path": "$.resource_pack.java.force",
+            "value": "${PUMPKIN_RESOURCE_PACK_ENFORCE}",
+            "value-type": "bool"
+          }
+        }
+      ]
+    }
+  ]
+}

files/pumpkin.toml

@@ -0,0 +1,52 @@
+seed = ""
+default_difficulty = "Normal"
+default_gamemode = "Survival"
+op_permission_level = 4
+allow_nether = true
+hardcore = false
+force_gamemode = false
+default_level_name = "world"
+white_list = false
+enforce_whitelist = false
+accepts_transfers = true
+spawn_protection = 16
+
+[logging]
+level = "info"
+
+[resource_pack.java]
+enabled = false
+url = ""
+sha1 = ""
+prompt_message = ""
+force = false
+
+[networking.query]
+enabled = false
+address = "0.0.0.0:25565"
+
+[networking.rcon]
+enabled = false
+address = "0.0.0.0:25575"
+password = ""
+
+[networking.java]
+address = "0.0.0.0:25565"
+online_mode = true
+max_players = 1000
+view_distance = 16
+simulation_distance = 10
+motd = "A blazingly fast Pumpkin server!"
+
+[networking.java.authentication]
+prevent_proxy_connections = false
+
+[networking.bedrock]
+online_mode = true
+max_players = 1000
+view_distance = 16
+simulation_distance = 10
+motd = "A blazingly fast Pumpkin server!"
+
+[pvp]
+enabled = true

renovate.json5

@@ -10,6 +10,16 @@
       "matchStrings": [
         "# renovate: datasource=(?<datasource>[a-z-]+?)(?: packageName=(?<packageName>.+?))?(?: versioning=(?<versioning>[a-z-]+))?\\s(?:ENV|ARG) .+?_VERSION=(?<currentValue>.+?)\\s"
       ]
+    },
+    {
+      "customType": "regex",
+      "description": "Update versioned images used by Dockerfile COPY --from instructions",
+      "managerFilePatterns": ["/^Dockerfile$/"],
+      "matchStrings": [
+        "COPY --from=(?<depName>[^:\\s]+):(?<currentValue>[^\\s]+)\\s"
+      ],
+      "datasourceTemplate": "docker",
+      "versioningTemplate": "docker"
     }
   ],
   "labels": ["dependencies"]

scripts/start-configuration

@@ -36,7 +36,7 @@ if isTrue "$PREFER_IPV6"; then
   export JVM_DD_OPTS
 fi
 
-if (( $(mc-image-helper java-release) >= 17 )); then
+if (( $(getJavaRelease) >= 17 )); then
   MC_IMAGE_HELPER_OPTS+=" --enable-native-access=ALL-UNNAMED"
   export MC_IMAGE_HELPER_OPTS
 fi
@@ -343,6 +343,10 @@ case "${TYPE^^}" in
     exec "$(dirname "$0")/start-deployNanoLimbo" "$@"
   ;;
 
+  PUMPKIN)
+    exec "$(dirname "$0")/start-deployPumpkin" "$@"
+  ;;
+
   CRUCIBLE)
     exec "$(dirname "$0")/start-deployCrucible" "$@"
   ;;
@@ -363,7 +367,7 @@ case "${TYPE^^}" in
       logError "Invalid TYPE: '$TYPE'"
       logError "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FOLIA, PURPUR, FABRIC, QUILT,"
       logError "         SPONGEVANILLA, CUSTOM, MAGMA, MOHIST, GTNH, AIRPLANE, PUFFERFISH,"
-      logError "         CANYON, LIMBO, NANOLIMBO, CRUCIBLE, LEAF, YOUER, BANNER, NEOFORGE"
+      logError "         CANYON, LIMBO, NANOLIMBO, PUMPKIN, CRUCIBLE, LEAF, YOUER, BANNER, NEOFORGE"
       exit 1
   ;;
 

scripts/start-deployGTNH

@@ -4,9 +4,33 @@
 . "$(dirname "$0")/start-utils"
 
 # Define setup functions
+function getGTNHversion(){
+  local gtnh_versions_json_url="https://downloads.gtnewhorizons.com/versions.json"
+  local json
+  local result
+
+  if ! json="$(curl -fsSL "$gtnh_versions_json_url")"; then
+    logError "Failed to download from \"$gtnh_versions_json_url\"" >&2
+    return 1
+  elif [[ -z $json ]]; then
+    logError "Empty response from \"$gtnh_versions_json_url\"" >&2
+    return 1
+  fi
+
+  if ! result="$(jq "$@" <<< "$json")"; then
+    logError "Failed to parse the versions file from \"$gtnh_versions_json_url\"" >&2
+    return 1
+  elif [[ $result == "null" ]] || [[ -z $result ]]; then
+    logError "No release found for GTNH_PACK_VERSION=$GTNH_PACK_VERSION. Please check if the version is valid." >&2
+    return 1
+  fi
+  printf '%s\n' "$result"
+}
+
 function getGTNHdownloadPath(){
   gtnh_download_path=""
   local release_object=""
+  local log_version_from=""
 
   # Select release JSON object
   # latest-dev will be removed in the future, but is still supported for now.
@@ -14,37 +38,24 @@ function getGTNHdownloadPath(){
     if [ "$GTNH_PACK_VERSION" == "latest-dev" ]; then
       logWarning "GTNH_PACK_VERSION=latest-dev is deprecated and will be removed in the future."
     fi
-    if ! release_object="$(
-      curl -fsSL "https://downloads.gtnewhorizons.com/versions.json" \
-        | jq -r '(.versions // .)|to_entries|sort_by(.value.releaseDate)|map(select(.value.title=="Beta release"))|.[-1]'
-      )"; then logError "Failed to retrieve release from https://downloads.gtnewhorizons.com/versions.json"
-      exit 1
-    fi
-    log "Selected $(jq '.key' <<< "$release_object") as latest dev version for download."
+    release_object=$(getGTNHversion '(.versions // .)|to_entries|map(select(.value.title == "Beta release"))|sort_by(.value.releaseDate,(.key | ascii_downcase | if test("rc") then 2 elif test("beta") then 1 else 0 end))|.[-1]') || exit 1
+    log_version_from="latest beta";
   
   elif [ "$GTNH_PACK_VERSION" == "latest" ]; then
-    if ! release_object="$(
-      curl -fsSL "https://downloads.gtnewhorizons.com/versions.json" \
-        | jq -r '(.versions // .)|to_entries|sort_by(.value.releaseDate)|map(select(.value.title=="Stable release"))|.[-1]'
-      )"; then logError "Failed to retrieve release from https://downloads.gtnewhorizons.com/versions.json"
-      exit 1
-    fi
-    log "Selected $(jq '.key' <<< "$release_object") as latest version for download."
-  
+    release_object=$(getGTNHversion '(.versions // .)|to_entries|sort_by(.value.releaseDate)|map(select(.value.title=="Stable release"))|.[-1]') || exit 1
+    log_version_from="latest";
+
   else
-    if ! release_object="$(
-      curl -fsSL "https://downloads.gtnewhorizons.com/versions.json" \
-        | jq -r --arg USRIN "$GTNH_PACK_VERSION" '(.versions // .)|to_entries|sort_by(.value.releaseDate)|map(select(.key==$USRIN))|.[]'
-      )"; then logError "Failed to retrieve release from https://downloads.gtnewhorizons.com/versions.json"
-      exit 1
-    fi
-    log "Selected $(jq -r '.key' <<< "$release_object") as matching version for download."
-  
+    release_object=$(getGTNHversion --arg USRIN "$GTNH_PACK_VERSION" '($USRIN | ascii_downcase) as $in|(.versions // .)|to_entries|sort_by(.value.releaseDate)|map(select((.key | ascii_downcase)==$in))|.[]') || exit 1
+    log_version_from="matching";
+
   fi
 
   if [[ -z $release_object ]]; then
     logError "No release found for GTNH_PACK_VERSION=$GTNH_PACK_VERSION. Please check if the version is valid."
     exit 1
+  else
+    log "Selected \"$(jq -r '.key' <<< "$release_object")\" as ${log_version_from} version for download."
   fi
   
   # Select compatible server files for java version

scripts/start-deployPumpkin

@@ -0,0 +1,159 @@
+#!/bin/bash
+
+# shellcheck source=start-utils
+. "${SCRIPTS:-$(dirname "$0")}/start-utils"
+set -o pipefail
+set -e
+isDebugging && set -x
+
+# Pumpkin is released as a native executable per platform
+case "$(uname -m)" in
+  x86_64 | amd64)
+    pumpkinArch=X64
+    ;;
+  aarch64 | arm64)
+    pumpkinArch=ARM64
+    ;;
+  *)
+    logError "Pumpkin does not provide a Linux build for $(uname -m)"
+    exit 1
+    ;;
+esac
+
+pumpkinAsset="pumpkin-${pumpkinArch}-Linux"
+# The Alpine based image needs the musl linked build
+if [[ $(getDistro) == alpine ]]; then
+  pumpkinAsset+="-musl"
+fi
+
+if isTrue "${FORCE_REDOWNLOAD:-false}"; then
+  log "Forcing re-download of ${pumpkinAsset}"
+  rm -f "/data/${pumpkinAsset}"
+fi
+
+if ! SERVER=$(mc-image-helper github download-latest-asset \
+  --output-directory=/data \
+  --name-pattern="^${pumpkinAsset}$" \
+  Pumpkin-MC/Pumpkin
+  ); then
+    logError "Failed to download ${pumpkinAsset} from the latest Pumpkin release"
+    exit 1
+fi
+
+log "Using Pumpkin server executable ${SERVER}"
+if [[ ! -x "${SERVER}" ]]; then
+  chmod +x "${SERVER}"
+fi
+
+export SERVER
+# Native executable, so the final exec skips the JVM handling
+export FAMILY=NATIVE
+
+pumpkinConfig=/data/pumpkin.toml
+
+# Narrow booleans to the values that the patch bool conversion accepts
+function exportBoolean() {
+  local target=$1
+  local source=$2
+  if [[ -v $source ]]; then
+    local value=false
+    if isTrue "${!source}"; then
+      value=true
+    fi
+    printf -v "$target" '%s' "$value"
+    export "$target"
+  fi
+}
+
+function exportInteger() {
+  local target=$1
+  local source=$2
+  if [[ -v $source ]] && isNumeric "${!source}"; then
+    printf -v "$target" '%s' "${!source}"
+    export "$target"
+  fi
+}
+
+function normalizeGamemode() {
+  case "${1,,}" in
+    0 | su*) echo Survival ;;
+    1 | c*) echo Creative ;;
+    2 | a*) echo Adventure ;;
+    3 | sp*) echo Spectator ;;
+    *) echo "$1" ;;
+  esac
+}
+
+function normalizeDifficulty() {
+  case "${1,,}" in
+    0 | p*) echo Peaceful ;;
+    1 | e*) echo Easy ;;
+    2 | n*) echo Normal ;;
+    3 | h*) echo Hard ;;
+    *) echo "$1" ;;
+  esac
+}
+
+exportBoolean PUMPKIN_ONLINE_MODE ONLINE_MODE
+exportBoolean PUMPKIN_HARDCORE HARDCORE
+exportBoolean PUMPKIN_ALLOW_NETHER ALLOW_NETHER
+exportBoolean PUMPKIN_FORCE_GAMEMODE FORCE_GAMEMODE
+exportBoolean PUMPKIN_ENFORCE_WHITELIST ENFORCE_WHITELIST
+exportBoolean PUMPKIN_ACCEPTS_TRANSFERS ACCEPTS_TRANSFERS
+exportBoolean PUMPKIN_PREVENT_PROXY_CONNECTIONS PREVENT_PROXY_CONNECTIONS
+exportBoolean PUMPKIN_PVP PVP
+exportBoolean PUMPKIN_ENABLE_RCON ENABLE_RCON
+exportBoolean PUMPKIN_ENABLE_QUERY ENABLE_QUERY
+exportBoolean PUMPKIN_RESOURCE_PACK_ENFORCE RESOURCE_PACK_ENFORCE
+
+exportInteger PUMPKIN_MAX_PLAYERS MAX_PLAYERS
+exportInteger PUMPKIN_VIEW_DISTANCE VIEW_DISTANCE
+exportInteger PUMPKIN_SIMULATION_DISTANCE SIMULATION_DISTANCE
+exportInteger PUMPKIN_OP_PERMISSION_LEVEL OP_PERMISSION_LEVEL
+exportInteger PUMPKIN_SPAWN_PROTECTION SPAWN_PROTECTION
+
+if [[ -v MODE ]]; then
+  PUMPKIN_GAMEMODE=$(normalizeGamemode "$MODE")
+  export PUMPKIN_GAMEMODE
+fi
+
+if [[ -v DIFFICULTY ]]; then
+  PUMPKIN_DIFFICULTY=$(normalizeDifficulty "$DIFFICULTY")
+  export PUMPKIN_DIFFICULTY
+fi
+
+# The image enables the whitelist whenever one is provided
+if [[ -v WHITELIST || -v WHITELIST_FILE ]]; then
+  export PUMPKIN_WHITE_LIST=true
+else
+  exportBoolean PUMPKIN_WHITE_LIST ENABLE_WHITELIST
+fi
+
+if [[ -v RESOURCE_PACK ]]; then
+  export PUMPKIN_RESOURCE_PACK_ENABLED=true
+fi
+
+# Only override the listening addresses when a port was declared
+if [[ -v SERVER_PORT ]]; then
+  export PUMPKIN_JAVA_ADDRESS="0.0.0.0:${SERVER_PORT}"
+fi
+if [[ -v RCON_PORT ]]; then
+  export PUMPKIN_RCON_ADDRESS="0.0.0.0:${RCON_PORT}"
+fi
+if [[ -v QUERY_PORT ]]; then
+  export PUMPKIN_QUERY_ADDRESS="0.0.0.0:${QUERY_PORT}"
+fi
+
+if [[ ! -f "$pumpkinConfig" ]]; then
+  log "Creating initial Pumpkin configuration"
+  cp /image/pumpkin.toml "$pumpkinConfig"
+fi
+
+log "Applying Pumpkin configuration from environment variables"
+# Undeclared variables only warn, so only surface failures
+if ! pumpkinPatchResult=$(mc-image-helper patch --patch-env-prefix "" /image/pumpkin-config-patch.json 2>&1); then
+  logWarning "Failed to apply one or more settings to ${pumpkinConfig}"
+  echo "$pumpkinPatchResult" | applyLogPrefix
+fi
+
+exec "$(dirname "$0")/start-setupWorld" "$@"

scripts/start-finalExec

@@ -4,10 +4,27 @@
 : "${SETUP_ONLY:=false}"
 : "${CUSTOM_JAR_EXEC:=}"
 : "${SERVER_RUNNER:=mc-server-runner}"
+: "${PRE_START_SCRIPT:=}"
 
 # shellcheck source=start-utils
 . "$(dirname "$0")/start-utils"
 isDebugging && set -x
+
+function runPreStartScript() {
+  if [[ ! $PRE_START_SCRIPT ]]; then
+    return
+  fi
+  if [[ ! -x $PRE_START_SCRIPT ]]; then
+    logError "PRE_START_SCRIPT $PRE_START_SCRIPT is not an executable file"
+    exit 1
+  fi
+  log "Running pre-start script $PRE_START_SCRIPT..."
+  if ! "$PRE_START_SCRIPT"; then
+    logError "Pre-start script $PRE_START_SCRIPT failed, so the server will not be started"
+    exit 1
+  fi
+}
+
 baseDataDir=/data
 tmpServerIconPath=/tmp/icon.img
 serverIconPath=${baseDataDir}/server-icon.png
@@ -74,7 +91,9 @@ oldState=$(shopt -po xtrace || true)
 shopt -u -o xtrace
 # 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
+if isFamily NATIVE; then
+  : # Native server, so there is no log4j to patch
+elif 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
@@ -94,7 +113,9 @@ if ${useFallbackJvmFlag}; then
   JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
 fi
 
-if versionLessThan 1.7; then
+if isFamily NATIVE; then
+  : # Native server, so no Log4jPatcher agent
+elif versionLessThan 1.7; then
   : # No patch required here.
 elif versionLessThan 1.18.1; then
   if isTrue "${SKIP_LOG4J_PATCHER:-false}"; then
@@ -106,7 +127,9 @@ fi
 
 # Set up log4j2 configuration with templating support
 LOGFILE="${SERVER_DIR}/log4j2.xml"
-if ${useGeneratedLogs}; then
+if isFamily NATIVE; then
+  : # Native server, so no log4j configuration
+elif ${useGeneratedLogs}; then
   # Set up log configuration defaults
   : "${LOG_LEVEL:=info}"
   : "${ROLLING_LOG_MAX_FILES:=1000}"
@@ -178,12 +201,12 @@ else
 fi
 
 # Optional disable console
-if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
+if ! isFamily NATIVE && versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
   EXTRA_ARGS+=" --noconsole"
 fi
 
 # Optional disable GUI for headless servers
-if [[ ${GUI,,} = false ]]; then
+if ! isFamily NATIVE && [[ ${GUI,,} = false ]]; then
   EXTRA_ARGS+=" nogui"
 fi
 
@@ -455,7 +478,10 @@ function copyFilesForCurseForge() {
   cp -f ${baseDataDir}/eula.txt "${FTB_DIR}/"
 }
 
-if versionLessThan 'b1.8'; then
+if isFamily NATIVE; then
+  # Native server, always probed with the modern server list ping
+  rm -f "$mcHealthEnvPath"
+elif versionLessThan 'b1.8'; then
   echo "
 DISABLE_HEALTHCHECK=true
   " > "$mcHealthEnvPath"
@@ -505,6 +531,7 @@ if [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
     exit 1
   fi
   log "Starting CurseForge server in ${FTB_DIR}..."
+  runPreStartScript
   if isTrue "${DEBUG_EXEC}"; then
     set -x
   fi
@@ -569,6 +596,7 @@ fi
       JVM_ARGS=${JVM_ARGS//$'\n'/}
       sed -i "s~JAVA_ARGS=.*~JAVA_ARGS=\"${JVM_ARGS}\"~" "${FTB_DIR}/variables.txt"
   fi
+  runPreStartScript
   exec ${SERVER_RUNNER} "${mcServerRunnerArgs[@]}" -- "${finalArgs[@]}"
 elif [[ $SERVER =~ run.sh ]]; then
   log "Using Forge supplied run.sh script..."
@@ -577,10 +605,34 @@ elif [[ $SERVER =~ run.sh ]]; then
     echo "SETUP_ONLY: bash ${SERVER}"
     exit
   fi
+  runPreStartScript
   if isTrue "${DEBUG_EXEC}"; then
     set -x
   fi
   exec ${SERVER_RUNNER} "${mcServerRunnerArgs[@]}" --shell bash -- "${SERVER}" $EXTRA_ARGS
+elif isFamily NATIVE; then
+  # Native server, so no JVM arguments
+  if [[ ! -x "$SERVER" ]]; then
+    log "Making $SERVER executable"
+    if ! chmod +x "$SERVER"; then
+      logError "Failed to make $SERVER executable"
+      exit 1
+    fi
+  fi
+
+  if isTrue "${SETUP_ONLY}"; then
+    echo "SETUP_ONLY: ${SERVER}"
+    exit
+  fi
+
+  runPreStartScript
+  if isTrue "${DEBUG_EXEC}"; then
+    set -x
+  fi
+
+  log "Starting the Minecraft server..."
+  # shellcheck disable=SC2086
+  exec ${SERVER_RUNNER} ${bootstrapArgs} "${mcServerRunnerArgs[@]}" -- "${SERVER}" "$@" $EXTRA_ARGS
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f $bootstrapPath ]; then
@@ -614,6 +666,7 @@ else
     exit
   fi
 
+  runPreStartScript
   if isTrue "${DEBUG_EXEC}"; then
     set -x
   fi

scripts/start-setupModpack

@@ -9,6 +9,11 @@ set -e -o pipefail
 : "${PLUGINS_FILE:=}"
 : "${REMOVE_OLD_MODS_DEPTH:=1} "
 : "${REMOVE_OLD_MODS_INCLUDE:=*.jar,*-version.json}"
+: "${REMOVE_OLD_CONFIGS:=false}"
+: "${CONFIG_OUT_DIR:=/data/config}"
+: "${REMOVE_OLD_CONFIGS_DEPTH:=16}"
+: "${REMOVE_OLD_CONFIGS_INCLUDE:=*}"
+: "${REMOVE_OLD_CONFIGS_EXCLUDE:=}"
 : "${CF_USE_HTTP2:=false}" # CF downloads are faster with HTTP 1.1
 : "${MODRINTH_LOADER:=}"
 
@@ -25,6 +30,10 @@ if isTrue "${REMOVE_OLD_MODS}" && [ -z "${MODS_FILE}" ]; then
   rm -f "$sum_file"
 fi
 
+if isTrue "${REMOVE_OLD_CONFIGS}"; then
+  removeOldConfigs "$CONFIG_OUT_DIR"
+fi
+
 function handlePackwiz() {
   # If packwiz url passed, bootstrap packwiz and update mods before other modpack processing
   if [[ "${PACKWIZ_URL:-}" ]]; then

scripts/start-utils

@@ -547,6 +547,23 @@ function removeOldMods {
   fi
 }
 
+function removeOldConfigs {
+  if [ -d "$1" ]; then
+    log "Removing old configs including='${REMOVE_OLD_CONFIGS_INCLUDE}' excluding='${REMOVE_OLD_CONFIGS_EXCLUDE}' up to depth=${REMOVE_OLD_CONFIGS_DEPTH}"
+    args=(
+      --delete
+      --type file
+      --min-depth=1 --max-depth "${REMOVE_OLD_CONFIGS_DEPTH}"
+      --name "${REMOVE_OLD_CONFIGS_INCLUDE}"
+      --exclude-name "${REMOVE_OLD_CONFIGS_EXCLUDE}"
+    )
+    if ! isDebugging; then
+      args+=(--quiet)
+    fi
+    mc-image-helper find "${args[@]}" "$1"
+  fi
+}
+
 function get() {
   mc-image-helper get "$@"
 }
@@ -579,11 +596,21 @@ function isType() {
 }
 
 function extract() {
-  src=${1?}
-  destDir=${2?}
+  local src=${1?}
+  local destDir=${2?}
   shift 2
-  # remaining args are paths within the archive to extract; if none, extract everything
+  # Remaining args are paths within the archive; if none, extract everything.
 
+  # Use modern `mc-image-helper extract archive` if it exists. Standardises extraction logic
+  # and checks if ZipSlips / Path Traversals exist before extraction
+  # Supports ZIP, TAR, TAR.GZ, TAR.BZ2, TAR.ZSTD 
+  if mc-image-helper has-feature archive; then
+    mc-image-helper archive extract --overwrite -- "${src}" "${destDir}" "$@"
+    return $?
+  fi
+
+  # Older helper builds, including Java 8, use the shell extraction fallback.
+  local type
   type=$(file -b --mime-type "${src}")
   if [[ "$type" == application/octet-stream ]]; then
       logWarning "Detected non-specific file type $type for $src"
@@ -629,6 +656,23 @@ function getDistro() {
   grep -E "^ID=" /etc/os-release | cut -d= -f2 | sed -e 's/"//g'
 }
 
+function getJavaRelease() {
+  # Read the major version from the JDK's release file so no JVM has to start;
+  # the helper is the fallback when the file is missing.
+  local version
+  if [[ ${JAVA_HOME:-} && -f "$JAVA_HOME/release" ]]; then
+    version=$(sed -n -e 's/^JAVA_VERSION="\(.*\)"$/\1/p' "$JAVA_HOME/release")
+    # Java 8 and earlier report 1.8.0_312 and so on
+    version=${version#1.}
+    version=${version%%[._-]*}
+  fi
+  if isNumeric "${version:-}"; then
+    echo "$version"
+  else
+    mc-image-helper java-release
+  fi
+}
+
 function checkSum() {
   local sum_file=${1?}
 

tests/setuponlytests/pumpkin/docker-compose.yml

@@ -0,0 +1,21 @@
+services:
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      SETUP_ONLY: "TRUE"
+      TYPE: PUMPKIN
+      MOTD: "Pumpkin test MOTD"
+      MAX_PLAYERS: "25"
+      ONLINE_MODE: "false"
+      MODE: "creative"
+      DIFFICULTY: "hard"
+      LEVEL: "myworld"
+      VIEW_DISTANCE: "8"
+      PVP: "false"
+      ENABLE_QUERY: "true"
+      QUERY_PORT: "25566"
+      RCON_PORT: "25576"
+    volumes:
+      - ./data:/data

tests/setuponlytests/pumpkin/verify.sh

@@ -0,0 +1,29 @@
+mc-image-helper assert fileExists "/data/pumpkin-*-Linux*"
+
+pumpkinToml=/data/pumpkin.toml
+
+assertPathEquals() {
+  local path=$1
+  local expected=$2
+  local actual
+  actual=$(mc-image-helper toml-path --file "${pumpkinToml}" "${path}")
+  if [[ ${actual} != "${expected}" ]]; then
+    echo "Expected ${path} to be '${expected}', but was '${actual}'"
+    exit 1
+  fi
+}
+
+assertPathEquals '$.networking.java.motd' "Pumpkin test MOTD"
+assertPathEquals '$.networking.bedrock.motd' "Pumpkin test MOTD"
+assertPathEquals '$.networking.java.max_players' "25"
+assertPathEquals '$.networking.bedrock.max_players' "25"
+assertPathEquals '$.networking.java.online_mode' "false"
+assertPathEquals '$.networking.bedrock.online_mode' "false"
+assertPathEquals '$.networking.java.view_distance' "8"
+assertPathEquals '$.default_gamemode' "Creative"
+assertPathEquals '$.default_difficulty' "Hard"
+assertPathEquals '$.default_level_name' "myworld"
+assertPathEquals '$.pvp.enabled' "false"
+assertPathEquals '$.networking.query.enabled' "true"
+assertPathEquals '$.networking.query.address' "0.0.0.0:25566"
+assertPathEquals '$.networking.rcon.address' "0.0.0.0:25576"

tests/setuponlytests/remove-old-configs/docker-compose.yml

@@ -0,0 +1,43 @@
+services:
+  # copies an existing config into /data before mc starts, so REMOVE_OLD_CONFIGS
+  # has an old config to remove once the modpack config is installed
+  seed:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    entrypoint: ["bash", "-c", "mkdir -p /data/config && cp /seed/config/stale.txt /data/config/ && chown -R 1000:1000 /data"]
+    volumes:
+      - ./seed:/seed
+      - ./data:/data
+
+  web:
+    image: nginx
+    volumes:
+      - ./configs.zip:/usr/share/nginx/html/configs.zip:ro
+    healthcheck:
+      test: ["CMD", "curl", "--fail", "http://localhost/configs.zip"]
+      interval: 3s
+      timeout: 5s
+      retries: 3
+
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    depends_on:
+      seed:
+        condition: service_completed_successfully
+      web:
+        condition: service_healthy
+    environment:
+      EULA: "true"
+      SETUP_ONLY: "true"
+      GENERIC_PACKS: http://web/configs.zip
+      REMOVE_OLD_CONFIGS: "true"
+      LOG_TIMESTAMP: "true"
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
+      DEBUG: "true"
+    volumes:
+      - ./data:/data
+      - ./fake.jar:/servers/fake.jar

tests/setuponlytests/remove-old-configs/seed/config/stale.txt

@@ -0,0 +1 @@
+old

tests/setuponlytests/remove-old-configs/verify.sh

@@ -0,0 +1,3 @@
+# verify that the old config was removed and the new one from the pack was installed
+mc-image-helper assert fileNotExists config/stale.txt
+mc-image-helper assert fileExists config/opt.yml