Merge branch 'refs/heads/dev' into feat/next-api

# Conflicts:
#	pom.xml
#	src/main/java/snw/kookbc/impl/command/litecommands/WrappedLiteCommandsBuilder.java
#	src/main/java/snw/kookbc/impl/entity/channel/TextChannelImpl.java
#	src/main/java/snw/kookbc/impl/network/NetworkClient.java

CLOUD_MIGRATE_TO_LITECOMMANDS.md

@@ -1,5 +1,10 @@
 ### 从Cloud迁移到LiteCommands
 
+#### 兼容层
+
+如果你不想迁移，可以安装 [kook-cloud-compatible](https://github.com/huanmeng-qwq/kookbc-cloud-compatible/releases)
+插件来允许使用cloud框架注册命令的插件正常运行
+
 ### 注解
 
 | Cloud                  | LiteCommands          |
@@ -9,9 +14,11 @@
 | @Argument              | @Arg                  |
 
 ### 示例
+
 #### Cloud
 
 ```java
+
 @CommandContainer
 @CommandPrefix("!")
 @CommandMethod("test")
@@ -24,8 +31,9 @@ public class TestCloudCommand {
 ```
 
 #### LiteCommands
+
 > Github: [LiteCommands](https://github.com/Rollczi/LiteCommands)
-> 
+>
 > IDEA中安装[LiteCommands](https://plugins.jetbrains.com/plugin/20799-litecommands)插件后，可以自动识别LiteCommands的注解，并能够很好的辅助开发。
 
 ```java

pom.xml

@@ -53,7 +53,7 @@
         <log4j2.version>2.19.0</log4j2.version>
         <jkook.version>9a22f1e9</jkook.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mixin.version>0.12.4+mixin.0.8.5</mixin.version>
+        <mixin.version>0.15.2+mixin.0.8.7</mixin.version>
         <asm.version>9.3</asm.version>
         <!-- Used by JitPack CI -->
         <skipShade>false</skipShade>
@@ -304,7 +304,7 @@
         <dependency>
             <groupId>dev.rollczi</groupId>
             <artifactId>litecommands-framework</artifactId>
-            <version>3.3.4</version>
+            <version>3.4.2</version>
         </dependency>
 
         <dependency>

src/main/java/snw/kookbc/impl/HttpAPIImpl.java

@@ -439,6 +439,6 @@ public void handleFriendRequest(int id, boolean accept) {
                 .put("id", id)
                 .put("accept", accept ? 1 : 0)
                 .build();
-        HttpAPIImpl.this.client.getNetworkClient().post(HttpAPIRoute.FRIEND_HANDLE_REQUEST.toFullURL(), body);
+        HttpAPIImpl.this.client.getNetworkClient().postContent(HttpAPIRoute.FRIEND_HANDLE_REQUEST.toFullURL(), body);
     }
 }

src/main/java/snw/kookbc/impl/KBCClient.java

@@ -41,7 +41,6 @@
 import snw.jkook.Core;
 import snw.jkook.command.CommandExecutor;
 import snw.jkook.command.CommandManager;
-import snw.jkook.command.JKookCommand;
 import snw.jkook.config.ConfigurationSection;
 import snw.jkook.entity.User;
 import snw.jkook.plugin.InvalidPluginException;
@@ -51,13 +50,16 @@
 import snw.jkook.util.Validate;
 import snw.kookbc.SharedConstants;
 import snw.kookbc.impl.command.CommandManagerImpl;
-import snw.kookbc.impl.command.internal.HelpCommand;
 import snw.kookbc.impl.command.litecommands.LiteKookFactory;
+import snw.kookbc.impl.command.litecommands.internal.HelpCommand;
 import snw.kookbc.impl.command.litecommands.internal.PluginsCommand;
+import snw.kookbc.impl.command.litecommands.internal.StopCommand;
+import snw.kookbc.impl.command.litecommands.result.ResultTypes;
 import snw.kookbc.impl.console.Console;
 import snw.kookbc.impl.entity.builder.EntityBuilder;
 import snw.kookbc.impl.entity.builder.MessageBuilder;
 import snw.kookbc.impl.event.EventFactory;
+import snw.kookbc.impl.event.internal.InternalListener;
 import snw.kookbc.impl.event.internal.UserClickButtonListener;
 import snw.kookbc.impl.network.HttpAPIRoute;
 import snw.kookbc.impl.network.NetworkClient;
@@ -500,50 +502,45 @@ public NetworkSystem getNetworkSystem() {
     }
 
     protected void registerInternal() {
+        this.core.getEventManager().registerHandlers(this.internalPlugin, new InternalListener());
         ConfigurationSection commandConfig = getConfig().getConfigurationSection("internal-commands");
         if (commandConfig == null) {
             commandConfig = getConfig().createSection("internal-commands");
         }
+        List<Class<?>> commands = new ArrayList<>();
         if (commandConfig.getBoolean("stop", true)) {
-            registerStopCommand();
+            commands.add(StopCommand.class);
         }
         if (commandConfig.getBoolean("help", true)) {
-            registerHelpCommand();
+            this.core.getEventManager()
+                    .registerHandlers(this.internalPlugin, new UserClickButtonListener(this));
+            commands.add(HelpCommand.class);
         }
         if (commandConfig.getBoolean("plugins", true)) {
-            registerPluginsCommand();
+            commands.add(PluginsCommand.class);
         }
+        registerCommands(commands);
     }
 
-    protected void registerStopCommand() {
-        new JKookCommand("stop")
-                .setDescription("停止 " + SharedConstants.IMPL_NAME + " 实例。")
-                .setExecutor(wrapConsoleCmd((args) -> shutdown()))
-                .register(getInternalPlugin());
-    }
-
-    protected void registerPluginsCommand() {
-//        new JKookCommand("plugins")
-//                .setDescription("获取已安装到此 " + SharedConstants.IMPL_NAME + " 实例的插件列表。")
-//                .setExecutor(new PluginsCommand(this))
-//                .register(getInternalPlugin());
+    private void registerCommands(List<Class<?>> commands) {
         LiteKookFactory.builder(getInternalPlugin())
-                .commands(new PluginsCommand(this))
+                .settings((k) -> {
+                    if (!getConfig().contains("internal-commands-reply-result-type")) {
+                        return k;
+                    }
+                    try {
+                        ResultTypes resultTypes = ResultTypes.valueOf(getConfig().getString("internal-commands-reply-result-type"));
+                        k.defaultResultType(resultTypes);
+                    } catch (Exception e) {
+                        getCore().getLogger().error("`internal-commands-reply-result-type` is not a valid result-type");
+                    }
+                    return k;
+                })
+                .commands(commands.toArray())
                 .build()
         ;
     }
 
-    protected void registerHelpCommand() {
-        HelpCommand executor = new HelpCommand(this);
-        new JKookCommand("help")
-                .setDescription("获取此帮助列表。")
-                .executesUser(executor)
-                .executesConsole(executor)
-                .register(getInternalPlugin());
-        this.core.getEventManager()
-                .registerHandlers(this.internalPlugin, new UserClickButtonListener(this));
-    }
-
     public CommandManager getCommandManager() {
         return commandManager;
     }