From b2aefcc4cbdb4003c51c13b6aa7290af40163c73 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Sat, 6 Jul 2024 14:21:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                              |  2 +-
 .../mc/plugin/currency/CurrencyPlugin.java    | 25 +++++++++----------
 .../command/CurrencyCreateCommand.java        |  2 +-
 src/main/resources/config.yml                 |  4 ++-
 src/main/resources/plugin.yml                 | 13 +---------
 5 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d9cb297..4a66196 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "cn.hamster3.mc.plugin"
-version = "3.1.0"
+version = "3.1.1"
 
 repositories {
     maven("https://maven.airgame.net/maven-public/")
diff --git a/src/main/java/cn/hamster3/mc/plugin/currency/CurrencyPlugin.java b/src/main/java/cn/hamster3/mc/plugin/currency/CurrencyPlugin.java
index d873fcc..1920a9f 100644
--- a/src/main/java/cn/hamster3/mc/plugin/currency/CurrencyPlugin.java
+++ b/src/main/java/cn/hamster3/mc/plugin/currency/CurrencyPlugin.java
@@ -52,19 +52,6 @@ public class CurrencyPlugin extends JavaPlugin {
         } catch (SQLException e) {
             e.printStackTrace();
         }
-
-        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-            logger.info("检测到 Vault 已安装");
-            Bukkit.getServicesManager().register(Economy.class, VaultEconomyHook.INSTANCE, this, ServicePriority.Normal);
-            CurrencyType type = CurrencyDataManager.getVaultCurrencyType();
-            if (type != null) {
-                logger.info(String.format("已挂载货币类型 %s(%s) 至 Vault 系统", type.getId(), type.getName()));
-            } else {
-                logger.warning("已挂接 Vault 系统，但未找到 Vault 货币类型，请检查配置文件或创建货币类型: " + CurrencyConfigManager.getVaultCurrencyID());
-            }
-        } else {
-            logger.info("未找到 Vault 插件! 取消注册 Vault 经济系统");
-        }
         if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
             logger.info("检测到 PlaceholderAPI 已安装");
             if (PlaceholderHook.INSTANCE.register()) {
@@ -87,6 +74,18 @@ public class CurrencyPlugin extends JavaPlugin {
         Bukkit.getPluginManager().registerEvents(CurrencyListener.INSTANCE, this);
         logger.info("已注册 CurrencyListener");
         ParentCurrencyCommand.INSTANCE.register();
+        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+            logger.info("检测到 Vault 已安装");
+            Bukkit.getServicesManager().register(Economy.class, VaultEconomyHook.INSTANCE, this, ServicePriority.Normal);
+            CurrencyType type = CurrencyDataManager.getVaultCurrencyType();
+            if (type != null) {
+                logger.info(String.format("已挂载货币类型 %s(%s) 至 Vault 系统", type.getId(), type.getName()));
+            } else {
+                logger.warning("已挂接 Vault 系统，但未找到 Vault 货币类型，请检查配置文件或创建货币类型: " + CurrencyConfigManager.getVaultCurrencyID());
+            }
+        } else {
+            logger.info("未找到 Vault 插件! 取消注册 Vault 经济系统");
+        }
         long time = System.currentTimeMillis() - start;
         logger.info("仓鼠经济启动完成，总计耗时 " + time + " ms");
 
diff --git a/src/main/java/cn/hamster3/mc/plugin/currency/command/CurrencyCreateCommand.java b/src/main/java/cn/hamster3/mc/plugin/currency/command/CurrencyCreateCommand.java
index 72d1824..397da17 100644
--- a/src/main/java/cn/hamster3/mc/plugin/currency/command/CurrencyCreateCommand.java
+++ b/src/main/java/cn/hamster3/mc/plugin/currency/command/CurrencyCreateCommand.java
@@ -44,7 +44,7 @@ public class CurrencyCreateCommand extends ChildCommand {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 4) {
+        if (args.length < 3) {
             ParentCurrencyCommand.INSTANCE.sendHelp(sender);
             return true;
         }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 1b5b8f7..13cf059 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,6 +1,8 @@
 # VaultAPI 相关配置
 vault-settings:
+  # 与 VaultAPI 挂接的货币 ID
+  currency-id: money
   # Vault 显示货币名称（单数）
   currency-name-singular: 金币
   # Vault 显示货币名称（复数）
-  currency-name-plural: 金币
+  currency-name-plural: 金币
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 0378f6e..f451d70 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -6,7 +6,7 @@ load: STARTUP
 
 author: MiniDay
 description: 叁只仓鼠的跨服多货币经济插件
-website: https://github.com/MiniDay/hamster-currency
+website: https://git.airgame.net/MiniDay/hamster-currency/
 
 depend:
   - HamsterCore
@@ -20,17 +20,6 @@ softdepend:
 commands:
   hamster-currency:
     aliases: [ hcurrency, currency ]
-  balance:
-    aliases: [ bal, seemoney ]
-    permission: hamster.currency.see
-  balance-top:
-    aliases: [ balancetop, baltop ]
-    permission: hamster.currency.top
-  pay-money:
-    aliases: [ paymoney, pay ]
-  economy:
-    aliases: [ eco, money ]
-    permission: hamster.currency.see
 
 permissions:
   hamster.currency.admin: