From e0137c8dfd6d44c036507b99e8f68b29332ddd03 Mon Sep 17 00:00:00 2001
From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
Date: Sun, 11 Feb 2024 01:45:20 +0100
Subject: [PATCH 1/9] Update start-deployKetting

---
 scripts/start-deployKetting | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/start-deployKetting b/scripts/start-deployKetting
index d0fb72861fe..cc4c500d475 100755
--- a/scripts/start-deployKetting
+++ b/scripts/start-deployKetting
@@ -6,19 +6,24 @@ isDebugging && set -x
 
 : "${FORGE_VERSION:=${FORGEVERSION:-RECOMMENDED}}"
 : "${KETTING_VERSION:=}"
-: "${KETTING_TAG:=${KETTING_VERSION:0:7}}"
-
-resolveVersion
-
-if ! downloadUrl="https://github.com/kettingpowered/Ketting-1-20-x/releases/download/${KETTING_TAG}/ketting-${VERSION}-${FORGE_VERSION}-${KETTING_VERSION}-server.jar"; then
-  log "ERROR failed to locate latest Ketting download for ${VERSION}. Is that version supported?"
+: "${KETTING_TAG:=${KETTING_VERSION}}"
+: "${KETTING_LAUNCHER_VERSION:=1.3.0}
+
+if [ ! -f kettinglauncher.jar ] && \
+  !( \
+    downloadUrl="https://github.com/kettingpowered/kettinglauncher/releases/download/v${KETTING_LAUNCHER_VERSION}/kettinglauncher-${KETTING_LAUNCHER_VERSION}.jar" || \
+    downloadUrl="https://nexus.c0d3m4513r.com/repository/Ketting/org/kettingpowered/kettinglauncher/${KETTING_LAUNCHER_VERSION}/kettinglauncher-${KETTING_LAUNCHER_VERSION}.jar" \
+  )
+then
+  log "ERROR failed to download Ketting Launcher Version ${KETTING_LAUNCHER_VERSION}?"
   exit 1
 fi
 
 if [[ $downloadUrl == null ]]; then
-  log "ERROR Ketting does not seem to be available for $VERSION"
+  log "ERROR failed to download Ketting Launcher Version ${KETTING_LAUNCHER_VERSION}?"
+  log "ERROR KettingLauncher does not seem to be available for the Version ${KETTING_LAUNCHER_VERSION}"
   exit 1
-fi
+ fi
 
 if ! SERVER=$(get --output-filename --skip-up-to-date --output /data "$downloadUrl"); then
   log "ERROR: failed to download Ketting server jar from $downloadUrl"

From 366250ea99ccfe2d63f9046cff89930a8eeaf407 Mon Sep 17 00:00:00 2001
From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
Date: Sun, 11 Feb 2024 01:52:32 +0100
Subject: [PATCH 2/9] Update start-deployKetting

---
 scripts/start-deployKetting | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/start-deployKetting b/scripts/start-deployKetting
index d0fb72861fe..a9299d29065 100755
--- a/scripts/start-deployKetting
+++ b/scripts/start-deployKetting
@@ -8,8 +8,6 @@ isDebugging && set -x
 : "${KETTING_VERSION:=}"
 : "${KETTING_TAG:=${KETTING_VERSION:0:7}}"
 
-resolveVersion
-
 if ! downloadUrl="https://github.com/kettingpowered/Ketting-1-20-x/releases/download/${KETTING_TAG}/ketting-${VERSION}-${FORGE_VERSION}-${KETTING_VERSION}-server.jar"; then
   log "ERROR failed to locate latest Ketting download for ${VERSION}. Is that version supported?"
   exit 1
