Merge pull request #6 from MinecraftChampions/Card

Update message/card and something

Author: mcchampions

src/main/java/io/github/minecraftchampions/dodoopenjava/api/v2/ChannelMessageApi.java

@@ -708,7 +708,7 @@ public static Result sendCardMessage(String authorization, String channelId, Car
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("channelId", channelId)
                 .put("messageType", 6)
-                .put("messageBody", messageBody.toJSONObject());
+                .put("messageBody", messageBody.toMessage());
         return NetUtil.sendRequest(jsonObject.toString(), url, authorization);
     }
 

src/main/java/io/github/minecraftchampions/dodoopenjava/command/CommandManager.java

@@ -17,7 +17,7 @@
 @Getter
 @RequiredArgsConstructor
 public class CommandManager {
-    private final Map<String, CommandExecutor> commands = new ConcurrentHashMap<>();
+    private final Map<String, CommandExecutor> commandMap = new ConcurrentHashMap<>();
 
     private final Map<String, String> commandAliasesMapping = new ConcurrentHashMap<>();
 
@@ -49,14 +49,14 @@ public void registerCommand(@NonNull CommandExecutor command) {
                     new RuntimeException("别名包括命令名:" + commandName + ",已取消添加此别名"));
             aliases.remove(commandName);
         }
-        if (commands.containsKey(commandName)) {
+        if (commandMap.containsKey(commandName)) {
             DodoOpenJava.LOGGER.error("注册命令时错误",
                     new RuntimeException("重复的命令名:" + commandName + ";已取消注册"));
             return;
         }
-        commands.put(commandName, command);
+        commandMap.put(commandName, command);
         for (String name : aliases) {
-            if (commands.containsKey(name)) {
+            if (commandMap.containsKey(name)) {
                 DodoOpenJava.LOGGER.error("注册命令时错误",
                         new RuntimeException("已经注册过命令名为" + name + "的命令，已经取消添加此别名"));
             } else {
@@ -79,7 +79,7 @@ public void registerCommand(@NonNull CommandExecutor command) {
      * @param command 命令实例
      */
     public void unregisterCommand(@NonNull CommandExecutor command) {
-        commands.remove(command.getMainCommand());
+        commandMap.remove(command.getMainCommand());
         for (String str : command.getCommandAliases()) {
             commandAliasesMapping.remove(str);
         }
@@ -89,7 +89,7 @@ public void unregisterCommand(@NonNull CommandExecutor command) {
      * 注销所有命令
      */
     public void unregisterAllCommands() {
-        commands.clear();
+        commandMap.clear();
         commandAliasesMapping.clear();
     }
 
@@ -103,10 +103,10 @@ public void unregisterAllCommands() {
     public boolean trigger(@NonNull CommandSender sender, @NonNull String commandName,
                            boolean personalMessage, @NonNull String... args) {
         CommandExecutor command;
-        if (commands.containsKey(commandName)) {
-            command = commands.get(commandName);
+        if (commandMap.containsKey(commandName)) {
+            command = commandMap.get(commandName);
         } else if (commandAliasesMapping.containsKey(commandName)) {
-            command = commands.get(commandAliasesMapping.get(commandName));
+            command = commandMap.get(commandAliasesMapping.get(commandName));
         } else {
             return false;
         }

src/main/java/io/github/minecraftchampions/dodoopenjava/configuration/CommentConfiguration.java

@@ -76,17 +76,17 @@ public void loadFromString(String contents) throws InvalidConfigurationException
     @Override
     public String saveToString() {
         String contents = super.saveToString();
-        StringBuilder savcontent = new StringBuilder();
+        StringBuilder saveContent = new StringBuilder();
         String[] parts = contents.split("\n");
         for (String part : parts) {
             Matcher matcher = toPattern.matcher(part);
             if (matcher.find() && matcher.groupCount() == 5) {
                 part = this.checkNull(matcher.group(1)) + matcher.group(4);
             }
-            savcontent.append(part.replaceAll("．", ".").replaceAll("＇", "'").replaceAll("：", ":"));
-            savcontent.append("\n");
+            saveContent.append(part.replaceAll("．", ".").replaceAll("＇", "'").replaceAll("：", ":"));
+            saveContent.append("\n");
         }
-        return savcontent.toString();
+        return saveContent.toString();
     }
 
     private String checkNull(String string) {