From f034567aec15dfa1d3c88f0ddc64e6b7a9ee4974 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Mon, 30 Sep 2024 18:04:33 +0200 Subject: [PATCH] 16.9 Important! If you have downloaded and are using version 16.8, please make sure to upgrade to 16.9! The 16.8 is not compatible with my plugins, as this is already a revised version but all my plugins have not yet been adapted. I apologize for this mistake on my part. --- pom.xml | 2 +- .../api/minecraftVersion/T2CmcVersion.java | 21 +++++++++++++++++++ .../api/minecraftVersion/T2CnmsVersions.java | 2 +- .../SPIGOT/system/T2CodeLibMain.java | 4 ++-- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1d9ff3e..1429a57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 16.6 + 16.9 diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java index 6a339c2..c56700c 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java @@ -31,6 +31,7 @@ public class T2CmcVersion { mc1_19 = mcVersion.contains("MC: 1.19"); mc1_20 = mcVersion.contains("MC: 1.20"); mc1_21 = mcVersion.contains("MC: 1.21"); + mc1_22 = mcVersion.contains("MC: 1.22"); nms1_8_R1 = nms.contains("1_8_R1"); nms1_8_R2 = nms.contains("1_8_R2"); @@ -57,6 +58,8 @@ public class T2CmcVersion { nms1_20_R3 = nms.contains("1_20_R3"); nms1_20_R4 = nms.contains("1_20_R4"); nms1_21_R1 = nms.contains("1_21_R1"); + nms1_21_R2 = nms.contains("1_21_R2"); + nms1_22_R1 = nms.contains("1_22_R1"); } private static String mcVersion; @@ -75,6 +78,7 @@ public class T2CmcVersion { private static boolean mc1_19; private static boolean mc1_20; private static boolean mc1_21; + private static boolean mc1_22; private static String nms; private static boolean nms1_8_R1; @@ -102,6 +106,8 @@ public class T2CmcVersion { private static boolean nms1_20_R3; private static boolean nms1_20_R4; private static boolean nms1_21_R1; + private static boolean nms1_21_R2; + private static boolean nms1_22_R1; public static String getMcVersion() { return mcVersion; @@ -166,6 +172,11 @@ public class T2CmcVersion { public static boolean isMc1_21() { return mc1_21; } + public static boolean isMc1_22() { + return mc1_22; + } + + public static String getNms() { return nms; @@ -270,6 +281,12 @@ public class T2CmcVersion { public static boolean isNms1_21_R1() { return nms1_21_R1; } + public static boolean isNms1_21_R2() { + return nms1_21_R2; + } + public static boolean isNms1_22_R1() { + return nms1_22_R1; + } public static boolean minMc1_8() { @@ -324,4 +341,8 @@ public class T2CmcVersion { return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17() && !isMc1_18() && !isMc1_19(); } + public static boolean minMc1_21() { + return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17() + && !isMc1_18() && !isMc1_19()&& !isMc1_20(); + } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java index b6c8475..30969cf 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java @@ -90,7 +90,7 @@ public class T2CnmsVersions { } else if (mc.contains("(MC: 1.20.6)")) { t2CnmsEnum = T2CnmsEnum.v1_20_R4; T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); - } else if (mc.contains("(MC: 1.21)")) { + } else if (mc.contains("(MC: 1.21)") || mc.contains("(MC: 1.21.1)")) { t2CnmsEnum = T2CnmsEnum.v1_21_R1; T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); } else t2CnmsEnum = T2CnmsEnum.not_support; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java index 63195b1..6d705b5 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java @@ -79,10 +79,10 @@ public final class T2CodeLibMain extends JavaPlugin { } } } - if (T2CmcVersion.isMc1_21()) { + if (T2CmcVersion.isMc1_22()) { T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!"); T2Csend.console(prefix); - T2Csend.warning(plugin, "The 1.21 is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net"); + T2Csend.warning(plugin, "The 1.22 is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net"); T2Csend.console(prefix); T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!"); if (!SelectLibConfig.getT2cTestDevelopment()) {