From 81d9c55eee551c3243157ebbf80269dcbf94abbf Mon Sep 17 00:00:00 2001 From: Jawa_Juice <67296752+Jawa-Juice@users.noreply.github.com> Date: Sun, 6 Jun 2021 21:38:29 -0400 Subject: [PATCH 1/6] Reflect Pupur's removal of Airplane patches (#910) --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b15d4e02..9700c0a4 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + @@ -460,7 +460,7 @@ Extra variables: ### Running a Purpur server -A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity, Airplane with the goal of providing new and interesting configuration options". +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.". -e TYPE=PURPUR @@ -469,7 +469,6 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity, 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 -- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler ### Running a Yatopia server From ae5b19b0aa93f3b66b7f06aa2efdc8275f6fb7a9 Mon Sep 17 00:00:00 2001 From: itzg Date: Mon, 7 Jun 2021 01:38:43 +0000 Subject: [PATCH 2/6] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9700c0a4..9889807c 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + From 012bd3a30773c40cf0b59cdc123db0dadd521893 Mon Sep 17 00:00:00 2001 From: Jawa_Juice <67296752+Jawa-Juice@users.noreply.github.com> Date: Wed, 9 Jun 2021 08:35:00 -0400 Subject: [PATCH 3/6] Support Java versions above 11 for Airplane (#917) --- README.md | 4 +--- start-deployAirplane | 11 ++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9889807c..a69b13e1 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + @@ -452,8 +452,6 @@ An [Airplane](https://github.com/TECHNOVE/Airplane) server, which is a fork of T > **NOTE** only `VERSION=LATEST` is supported -> **NOTE** only Java 8 and 11 are supported - Extra variables: - `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 diff --git a/start-deployAirplane b/start-deployAirplane index 85b398f8..0ce0b35d 100644 --- a/start-deployAirplane +++ b/start-deployAirplane @@ -7,9 +7,10 @@ isDebugging && set -x JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1) -if [ "${JAVA_VER}" != "8" ] && [ "${JAVA_VER}" != "11" ]; then - log "ERROR: Airplane server type only supports Java versions 8 and 11" - exit 1 +if [ "${JAVA_VER}" = "8" ]; then + JDK=8 +else + JDK=11 fi if [ "${VERSION}" != "LATEST" ]; then @@ -17,10 +18,10 @@ if [ "${VERSION}" != "LATEST" ]; then exit 1 fi -export SERVER=airplane-${VANILLA_VERSION}-jdk${JAVA_VER}.jar +export SERVER=airplane-${VANILLA_VERSION}-jdk${JDK}.jar if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then - downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JAVA_VER}/launcher-airplane.jar" + downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JDK}/launcher-airplane.jar" log "Downloading Airplane from $downloadUrl ..." curl -fsSL -o "$SERVER" "$downloadUrl" if [ ! -f "$SERVER" ]; then From 727a1f29d1ebad95035f2d9d43c7fdb65d585083 Mon Sep 17 00:00:00 2001 From: itzg Date: Wed, 9 Jun 2021 12:35:19 +0000 Subject: [PATCH 4/6] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a69b13e1..378df37a 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + From 1bb2f92f5b5a9b74021050bda2899fb18134ed69 Mon Sep 17 00:00:00 2001 From: basisbit Date: Wed, 16 Jun 2021 14:34:38 +0200 Subject: [PATCH 5/6] Workaround: Change default RELEASE of Yatopia (#922) --- start-deployYatopia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start-deployYatopia b/start-deployYatopia index 0cbc28ce..39f08cf3 100644 --- a/start-deployYatopia +++ b/start-deployYatopia @@ -6,7 +6,7 @@ IFS=$'\n\t' isDebugging && set -x : ${VANILLA_VERSION:?} -: ${RELEASE:=stable} +: ${RELEASE:=latest} : ${FORCE_REDOWNLOAD:=false} requireEnum RELEASE stable latest From 047ef107aef0e0b653dbc649b9b9069976502143 Mon Sep 17 00:00:00 2001 From: Duncan X Simpson Date: Sun, 20 Jun 2021 10:27:18 -0700 Subject: [PATCH 6/6] Modify start-deployFTBA to allow Fabric FTB packs (#926) Fixes #912 Co-authored-by: Duncan X Simpson --- start-deployFTBA | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/start-deployFTBA b/start-deployFTBA index 38fae975..fa4f4b00 100644 --- a/start-deployFTBA +++ b/start-deployFTBA @@ -52,12 +52,14 @@ fi isDebugging && cat version.json forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json) +fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version' version.json) mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json) variants=( forge-${mcVersion}-${forgeVersion}.jar forge-${mcVersion}-${forgeVersion}-universal.jar forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar + fabric-${mcVersion}-${fabricVersion}-server-launch.jar ) for f in ${variants[@]}; do if [ -f $f ]; then @@ -66,7 +68,7 @@ for f in ${variants[@]}; do fi done if ! [ -v SERVER ]; then - log "ERROR unable to locate the installed forge server jar" + log "ERROR unable to locate the installed FTB server jar" ls *.jar exit 2 fi