@@ -25,6 +23,13 @@ if ! SERVER=$(get --output-filename --skip-up-to-date --output /data "$downloadU
   exit 1
 fi
 
+resolveVersion
+
+EXTRA_ARGS+="-minecraftVersion $VERSION"
+EXTRA_ARGS+="-kettingVersion $KETTING_VERSION"
+EXTRA_ARGS+="-forgeVersion $FORGEVERSION"
+
+
 export SERVER
 export FAMILY=HYBRID
 

From 7c4fefe02b93d366bf585123ea9034137e8fff76 Mon Sep 17 00:00:00 2001
From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
Date: Sun, 11 Feb 2024 01:57:28 +0100
Subject: [PATCH 3/9] Only restrict Ketting ForgeVersion, if explicitly set

---
 scripts/start-deployKetting | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/start-deployKetting b/scripts/start-deployKetting
index 488d1d484a9..aa394956a7b 100755
--- a/scripts/start-deployKetting
+++ b/scripts/start-deployKetting
@@ -4,7 +4,6 @@
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 
-: "${FORGE_VERSION:=${FORGEVERSION:-RECOMMENDED}}"
 : "${KETTING_LAUNCHER_VERSION:=1.3.0}
 
 if [ ! -f kettinglauncher.jar ] && \
@@ -34,8 +33,9 @@ EXTRA_ARGS+="-minecraftVersion $VERSION"
 if [[ $KETTING_VERSION != null ]]; then
   EXTRA_ARGS+="-kettingVersion $KETTING_VERSION"
 fi
-EXTRA_ARGS+="-forgeVersion $FORGEVERSION"
-
+if [[ $FORGEVERSION != null ]]; then
+  EXTRA_ARGS+="-forgeVersion $FORGEVERSION"
+fi
 
 export SERVER
 export FAMILY=HYBRID

From 9eae1a26817bbc6d79d191be2440c991b94c5ab8 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 10 Feb 2024 19:23:27 -0600
Subject: [PATCH 4/9] Use new helper github download-latest-asset command

---
 scripts/start-configuration |  1 -
 scripts/start-deployKetting | 35 ++++++++++++-----------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/scripts/start-configuration b/scripts/start-configuration
index 30aa5ac3ce1..b8586c328a6 100755
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -240,7 +240,6 @@ case "${TYPE^^}" in
   ;;
 
   KETTING)
-    evaluateJavaCompatibilityForForge
     exec "${SCRIPTS:-/}start-deployKetting" "$@"
   ;;
 
diff --git a/scripts/start-deployKetting b/scripts/start-deployKetting
index aa394956a7b..9b14ca4a4c8 100755
--- a/scripts/start-deployKetting
+++ b/scripts/start-deployKetting
@@ -4,38 +4,27 @@
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 
-: "${KETTING_LAUNCHER_VERSION:=1.3.0}
-
-if [ ! -f kettinglauncher.jar ] && \
-  !( \
-    downloadUrl="https://github.com/kettingpowered/kettinglauncher/releases/download/v${KETTING_LAUNCHER_VERSION}/kettinglauncher-${KETTING_LAUNCHER_VERSION}.jar" || \
-    downloadUrl="https://nexus.c0d3m4513r.com/repository/Ketting/org/kettingpowered/kettinglauncher/${KETTING_LAUNCHER_VERSION}/kettinglauncher-${KETTING_LAUNCHER_VERSION}.jar" \
-  )
-then
-  log "ERROR failed to download Ketting Launcher Version ${KETTING_LAUNCHER_VERSION}?"
-  exit 1
+if ! SERVER=$(mc-image-helper github download-latest-asset \
+  --output-directory=/data \
+  --name-pattern="kettinglauncher-.+?(?<!-sources)\.jar" \
+  kettingpowered/kettinglauncher
+  ); then
+    log "ERROR: failed to download Ketting launcher"
+    exit 1
 fi
 
-if [[ $downloadUrl == null ]]; then
-  log "ERROR failed to download Ketting Launcher Version ${KETTING_LAUNCHER_VERSION}?"
-  log "ERROR KettingLauncher does not seem to be available for the Version ${KETTING_LAUNCHER_VERSION}"
-  exit 1
- fi
-
-if ! SERVER=$(get --output-filename --skip-up-to-date --output /data "$downloadUrl"); then
-  log "ERROR: failed to download Ketting server jar from $downloadUrl"
-  exit 1
-fi
+export SERVER
 
 resolveVersion
 
 EXTRA_ARGS+="-minecraftVersion $VERSION"
