From 8345a58f2b9d0fdeb3d493fe7a2f7a6e15e983b1 Mon Sep 17 00:00:00 2001 From: CrazyDev22 Date: Wed, 15 May 2024 18:11:05 +0200 Subject: [PATCH] change safeguard message --- .../java/com/volmit/iris/core/safeguard/ServerBootSFG.java | 3 ++- .../main/java/com/volmit/iris/core/safeguard/UtilsSFG.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java index 754744e41..f26ab913e 100644 --- a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java @@ -15,6 +15,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.StringJoiner; @@ -81,7 +82,7 @@ public class ServerBootSFG { severityHigh++; } - if (getJavaVersion() != 17) { + if (!List.of(17, 21).contains(getJavaVersion())) { isJDK17 = false; joiner.add("Unsupported Java version"); severityMedium++; diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java index 11516c028..679211a56 100644 --- a/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java @@ -53,11 +53,11 @@ public class UtilsSFG { } if (!ServerBootSFG.isJDK17) { Iris.safeguard(C.YELLOW + "Unsupported java version"); - Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 Instead of JDK " + Iris.getJavaVersion()); + Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 (or 21 for 1.20.6) Instead of JDK " + Iris.getJavaVersion()); } if (ServerBootSFG.isJRE) { Iris.safeguard(C.YELLOW + "Unsupported Server JDK"); - Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 Instead of JRE " + Iris.getJavaVersion()); + Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 (or 21 for 1.20.6) Instead of JRE " + Iris.getJavaVersion()); } } }