From fff7a19bc489bddd19204316a792864ff5d2a731 Mon Sep 17 00:00:00 2001 From: khankul Date: Fri, 14 Apr 2023 01:41:34 +0700 Subject: [PATCH 1/3] Remove LoliServer from README.md LoliServer is dead per #1622 --- README.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index 0ae4b4f2396..261ef660f11 100644 --- a/README.md +++ b/README.md @@ -515,16 +515,6 @@ A [Catserver](http://catserver.moe/) type server can be used with > **NOTE** Catserver only provides a single release stream, so `VERSION` is ignored -### Running a Loliserver type server - -A [Loliserver](https://github.com/Loli-Server/LoliServer) type server can be used with - - -e TYPE=LOLISERVER - -> **NOTE** Loliserver only provides a single release stream, so `VERSION` is ignored - -> **Disclaimer** The retrieval of the serverjar is not bulletproof. It can and probably will change in the future. - ### Running a Canyon server [Canyon](https://github.com/canyonmodded/canyon) is a fork of CraftBukkit for Minecraft Beta 1.7.3. It includes multiple enhancements whilst also retaining compatibility with old Bukkit plugins and mods as much as possible. From 716a61c994b6ab557b01f22417179a7ad1ed22e2 Mon Sep 17 00:00:00 2001 From: khankul Date: Sun, 16 Apr 2023 06:05:59 +0700 Subject: [PATCH 2/3] Delete start-deployLoliserver --- scripts/start-deployLoliserver | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100755 scripts/start-deployLoliserver diff --git a/scripts/start-deployLoliserver b/scripts/start-deployLoliserver deleted file mode 100755 index 9228703877a..00000000000 --- a/scripts/start-deployLoliserver +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# shellcheck source=start-utils -. "${SCRIPTS:-/}start-utils" -set -o pipefail -set -e - -latestAsset=$( - curl -fsSL https://cdn.ci.loliidc.cn:30011/job/LoliServer-1.16.5/lastSuccessfulBuild/artifact/projects/LoliServer/build/libs | \ - jq '.assets[] | select(.name | match(".*-server.jar"))' -) - -if [[ -z "${latestAsset}" ]]; then - log "ERROR: latest release of Loliserver is missing server.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://cdn.ci.loliidc.cn:30011/job/LoliServer-1.16.5/lastSuccessfulBuild/artifact/projects/LoliServer/build/libs/${latestJarId} -fi - -export FAMILY=HYBRID - -exec "${SCRIPTS:-/}start-setupWorld" "$@" From 3671a9a01805c75e3828045ecd06f3114de932ea Mon Sep 17 00:00:00 2001 From: khankul Date: Sun, 16 Apr 2023 06:07:58 +0700 Subject: [PATCH 3/3] Remove LoliServer from start-configuration --- scripts/start-configuration | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/start-configuration b/scripts/start-configuration index 3acc9f42a10..aff3eb548b6 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -236,11 +236,6 @@ case "${TYPE^^}" in exec "${SCRIPTS:-/}start-deployCatserver" "$@" ;; - LOLISERVER) - evaluateJavaCompatibilityForForge - exec "${SCRIPTS:-/}start-deployLoliserver" "$@" - ;; - PURPUR) exec "${SCRIPTS:-/}start-deployPurpur" "$@" ;; @@ -271,7 +266,7 @@ case "${TYPE^^}" in log "Invalid type: '$TYPE'" log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only)," log " CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM," - log " MAGMA, MOHIST, CATSERVER, LOLISERVER, AIRPLANE, PUFFERFISH, CANYON, LIMBO, CRUCIBLE" + log " MAGMA, MOHIST, CATSERVER, AIRPLANE, PUFFERFISH, CANYON, LIMBO, CRUCIBLE" exit 1 ;;