Force-include SDM UI Lib and GeckolibBetterFPS for CurseForge packs (#4385)

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

.github/workflows/build.yml

@@ -193,14 +193,14 @@ jobs:
           tests/test.sh
 
       - name: Login to DockerHub
-        uses: docker/login-action@v4.6.0
+        uses: docker/login-action@v4.7.0
         if: env.HAS_IMAGE_REPO_ACCESS == 'true'
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v4.6.0
+        uses: docker/login-action@v4.7.0
         if: env.HAS_IMAGE_REPO_ACCESS == 'true'
         with:
           registry: ghcr.io

Dockerfile

@@ -45,7 +45,7 @@ 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=1.18.3
+ARG MC_MONITOR_VERSION=1.19.0
 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
@@ -57,7 +57,7 @@ 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-image-helper versioning=loose
-ARG MC_HELPER_VERSION=1.74.2
+ARG MC_HELPER_VERSION=1.76.1
 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

docs/configuration/jvm-options.md

@@ -158,3 +158,5 @@ When `MEMORY` is greater than or equal to 12G, then the Aikar flags will be adju
 [MeowIce has created an updated set of JVM flags](https://github.com/MeowIce/meowice-flags?tab=readme-ov-file#why-would-i-have-to-switch-) based on Aikar's flags but with support for optimizations for Java 17 and above
 
 The set of flags documented there can be added by setting the environment variable `USE_MEOWICE_FLAGS` to `true`. There is an optional `USE_MEOWICE_GRAALVM_FLAGS` variable to enable GraalVM specific optimizations, defaults to `FALSE`.
+
+MeowIce's flags use the G1 garbage collector by default. MeowIce also provides a [ZGC version of the flags](https://github.com/MeowIce/meowice-flags#zgc-version-for-large-servers-with-32gb-allocated-heap), which is recommended for servers with 32GB or more of allocated memory and many CPU cores. To use it instead, also set `USE_MEOWICE_ZGC_FLAGS` to `true`. When `MAX_MEMORY` (or `MEMORY`) is larger than 2GB, the soft max heap size is set to 2GB below it, as in MeowIce's flags.

docs/misc/deployment/index.md

@@ -21,8 +21,8 @@
 
 [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.
+- You can then enable [Minecraft](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/minecraft/README.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.
+- 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/components/authelia/README.md), [remote backups](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/backup_borg/README.md), [email relay](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/exim_relay/README.md), [cron monitoring](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/healthchecks/README.md), [audio and video conferencing](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/jitsi/README.md), databases ([MariaDB](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/mariadb/README.md), [PostgresSQL](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/postgres/README.md)), [push notifications](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/ntfy/README.md), [uptime monitoring](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/uptime_kuma/README.md), [a website](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/components/wordpress/README.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/components/auxiliary/README.md) automatically on deployment.
 
 ## On CloudFormation (AWS)
 

docs/mods-and-plugins/index.md

@@ -60,9 +60,9 @@ There are optional volume paths that can be attached to supply content to be cop
 
 By default, the [environment variable processing](../configuration/interpolating.md) 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`.
 
-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, which are comma separated lists of file glob patterns. If a directory is excluded, then it and all of its contents are excluded. By default, only jars are removed. 
+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, which are comma separated lists of file glob patterns. If a directory is excluded, then it and all of its contents are excluded. By default, `REMOVE_OLD_MODS_INCLUDE` is `*.jar,*-version.json`, so jars and the `*-version.json` files are removed.
 
-You can also specify the `REMOVE_OLD_MODS_DEPTH` (default is 16) variable to only delete files up to a certain level.
+You can also specify the `REMOVE_OLD_MODS_DEPTH` (default is 1) variable to only delete files up to a certain level. With the default, only files directly inside the `plugins/` or `mods/` directory are removed.
 
 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.
 
@@ -301,4 +301,4 @@ docker run -d -e REMOVE_OLD_MODS=TRUE -e MODPACK=http://www.example.com/mods/mod
 
 !!! danger 
 
-    All content of the `mods` or `plugins` directory will be deleted before unpacking new content from the MODPACK or MODS.
+    Files in the `mods` and `plugins` directories that match `REMOVE_OLD_MODS_INCLUDE` (by default, jars and `*-version.json` files directly inside them) will be deleted before unpacking new content from the MODPACK or MODS.

docs/requirements.txt

@@ -2,24 +2,24 @@ click==8.5.0
 colorama==0.4.6
 deepmerge==3.0.1
 ghp-import==2.1.0
-griffe==2.3.2
+griffe==2.4.1
 Jinja2==3.1.6
-Markdown==3.11.1
+Markdown==3.11.2
 MarkupSafe==3.0.4
 mergedeep==1.3.4
 mkdocs==1.6.1
-mkdocs-autorefs==1.4.4
+mkdocs-autorefs==1.4.5
 mkdocs-get-deps==0.2.2
-mkdocstrings==1.0.7
+mkdocstrings==1.0.8
-mkdocstrings-python==2.0.9
+mkdocstrings-python==2.0.10
 packaging==26.3
 pathspec==1.1.1
-platformdirs==4.13.4
+platformdirs==4.14.2
 Pygments==2.21.0
 pymdown-extensions==12.3
-python-dateutil==2.9.0.post0
+python-dateutil==3.0.0
 PyYAML==6.0.3
 pyyaml_env_tag==1.1
 six==1.17.0
 watchdog==6.0.0
-zensical==0.0.71
+zensical==0.0.74

docs/variables.md

@@ -129,6 +129,12 @@ alternatively, you can mount: <code>/etc/localtime:/etc/localtime:ro
             <td><code>true</code></td>
             <td>⬜️</td>
         </tr>
+        <tr>
+            <td><code>USE_MEOWICE_ZGC_FLAGS</code></td>
+            <td>uses the ZGC version of MeowIce's flags instead of the G1 version when USE_MEOWICE_FLAGS is also TRUE</td>
+            <td><code>false</code></td>
+            <td>⬜️</td>
+        </tr>
         <tr>
             <td><code>JVM_OPTS</code></td>
             <td>General JVM options can be passed to the Minecraft Server invocation by passing a <code>JVM_OPTS</code> environment variable. The JVM requires -XX options to precede -X options, so those can be declared in <code>JVM_XX_OPTS</code>. Both variables are space-delimited, raw JVM arguments</td>

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

@@ -0,0 +1,27 @@
+services:
+  minecraft:
+    image: itzg/minecraft-server:java25
+    tty: true
+    stdin_open: true
+    ports:
+      - "25565:25565"
+    environment:
+      EULA: true
+      MOD_PLATFORM: AUTO_CURSEFORGE
+      CF_SLUG: "custom"
+      CF_MODPACK_ZIP: "/downloads/modpacks/PO3-3.5.1.zip"
+      APPLY_CLEANROOM: true
+      # Mod needed for this pack
+      CF_FORCE_INCLUDE_MODS: hwyla
+      MEMORY: 8G
+      OVERRIDE_SERVER_PROPERTIES: true
+      LEVEL_TYPE: botania-skyblock
+    volumes:
+      - ./downloads:/downloads
+      - ./data:/data
+      # Uses managed volume by default
+      #- mc-data:/data    
+
+# Managed volume by default
+#volumes:
+  #mc-data:

files/cf-exclude-include.json

@@ -176,11 +176,18 @@
     "yungs-menu-tweaks",
     "zume"
   ],
-  "globalForceIncludes": ["simply-tooltips"],
+  "globalForceIncludes": [
+    "simply-tooltips",
+    "sdm-ui-lib",
+    "geckolibbetterfps"
+  ],
   "modpacks": {
     "all-of-fabric-6": {
       "forceIncludes": ["revelationary"]
     },
+    "better-mc-forge-bmc4": {
+      "forceIncludes": ["wakes-reforged"]
+    },
     "beyond-depth": {
       "forceIncludes": ["particular-reforged"]
     },

scripts/start-deployPumpkin

@@ -21,9 +21,10 @@ case "$(uname -m)" in
 esac
 
 pumpkinAsset="pumpkin-${pumpkinArch}-Linux"
-# The Alpine based image needs the musl linked build
 if [[ $(getDistro) == alpine ]]; then
-  pumpkinAsset+="-musl"
+  # https://github.com/Pumpkin-MC/Pumpkin/issues/4518#issuecomment-6719704189
+  logError "PumpkinMC is no longer supported for Alpine/musl"
+  exit 1
 fi
 
 pumpkinReleasesUrl=https://github.com/Pumpkin-MC/Pumpkin/releases

scripts/start-finalExec

@@ -65,66 +65,11 @@ if [ -n "$ICON" ]; then
     fi
 fi
 
-useGeneratedLogs=${GENERATE_LOG4J2_CONFIG:-${ENABLE_ROLLING_LOGS:-false}}
-useFallbackJvmFlag=false
-
 SERVER_DIR="$baseDataDir"
 if [[ ${FTB_DIR:-} ]]; then
   SERVER_DIR="$FTB_DIR"
 fi
 
-
-patchLog4jConfig() {
-  file=${1?}
-  url=${2?}
-  if ! get -o "${SERVER_DIR}/${file}" "$url"; then
-    logError "Failed to download corrected log4j config, fallback to JVM flag"
-    useFallbackJvmFlag=true
-    return 1
-  fi
-  JVM_OPTS="-Dlog4j.configurationFile=${file} ${JVM_OPTS}"
-  useGeneratedLogs=false
-}
-
-# Temporarily disable debugging output
-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 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
-elif isFamily VANILLA && versionLessThan 1.17; then
-  patchLog4jConfig log4j2_112-116.xml https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml
-# See https://purpurmc.org/docs/Log4j/
-elif isType PURPUR && versionLessThan 1.17; then
-  patchLog4jConfig purpur_log4j2_1141-1165.xml https://purpurmc.org/docs/xml/purpur_log4j2_1141-1165.xml
-elif isType PURPUR && versionLessThan 1.18.1; then
-  patchLog4jConfig purpur_log4j2_117.xml https://purpurmc.org/docs/xml/purpur_log4j2_117.xml
-elif versionLessThan 1.18.1; then
-  useFallbackJvmFlag=true
-fi
-eval "$oldState"
-
-if ${useFallbackJvmFlag}; then
-  JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
-fi
-
-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
-    log "Skipping Log4jPatcher, make sure you are not affected"
-  else
-    JVM_OPTS="-javaagent:/image/Log4jPatcher.jar ${JVM_OPTS}"
-  fi
-fi
-
 function addAgents() {
   local agents=$1 outDir=$2 glob=$3 option=$4
 
@@ -158,80 +103,8 @@ else
   fi
 fi
 
-# Set up log4j2 configuration with templating support
+# shellcheck source=start-finalExec-log4j
-LOGFILE="${SERVER_DIR}/log4j2.xml"
+. "$(dirname "$0")/start-finalExec-log4j"
-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}"
-  # Note: Can't use ${VAR:=default} syntax for values containing } as it breaks parsing
-  if [ -z "${ROLLING_LOG_FILE_PATTERN}" ]; then
-    ROLLING_LOG_FILE_PATTERN='logs/%d{yyyy-MM-dd}-%i.log.gz'
-  fi
-
-  # Pattern format defaults (compatible with vanilla Minecraft)
-  # Note: Can't use ${VAR:=default} syntax because } in the value breaks parsing
-  if [ -z "${LOG_CONSOLE_FORMAT}" ]; then
-    LOG_CONSOLE_FORMAT='[%d{HH:mm:ss}] [%t/%level]: %msg%n'
-  fi
-  if [ -z "${LOG_TERMINAL_FORMAT}" ]; then
-    LOG_TERMINAL_FORMAT='[%d{HH:mm:ss} %level]: %msg%n'
-  fi
-  if [ -z "${LOG_FILE_FORMAT}" ]; then
-    LOG_FILE_FORMAT='[%d{HH:mm:ss}] [%t/%level]: %msg%n'
-  fi
-
-  export LOG_LEVEL ROLLING_LOG_FILE_PATTERN ROLLING_LOG_MAX_FILES
-  export LOG_CONSOLE_FORMAT LOG_TERMINAL_FORMAT LOG_FILE_FORMAT
-
-
-  # Always regenerate if file doesn't exist
-  if [ ! -e "$LOGFILE" ] || isTrue "${REGENERATE_LOG4J2:-true}"; then
-    log "Generating log4j2.xml from template in ${LOGFILE}"
-
-    # Generate log4j2.xml using heredoc for reliable variable substitution
-    cat > "$LOGFILE" <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="SysOut" target="SYSTEM_OUT">
-            <PatternLayout pattern="${LOG_CONSOLE_FORMAT}" />
-        </Console>
-        <Queue name="TerminalConsole">
-            <PatternLayout pattern="${LOG_TERMINAL_FORMAT}" />
-        </Queue>
-        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="${ROLLING_LOG_FILE_PATTERN}">
-            <PatternLayout pattern="${LOG_FILE_FORMAT}" />
-            <Policies>
-                <TimeBasedTriggeringPolicy />
-                <OnStartupTriggeringPolicy />
-            </Policies>
-            <DefaultRolloverStrategy max="${ROLLING_LOG_MAX_FILES}"/>
-        </RollingRandomAccessFile>
-    </Appenders>
-    <Loggers>
-        <Root level="${LOG_LEVEL}">
-            <filters>
-                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
-            </filters>
-            <AppenderRef ref="SysOut"/>
-            <AppenderRef ref="File"/>
-            <AppenderRef ref="TerminalConsole"/>
-        </Root>
-    </Loggers>
-</Configuration>
-EOF
-  else
-    log "log4j2.xml already exists and is up to date, skipping generation"
-  fi
-
-  # Apply the log4j2 configuration
-  JVM_OPTS="-Dlog4j.configurationFile=log4j2.xml ${JVM_OPTS}"
-else
-  rm -f "${LOGFILE}"
-fi
 
 # Optional disable console
 if ! isFamily NATIVE && versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
@@ -265,210 +138,8 @@ if isTrue "${ENABLE_JMX}"; then
   log "JMX is enabled. Make sure you have port forwarding for ${JMX_PORT}"
 fi
 
-: "${USE_AIKAR_FLAGS:=false}"
+# shellcheck source=start-finalExec-jvmFlags
-: "${USE_MEOWICE_FLAGS:=false}"
+. "$(dirname "$0")/start-finalExec-jvmFlags"
-: "${USE_MEOWICE_GRAALVM_FLAGS:=false}"
-
-if isTrue "${USE_MEOWICE_FLAGS}" || isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
-  java_major_version=$(mc-image-helper java-release)
-fi
-
-if isTrue "${USE_MEOWICE_FLAGS}"; then
-  if [[ $java_major_version -gt 16 ]]; then
-    log "Java version $java_major_version using MeowIce's flags for Java 17+"
-  else
-    log "Your Java version is $java_major_version, MeowIce's flags are for Java 17+ falling back to Aikar's"
-    USE_MEOWICE_FLAGS=FALSE
-    USE_AIKAR_FLAGS=TRUE
-  fi
-fi
-
-if isTrue "${USE_AIKAR_FLAGS}" || isTrue "${USE_MEOWICE_FLAGS}"; then
-  # From https://mcflags.emc.gs/
-  if isTrue "${USE_MEOWICE_FLAGS}"; then
-    log "Using MeowIce's flags"
-    G1NewSizePercent=28
-    G1MaxNewSizePercent=50
-    G1HeapRegionSize=16M
-    G1ReservePercent=15
-    InitiatingHeapOccupancyPercent=20
-    G1MixedGCCountTarget=3
-    G1RSetUpdatingPauseTimePercent=0
-  elif [[ $MAX_MEMORY ]] && (( $(normalizeMemSize "${MAX_MEMORY}") >= $(normalizeMemSize 12g) )); then
-    log "Using Aikar's >12GB flags"
-    G1NewSizePercent=40
-    G1MaxNewSizePercent=50
-    G1HeapRegionSize=16M
-    G1ReservePercent=15
-    InitiatingHeapOccupancyPercent=20
-    G1MixedGCCountTarget=4
-    G1RSetUpdatingPauseTimePercent=5
-  else
-    log "Using Aikar's flags"
-    G1NewSizePercent=30
-    G1MaxNewSizePercent=40
-    G1HeapRegionSize=8M
-    G1ReservePercent=20
-    InitiatingHeapOccupancyPercent=15
-    G1MixedGCCountTarget=4
-    G1RSetUpdatingPauseTimePercent=5
-  fi
-
-  JVM_XX_OPTS="${JVM_XX_OPTS}
-  -XX:+UseG1GC
-  -XX:+ParallelRefProcEnabled
-  -XX:MaxGCPauseMillis=200
-  -XX:+UnlockExperimentalVMOptions
-  -XX:+DisableExplicitGC
-  -XX:+AlwaysPreTouch
-  -XX:G1NewSizePercent=${G1NewSizePercent}
-  -XX:G1MaxNewSizePercent=${G1MaxNewSizePercent}
-  -XX:G1HeapRegionSize=${G1HeapRegionSize}
-  -XX:G1ReservePercent=${G1ReservePercent}
-  -XX:G1HeapWastePercent=5
-  -XX:G1MixedGCCountTarget=${G1MixedGCCountTarget}
-  -XX:InitiatingHeapOccupancyPercent=${InitiatingHeapOccupancyPercent}
-  -XX:G1MixedGCLiveThresholdPercent=90
-  -XX:G1RSetUpdatingPauseTimePercent=${G1RSetUpdatingPauseTimePercent}
-  -XX:SurvivorRatio=32
-  -XX:+PerfDisableSharedMem
-  -XX:MaxTenuringThreshold=1
-  "
-  if isTrue "${USE_AIKAR_FLAGS}"; then
-    JVM_XX_OPTS="${JVM_XX_OPTS}
-    -Dusing.aikars.flags=https://mcflags.emc.gs
-    -Daikars.new.flags=true
-    "
-  fi
-fi
-
-if isTrue "${USE_MEOWICE_FLAGS}"; then
-  JVM_XX_OPTS="${JVM_XX_OPTS}
-  -XX:+UnlockDiagnosticVMOptions
-  -XX:+UnlockExperimentalVMOptions
-  -XX:G1SATBBufferEnqueueingThresholdPercent=30
-  -XX:G1ConcMarkStepDurationMillis=5
-  -XX:+UseNUMA
-  -XX:-DontCompileHugeMethods
-  -XX:MaxNodeLimit=240000
-  -XX:NodeLimitFudgeFactor=8000
-  -XX:ReservedCodeCacheSize=400M
-  -XX:NonNMethodCodeHeapSize=12M
-  -XX:ProfiledCodeHeapSize=194M
-  -XX:NonProfiledCodeHeapSize=194M
-  -XX:NmethodSweepActivity=1
-  -XX:+UseFastUnorderedTimeStamps
-  -XX:+UseCriticalJavaThreadPriority
-  -XX:AllocatePrefetchStyle=3
-  -XX:+AlwaysActAsServerClassMachine
-  -XX:+UseTransparentHugePages
-  -XX:LargePageSizeInBytes=2M
-  -XX:+UseLargePages
-  -XX:+EagerJVMCI
-  -XX:+UseStringDeduplication
-  -XX:+UseAES
-  -XX:+UseAESIntrinsics
-  -XX:+UseFMA
-  -XX:+UseLoopPredicate
-  -XX:+RangeCheckElimination
-  -XX:+OptimizeStringConcat
-  -XX:+UseCompressedOops
-  -XX:+UseThreadPriorities
-  -XX:+OmitStackTraceInFastThrow
-  -XX:+RewriteBytecodes
-  -XX:+RewriteFrequentPairs
-  -XX:+UseFPUForSpilling
-  -XX:+UseVectorCmov
-  -XX:+UseXMMForArrayCopy
-  -XX:+EliminateLocks
-  -XX:+DoEscapeAnalysis
-  -XX:+AlignVector
-  -XX:+OptimizeFill
-  -XX:+EnableVectorSupport
-  -XX:+UseCharacterCompareIntrinsics
-  -XX:+UseCopySignIntrinsic
-  -XX:+UseVectorStubs
-  "
-  if [[ $(arch) == "x86_64" ]]; then
-    JVM_XX_OPTS="${JVM_XX_OPTS}
-    -XX:+UseFastStosb
-    -XX:+UseNewLongLShift
-    -XX:+UseXmmI2D
-    -XX:+UseXmmI2F
-    -XX:+UseXmmLoadAndClearUpper
-    -XX:+UseXmmRegToRegMoveAll
-    -XX:UseAVX=2
-    -XX:UseSSE=4
-    "
-  else
-    log "cpu not x86_64, disabling architecture specific flags"
-  fi
-  if [[ $java_major_version -gt 23 ]]; then
-    JVM_XX_OPTS="${JVM_XX_OPTS}
-    -XX:+UseCompactObjectHeaders
-    "
-  fi
-fi
-
-if isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
-  if [[ $java_major_version -gt 23 ]]; then
-    log "Java 24 or higher detected, using modified GraalVM flags"
-    JVM_XX_OPTS="${JVM_XX_OPTS}
-    -XX:+UseFastJNIAccessors
-    -XX:+UseInlineCaches
-    -XX:+SegmentedCodeCache
-    -Djdk.nio.maxCachedBufferSize=262144
-    -Djdk.graal.UsePriorityInlining=true
-    -Djdk.graal.Vectorization=true
-    -Djdk.graal.OptDuplication=true
-    -Djdk.graal.DetectInvertedLoopsAsCounted=true
-    -Djdk.graal.LoopInversion=true
-    -Djdk.graal.VectorizeHashes=true
-    -Djdk.graal.EnterprisePartialUnroll=true
-    -Djdk.graal.VectorizeSIMD=true
-    -Djdk.graal.StripMineNonCountedLoops=true
-    -Djdk.graal.SpeculativeGuardMovement=true
-    -Djdk.graal.TuneInlinerExploration=1
-    -Djdk.graal.LoopRotation=true
-    -Djdk.graal.CompilerConfiguration=enterprise
-    "
-  else
-    log "Using MeowIce's flags for Graalvm"
-    JVM_XX_OPTS="${JVM_XX_OPTS}
-    -XX:+UseFastJNIAccessors
-    -XX:+UseInlineCaches
-    -XX:+SegmentedCodeCache
-    -Djdk.nio.maxCachedBufferSize=262144
-    -Dgraal.UsePriorityInlining=true
-    -Dgraal.Vectorization=true
-    -Dgraal.OptDuplication=true
-    -Dgraal.DetectInvertedLoopsAsCounted=true
-    -Dgraal.LoopInversion=true
-    -Dgraal.VectorizeHashes=true
-    -Dgraal.EnterprisePartialUnroll=true
-    -Dgraal.VectorizeSIMD=true
-    -Dgraal.StripMineNonCountedLoops=true
-    -Dgraal.SpeculativeGuardMovement=true
-    -Dgraal.TuneInlinerExploration=1
-    -Dgraal.LoopRotation=true
-    -Dgraal.OptWriteMotion=true
-    -Dgraal.CompilerConfiguration=enterprise
-    "
-  fi
-fi
-
-if isTrue "${USE_FLARE_FLAGS}"; then
-  JVM_XX_OPTS="${JVM_XX_OPTS}
-  -XX:+UnlockDiagnosticVMOptions
-  -XX:+DebugNonSafepoints
-  "
-fi
-
-if isTrue "${USE_SIMD_FLAGS}"; then
-  JVM_XX_OPTS="${JVM_XX_OPTS}
-  --add-modules=jdk.incubator.vector
-  "
-fi
 
 # Handle GTNH args
 if isType "GTNH"; then

scripts/start-finalExec-jvmFlags

@@ -0,0 +1,237 @@
+#!/bin/bash
+
+: "${USE_AIKAR_FLAGS:=false}"
+: "${USE_MEOWICE_FLAGS:=false}"
+: "${USE_MEOWICE_GRAALVM_FLAGS:=false}"
+: "${USE_MEOWICE_ZGC_FLAGS:=false}"
+
+if isTrue "${USE_MEOWICE_FLAGS}" || isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
+  java_major_version=$(mc-image-helper java-release)
+fi
+
+if isTrue "${USE_MEOWICE_FLAGS}"; then
+  if [[ $java_major_version -gt 16 ]]; then
+    log "Java version $java_major_version using MeowIce's flags for Java 17+"
+  else
+    log "Your Java version is $java_major_version, MeowIce's flags are for Java 17+ falling back to Aikar's"
+    USE_MEOWICE_FLAGS=FALSE
+    USE_AIKAR_FLAGS=TRUE
+  fi
+fi
+
+use_meowice_zgc=false
+if isTrue "${USE_MEOWICE_FLAGS}" && isTrue "${USE_MEOWICE_ZGC_FLAGS}"; then
+  use_meowice_zgc=true
+fi
+
+if isTrue "${use_meowice_zgc}"; then
+  log "Using MeowIce's ZGC flags"
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UseZGC
+  -XX:-ZProactive
+  -XX:+UnlockExperimentalVMOptions
+  -XX:+DisableExplicitGC
+  -XX:+AlwaysPreTouch
+  -XX:+PerfDisableSharedMem
+  "
+  # MeowIce sets the soft max heap size to 2GB below the max heap size
+  if [[ $MAX_MEMORY ]] && max_memory_bytes=$(normalizeMemSize "${MAX_MEMORY}") \
+      && (( max_memory_bytes > $(normalizeMemSize 2048m) )); then
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:SoftMaxHeapSize=$(( max_memory_bytes / 1048576 - 2048 ))M
+    "
+  fi
+elif isTrue "${USE_AIKAR_FLAGS}" || isTrue "${USE_MEOWICE_FLAGS}"; then
+  # From https://mcflags.emc.gs/
+  if isTrue "${USE_MEOWICE_FLAGS}"; then
+    log "Using MeowIce's flags"
+    G1NewSizePercent=28
+    G1MaxNewSizePercent=50
+    G1HeapRegionSize=16M
+    G1ReservePercent=15
+    InitiatingHeapOccupancyPercent=20
+    G1MixedGCCountTarget=3
+    G1RSetUpdatingPauseTimePercent=0
+  elif [[ $MAX_MEMORY ]] && (( $(normalizeMemSize "${MAX_MEMORY}") >= $(normalizeMemSize 12g) )); then
+    log "Using Aikar's >12GB flags"
+    G1NewSizePercent=40
+    G1MaxNewSizePercent=50
+    G1HeapRegionSize=16M
+    G1ReservePercent=15
+    InitiatingHeapOccupancyPercent=20
+    G1MixedGCCountTarget=4
+    G1RSetUpdatingPauseTimePercent=5
+  else
+    log "Using Aikar's flags"
+    G1NewSizePercent=30
+    G1MaxNewSizePercent=40
+    G1HeapRegionSize=8M
+    G1ReservePercent=20
+    InitiatingHeapOccupancyPercent=15
+    G1MixedGCCountTarget=4
+    G1RSetUpdatingPauseTimePercent=5
+  fi
+
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UseG1GC
+  -XX:+ParallelRefProcEnabled
+  -XX:MaxGCPauseMillis=200
+  -XX:+UnlockExperimentalVMOptions
+  -XX:+DisableExplicitGC
+  -XX:+AlwaysPreTouch
+  -XX:G1NewSizePercent=${G1NewSizePercent}
+  -XX:G1MaxNewSizePercent=${G1MaxNewSizePercent}
+  -XX:G1HeapRegionSize=${G1HeapRegionSize}
+  -XX:G1ReservePercent=${G1ReservePercent}
+  -XX:G1HeapWastePercent=5
+  -XX:G1MixedGCCountTarget=${G1MixedGCCountTarget}
+  -XX:InitiatingHeapOccupancyPercent=${InitiatingHeapOccupancyPercent}
+  -XX:G1MixedGCLiveThresholdPercent=90
+  -XX:G1RSetUpdatingPauseTimePercent=${G1RSetUpdatingPauseTimePercent}
+  -XX:SurvivorRatio=32
+  -XX:+PerfDisableSharedMem
+  -XX:MaxTenuringThreshold=1
+  "
+  if isTrue "${USE_AIKAR_FLAGS}"; then
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -Dusing.aikars.flags=https://mcflags.emc.gs
+    -Daikars.new.flags=true
+    "
+  fi
+fi
+
+if isTrue "${USE_MEOWICE_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UnlockDiagnosticVMOptions
+  -XX:+UnlockExperimentalVMOptions
+  -XX:+UseNUMA
+  -XX:-DontCompileHugeMethods
+  -XX:MaxNodeLimit=240000
+  -XX:NodeLimitFudgeFactor=8000
+  -XX:ReservedCodeCacheSize=400M
+  -XX:NonNMethodCodeHeapSize=12M
+  -XX:ProfiledCodeHeapSize=194M
+  -XX:NonProfiledCodeHeapSize=194M
+  -XX:NmethodSweepActivity=1
+  -XX:+UseFastUnorderedTimeStamps
+  -XX:+UseCriticalJavaThreadPriority
+  -XX:+AlwaysActAsServerClassMachine
+  -XX:+UseTransparentHugePages
+  -XX:LargePageSizeInBytes=2M
+  -XX:+UseLargePages
+  -XX:+EagerJVMCI
+  -XX:+UseStringDeduplication
+  -XX:+UseAES
+  -XX:+UseAESIntrinsics
+  -XX:+UseFMA
+  -XX:+UseLoopPredicate
+  -XX:+RangeCheckElimination
+  -XX:+OptimizeStringConcat
+  -XX:+UseCompressedOops
+  -XX:+UseThreadPriorities
+  -XX:+OmitStackTraceInFastThrow
+  -XX:+RewriteBytecodes
+  -XX:+RewriteFrequentPairs
+  -XX:+UseFPUForSpilling
+  -XX:+UseVectorCmov
+  -XX:+UseXMMForArrayCopy
+  -XX:+EliminateLocks
+  -XX:+DoEscapeAnalysis
+  -XX:+AlignVector
+  -XX:+OptimizeFill
+  -XX:+EnableVectorSupport
+  -XX:+UseCharacterCompareIntrinsics
+  -XX:+UseCopySignIntrinsic
+  -XX:+UseVectorStubs
+  "
+  if isTrue "${use_meowice_zgc}"; then
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:AllocatePrefetchStyle=1
+    "
+  else
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:G1SATBBufferEnqueueingThresholdPercent=30
+    -XX:G1ConcMarkStepDurationMillis=5
+    -XX:AllocatePrefetchStyle=3
+    "
+  fi
+  if [[ $(arch) == "x86_64" ]]; then
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:+UseFastStosb
+    -XX:+UseNewLongLShift
+    -XX:+UseXmmI2D
+    -XX:+UseXmmI2F
+    -XX:+UseXmmLoadAndClearUpper
+    -XX:+UseXmmRegToRegMoveAll
+    -XX:UseAVX=2
+    -XX:UseSSE=4
+    "
+  else
+    log "cpu not x86_64, disabling architecture specific flags"
+  fi
+  if [[ $java_major_version -gt 23 ]]; then
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:+UseCompactObjectHeaders
+    "
+  fi
+fi
+
+if isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
+  if [[ $java_major_version -gt 23 ]]; then
+    log "Java 24 or higher detected, using modified GraalVM flags"
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:+UseFastJNIAccessors
+    -XX:+UseInlineCaches
+    -XX:+SegmentedCodeCache
+    -Djdk.nio.maxCachedBufferSize=262144
+    -Djdk.graal.UsePriorityInlining=true
+    -Djdk.graal.Vectorization=true
+    -Djdk.graal.OptDuplication=true
+    -Djdk.graal.DetectInvertedLoopsAsCounted=true
+    -Djdk.graal.LoopInversion=true
+    -Djdk.graal.VectorizeHashes=true
+    -Djdk.graal.EnterprisePartialUnroll=true
+    -Djdk.graal.VectorizeSIMD=true
+    -Djdk.graal.StripMineNonCountedLoops=true
+    -Djdk.graal.SpeculativeGuardMovement=true
+    -Djdk.graal.TuneInlinerExploration=1
+    -Djdk.graal.LoopRotation=true
+    -Djdk.graal.CompilerConfiguration=enterprise
+    "
+  else
+    log "Using MeowIce's flags for Graalvm"
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:+UseFastJNIAccessors
+    -XX:+UseInlineCaches
+    -XX:+SegmentedCodeCache
+    -Djdk.nio.maxCachedBufferSize=262144
+    -Dgraal.UsePriorityInlining=true
+    -Dgraal.Vectorization=true
+    -Dgraal.OptDuplication=true
+    -Dgraal.DetectInvertedLoopsAsCounted=true
+    -Dgraal.LoopInversion=true
+    -Dgraal.VectorizeHashes=true
+    -Dgraal.EnterprisePartialUnroll=true
+    -Dgraal.VectorizeSIMD=true
+    -Dgraal.StripMineNonCountedLoops=true
+    -Dgraal.SpeculativeGuardMovement=true
+    -Dgraal.TuneInlinerExploration=1
+    -Dgraal.LoopRotation=true
+    -Dgraal.OptWriteMotion=true
+    -Dgraal.CompilerConfiguration=enterprise
+    "
+  fi
+fi
+
+if isTrue "${USE_FLARE_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UnlockDiagnosticVMOptions
+  -XX:+DebugNonSafepoints
+  "
+fi
+
+if isTrue "${USE_SIMD_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  --add-modules=jdk.incubator.vector
+  "
+fi

scripts/start-finalExec-log4j

@@ -0,0 +1,130 @@
+#!/bin/bash
+
+useGeneratedLogs=${GENERATE_LOG4J2_CONFIG:-${ENABLE_ROLLING_LOGS:-false}}
+useFallbackJvmFlag=false
+
+patchLog4jConfig() {
+  file=${1?}
+  url=${2?}
+  if ! get -o "${SERVER_DIR}/${file}" "$url"; then
+    logError "Failed to download corrected log4j config, fallback to JVM flag"
+    useFallbackJvmFlag=true
+    return 1
+  fi
+  JVM_OPTS="-Dlog4j.configurationFile=${file} ${JVM_OPTS}"
+  useGeneratedLogs=false
+}
+
+# Temporarily disable debugging output
+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 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
+elif isFamily VANILLA && versionLessThan 1.17; then
+  patchLog4jConfig log4j2_112-116.xml https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml
+# See https://purpurmc.org/docs/Log4j/
+elif isType PURPUR && versionLessThan 1.17; then
+  patchLog4jConfig purpur_log4j2_1141-1165.xml https://purpurmc.org/docs/xml/purpur_log4j2_1141-1165.xml
+elif isType PURPUR && versionLessThan 1.18.1; then
+  patchLog4jConfig purpur_log4j2_117.xml https://purpurmc.org/docs/xml/purpur_log4j2_117.xml
+elif versionLessThan 1.18.1; then
+  useFallbackJvmFlag=true
+fi
+eval "$oldState"
+
+if ${useFallbackJvmFlag}; then
+  JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
+fi
+
+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
+    log "Skipping Log4jPatcher, make sure you are not affected"
+  else
+    JVM_OPTS="-javaagent:/image/Log4jPatcher.jar ${JVM_OPTS}"
+  fi
+fi
+
+# Set up log4j2 configuration with templating support
+LOGFILE="${SERVER_DIR}/log4j2.xml"
+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}"
+  # Note: Can't use ${VAR:=default} syntax for values containing } as it breaks parsing
+  if [ -z "${ROLLING_LOG_FILE_PATTERN}" ]; then
+    ROLLING_LOG_FILE_PATTERN='logs/%d{yyyy-MM-dd}-%i.log.gz'
+  fi
+
+  # Pattern format defaults (compatible with vanilla Minecraft)
+  # Note: Can't use ${VAR:=default} syntax because } in the value breaks parsing
+  if [ -z "${LOG_CONSOLE_FORMAT}" ]; then
+    LOG_CONSOLE_FORMAT='[%d{HH:mm:ss}] [%t/%level]: %msg%n'
+  fi
+  if [ -z "${LOG_TERMINAL_FORMAT}" ]; then
+    LOG_TERMINAL_FORMAT='[%d{HH:mm:ss} %level]: %msg%n'
+  fi
+  if [ -z "${LOG_FILE_FORMAT}" ]; then
+    LOG_FILE_FORMAT='[%d{HH:mm:ss}] [%t/%level]: %msg%n'
+  fi
+
+  export LOG_LEVEL ROLLING_LOG_FILE_PATTERN ROLLING_LOG_MAX_FILES
+  export LOG_CONSOLE_FORMAT LOG_TERMINAL_FORMAT LOG_FILE_FORMAT
+
+
+  # Always regenerate if file doesn't exist
+  if [ ! -e "$LOGFILE" ] || isTrue "${REGENERATE_LOG4J2:-true}"; then
+    log "Generating log4j2.xml from template in ${LOGFILE}"
+
+    # Generate log4j2.xml using heredoc for reliable variable substitution
+    cat > "$LOGFILE" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="${LOG_CONSOLE_FORMAT}" />
+        </Console>
+        <Queue name="TerminalConsole">
+            <PatternLayout pattern="${LOG_TERMINAL_FORMAT}" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="${ROLLING_LOG_FILE_PATTERN}">
+            <PatternLayout pattern="${LOG_FILE_FORMAT}" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+            </Policies>
+            <DefaultRolloverStrategy max="${ROLLING_LOG_MAX_FILES}"/>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="${LOG_LEVEL}">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="SysOut"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="TerminalConsole"/>
+        </Root>
+    </Loggers>
+</Configuration>
+EOF
+  else
+    log "log4j2.xml already exists and is up to date, skipping generation"
+  fi
+
+  # Apply the log4j2 configuration
+  JVM_OPTS="-Dlog4j.configurationFile=log4j2.xml ${JVM_OPTS}"
+else
+  rm -f "${LOGFILE}"
+fi

tests/setuponlytests/pumpkin-release/require.sh

@@ -0,0 +1,2 @@
+# PumpkinMC is no longer supported for Alpine/musl
+[[ "$VARIANT" != *-alpine ]]

tests/setuponlytests/pumpkin/require.sh

@@ -0,0 +1,2 @@
+# PumpkinMC is no longer supported for Alpine/musl
+[[ "$VARIANT" != *-alpine ]]