From 9dd0645b6c4ad6642fbe3ad2f64dc17452326a1c Mon Sep 17 00:00:00 2001
From: Greaper88 <61922763+Greaper88@users.noreply.github.com>
Date: Wed, 30 Dec 2020 14:44:15 -0600
Subject: [PATCH 1/5] Update entrypoint.sh (#13)

---
 entrypoint.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 4cbc4cd..114b47b 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -11,13 +11,13 @@ export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
 if [ "${AUTO_UPDATE}" == "1" ]; then
 	echo "Checking for updates..."
 
-	LATEST_HASH=`curl -s https://ci.nukkitx.com/job/GeyserMC/job/Geyser/job/${UPDATE_BRANCH}/lastSuccessfulBuild/api/xml?xpath=//lastBuiltRevision/SHA1 | sed 's/.*>\(.*\)<.*/\1/'`
+	LATEST_HASH=`curl -s https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/${UPDATE_BRANCH}/lastSuccessfulBuild/api/xml?xpath=//lastBuiltRevision/SHA1 | sed 's/.*>\(.*\)<.*/\1/'`
 	CURRENT_HASH=`cat .currenthash 2>/dev/null`
 
 	if [ "$LATEST_HASH" != "$CURRENT_HASH" ]; then
 		echo "Update available!"
 		echo "Updating from '$CURRENT_HASH' -> '$LATEST_HASH'"
-		curl -s -o ${SERVER_JARFILE} https://ci.nukkitx.com/job/GeyserMC/job/Geyser/job/${UPDATE_BRANCH}/lastSuccessfulBuild/artifact/bootstrap/standalone/target/Geyser.jar
+		curl -s -o ${SERVER_JARFILE} https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/${UPDATE_BRANCH}/lastSuccessfulBuild/artifact/bootstrap/standalone/target/Geyser.jar
 
 		echo "$LATEST_HASH" > ".currenthash"
 		echo "Updated!"
@@ -31,4 +31,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo ":/home/container$ ${MODIFIED_STARTUP}"
 
 # Run the Server
-eval ${MODIFIED_STARTUP}
\ No newline at end of file
+eval ${MODIFIED_STARTUP}

From b78837bc118ecc73f545fb1de90ad2fdbc4df7cb Mon Sep 17 00:00:00 2001
From: rtm516 <rtm516@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:41:27 +0100
Subject: [PATCH 2/5] Update for java 16 (#26)

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e51b00b..1e9a61b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 # Environment: Java (glibc support)
 # Minimum Panel Version: 0.6.0
 # ----------------------------------
-FROM        openjdk:8-jre-slim
+FROM        openjdk:16-slim
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 

From f1491fcc6f967d0049cf8fd444b34472b9b04fdc Mon Sep 17 00:00:00 2001
From: Greaper88 <61922763+Greaper88@users.noreply.github.com>
Date: Sun, 3 Oct 2021 10:25:13 -0500
Subject: [PATCH 3/5] Update Dockerfile (#36)

Update to Java 17.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1e9a61b..4af3a00 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 # Environment: Java (glibc support)
 # Minimum Panel Version: 0.6.0
 # ----------------------------------
-FROM        openjdk:16-slim
+FROM        openjdk:17-slim
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 

From 5f856278fb8390f97c56e6620726d8a81b72a367 Mon Sep 17 00:00:00 2001
From: rtm516 <rtm516@users.noreply.github.com>
Date: Sun, 21 Nov 2021 09:17:31 +0000
Subject: [PATCH 4/5] Fix package names

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4af3a00..f995c16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,9 @@ FROM        openjdk:17-slim
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
-RUN apt-get update -y \
- && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
- && useradd -d /home/container -m container
+RUN 		apt-get update -y \
+ 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+ 			&& useradd -d /home/container -m container
  
 USER container
 ENV  USER=container HOME=/home/container

From 692edc0d8594ed935eb68cee7721ecfcd6675fb8 Mon Sep 17 00:00:00 2001
From: diamkil <35732047+diamkil@users.noreply.github.com>
Date: Mon, 17 Oct 2022 10:28:26 -0400
Subject: [PATCH 5/5] Update to the new jar name. (#44)

---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 114b47b..e9ace59 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -17,7 +17,7 @@ if [ "${AUTO_UPDATE}" == "1" ]; then
 	if [ "$LATEST_HASH" != "$CURRENT_HASH" ]; then
 		echo "Update available!"
 		echo "Updating from '$CURRENT_HASH' -> '$LATEST_HASH'"
-		curl -s -o ${SERVER_JARFILE} https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/${UPDATE_BRANCH}/lastSuccessfulBuild/artifact/bootstrap/standalone/target/Geyser.jar
+		curl -s -o ${SERVER_JARFILE} https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/${UPDATE_BRANCH}/lastSuccessfulBuild/artifact/bootstrap/standalone/build/libs/Geyser-Standalone.jar
 
 		echo "$LATEST_HASH" > ".currenthash"
 		echo "Updated!"