From 9758be53540b78faab8cc32527cf38efc596a487 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sun, 1 Jan 2023 14:20:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20page=E6=B0=B8=E8=BF=9C=E4=BB=8E?= =?UTF-8?q?=E6=8F=92=E4=BB=B6jar=E6=96=87=E4=BB=B6=E5=86=85=E8=A6=86?= =?UTF-8?q?=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/core/bukkit/page/PageManager.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java index db50001..947936d 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java @@ -31,10 +31,6 @@ public class PageManager { if (plugin == null) { throw new IllegalArgumentException("未找到插件 " + pluginName + " !"); } - File pageFolder = new File(plugin.getDataFolder(), "pages"); - if (pageFolder.mkdirs()) { - HamsterCorePlugin.getInstance().getLogger().info("为 " + pluginName + " 创建页面配置文件夹..."); - } pageConfig = getPageConfig(plugin, clazz.getSimpleName()); PAGE_CONFIG.put(clazz.getName(), pageConfig); return pageConfig; @@ -48,16 +44,20 @@ public class PageManager { HamsterCorePlugin.getInstance().getLogger().info("为 " + pluginName + " 创建页面配置文件夹..."); } String filename = pageName + ".yml"; - File pageFile = new File(pageFolder, filename); + File pageConfigFile = new File(pageFolder, filename); + if (pageConfigFile.exists()) { + YamlConfiguration config = YamlConfiguration.loadConfiguration(pageConfigFile); + return new PageConfig(plugin, config); + } try (InputStream resource = plugin.getResource("pages/" + filename)) { if (resource == null) { - throw new IllegalArgumentException("在插件 " + plugin.getName() + " 的 Jar 文件内部未找到 " + filename + " !"); + throw new IllegalArgumentException("在插件 " + plugin.getName() + " 的 Jar 文件内部未找到 /pages/" + filename + " !"); } - Files.copy(resource, pageFile.toPath(), StandardCopyOption.REPLACE_EXISTING); - YamlConfiguration config = YamlConfiguration.loadConfiguration(pageFile); + Files.copy(resource, pageConfigFile.toPath(), StandardCopyOption.REPLACE_EXISTING); + YamlConfiguration config = YamlConfiguration.loadConfiguration(pageConfigFile); return new PageConfig(plugin, config); } catch (IOException e) { - throw new IllegalArgumentException("为插件 " + pluginName + " 加载页面配置文件 " + filename + " 时出错!"); + throw new IllegalArgumentException("为插件 " + pluginName + " 加载页面配置文件 " + filename + " 时出错!", e); } } }