From 5987d64a00c19a467997c6c772cef82663a5f557 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Mon, 11 Mar 2024 23:03:11 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=96=B0=20maven=20=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- .../mc/plugin/core/bukkit/HamsterCorePlugin.java | 12 +++++------- .../mc/plugin/core/bukkit/api/CoreBukkitAPI.java | 4 ++-- .../{util => }/serializer/ItemStackAdapter.java | 2 +- .../{util => }/serializer/PotionEffectAdapter.java | 2 +- .../mc/plugin/core/bukkit/util/CoreBukkitUtils.java | 1 - .../mc/plugin/core/bungee/HamsterCorePlugin.java | 9 ++++----- 7 files changed, 14 insertions(+), 18 deletions(-) rename core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/{util => }/serializer/ItemStackAdapter.java (94%) rename core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/{util => }/serializer/PotionEffectAdapter.java (94%) diff --git a/build.gradle.kts b/build.gradle.kts index 84ab660..8b59819 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,7 @@ subprojects { } repositories { maven { - url = uri("https://maven.airgame.net/maven-airgame") + url = uri("https://maven.airgame.net/public") credentials { username = rootProject.properties.getOrDefault("maven_username", "").toString() 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 d510669..efdfe29 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 @@ -58,9 +58,8 @@ public class HamsterCorePlugin extends JavaPlugin { public void onLoad() { long start = System.currentTimeMillis(); Logger logger = getLogger(); - logger.info("仓鼠核心正在初始化"); logger.info("Minecraft 版本: " + CoreBukkitUtils.getMCVersion()); - logger.info("nms 版本: " + CoreBukkitUtils.getNMSVersion()); + logger.info("NMS 版本: " + CoreBukkitUtils.getNMSVersion()); instance = this; saveDefaultConfig(); reloadConfig(); @@ -106,15 +105,14 @@ public class HamsterCorePlugin extends JavaPlugin { public void onDisable() { long start = System.currentTimeMillis(); Logger logger = getLogger(); - logger.info("仓鼠核心正在关闭"); - CoreBukkitAPI.getInstance().getDataSource().close(); - logger.info("已关闭数据库连接池"); CoreAPI.getInstance().getRedisClient().close(); logger.info("已关闭 Redis 连接池"); + CoreBukkitAPI.getInstance().getDataSource().close(); + logger.info("已关闭数据库连接池"); CoreAPI.getInstance().getExecutorService().shutdownNow(); - logger.info("已关闭线程池"); + logger.info("已关闭 ExecutorService 线程池"); CoreAPI.getInstance().getScheduledService().shutdownNow(); - logger.info("已关闭调度器"); + logger.info("已关闭 ScheduledExecutorService 线程池"); for (Player player : Bukkit.getOnlinePlayers()) { InventoryView view = player.getOpenInventory(); Inventory inventory = view.getTopInventory(); diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java index dc2a11b..2c4f133 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java @@ -1,8 +1,8 @@ package cn.hamster3.mc.plugin.core.bukkit.api; import cn.hamster3.mc.plugin.core.bukkit.HamsterCorePlugin; -import cn.hamster3.mc.plugin.core.bukkit.util.serializer.ItemStackAdapter; -import cn.hamster3.mc.plugin.core.bukkit.util.serializer.PotionEffectAdapter; +import cn.hamster3.mc.plugin.core.bukkit.serializer.ItemStackAdapter; +import cn.hamster3.mc.plugin.core.bukkit.serializer.PotionEffectAdapter; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import cn.hamster3.mc.plugin.core.common.serializer.ComponentTypeAdapter; diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/serializer/ItemStackAdapter.java similarity index 94% rename from core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/serializer/ItemStackAdapter.java index 140fef5..65c8525 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/serializer/ItemStackAdapter.java @@ -1,4 +1,4 @@ -package cn.hamster3.mc.plugin.core.bukkit.util.serializer; +package cn.hamster3.mc.plugin.core.bukkit.serializer; import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import com.google.gson.*; diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/serializer/PotionEffectAdapter.java similarity index 94% rename from core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/serializer/PotionEffectAdapter.java index da843e7..da96579 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/serializer/PotionEffectAdapter.java @@ -1,4 +1,4 @@ -package cn.hamster3.mc.plugin.core.bukkit.util.serializer; +package cn.hamster3.mc.plugin.core.bukkit.serializer; import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import com.google.gson.*; diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java index d3db5dc..418eb18 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java @@ -407,7 +407,6 @@ public final class CoreBukkitUtils { ); } - @SuppressWarnings("CallToPrintStackTrace") public static void executeCommand(@NotNull Player player, @NotNull String command) { command = command.replace("%player_name%", player.getName()); if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { 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 6d93c25..f88f554 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 @@ -47,15 +47,14 @@ public class HamsterCorePlugin extends Plugin { public void onDisable() { long start = System.currentTimeMillis(); Logger logger = getLogger(); - logger.info("仓鼠核心正在关闭"); - CoreBungeeAPI.getInstance().getDataSource().close(); - logger.info("已关闭数据库连接池"); CoreAPI.getInstance().getRedisClient().close(); logger.info("已关闭 Redis 连接池"); + CoreBungeeAPI.getInstance().getDataSource().close(); + logger.info("已关闭数据库连接池"); CoreAPI.getInstance().getExecutorService().shutdownNow(); - logger.info("已关闭线程池"); + logger.info("已关闭 ExecutorService 线程池"); CoreAPI.getInstance().getScheduledService().shutdownNow(); - logger.info("已关闭调度器"); + logger.info("已关闭 ScheduledExecutorService 线程池"); long time = System.currentTimeMillis() - start; logger.info("仓鼠核心已关闭，总计耗时 " + time + " ms"); }