From 2263a74a77cc6b63e22a91ae9cbb209f8cb6532e Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Thu, 25 Jul 2024 20:22:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B91.21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/plugin/core/bukkit/HamsterCorePlugin.java | 6 ++++-- .../core/bukkit/util/MinecraftVersion.java | 16 ++++++++++++---- .../mc/plugin/core/bungee/HamsterCorePlugin.java | 3 +-- .../mc/plugin/core/common/util/SimpleLogger.java | 6 +++--- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java index e5f842e..f693f66 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java @@ -35,7 +35,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.StandardCopyOption; -import java.util.logging.Level; public class HamsterCorePlugin extends JavaPlugin { @Getter @@ -91,7 +90,7 @@ public class HamsterCorePlugin extends JavaPlugin { CoreBukkitAPI.init(configFile); simpleLogger.info("已初始化 CoreAPI"); } catch (Exception e) { - simpleLogger.log(Level.WARNING, "初始化 CoreAPI 出错", e); + simpleLogger.error(e, "初始化 CoreAPI 出错"); } CoreMessage.init(this); simpleLogger.info("已初始化语言文本"); @@ -114,6 +113,9 @@ public class HamsterCorePlugin extends JavaPlugin { simpleLogger.info("已注册 CallbackListener"); Bukkit.getPluginManager().registerEvents(DebugListener.INSTANCE, this); simpleLogger.info("已注册 DebugListener"); + simpleLogger.info("Redis 启用状态: %b", CoreAPI.getInstance().isEnableRedis()); + simpleLogger.info("Database 启用状态: %b", CoreAPI.getInstance().isEnableDatabase()); + simpleLogger.info("已注册 DebugListener"); long time = System.currentTimeMillis() - start; sync(() -> { PointAPI.reloadPlayerPointAPIHook(); diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/MinecraftVersion.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/MinecraftVersion.java index 300ec99..0510477 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/MinecraftVersion.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/MinecraftVersion.java @@ -61,8 +61,10 @@ public class MinecraftVersion { @NotNull public static Class getNMSClass(@NotNull String className) throws ClassNotFoundException { - if (version1 >= 1 && version2 >= 17) { - return Class.forName("net.minecraft.server." + className); + if (version1 >= 1) { + if (version2 >= 17) { + return Class.forName("net.minecraft.server." + className); + } } String nmsVersion = getNMSVersion(); return Class.forName("net.minecraft.server." + nmsVersion + "." + className); @@ -79,8 +81,13 @@ public class MinecraftVersion { @NotNull public static Class getCraftBukkitClass(@NotNull String className) throws ClassNotFoundException { - if (version1 >= 1 && version2 >= 20 && version3 >= 6) { - return Class.forName("org.bukkit.craftbukkit." + className); + if (version1 >= 1) { + if (version2 >= 21) { + return Class.forName("org.bukkit.craftbukkit." + className); + } + if (version2 == 20 && version3 >= 6) { + return Class.forName("org.bukkit.craftbukkit." + className); + } } String nmsVersion = getNMSVersion(); return Class.forName("org.bukkit.craftbukkit." + nmsVersion + "." + className); @@ -91,6 +98,7 @@ public class MinecraftVersion { try { return getCraftBukkitClass(className); } catch (ClassNotFoundException e) { + e.printStackTrace(); throw new RuntimeException(e); } } diff --git a/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java b/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java index 02a4584..75b2a8a 100644 --- a/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java +++ b/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java @@ -19,7 +19,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.StandardCopyOption; -import java.util.logging.Level; public class HamsterCorePlugin extends Plugin { @Getter @@ -51,7 +50,7 @@ public class HamsterCorePlugin extends Plugin { CoreBungeeAPI.init(configFile); simpleLogger.info("已初始化 CoreAPI"); } catch (Exception e) { - simpleLogger.log(Level.WARNING, "初始化 CoreAPI 出错", e); + simpleLogger.error(e, "初始化 CoreAPI 出错"); } long time = System.currentTimeMillis() - start; simpleLogger.info("仓鼠核心初始化完成，总计耗时 " + time + " ms"); diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SimpleLogger.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SimpleLogger.java index 9ac29ce..ebf844a 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SimpleLogger.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SimpleLogger.java @@ -19,9 +19,9 @@ public abstract class SimpleLogger { try { log(level, String.format(msg, args)); } catch (Exception e) { - log(Level.WARNING, "输出日志 " + msg + " 时遇到一个异常"); - log(Level.WARNING, "日志参数: " + Arrays.toString(args)); - log(Level.WARNING, "异常信息: ", e); + log(Level.WARNING, "输出日志 %s 时遇到一个异常", msg); + log(Level.WARNING, "日志参数: %s", Arrays.toString(args)); + log(Level.WARNING, e, "异常信息: "); } }