From 6d26588839ba439052c69c8b009e78079d5514bd Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Tue, 14 Jul 2026 16:51:51 -0700
Subject: [PATCH] fix java version

---
 testing/Dockerfile        |  1 -
 testing/install_script.sh | 35 +++++++++++++----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/testing/Dockerfile b/testing/Dockerfile
index 255df8e..427922b 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -15,7 +15,6 @@ ENV FABRIC_VERSION=""
 ENV FABRIC_INSTALLER_VERSION=""
 
 # Java settings
-ENV JAVA_TYPE="openjdk"
 ENV JAVA_VERSION=""
 
 ENV XMX_SIZE=""
diff --git a/testing/install_script.sh b/testing/install_script.sh
index d47f0cf..93cdc47 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -20,9 +20,7 @@ BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERS
 MC_BUKKIT_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
 
 # Install java
-if [ $JAVA_TYPE = "openjdk" ]; then
-    echo "INFO ! openjdk selected"
-	if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
 	then
 		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
 	else
@@ -30,27 +28,20 @@ if [ $JAVA_TYPE = "openjdk" ]; then
 		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
 		apt-get update
 		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
-	fi
-
-elif [ $JAVA_TYPE = "msopenjdk" ]; then
-    echo "INFO ! msopenjdk selected"
-	if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
-	then
-		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
-		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-		dpkg -i packages-microsoft-prod.deb \
-		apt-get update && apt-get install -y msopenjdk-25 \
-		apt-get -y update && apt-get -y --fix-broken install
-	fi
-
-else
-    echo "ERROR ! JAVA_TYPE must be set to on first run"
-    sleep infinity
 fi
 
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ $MC_TYPE = "vanilla" ]; then