-if [[ $KETTING_VERSION != null ]]; then
+if [[ ${KETTING_VERSION:-} ]]; then
   EXTRA_ARGS+="-kettingVersion $KETTING_VERSION"
 fi
-if [[ $FORGEVERSION != null ]]; then
-  EXTRA_ARGS+="-forgeVersion $FORGEVERSION"
+if [[ ${FORGE_VERSION:-} ]]; then
+  EXTRA_ARGS+="-forgeVersion $FORGE_VERSION"
 fi
+export EXTRA_ARGS
 
 export SERVER
 export FAMILY=HYBRID

From ade425eac0a142bf9562d4be1ee5e65335e8d93b Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 10 Feb 2024 19:26:09 -0600
Subject: [PATCH 5/9] Updated docs

---
 docs/types-and-platforms/server-types/hybrids.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/types-and-platforms/server-types/hybrids.md b/docs/types-and-platforms/server-types/hybrids.md
index ac6d2954df5..c8c0b79d460 100644
--- a/docs/types-and-platforms/server-types/hybrids.md
+++ b/docs/types-and-platforms/server-types/hybrids.md
@@ -25,18 +25,13 @@ A [Magma Maintained](https://github.com/magmamaintained/) server, which is a alt
 
 ### Ketting
 
-A [Ketting](https://github.com/kettingpowered/Ketting-1-20-x) server, which is a alternative project of Magma 1.20.2+, can be used with
+A [Ketting](https://github.com/kettingpowered/Ketting-1-20-x) server, which is an alternative project of Magma 1.20.2+, can be used with
 
     -e TYPE=KETTING
 
 There are limited base versions supported, so you will also need to  set `VERSION`, such as "1.20.2" or later.
 
-In addition, `FORGE_VERSION` and `KETTING_VERSION` must be specified. You can find the supported `FORGE_VERSION` in the [project page](https://github.com/kettingpowered/Ketting-1-20-x), and `KETTING_VERSION` in the [release page](https://github.com/kettingpowered/Ketting-1-20-x/releases).
-
-!!! note
-
-    The length of `KETTING_VERSION` is 8, not 7 since it is taken from an abbreviated git commit hash. The value can be found in a jar file link on an Assets section for each releases.
-
+`FORGE_VERSION` and `KETTING_VERSION` may be specified; however, they will be defaulted by the [Ketting launcher](https://github.com/kettingpowered/kettinglauncher) otherwise.
 
 ### Mohist
 

From f34c1ae967caab4686907f8c1d53b6a2f93a3af2 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 10 Feb 2024 19:30:19 -0600
Subject: [PATCH 6/9] Bump to released mc-image-helper

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b3c420f2a7e..1641398881b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,7 +49,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.37.13
+ARG MC_HELPER_VERSION=1.38.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

From 0e8e520e45e94fcb0efb82901035ba2aae1d97f7 Mon Sep 17 00:00:00 2001
From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
Date: Sun, 11 Feb 2024 02:38:15 +0100
Subject: [PATCH 7/9] Update hybrids.md

---
 docs/types-and-platforms/server-types/hybrids.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/types-and-platforms/server-types/hybrids.md b/docs/types-and-platforms/server-types/hybrids.md
index c8c0b79d460..1722d1afe50 100644
--- a/docs/types-and-platforms/server-types/hybrids.md
+++ b/docs/types-and-platforms/server-types/hybrids.md
@@ -8,7 +8,7 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
 !!! note
 
-    The Magma project [has been terminated](https://git.magmafoundation.org/magmafoundation/magma-1-20-x/-/commit/4e7abe37403c47d09b74b77bcfc26a19b18f5891). Please use Magma Maintained for 1.12.2, 1.18.2, 1.19.3, and 1.20.1, or Ketting for 1.20.2+.
+    The Magma project [has been terminated](https://git.magmafoundation.org/magmafoundation/magma-1-20-x/-/commit/4e7abe37403c47d09b74b77bcfc26a19b18f5891). Please use Magma Maintained for 1.12.2, 1.18.2, 1.19.3, and 1.20.1, or Ketting for 1.20.1+.
 
     There are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2", "1.16.5", etc.
 
@@ -32,6 +32,8 @@ A [Ketting](https://github.com/kettingpowered/Ketting-1-20-x) server, which is a
 There are limited base versions supported, so you will also need to  set `VERSION`, such as "1.20.2" or later.
 
 `FORGE_VERSION` and `KETTING_VERSION` may be specified; however, they will be defaulted by the [Ketting launcher](https://github.com/kettingpowered/kettinglauncher) otherwise.
+Available Ketting Versions may be found at [https://github.com/kettingpowered/Ketting-1-20-x/packages/2041866/versions](https://github.com/kettingpowered/Ketting-1-20-x/packages/2041866/versions).
+The Version structure is `MinecraftVersion-ForgeVersion-KettingVersion` (e.g. `1.20.1-47.2.20-0.1.4` is for Minecraft `1.20.1`, Forge `47.2.20` and Ketting `0.1.4`).
 
 ### Mohist
 

From d6a1bca09c6eca66ce339807b771527e2643e328 Mon Sep 17 00:00:00 2001
From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
Date: Sun, 11 Feb 2024 02:46:58 +0100
Subject: [PATCH 8/9] Ketting is available for 1.20.1+

---
 docs/types-and-platforms/server-types/hybrids.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/types-and-platforms/server-types/hybrids.md b/docs/types-and-platforms/server-types/hybrids.md
index 1722d1afe50..c2b4e3f5814 100644
--- a/docs/types-and-platforms/server-types/hybrids.md
+++ b/docs/types-and-platforms/server-types/hybrids.md
@@ -25,11 +25,11 @@ A [Magma Maintained](https://github.com/magmamaintained/) server, which is a alt
 
 ### Ketting
 
-A [Ketting](https://github.com/kettingpowered/Ketting-1-20-x) server, which is an alternative project of Magma 1.20.2+, can be used with
+A [Ketting](https://github.com/kettingpowered/Ketting-1-20-x) server, which is an alternative project of Magma 1.20.1+, can be used with
 
     -e TYPE=KETTING
 
-There are limited base versions supported, so you will also need to  set `VERSION`, such as "1.20.2" or later.
+There are limited base versions supported, so you will also need to  set `VERSION`, such as "1.20.1" or later.
 
 `FORGE_VERSION` and `KETTING_VERSION` may be specified; however, they will be defaulted by the [Ketting launcher](https://github.com/kettingpowered/kettinglauncher) otherwise.
 Available Ketting Versions may be found at [https://github.com/kettingpowered/Ketting-1-20-x/packages/2041866/versions](https://github.com/kettingpowered/Ketting-1-20-x/packages/2041866/versions).

From f23ed64fc72c6e4e489cb95bf79e92858d5e47e0 Mon Sep 17 00:00:00 2001
From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
Date: Sun, 11 Feb 2024 02:50:04 +0100
Subject: [PATCH 9/9] Update Magma section to accurately reflect dead link

---
 docs/types-and-platforms/server-types/hybrids.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types-and-platforms/server-types/hybrids.md b/docs/types-and-platforms/server-types/hybrids.md
index c2b4e3f5814..082b61be619 100644
--- a/docs/types-and-platforms/server-types/hybrids.md
+++ b/docs/types-and-platforms/server-types/hybrids.md
@@ -8,7 +8,7 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
 !!! note
 
-    The Magma project [has been terminated](https://git.magmafoundation.org/magmafoundation/magma-1-20-x/-/commit/4e7abe37403c47d09b74b77bcfc26a19b18f5891). Please use Magma Maintained for 1.12.2, 1.18.2, 1.19.3, and 1.20.1, or Ketting for 1.20.1+.
+    The Magma project has been terminated ([original link died](https://git.magmafoundation.org/magmafoundation/magma-1-20-x/-/commit/4e7abe37403c47d09b74b77bcfc26a19b18f5891), [alternate statement on their discord](https://discord.com/channels/612695539729039411/647287352833605662/1174412642962649198) ). Please use Magma Maintained for 1.12.2, 1.18.2, 1.19.3, and 1.20.1, or Ketting for 1.20.1+.
 
     There are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2", "1.16.5", etc.