From 70a1092482e65773e603e5557d3115533ef5e00a Mon Sep 17 00:00:00 2001
From: Mikkel D <36984522+mikkel1156@users.noreply.github.com>
Date: Mon, 27 Jun 2022 20:53:16 +0200
Subject: [PATCH 1/2] Update Magma API to V2

Removing channels, since there is no such thing in the API anymore. It will always just get the latest build.
Also using only the installer to more easily be compatible with both 1.16+ and 1.18+ since they both have at least an installer.
---
 scripts/start-deployMagma | 40 +++++----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/scripts/start-deployMagma b/scripts/start-deployMagma
index 7ff966f6ca8..700357b8b93 100755
--- a/scripts/start-deployMagma
+++ b/scripts/start-deployMagma
@@ -5,25 +5,6 @@
 isDebugging && set -x
 
 : "${VANILLA_VERSION?}"
-# stable, dev
-: "${MAGMA_CHANNEL:=stable}"
-
-
-magmaDownloadServer() {
-  url=${1?}
-  tagName=${2?}
-  markerFile=${3?}
-
-  export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
-
-  log "Downloading Magma server file for ${VANILLA_VERSION} @ ${tagName}"
-  if ! curl -o /data/magma-server-${VANILLA_VERSION}.jar -fsSL "$url"; then
-    log "ERROR failed to download Magma server from $url (status=$?)"
-    exit 1
-  fi
-
-  echo -n "$SERVER" > "$markerFile"
-}
 
 magmaHandleInstaller() {
   url=${1?}
@@ -46,9 +27,9 @@ magmaHandleInstaller() {
   exec ${SCRIPTS:-/}start-deployForge "$@"
 }
 
-latestMeta=$(curl -fsSL https://api.magmafoundation.org/api/resources/Magma/${VANILLA_VERSION}/${MAGMA_CHANNEL}/latest || exit $?)
+latestMeta=$(curl -fsSL https://api.magmafoundation.org/api/v2/${VANILLA_VERSION}/latest || exit $?)
 if [ $? != 0 ]; then
-  log "ERROR failed to locate latest Magma info for ${VANILLA_VERSION} in channel ${MAGMA_CHANNEL} (error=$?)"
+  log "ERROR failed to locate latest Magma info for ${VANILLA_VERSION} (error=$?)"
   exit 1
 fi
 
@@ -59,24 +40,13 @@ if [ -f "${markerFile}" ]; then
 fi
 
 if [ ! -f "${markerFile}" ]; then
-
-  if versionLessThan 1.16; then
-    assetType=server
-  else
-    assetType=installer
-  fi
-
-  assetUrl=$(echo "${latestMeta}" | jq -r ".assets | .[].browser_download_url | select(test(\"${assetType}\"))")
+  assetUrl=$(echo "${latestMeta}" | jq -r ".installer_link")
   if [ $? != 0 ] || [ -z "$assetUrl" ]; then
-    log "ERROR failed to extract ${assetType} asset type for ${VANILLA_VERSION} in channel ${MAGMA_CHANNEL}"
+    log "ERROR failed to extract installer for ${VANILLA_VERSION} tag ${tagName}"
     exit 1
   fi
 
-  if [[ ${assetType} = server ]]; then
-    magmaDownloadServer "$assetUrl" "$tagName" "$markerFile"
-  else
-    magmaHandleInstaller "$assetUrl" "$tagName" "$markerFile"
-  fi
+  magmaHandleInstaller "$assetUrl" "$tagName" "$markerFile"
 else
   export SERVER=$(cat "${markerFile}")
 

From d159b5f2f4743e387d43a018a3dc9ff2e44376ff Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 27 Jun 2022 21:40:47 -0500
Subject: [PATCH 2/2] Added an example compose file for Magma

---
 README.md                         |  2 --
 examples/docker-compose-magma.yml | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 examples/docker-compose-magma.yml

diff --git a/README.md b/README.md
index 8af46bcce0d..32a5f677494 100644
--- a/README.md
+++ b/README.md
@@ -468,8 +468,6 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
     -e TYPE=MAGMA
 
-By default, the "stable" channel is used, but you can set `MAGMA_CHANNEL` to "dev" to access dev channel versions.
-
 > **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2", "1.16.5", etc.
 
 
diff --git a/examples/docker-compose-magma.yml b/examples/docker-compose-magma.yml
new file mode 100644
index 00000000000..1d061e2ab73
--- /dev/null
+++ b/examples/docker-compose-magma.yml
@@ -0,0 +1,17 @@
+version: "3.8"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    tty: true
+    stdin_open: true
+    ports:
+      - "25565:25565"
+    environment:
+      EULA: "TRUE"
+      TYPE: MAGMA
+      VERSION: 1.18.2
+    volumes:
+      - data:/data
+volumes:
+  data: {}
\ No newline at end of file