From 5d0ee65666f501daf9e4e27bdd98f3c99353a8cb Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sat, 3 Dec 2022 19:14:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=BB=E5=8F=96=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java | 4 ++-- .../mc/plugin/core/bukkit/page/handler/PageHandler.java | 6 +----- .../cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java | 2 +- 3 files changed, 4 insertions(+), 8 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 59635b1..ec899e7 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 @@ -49,9 +49,9 @@ public class PageManager { } String filename = pageName + ".yml"; File pageFile = new File(pageFolder, filename); - try (InputStream resource = plugin.getResource("/pages/" + filename)) { + try (InputStream resource = plugin.getResource("pages/" + filename)) { if (resource == null) { - throw new IllegalArgumentException("为插件 " + pluginName + " 加载页面配置文件 " + filename + " 时出错!"); + throw new IllegalArgumentException("在插件 " + plugin.getName() + " 的 Jar 文件内部未找到 " + filename + " !"); } Files.copy(resource, pageFile.toPath(), StandardCopyOption.REPLACE_EXISTING); YamlConfiguration config = YamlConfiguration.loadConfiguration(pageFile); diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java index b91d2d6..d71d27d 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java @@ -22,11 +22,7 @@ public abstract class PageHandler implements InventoryHolder { protected Inventory inventory; public PageHandler(@NotNull HumanEntity player) { - try { - config = PageManager.getPageConfig(getClass()); - } catch (Exception e) { - throw new IllegalArgumentException("加载界面配置时遇到了一个异常!", e); - } + config = PageManager.getPageConfig(getClass()); this.player = player; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java index c067812..5e48080 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java @@ -224,7 +224,7 @@ public final class BukkitUtils { } File file = new File(dataFolder, filename); if (!file.exists()) { - try (InputStream stream = plugin.getClass().getResourceAsStream("/" + filename)) { + try (InputStream stream = plugin.getClass().getResourceAsStream(filename)) { if (stream == null) { throw new IllegalArgumentException("在插件 " + plugin.getName() + " 的文件内部未找到 " + filename + " !"); }