From 90d64064722d820dc667f90bac6e5b04ab062ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sivert=20V=2E=20S=C3=A6ther?= <git@sivert.pw>
Date: Tue, 18 Nov 2025 15:41:55 +0100
Subject: [PATCH] Update papermc, openjdk docker image is deprecated, switch to
 eclipse-temurin

---
 siverten/papermc/Dockerfile | 11 +++++------
 siverten/papermc/papermc.sh | 26 +++++++++++---------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/siverten/papermc/Dockerfile b/siverten/papermc/Dockerfile
index 834c766..2e7e3b9 100644
--- a/siverten/papermc/Dockerfile
+++ b/siverten/papermc/Dockerfile
@@ -1,15 +1,14 @@
-FROM openjdk:17-slim
+FROM eclipse-temurin:21
 
 ENV MC_VERSION="latest" \
-    PAPER_BUILD="latest" \
     MC_RAM="4G" \
     JAVA_OPTS=""
+# PAPER_BUILD="latest"
 
 ADD papermc.sh .
-RUN apt-get update \
-    && apt-get install -y wget \
-    && apt-get install -y jq \
-    && mkdir /papermc
+RUN apt update && apt install -y jq && \
+ apt clean && rm -rf /var/lib/apt/lists/* && \
+ mkdir /papermc
 
 CMD ["sh", "./papermc.sh"]
 
diff --git a/siverten/papermc/papermc.sh b/siverten/papermc/papermc.sh
index 9f46333..e962f9e 100755
--- a/siverten/papermc/papermc.sh
+++ b/siverten/papermc/papermc.sh
@@ -1,21 +1,18 @@
 #!/bin/bash
 cd papermc
-urlPrefix=https://papermc.io/api/v2/projects/paper
+urlPrefix=https://fill.papermc.io/v3/projects/paper
 if [ ${MC_VERSION} = latest ]; then
-  MC_VERSION=$(wget -qO - $urlPrefix | jq -r '.versions[-1]') # "-r" is needed because the output has quotes otherwise
+  MC_VERSION=$(curl -s $urlPrefix | jq -r '.versions | to_entries[0] | .value[0]')
 fi
 urlPrefix=${urlPrefix}/versions/${MC_VERSION}
-if [ ${PAPER_BUILD} = latest ]; then
-  PAPER_BUILD=$(wget -qO - $urlPrefix | jq '.builds[-1]')
-fi
-JAR_NAME=papermc-${MC_VERSION}-${PAPER_BUILD}.jar
-if [ ! -e ${JAR_NAME} ]; then
-  rm -f *.jar
-  wget ${urlPrefix}/builds/${PAPER_BUILD}/downloads/paper-${MC_VERSION}-${PAPER_BUILD}.jar -O ${JAR_NAME}
-  if [ ! -e eula.txt ]; then
-    java -jar ${JAR_NAME}
-    sed -i 's/false/true/g' eula.txt
-  fi
+DOWNLOAD_URL=$(
+  curl -s "$urlPrefix/builds" |
+  jq -r 'first(.[] | select(.channel == "STABLE") | .downloads."server:default".url) // "null"')
+rm -f *.jar
+curl -sO "$DOWNLOAD_URL"
+if [ ! -e eula.txt ]; then
+ java -jar paper-*.jar
+ sed -i 's/false/true/g' eula.txt
 fi
 
 #exec java -server -Xms${MC_RAM} -Xmx${MC_RAM} ${JAVA_OPTS} -jar ${JAR_NAME} nogui
@@ -27,5 +24,4 @@ exec java -Xms${MC_RAM} -Xmx${MC_RAM} -XX:+UseG1GC \
   -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 \
   -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 \
   -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 \
-  ${JAVA_OPTS} -jar ${JAR_NAME} nogui
-
+  ${JAVA_OPTS} -jar paper-*.jar nogui