Merge remote-tracking branch 'origin/master'

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "cn.hamster3.mc.plugin"
-version = "3.1.1"
+version = "3.1.2"
 
 repositories {
     maven("https://maven.airgame.net/maven-public/")

src/main/java/cn/hamster3/mc/plugin/currency/CurrencyPlugin.java

@@ -74,6 +74,7 @@ public class CurrencyPlugin extends JavaPlugin {
         Bukkit.getPluginManager().registerEvents(CurrencyListener.INSTANCE, this);
         logger.info("已注册 CurrencyListener");
         ParentCurrencyCommand.INSTANCE.register();
+        if (CurrencyConfigManager.isEnableVault()) {
             if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
                 logger.info("检测到 Vault 已安装");
                 Bukkit.getServicesManager().register(Economy.class, VaultEconomyHook.INSTANCE, this, ServicePriority.Normal);
@@ -86,6 +87,9 @@ public class CurrencyPlugin extends JavaPlugin {
             } else {
                 logger.info("未找到 Vault 插件! 取消注册 Vault 经济系统");
             }
+        } else {
+            logger.info("不进行 Vault 经济系统注册");
+        }
         long time = System.currentTimeMillis() - start;
         logger.info("仓鼠经济启动完成，总计耗时 " + time + " ms");
 

src/main/java/cn/hamster3/mc/plugin/currency/core/CurrencyConfigManager.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 import org.bukkit.configuration.file.FileConfiguration;
 
 public class CurrencyConfigManager {
+    @Getter
+    private static boolean enableVault;
     @Getter
     private static String vaultCurrencyID;
     @Getter
@@ -19,6 +21,7 @@ public class CurrencyConfigManager {
 
         FileConfiguration pluginConfig = plugin.getConfig();
 
+        enableVault = pluginConfig.getBoolean("vault-settings.enable", false);
         vaultCurrencyID = pluginConfig.getString("vault-settings.currency-id", "money");
         vaultNamePlural = pluginConfig.getString("vault-settings.currency-name-plural", "金币");
         vaultNameSingular = pluginConfig.getString("vault-settings.currency-name-singular", "金币");

src/main/resources/config.yml

@@ -1,5 +1,7 @@
 # VaultAPI 相关配置
 vault-settings:
+  # 是否启用 vault 挂接
+  enable: true
   # 与 VaultAPI 挂接的货币 ID
   currency-id: money
   # Vault 显示货币名称（单数）