Removed catserver and updated magma download (#3751)

Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>

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

@@ -77,14 +77,6 @@ By default the latest build will be used; however, a specific build number can b
 
     -e VERSION=1.16.5 -e MOHIST_BUILD=374
 
-### Catserver
-
-A [Catserver](http://catserver.moe/) type server can be used with
-
-    -e TYPE=CATSERVER
-
-> **NOTE** Catserver only provides a single release stream, so `VERSION` is ignored
-
 ### Arclight
 
 A [Arclight](https://arclight.izzel.io/) type server can be used with

scripts/start-configuration

@@ -282,10 +282,6 @@ case "${TYPE^^}" in
     exec "$(dirname "$0")/start-deployMohist" "$@"
   ;;
 
-  CATSERVER)
-    exec "$(dirname "$0")/start-deployCatserver" "$@"
-  ;;
-
   PURPUR)
     exec "$(dirname "$0")/start-deployPurpur" "$@"
   ;;
@@ -325,7 +321,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, CATSERVER, AIRPLANE, PUFFERFISH,"
+      logError "         SPONGEVANILLA, CUSTOM, MAGMA, MOHIST, GTNH, AIRPLANE, PUFFERFISH,"
       logError "         CANYON, LIMBO, NANOLIMBO, CRUCIBLE, LEAF, YOUER, BANNER"
       exit 1
   ;;

scripts/start-deployCatserver

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "$(dirname "$0")/start-utils"
-set -o pipefail
-set -e
-
-latestAsset=$(
-  curl -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/latest | \
-    jq '.assets[] | select(.name | match(".*-universal.jar"))'
-)
-
-if [[ -z "${latestAsset}" ]]; then
-  logError "Latest release of Catserver is missing universal.jar asset"
-  exit 1
-fi
-
-isDebugging && log "Latest asset ${latestAsset}"
-latestJarName=$(echo ${latestAsset} | jq --raw-output '.name')
-latestJarId=$(echo ${latestAsset} | jq --raw-output '.id')
-
-
-export SERVER="/data/${latestJarName}"
-
-if [ ! -f ${SERVER} ]; then
-  log "Downloading ${latestJarName}"
-  curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/assets/${latestJarId}
-fi
-
-export FAMILY=HYBRID
-export HYBRIDTYPE=forge
-
-exec "$(dirname "$0")/start-spiget" "$@"

scripts/start-deployMagma

@@ -8,18 +8,14 @@ isDebugging && set -x
 
 resolveVersion
 
-if ! downloadUrl=$(get --json-path '$.link' "https://api.magmafoundation.org/api/v2/${VERSION}/latest/${MAGMA_VERSION}"); then
-  logError "Failed to locate latest Magma download for ${VERSION}. Is that version supported?"
+# Neo Magma currently supports just 1.21.x
+if [[ ! $VERSION = 1.21.* ]]; then
+logError "Magma does not support $VERSION (expected 1.21.x)"
 exit 1
 fi
 
-if [[ $downloadUrl == null ]]; then
-  logError "Magma does not seem to be available for $VERSION"
-  exit 1
-fi
-
-if ! SERVER=$(get --output-filename --skip-up-to-date --output /data "$downloadUrl"); then
-  logError "Failed to download Magma server jar from $downloadUrl"
+if ! SERVER=$(get --output-filename --skip-up-to-date --output /data "https://magmafoundation.org/api/versions/${MAGMA_VERSION}/download"); then
+  logError "Failed to download Magma server jar for $MAGMA_VERSION"
   exit 1
 fi