Release: 2.4

Release: 2.4

README.md

@@ -2,7 +2,7 @@
 
 # CatSero `v2`
 
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/babcf1e300a44e3684e88840e2b2b803)](https://www.codacy.com/gh/XiaMoHuaHuo-CN/CatSero/dashboard?utm_source=github.com&utm_medium=referral&utm_content=XiaMoHuaHuo-CN/CatSero&utm_campaign=Badge_Grade)[![Gradle - Build](https://github.com/XiaMoHuaHuo-CN/CatSero/actions/workflows/main-build.yml/badge.svg?branch=main)](https://github.com/XiaMoHuaHuo-CN/CatSero/actions/workflows/main-build.yml)  
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/babcf1e300a44e3684e88840e2b2b803)](https://www.codacy.com/gh/XiaMoHuaHuo-CN/CatSero/dashboard?utm_source=github.com&utm_medium=referral&utm_content=XiaMoHuaHuo-CN/CatSero&utm_campaign=Badge_Grade)[![CodeFactor](https://www.codefactor.io/repository/github/xiamohuahuo-cn/catsero/badge)](https://www.codefactor.io/repository/github/xiamohuahuo-cn/catsero)[![Gradle - Build](https://github.com/XiaMoHuaHuo-CN/CatSero/actions/workflows/main-build.yml/badge.svg?branch=main)](https://github.com/XiaMoHuaHuo-CN/CatSero/actions/workflows/main-build.yml)  
 一个基于MiraiMC的QQ群功能&MC功能插件  
 支持的Minecraft版本: 1.8+ **注意: 基于Spigot-1.13.2 API开发，不保证更低版本可用性**  
 开发版构建结果请前往Actions - [Build](https://github.com/XiaMoHuaHuo-CN/CatSero/actions/workflows/dev-build.yml)

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "moe.xmcn.catsero"
-version = "2.4-beta"
+version = "2.4"
 
 repositories {
     maven("https://lss233.littleservice.cn/repositories/minecraft")
@@ -21,10 +21,10 @@ dependencies {
 
     // 远程
     implementation("org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT")
-    implementation("org.bstats:bstats-bukkit:3.0.1")
+    implementation("org.bstats:bstats-bukkit:3.0.2")
     implementation("me.clip:placeholderapi:2.11.2")
     implementation("io.github.dreamvoid:MiraiMC-Bukkit:1.8-pre1")
-    implementation("com.alibaba:fastjson:2.0.25")
+    implementation("com.alibaba:fastjson:2.0.31")
     implementation("com.github.CroaBeast:AdvancementInfo:2.0.2")
     implementation("com.zaxxer:HikariCP:4.0.3")
     implementation("org.geysermc.floodgate:api:2.2.0-SNAPSHOT")

config.groovy

@@ -1,7 +1,7 @@
 environments {
     prod {
         plugin {
-            version = "2.4-beta"
+            version = "2.4"
         }
     }
 }

src/main/java/moe/xmcn/catsero/CatSero.java

@@ -106,7 +106,7 @@ public void onLoad() {
         }
 
          */
-        if (Configuration.getPlugin().getBoolean(Configuration.buildYaID(
+        if (Configuration.getUses().getBoolean(Configuration.buildYaID(
                 Configuration.USESID.QWHITELIST,
                 new ArrayList<>(Collections.singletonList(
                         "enable"

src/main/java/moe/xmcn/catsero/Configuration.java

@@ -128,7 +128,7 @@ public static void saveFiles() {
         for (int i = configuration.size() - 1; i >= 0; i--) {
             if (!new File(formatPath(configuration.get(i), true)).exists()) {
                 //Logger.logWARN(cleanPath(configuration.get(i)));
-                INSTANCE.saveResource(formatPath(configuration.get(i), false), false);
+                INSTANCE.saveResource(cleanPath(configuration.get(i)/*, false*/), false);
                 Logger.logLoader("Save: " + cleanPath(configuration.get(i)));
             }
         }

src/main/java/moe/xmcn/catsero/executors/catsero/OnCommand.java

@@ -23,9 +23,11 @@
  */
 package moe.xmcn.catsero.executors.catsero;
 
+import moe.xmcn.catsero.CatSero;
 import moe.xmcn.catsero.I18n;
 import moe.xmcn.catsero.utils.Envrionment;
 import moe.xmcn.catsero.utils.Logger;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -56,6 +58,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                     case "debug":
                         new debug().command(sender, args);
                         break;
+                    case "help":
+                        Bukkit.getScheduler().runTask(CatSero.INSTANCE, () -> Bukkit.dispatchCommand(sender, "help CatSero"));
+                        break;
                     default:
                         sender.sendMessage(ChatColor.translateAlternateColorCodes('&', i18n.getI18n(new ArrayList<>(Arrays.asList(
                                 "minecraft", "command", "invalid-option"

src/main/java/moe/xmcn/catsero/uses/listeners/chatForward/OnGroupMessageToMC.java

@@ -138,17 +138,17 @@ private void run(MiraiGroupMessageEvent e, String message) {
                 switch (sender_permission) {
                     case 0:
                         format = format.replace("%sender_permission%", i18n.getI18n(new ArrayList<>(Arrays.asList(
-                                "minecraft", "call", "member"
+                                "qq", "call", "member"
                         ))));
                         break;
                     case 1:
                         format = format.replace("%sender_permission%", i18n.getI18n(new ArrayList<>(Arrays.asList(
-                                "minecraft", "call", "admin"
+                                "qq", "call", "admin"
                         ))));
                         break;
                     case 2:
                         format = format.replace("%sender_permission%", i18n.getI18n(new ArrayList<>(Arrays.asList(
-                                "minecraft", "call", "owner"
+                                "qq", "call", "owner"
                         ))));
                         break;
                 }

src/main/java/moe/xmcn/catsero/uses/listeners/heyFriend/OnPlayerJoin.java

@@ -0,0 +1,20 @@
+package moe.xmcn.catsero.uses.listeners.heyFriend;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+import java.util.UUID;
+
+public class OnPlayerJoin implements Listener {
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+
+        UUID uuid = player.getUniqueId();
+        //TODO: SimpleDB
+    }
+
+}

src/main/java/moe/xmcn/catsero/uses/listeners/heyFriend/SimpleYamlDB.java

@@ -0,0 +1,5 @@
+package moe.xmcn.catsero.uses.listeners.heyFriend;
+
+public class SimpleYamlDB {
+    //TODO: Read and white file "extra-configs/hey-bind.yml".And make it as a database.
+}

src/main/java/moe/xmcn/catsero/uses/listeners/qWhitelist/WhiteListEditor.kt → src/main/kotlin/moe/xmcn/catsero/uses/listeners/qWhitelist/WhiteListEditor.kt

@@ -52,7 +52,7 @@ class WhiteListEditor(
     private val groups: List<String> = Configuration.getUseMiraiGroup(ThisID)
 ) : Listener {
 
-    private val i18n = I18n();
+    private val i18n = I18n()
 
     @EventHandler
     fun onGroupMessage(e: OnQQGroupCommandEvent) {

src/main/resources/plugin.yml

@@ -14,8 +14,42 @@ softdepend:
 commands:
   catsero:
     description: "CatSero 基础方法"
+    usage: "/catsero <version|reload|whitelist|cms>"
+    subcommands:
+      version:
+        description: "插件版本以及信息"
+      reload:
+        description: "重载config.yml"
+      debug:
+        description: "Debug"
+        usage: "/catsero debug <子命令>"
+        subcommands:
+          readconfig:
+            description: "读取配置文件节点信息"
+            usage: "/catsero debug readconfig <config.yml/uses-config.yml> <节点>"
+      whitelist:
+        description: "白名单管理"
+        usage: "/catsero whitelist <子指令>"
+        subcommands:
+          add:
+            description: "添加白名单"
+            usage: "/catsero whitelist add <Player>"
+          change:
+            description: "更新白名单"
+            usage: "/catsero whitelist change <子指令>"
+            subcommands:
+              name:
+                description: "更新白名单中某个玩家的名称"
+                usage: "/catsero whitelist change name <PlayerOldName> <PlayerNewName>"
+              qq:
+                description: "更新白名单中某个玩家的QQ号码"
+                usage: "/catsero whitelist change qq <Player> <QQ>"
+          remove:
+            description: "移除白名单"
+            usage: "/catsero whitelist remove <Player>"
   cms:
     description: "CatSero 发消息到QQ群"
+    usage: "/cms <BotID> <GroupID> <message>"
 permissions:
   catsero.*:
     description: "CatSero所有权限组"