From 35417bd9def398daf701afa79e5475bb0d5ff6e9 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sat, 13 Aug 2022 17:03:41 -0500 Subject: [PATCH 1/4] ISSUE #35 Compare versions without using enum values. --- .../Aust1n46/chat/versions/VersionHandler.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java index bc1f652..9317824 100644 --- a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java +++ b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java @@ -67,10 +67,22 @@ public static boolean is1_19() { } public static boolean isUnder_1_19() { - return !SERVER_VERSION.isAtLeast(MinecraftVersion.WILD_UPDATE); + if (SERVER_VERSION.getMajor() < 1) { + return true; + } + return SERVER_VERSION.getMajor() == 1 && SERVER_VERSION.getMinor() < 19; } public static boolean isAbove_1_19() { - return !is1_19() && SERVER_VERSION.isAtLeast(MinecraftVersion.WILD_UPDATE); + if (SERVER_VERSION.getMajor() < 1) { + return false; + } + if (SERVER_VERSION.getMajor() > 1) { + return true; + } + if (SERVER_VERSION.getMinor() > 19) { + return true; + } + return SERVER_VERSION.getMinor() == 19 && SERVER_VERSION.getBuild() > 0; } } From e315824ae948254ebcce309a400da3342605279b Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Tue, 23 Aug 2022 22:00:32 -0500 Subject: [PATCH 2/4] Update src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java Co-authored-by: Derek Lee --- .../mineverse/Aust1n46/chat/versions/VersionHandler.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java index 9317824..fc9319c 100644 --- a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java +++ b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java @@ -67,10 +67,7 @@ public static boolean is1_19() { } public static boolean isUnder_1_19() { - if (SERVER_VERSION.getMajor() < 1) { - return true; - } - return SERVER_VERSION.getMajor() == 1 && SERVER_VERSION.getMinor() < 19; + return !SERVER_VERSION.isAtLeast(MC1_19); } public static boolean isAbove_1_19() { From dfcc2bf1bff975b434185a5d551acfccb6a9f22e Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Tue, 23 Aug 2022 22:00:36 -0500 Subject: [PATCH 3/4] Update src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java Co-authored-by: Derek Lee --- .../Aust1n46/chat/versions/VersionHandler.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java index fc9319c..dacecd2 100644 --- a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java +++ b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java @@ -71,15 +71,6 @@ public static boolean isUnder_1_19() { } public static boolean isAbove_1_19() { - if (SERVER_VERSION.getMajor() < 1) { - return false; - } - if (SERVER_VERSION.getMajor() > 1) { - return true; - } - if (SERVER_VERSION.getMinor() > 19) { - return true; - } - return SERVER_VERSION.getMinor() == 19 && SERVER_VERSION.getBuild() > 0; + return SERVER_VERSION.isAtLeast(MC1_19_1); } } From cad3636ef7eaef20754d650a9fd209d13b4d6ca0 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Tue, 23 Aug 2022 22:05:21 -0500 Subject: [PATCH 4/4] ISSUE #35 Refac with custom declared versions For 1.19 and 1.19.1 --- .../java/mineverse/Aust1n46/chat/versions/VersionHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java index dacecd2..6447bb2 100644 --- a/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java +++ b/src/main/java/mineverse/Aust1n46/chat/versions/VersionHandler.java @@ -2,10 +2,11 @@ import com.comphenix.protocol.utility.MinecraftVersion; -//This class contains methods for determining what version of Minecraft the server is running. public final class VersionHandler { public static final MinecraftVersion SERVER_VERSION = MinecraftVersion.getCurrentVersion(); + private static final MinecraftVersion MC1_19 = new MinecraftVersion(1, 19, 0); + private static final MinecraftVersion MC1_19_1 = new MinecraftVersion(1, 19, 1); private VersionHandler() { }