From c32a202cfdd70ccb61f0343af3e0bb69351b429c Mon Sep 17 00:00:00 2001
From: MiniDigger | Martin <admin@minidigger.dev>
Date: Sat, 16 Sep 2023 23:06:36 +0200
Subject: [PATCH] Improve java version check (#9692)

---
 .../server/Improve-java-version-check.patch   | 47 +++++++++++++++++++
 .../Remove-garbage-Java-version-check.patch   | 21 ---------
 2 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 patches/server/Improve-java-version-check.patch
 delete mode 100644 patches/server/Remove-garbage-Java-version-check.patch

diff --git a/patches/server/Improve-java-version-check.patch b/patches/server/Improve-java-version-check.patch
new file mode 100644
index 0000000000..fa63f447f1
--- /dev/null
+++ b/patches/server/Improve-java-version-check.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Wed, 16 Mar 2022 13:58:16 +0100
+Subject: [PATCH] Improve java version check
+
+Co-Authored-By: MiniDigger | Martin <admin@minidigger.dev>
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -0,0 +0,0 @@ public class Main {
+                 return;
+             }
+ 
++            // Paper start - better java version checks
++            boolean skip = Boolean.getBoolean("Paper.IgnoreJavaVersion");
+             float javaVersion = Float.parseFloat(System.getProperty("java.class.version"));
+-            if (javaVersion < 61.0) {
+-                System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'.");
+-                return;
+-            }
+-            if (javaVersion > 64.0) {
+-                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 20 is supported.");
++            boolean isOldVersion = javaVersion < 61.0;
++            if (!skip && isOldVersion) {
++                System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'. For more info see https://docs.papermc.io/misc/java-install");
+                 return;
+             }
+             String javaVersionName = System.getProperty("java.version");
+             // J2SE SDK/JRE Version String Naming Convention
+             boolean isPreRelease = javaVersionName.contains("-");
+-            if (isPreRelease && javaVersion == 61.0) {
+-                System.err.println("Unsupported Java detected (" + javaVersionName + "). You are running an outdated, pre-release version. Only general availability versions of Java are supported. Please update your Java version.");
++            if (!skip && isPreRelease) {
++                System.err.println("Unsupported Java detected (" + javaVersionName + "). You are running an unsupported, non official, version. Only general availability versions of Java are supported. Please update your Java version. See https://docs.papermc.io/paper/faq#unsupported-java-detected-what-do-i-do for more information.");
+                 return;
+             }
+ 
++            if (skip && (isOldVersion || isPreRelease)) {
++                System.err.println("Unsupported Java detected ("+ javaVersionName + "), but the check was skipped. Proceed with caution! ");
++            }
++            // Paper end - better java version checks
++
+             try {
+                 // Paper start - Handled by TerminalConsoleAppender
+                 /*
diff --git a/patches/server/Remove-garbage-Java-version-check.patch b/patches/server/Remove-garbage-Java-version-check.patch
deleted file mode 100644
index 7141c6e0e0..0000000000
--- a/patches/server/Remove-garbage-Java-version-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Wed, 16 Mar 2022 13:58:16 +0100
-Subject: [PATCH] Remove garbage Java version check
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -0,0 +0,0 @@ public class Main {
-                 System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'.");
-                 return;
-             }
--            if (javaVersion > 64.0) {
--                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 20 is supported.");
--                return;
--            }
-             String javaVersionName = System.getProperty("java.version");
-             // J2SE SDK/JRE Version String Naming Convention
-             boolean isPreRelease = javaVersionName.contains("-");