From 6d723b6f9ec5f071f6f8995226feb597a97f7dfc Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 1 Sep 2023 17:10:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(core-bungeecord):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=B7=A5=E5=85=B7=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/bungee/util/CoreBungeeCordUtils.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java index 5493575..cd84666 100644 --- a/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java +++ b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java @@ -41,10 +41,23 @@ public final class CoreBungeeCordUtils { } } + @NotNull + public static Configuration getPluginConfig(@NotNull Plugin plugin, @NotNull String filename) { + File configFile = new File(plugin.getDataFolder(), filename); + if (!configFile.exists()) { + return saveDefaultConfig(plugin, filename); + } + try { + return ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + @NotNull public static Configuration saveDefaultConfig(@NotNull Plugin plugin) { if (plugin.getDataFolder().mkdir()) { - plugin.getLogger().info("创建插件文件夹..."); + plugin.getLogger().info("已生成插件存档文件夹..."); } File configFile = new File(plugin.getDataFolder(), "config.yml"); try { @@ -55,4 +68,19 @@ public final class CoreBungeeCordUtils { throw new RuntimeException(e); } } + + @NotNull + public static Configuration saveDefaultConfig(@NotNull Plugin plugin, @NotNull String filename) { + if (plugin.getDataFolder().mkdir()) { + plugin.getLogger().info("已生成插件存档文件夹..."); + } + File configFile = new File(plugin.getDataFolder(), filename); + try { + InputStream in = plugin.getResourceAsStream(filename); + Files.copy(in, configFile.toPath()); + return ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile); + } catch (Exception e) { + throw new RuntimeException(e); + } + } } From 688e75c5eeba6a20f514d75bd5b9203e79a0b62a Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sun, 24 Sep 2023 07:59:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style(core-bukkit):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/core/bukkit/HamsterCorePlugin.java | 2 -- .../mc/plugin/core/bukkit/hook/VaultAPI.java | 20 +++++++++++-------- 2 files changed, 12 insertions(+), 10 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 d0a3958..042dfa2 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 @@ -80,9 +80,7 @@ public class HamsterCorePlugin extends JavaPlugin { logger.info("仓鼠核心启动完成，总计耗时 " + time + " ms."); Bukkit.getScheduler().runTaskLater(this, () -> { PointAPI.reloadPlayerPointAPIHook(); - logger.info("已完成 PlayerPoints 挂载."); VaultAPI.reloadVaultHook(); - logger.info("已完成 VaultAPI 挂载."); }, 1L); } diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java index cebce7d..7a67347 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java @@ -7,6 +7,8 @@ import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; +import java.util.logging.Logger; + /** * Vault API */ @@ -25,36 +27,38 @@ public class VaultAPI { economy = null; permission = null; vaultEnabled = Bukkit.getPluginManager().isPluginEnabled("Vault"); + Logger logger = HamsterCorePlugin.getInstance().getLogger(); if (!vaultEnabled) { - HamsterCorePlugin.getInstance().getLogger().warning("未检测到 Vault 插件!"); + logger.warning("未检测到 Vault 插件!"); return; } - HamsterCorePlugin.getInstance().getLogger().info("已连接 Vault!"); + logger.info("已连接 Vault!"); RegisteredServiceProvider chatProvider = Bukkit.getServer().getServicesManager().getRegistration(Chat.class); if (chatProvider != null) { chat = chatProvider.getProvider(); - HamsterCorePlugin.getInstance().getLogger().info("聊天系统挂接成功."); + logger.info("聊天系统挂接成功."); } else { - HamsterCorePlugin.getInstance().getLogger().warning("未检测到聊天系统!"); + logger.warning("未检测到聊天系统!"); } RegisteredServiceProvider economyProvider = Bukkit.getServer().getServicesManager().getRegistration(Economy.class); if (economyProvider != null) { economy = economyProvider.getProvider(); - HamsterCorePlugin.getInstance().getLogger().info("经济系统挂接成功."); + logger.info("经济系统挂接成功."); } else { - HamsterCorePlugin.getInstance().getLogger().warning("未检测到经济系统!"); + logger.warning("未检测到经济系统!"); } RegisteredServiceProvider permissionProvider = Bukkit.getServer().getServicesManager().getRegistration(Permission.class); if (permissionProvider != null) { permission = permissionProvider.getProvider(); - HamsterCorePlugin.getInstance().getLogger().info("权限系统挂接成功."); + logger.info("权限系统挂接成功."); } else { - HamsterCorePlugin.getInstance().getLogger().warning("未检测到权限插件!"); + logger.warning("未检测到权限插件!"); } + logger.info("已完成 VaultAPI 挂载."); } /**