From f0bf6f0d1d24024671aebd3c3021a15cdb5819fd Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 17 Dec 2021 17:57:21 +0100 Subject: [PATCH] Encourage Java 17 (not required) --- .../slimefun4/implementation/Slimefun.java | 8 +++++--- .../slimefun4/implementation/StartupWarnings.java | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java index 7ac9e9654..765d661f1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java @@ -133,6 +133,8 @@ import me.mrCookieSlime.Slimefun.api.inventory.UniversalBlockMenu; */ public final class Slimefun extends JavaPlugin implements SlimefunAddon { + private static final int RECOMMENDED_JAVA_VERSION = 17; + /** * Our static instance of {@link Slimefun}. * Make sure to clean this up in {@link #onDisable()}! @@ -263,9 +265,9 @@ public final class Slimefun extends JavaPlugin implements SlimefunAddon { StartupWarnings.discourageCSCoreLib(logger); } - // Encourage Java 16 - if (NumberUtils.getJavaVersion() < 16) { - StartupWarnings.oldJavaVersion(logger); + // Encourage newer Java version + if (NumberUtils.getJavaVersion() < RECOMMENDED_JAVA_VERSION) { + StartupWarnings.oldJavaVersion(logger, RECOMMENDED_JAVA_VERSION); } // If the server has no "data-storage" folder, it's _probably_ a new install. So mark it for metrics. diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/StartupWarnings.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/StartupWarnings.java index a1d2f0c5f..c70bc0796 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/StartupWarnings.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/StartupWarnings.java @@ -59,17 +59,17 @@ final class StartupWarnings { } @ParametersAreNonnullByDefault - static void oldJavaVersion(Logger logger) { + static void oldJavaVersion(Logger logger, int recommendedJavaVersion) { int javaVersion = NumberUtils.getJavaVersion(); logger.log(Level.WARNING, BORDER); logger.log(Level.WARNING, PREFIX + "Your Java version (Java {0}) is out of date.", javaVersion); logger.log(Level.WARNING, PREFIX); - logger.log(Level.WARNING, PREFIX + "We recommend you to update to Java 16."); - logger.log(Level.WARNING, PREFIX + "Java 16 is required as of Minecraft 1.17 and"); - logger.log(Level.WARNING, PREFIX + "we would like to utilise all the new features"); + logger.log(Level.WARNING, PREFIX + "We recommend you to update to Java {0}.", recommendedJavaVersion); + logger.log(Level.WARNING, PREFIX + "Java {0} is required for newer versions of Minecraft", recommendedJavaVersion); + logger.log(Level.WARNING, PREFIX + "and we would like to utilise all the new features"); logger.log(Level.WARNING, PREFIX + "that come with it as soon as possible."); - logger.log(Level.WARNING, PREFIX + "Slimefun will also require Java 16 in"); + logger.log(Level.WARNING, PREFIX + "Slimefun will also require Java {0} in", recommendedJavaVersion); logger.log(Level.WARNING, PREFIX + "the foreseeable future, so please update!"); logger.log(Level.WARNING, BORDER); }