From 37e956e517fa7ae796b9d76d06e622a7aec95c6e Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 5 Jul 2025 11:35:01 -0500
Subject: [PATCH] Quieter Paper/Bukkit default configs downloading (#3535)

---
 Dockerfile                                    |  2 +-
 .../types-and-platforms/server-types/paper.md |  4 ++
 scripts/start-setupEnvVariables               | 38 +++++++++++--------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f4965ad8..1f3d82c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ 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
 
-ARG MC_HELPER_VERSION=1.46.2
+ARG MC_HELPER_VERSION=1.47.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
diff --git a/docs/types-and-platforms/server-types/paper.md b/docs/types-and-platforms/server-types/paper.md
index 12c6311f..19142fc2 100644
--- a/docs/types-and-platforms/server-types/paper.md
+++ b/docs/types-and-platforms/server-types/paper.md
@@ -126,3 +126,7 @@ If you have attached a host directory to the `/data` volume, then you can instal
 
 !!! note
     The Folia type inherits from the Paper type. Paper's variables will override the Folia ones.
+
+## Extra config
+
+- `SKIP_DOWNLOAD_DEFAULTS`: when set to "true" startup will entirely skip checking for default Paper/Bukkit/Spigot config files to download
\ No newline at end of file
diff --git a/scripts/start-setupEnvVariables b/scripts/start-setupEnvVariables
index 38518170..f29b5f05 100755
--- a/scripts/start-setupEnvVariables
+++ b/scripts/start-setupEnvVariables
@@ -14,7 +14,9 @@ handleDebugMode
 : "${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}"
 : "${PATCH_DEFINITIONS:=}"
 : "${DEBUG:=false}"
+: "${DOWNLOAD_DEFAULTS:=}"
 : "${DOWNLOAD_DEFAULT_CONFIGS:=}"
+: "${SKIP_DOWNLOAD_DEFAULTS:=false}"
 
 if isTrue "${REPLACE_ENV_IN_PLACE}"; then
   log "Replacing env variables in ${REPLACE_ENV_PATHS} that match the prefix '$REPLACE_ENV_VARIABLE_PREFIX' ..."
@@ -27,22 +29,28 @@ if isTrue "${REPLACE_ENV_IN_PLACE}"; then
     "${REPLACE_ENV_PATHS[@]}"
 fi
 
-if [[ $DOWNLOAD_DEFAULT_CONFIGS ]]; then
-  log "Downloading default configs, if needed"
-  if ! mc-image-helper mcopy \
-    --to /data/config \
-    --skip-existing --skip-up-to-date=false \
-    "$DOWNLOAD_DEFAULT_CONFIGS" 2> /dev/null; then
-    logWarning "One or more default config files were not available from $DOWNLOAD_DEFAULT_CONFIGS"
+if isFalse "$SKIP_DOWNLOAD_DEFAULTS"; then
+  commonArgs=(
+    --skip-existing
+    --skip-up-to-date=false
+    --quiet-when-skipped
+    --ignore-missing-sources
+  )
+  if [[ $DOWNLOAD_DEFAULT_CONFIGS ]]; then
+    if ! mc-image-helper mcopy \
+      --to /data/config \
+      "${commonArgs[@]}" \
+      "$DOWNLOAD_DEFAULT_CONFIGS"; then
+      logWarning "One or more default config files were not available from $DOWNLOAD_DEFAULT_CONFIGS"
+    fi
   fi
-fi
-if [[ $DOWNLOAD_DEFAULTS ]]; then
-  log "Downloading default top-level configs, if needed"
-  if ! mc-image-helper mcopy \
-    --to /data \
-    --skip-existing --skip-up-to-date=false \
-    "$DOWNLOAD_DEFAULTS" 2> /dev/null; then
-    logWarning "One or more default files were not available from $DOWNLOAD_DEFAULTS"
+  if [[ $DOWNLOAD_DEFAULTS ]]; then
+    if ! mc-image-helper mcopy \
+      --to /data \
+      "${commonArgs[@]}" \
+      "$DOWNLOAD_DEFAULTS"; then
+      logWarning "One or more default files were not available from $DOWNLOAD_DEFAULTS"
+    fi
   fi
 fi