From 32b57de55c09949d09fb581acf8bc44b37f34575 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Sat, 15 Jun 2024 02:34:34 +0200 Subject: [PATCH] 16.6 1.21 support minor code changes / bug fixes --- .idea/misc.xml | 2 +- .idea/uiDesigner.xml | 124 +++++++++++++++++ pom.xml | 14 +- .../api/minecraftVersion/T2CmcVersion.java | 45 +++--- .../api/minecraftVersion/T2CnmsEnum.java | 31 +++++ .../api/minecraftVersion/T2CnmsVersions.java | 129 ++++++++++++++++++ .../SPIGOT/system/T2CodeLibMain.java | 29 ++-- 7 files changed, 337 insertions(+), 37 deletions(-) create mode 100644 .idea/uiDesigner.xml create mode 100644 src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsEnum.java create mode 100644 src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 23ff514..63ea76a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -14,5 +14,5 @@ - + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 113b79d..1d9ff3e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 16.5 + 16.6 @@ -118,7 +118,7 @@ org.spigotmc spigot-api - 1.20.6-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT provided @@ -134,14 +134,14 @@ net.md-5 bungeecord-api - 1.20-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar provided net.md-5 bungeecord-api - 1.19-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT javadoc provided @@ -182,19 +182,19 @@ net.kyori adventure-text-minimessage - 4.17.0 + 4.18.0-SNAPSHOT compile net.kyori adventure-platform-bukkit - 4.3.2 + 4.3.3 compile net.kyori adventure-platform-bungeecord - 4.3.2 + 4.3.3 compile 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 302cfba..6a339c2 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 @@ -1,27 +1,36 @@ package net.t2code.t2codelib.SPIGOT.api.minecraftVersion; +import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; +import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import org.bukkit.Bukkit; + public class T2CmcVersion { + public static void onCheck() { mcVersion = Bukkit.getServer().getVersion(); bukkitVersion = Bukkit.getServer().getBukkitVersion(); - nms = Bukkit.getServer().getClass().getPackage().getName(); - mc1_8 = nms.contains("1_8"); - mc1_9 = nms.contains("1_9"); - mc1_10 = nms.contains("1_10"); - mc1_11 = nms.contains("1_11"); - mc1_12 = nms.contains("1_12"); - mc1_13 = nms.contains("1_13"); - mc1_14 = nms.contains("1_14"); - mc1_15 = nms.contains("1_15"); - mc1_16 = nms.contains("1_16"); - mc1_17 = nms.contains("1_17"); - mc1_18 = nms.contains("1_18"); - mc1_19 = nms.contains("1_19"); - mc1_20 = nms.contains("1_20"); - mc1_21 = nms.contains("1_21"); + T2CnmsVersions.init(); + nms = String.valueOf(T2CnmsVersions.getT2CnmsEnum()); + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "mcVersion: " + mcVersion); + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "bukkitVersion: " + bukkitVersion); + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "nms: " + nms); + + mc1_8 = mcVersion.contains("MC: 1.8"); + mc1_9 = mcVersion.contains("MC: 1.9"); + mc1_10 = mcVersion.contains("MC: 1.10"); + mc1_11 = mcVersion.contains("MC: 1.11"); + mc1_12 = mcVersion.contains("MC: 1.12"); + mc1_13 = mcVersion.contains("MC: 1.13"); + mc1_14 = mcVersion.contains("MC: 1.14"); + mc1_15 = mcVersion.contains("MC: 1.15"); + mc1_16 = mcVersion.contains("MC: 1.16"); + mc1_17 = mcVersion.contains("MC: 1.17"); + mc1_18 = mcVersion.contains("MC: 1.18"); + mc1_19 = mcVersion.contains("MC: 1.19"); + mc1_20 = mcVersion.contains("MC: 1.20"); + mc1_21 = mcVersion.contains("MC: 1.21"); nms1_8_R1 = nms.contains("1_8_R1"); nms1_8_R2 = nms.contains("1_8_R2"); @@ -47,7 +56,6 @@ public class T2CmcVersion { nms1_20_R2 = nms.contains("1_20_R2"); nms1_20_R3 = nms.contains("1_20_R3"); nms1_20_R4 = nms.contains("1_20_R4"); - nms1_20_R5 = nms.contains("1_20_R5"); nms1_21_R1 = nms.contains("1_21_R1"); } @@ -93,7 +101,6 @@ public class T2CmcVersion { private static boolean nms1_20_R2; private static boolean nms1_20_R3; private static boolean nms1_20_R4; - private static boolean nms1_20_R5; private static boolean nms1_21_R1; public static String getMcVersion() { @@ -260,10 +267,6 @@ public class T2CmcVersion { return nms1_20_R4; } - public static boolean isNms1_20_R5() { - return nms1_20_R5; - } - public static boolean isNms1_21_R1() { return nms1_21_R1; } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsEnum.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsEnum.java new file mode 100644 index 0000000..f22f553 --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsEnum.java @@ -0,0 +1,31 @@ +package net.t2code.t2codelib.SPIGOT.api.minecraftVersion; + +public enum T2CnmsEnum { + not_support, + v1_8_R1, + v1_8_R2, + v1_8_R3, + v1_9_R1, + v1_9_R2, + v1_10_R1, + v1_11_R1, + v1_12_R1, + v1_13_R1, + v1_13_R2, + v1_14_R1, + v1_15_R1, + v1_16_R1, + v1_16_R2, + v1_16_R3, + v1_17_R1, + v1_18_R1, + v1_18_R2, + v1_19_R1, + v1_19_R2, + v1_19_R3, + v1_20_R1, + v1_20_R2, + v1_20_R3, + v1_20_R4, + v1_21_R1, +} 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 new file mode 100644 index 0000000..b6c8475 --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java @@ -0,0 +1,129 @@ +package net.t2code.t2codelib.SPIGOT.api.minecraftVersion; + +import lombok.Getter; +import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; +import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; + + +public class T2CnmsVersions { + + public static Class minecraftServerClass; + + @Getter + private static T2CnmsEnum t2CnmsEnum; + + public static void init() { + String mc = T2CmcVersion.getMcVersion(); + + if (mc.contains("(MC: 1.8)") || mc.contains("(MC: 1.8.1)")) { + t2CnmsEnum = T2CnmsEnum.v1_8_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.8.3)")) { + t2CnmsEnum = T2CnmsEnum.v1_8_R2; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.8.4)") || mc.contains("(MC: 1.8.5)") || mc.contains("(MC: 1.8.6)") || mc.contains("(MC: 1.8.7)") || mc.contains("(MC: 1.8.8)")) { + t2CnmsEnum = T2CnmsEnum.v1_8_R3; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.9)") || mc.contains("(MC: 1.9.2)")) { + t2CnmsEnum = T2CnmsEnum.v1_9_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.9.3)") || mc.contains("(MC: 1.9.4)")) { + t2CnmsEnum = T2CnmsEnum.v1_9_R2; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.10")) { + t2CnmsEnum = T2CnmsEnum.v1_10_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.11")) { + t2CnmsEnum = T2CnmsEnum.v1_11_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.12")) { + t2CnmsEnum = T2CnmsEnum.v1_12_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.13)")) { + t2CnmsEnum = T2CnmsEnum.v1_13_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.13.1)") || mc.contains("(MC: 1.13.2)")) { + t2CnmsEnum = T2CnmsEnum.v1_13_R2; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.14")) { + t2CnmsEnum = T2CnmsEnum.v1_14_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.15")) { + t2CnmsEnum = T2CnmsEnum.v1_15_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.16)") || mc.contains("(MC: 1.16.1)")) { + t2CnmsEnum = T2CnmsEnum.v1_16_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.16.2)") || mc.contains("(MC: 1.16.3)")) { + t2CnmsEnum = T2CnmsEnum.v1_16_R2; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.16.4)") || mc.contains("(MC: 1.16.5)")) { + t2CnmsEnum = T2CnmsEnum.v1_16_R3; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.17")) { + t2CnmsEnum = T2CnmsEnum.v1_17_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.18)") || mc.contains("(MC: 1.18.1)")) { + t2CnmsEnum = T2CnmsEnum.v1_18_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.18.2)")) { + t2CnmsEnum = T2CnmsEnum.v1_18_R2; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.19)") || mc.contains("(MC: 1.19.1)") || mc.contains("(MC: 1.19.2)")) { + t2CnmsEnum = T2CnmsEnum.v1_19_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.19.3)")) { + t2CnmsEnum = T2CnmsEnum.v1_19_R2; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.19.4)")) { + t2CnmsEnum = T2CnmsEnum.v1_19_R3; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.20)") || mc.contains("(MC: 1.20.1)")) { + t2CnmsEnum = T2CnmsEnum.v1_20_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.20.2)")) { + t2CnmsEnum = T2CnmsEnum.v1_20_R2; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else if (mc.contains("(MC: 1.20.3)") || mc.contains("(MC: 1.20.4)")) { + t2CnmsEnum = T2CnmsEnum.v1_20_R3; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } 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)")) { + t2CnmsEnum = T2CnmsEnum.v1_21_R1; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + } else t2CnmsEnum = T2CnmsEnum.not_support; + T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), String.valueOf(t2CnmsEnum)); + + + } + +// +// public static void init() { +// +// +// // List list= Arrays.stream(Class .getPackages()).map(Package::getName).filter(n -> n.startsWith("net.minecraft.server")).collect(Collectors.toList()); +// +// // for (String s : list){ +// // T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(),s); +// //} +// +// +// for (T2CnmsEnum nmsEnum : T2CnmsEnum.values()) { +// try { +// minecraftServerClass = Class.forName("net.minecraft.server." + nmsEnum + ".MinecraftServer"); +// } catch (ClassNotFoundException ignored) { +// +// } +// +// if (minecraftServerClass != null) { +// return; +// } +// +// } +// // todo nicht kompatiebel +// T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "nicht kompa"); +// +// } +} 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 6916692..63195b1 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java @@ -9,6 +9,8 @@ import net.t2code.t2codelib.SPIGOT.api.items.T2CitemVersion; import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CnmsEnum; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CnmsVersions; import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck; import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; import net.t2code.t2codelib.SPIGOT.system.bstats.Metrics; @@ -62,10 +64,11 @@ public final class T2CodeLibMain extends JavaPlugin { } T2CmcVersion.onCheck(); - if (T2CmcVersion.isNms1_20_R5()) { + if (T2CnmsVersions.getT2CnmsEnum() == T2CnmsEnum.not_support) { T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!"); T2Csend.console(prefix); - T2Csend.warning(plugin, "The 1.20.* (NMS R5) 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 " + T2CmcVersion.getMcVersion() + " is a very fresh / new version."); + T2Csend.warning(plugin, "The plugin may not yet be supported on this server! 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()) { @@ -75,7 +78,8 @@ public final class T2CodeLibMain extends JavaPlugin { e.printStackTrace(); } } - }if (T2CmcVersion.isMc1_21()) { + } + if (T2CmcVersion.isMc1_21()) { 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"); @@ -89,22 +93,31 @@ public final class T2CodeLibMain extends JavaPlugin { } } } - T2Csend.console(prefix + " §3Server run on: §6" + T2CmcVersion.getMcVersion() + " / " + T2CmcVersion.getNms()); + T2Ctemplate.onLoadSeparateStroke(prefix); + T2Csend.console(prefix + " §2Server run on:"); + T2Csend.console(prefix + " §3mcVersion: §6" + T2CmcVersion.getMcVersion()); + T2Csend.console(prefix + " §3bukkitVersion: §6" + T2CmcVersion.getBukkitVersion()); + T2Csend.console(prefix + " §3nms: §6" + T2CmcVersion.getNms()); + T2Ctemplate.onLoadSeparateStroke(prefix); if (eco != null) { String st = eco.getName(); if (eco.getName().equals("CMIEconomy")) st = "CMI"; if (Bukkit.getPluginManager().getPlugin(st) != null) { T2Csend.console(prefix + " §3Economy: §6" + eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); - } else T2Csend.console(prefix + " §3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); - } else T2Csend.console(prefix + " §3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else + T2Csend.console(prefix + " §3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else + T2Csend.console(prefix + " §3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); if (perm != null) { if (Bukkit.getPluginManager().getPlugin(perm.getName()) != null) { T2Csend.console(prefix + " §3Permission plugin: §6" + perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(perm.getName()).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); - } else T2Csend.console(prefix + " §3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_) + "ms"); - } else T2Csend.console(prefix + " §3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else + T2Csend.console(prefix + " §3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else + T2Csend.console(prefix + " §3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); if (T2CpluginCheck.papi()) { T2Csend.console(prefix + " §3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");