diff --git a/README.md b/README.md index 4bec3b9b..869da72e 100644 --- a/README.md +++ b/README.md @@ -431,7 +431,7 @@ If you have attached a host directory to the `/data` volume, then you can instal ### Running an Airplane server -An [Airplane](https://github.com/TECHNOVE/Airplane) server, which is a fork of Tuinity aimed at further improving server performance at high playercounts. +An [Airplane](https://airplane.gg) server, which is "a stable, optimized, well supported 1.17 Paper fork." -e TYPE=AIRPLANE @@ -444,7 +444,7 @@ Extra variables: ### Running a Purpur server -A [Purpur](https://purpur.pl3x.net/) server, which is "a drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and high performance built on top of Tuinity." +A [Purpur](https://purpur.pl3x.net/) server, which is "drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and performance built on top of Airplane." -e TYPE=PURPUR @@ -453,18 +453,6 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "a drop-in replacement for Extra variables: - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded - -### Running a Yatopia server - -A [Yatopia](https://github.com/YatopiaMC/Yatopia) server, which is a "blazing fast Tuinity fork with best in class performance". - - -e TYPE=YATOPIA - -> NOTE: the `VERSION` variable is used to locate the Yatopia version to download - -Extra variables: -- `RELEASE=stable` : set to `stable` or `latest` -- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded - `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler ### Running a Magma server diff --git a/start-configuration b/start-configuration index d3bbec3e..0d5cb5de 100755 --- a/start-configuration +++ b/start-configuration @@ -93,10 +93,6 @@ case "${TYPE^^}" in exec ${SCRIPTS:-/}start-deployPaper "$@" ;; - TUINITY) - exec ${SCRIPTS:-/}start-deployTuinity "$@" - ;; - FORGE) if versionLessThan 1.17; then log "**********************************************************************" @@ -159,10 +155,6 @@ case "${TYPE^^}" in exec ${SCRIPTS:-/}start-deployPurpur "$@" ;; - YATOPIA) - exec ${SCRIPTS:-/}start-deployYatopia "$@" - ;; - AIRPLANE) exec ${SCRIPTS:-/}start-deployAirplane "$@" ;; @@ -178,8 +170,8 @@ case "${TYPE^^}" in *) log "Invalid type: '$TYPE'" log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only)," - log " CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR" - log " CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE, CANYON, LIMBO" + log " CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM," + log " MAGMA, MOHIST, CATSERVER, AIRPLANE, CANYON, LIMBO" exit 1 ;; diff --git a/start-deployTuinity b/start-deployTuinity deleted file mode 100755 index 052cf4b1..00000000 --- a/start-deployTuinity +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -. ${SCRIPTS:-/}start-utils - -if [ "${VERSION}" != "LATEST" ]; then - log "ERROR: Tuinity server type only supports VERSION=LATEST" - exit 1 -fi - -: ${TUINITY_BUILD:=lastSuccessfulBuild} -export SERVER=tuinity-${VANILLA_VERSION}-${TUINITY_BUILD}.jar - -if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then - downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUINITY_BUILD}/artifact/tuinity-paperclip.jar" - log "Downloading Tuinity (build $TUINITY_BUILD) from $downloadUrl ..." - curl -fsSL -o "$SERVER" "$downloadUrl" - if [ ! -f "$SERVER" ]; then - log "ERROR: failed to download from $downloadUrl (status=$?)" - exit 3 - fi -fi - -# Normalize on Spigot for later operations -export TYPE=SPIGOT - -exec ${SCRIPTS:-/}start-spiget "$@" diff --git a/start-deployYatopia b/start-deployYatopia deleted file mode 100755 index 890b9b30..00000000 --- a/start-deployYatopia +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -set -euo pipefail -IFS=$'\n\t' - -. ${SCRIPTS:-/}start-utils -isDebugging && set -x - -: ${VANILLA_VERSION:?} -: ${RELEASE:=latest} -: ${FORCE_REDOWNLOAD:=false} - -requireEnum RELEASE stable latest - -export SERVER="yatopia-${RELEASE}-${VANILLA_VERSION}.jar" - -if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then - downloadUrl="https://api.yatopiamc.org/v2/${RELEASE}Build/download?branch=ver/${VANILLA_VERSION}" - log "Downloading Yatopia from $downloadUrl ..." - if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then - log "ERROR: failed to download from $downloadUrl (status=$?)" - exit 3 - fi -fi - -# Normalize on Spigot for later operations -export TYPE=SPIGOT -export SKIP_LOG4J_CONFIG=true - -exec ${SCRIPTS:-/}start-setupWorld $@