From 03b0d62b1941025bcaf464deefc6d44fdf79d5de Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Tue, 19 Mar 2024 17:57:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E8=8E=B7=E5=8F=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/core/bukkit/HamsterCorePlugin.java | 41 ++++++++--------- .../plugin/core/bungee/HamsterCorePlugin.java | 39 ++++++++-------- .../core/common/util/UpdateCheckUtils.java | 2 +- .../core/velocity/HamsterCorePlugin.java | 46 ++++++++++--------- 4 files changed, 65 insertions(+), 63 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 4408d02..6047a14 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.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.logging.Logger; -@SuppressWarnings("CallToPrintStackTrace") public class HamsterCorePlugin extends JavaPlugin { @Getter private static HamsterCorePlugin instance; @@ -117,26 +116,7 @@ public class HamsterCorePlugin extends JavaPlugin { sync(() -> { PointAPI.reloadPlayerPointAPIHook(); VaultAPI.reloadVaultHook(); - async(() -> { - for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) { - try (InputStream stream = plugin.getResource("plugin.yml")) { - if (stream == null) { - continue; - } - try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { - YamlConfig config = YamlConfig.load(reader); - ConfigSection section = config.getSection("UPDATE_CHECKER"); - if (section == null) { - continue; - } - UpdateCheckUtils.checkUpdate(plugin.getName(), section); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - + async(this::checkUpdate); }); logger.info("仓鼠核心启动完成，总计耗时 " + time + " ms"); } @@ -165,4 +145,23 @@ public class HamsterCorePlugin extends JavaPlugin { long time = System.currentTimeMillis() - start; logger.info("仓鼠核心已关闭，总计耗时 " + time + " ms"); } + + private void checkUpdate() { + for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) { + try (InputStream stream = plugin.getResource("plugin.yml")) { + if (stream == null) { + continue; + } + try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + YamlConfig config = YamlConfig.load(reader); + ConfigSection section = config.getSection("UPDATE_CHECKER"); + if (section == null) { + continue; + } + UpdateCheckUtils.checkUpdate(plugin.getName(), section); + } + } catch (Exception ignored) { + } + } + } } 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 30d7445..9af906f 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 @@ -62,27 +62,9 @@ public class HamsterCorePlugin extends Plugin { logger.info("仓鼠核心正在启动"); audienceProvider = BungeeAudiences.create(this); logger.info("已创建 AudienceProvider"); + CoreAPI.getInstance().getExecutorService().submit(this::checkUpdate); long time = System.currentTimeMillis() - start; logger.info("仓鼠核心启动完成，总计耗时 " + time + " ms"); - - CoreAPI.getInstance().getExecutorService().submit(() -> { - for (Plugin plugin : ProxyServer.getInstance().getPluginManager().getPlugins()) { - try (InputStream stream = plugin.getResourceAsStream("bungee.yml")) { - if (stream == null) { - continue; - } - try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { - YamlConfig config = YamlConfig.load(reader); - ConfigSection section = config.getSection("UPDATE_CHECKER"); - if (section == null) { - continue; - } - UpdateCheckUtils.checkUpdate(plugin.getDescription().getName(), section); - } - } catch (IOException ignored) { - } - } - }); } @Override @@ -100,4 +82,23 @@ public class HamsterCorePlugin extends Plugin { long time = System.currentTimeMillis() - start; logger.info("仓鼠核心已关闭，总计耗时 " + time + " ms"); } + + private void checkUpdate() { + for (Plugin plugin : ProxyServer.getInstance().getPluginManager().getPlugins()) { + try (InputStream stream = plugin.getResourceAsStream("bungee.yml")) { + if (stream == null) { + continue; + } + try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + YamlConfig config = YamlConfig.load(reader); + ConfigSection section = config.getSection("UPDATE_CHECKER"); + if (section == null) { + continue; + } + UpdateCheckUtils.checkUpdate(plugin.getDescription().getName(), section); + } + } catch (IOException ignored) { + } + } + } } diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java index 3e12e3f..b437e7a 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/UpdateCheckUtils.java @@ -32,7 +32,7 @@ public final class UpdateCheckUtils { } public static void checkUpdate(@NotNull String pluginName, @NotNull ConfigSection updateConfig, @NotNull Audience sender) throws IOException { - String version = updateConfig.getString("version", ""); + String version = updateConfig.getString("VERSION", ""); String checkType = updateConfig.getString("CHECK_TYPE", ""); String baseUrl = updateConfig.getString("GIT_BASE_URL"); String gitRepo = updateConfig.getString("GIT_REPO"); diff --git a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java index 80e2545..98a3342 100644 --- a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java +++ b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java @@ -77,30 +77,9 @@ public class HamsterCorePlugin { public void onProxyInitialization(ProxyInitializeEvent event) { long start = System.currentTimeMillis(); slf4jLogger.info("仓鼠核心正在启动"); + CoreAPI.getInstance().getExecutorService().submit(this::checkUpdate); long time = System.currentTimeMillis() - start; slf4jLogger.info("仓鼠核心启动完成，总计耗时 " + time + " ms"); - CoreAPI.getInstance().getExecutorService().submit(() -> { - for (PluginContainer plugin : proxyServer.getPluginManager().getPlugins()) { - String pluginName = plugin.getDescription().getName().orElse(null); - if (pluginName == null) { - continue; - } - Object pluginObject = plugin.getInstance().orElse(null); - if (pluginObject == null) { - continue; - } - try (InputStream stream = pluginObject.getClass().getResourceAsStream("/update.yml")) { - if (stream == null) { - continue; - } - try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { - YamlConfig config = YamlConfig.load(reader); - UpdateCheckUtils.checkUpdate(pluginName, config); - } - } catch (Exception ignored) { - } - } - }); } @Subscribe(order = PostOrder.LAST) @@ -119,4 +98,27 @@ public class HamsterCorePlugin { long time = System.currentTimeMillis() - start; slf4jLogger.info("仓鼠核心关闭完成，总计耗时 " + time + " ms"); } + + private void checkUpdate() { + for (PluginContainer plugin : proxyServer.getPluginManager().getPlugins()) { + String pluginName = plugin.getDescription().getName().orElse(null); + if (pluginName == null) { + continue; + } + Object pluginObject = plugin.getInstance().orElse(null); + if (pluginObject == null) { + continue; + } + try (InputStream stream = pluginObject.getClass().getResourceAsStream("/update.yml")) { + if (stream == null) { + continue; + } + try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + YamlConfig config = YamlConfig.load(reader); + UpdateCheckUtils.checkUpdate(pluginName, config); + } + } catch (Exception ignored) { + } + } + } } \ No newline at end of file