Update version to v1.6.1

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - "**.java"
     branches:
-      - "for-unstable"
+      - "master"
   pull_request:
     paths:
       - "**.java"
@@ -35,7 +35,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Download latest grasscutter jar
-        run: wget https://nightly.link/Grasscutters/Grasscutter/workflows/build/unstable/Grasscutter.zip && mkdir lib && unzip Grasscutter.zip -d lib
+        run: wget https://nightly.link/Grasscutters/Grasscutter/workflows/build/development/Grasscutter.zip && mkdir lib && unzip Grasscutter.zip -d lib
         
       - name: Change permission
         run: chmod +x gradlew

README.md

@@ -4,10 +4,6 @@
 
 一个为第三方客户端开放GC命令执行接口的插件
 
-## 分支说明
-
-本分支目的在于兼容 GC 的 `unstable` 分支
-
 ## 使用本插件的应用
 - [GrasscutterTools](https://github.com/jie65535/GrasscutterCommandGenerator) —— Windows 客户端工具
 - [JGrasscutterCommand](https://github.com/jie65535/JGrasscutterCommand) —— [Mirai](https://github.com/mamoe/mirai) 插件，在QQ里执行命令
@@ -74,7 +70,7 @@
 
 ## `config.json`
 
-```json5
+```json
 {
   // 控制台连接令牌
   "consoleToken": "",
@@ -263,7 +259,7 @@ public final class JsonResponse {
 | message | `Success` | `String`     |
 | data    | `{}`      | `JsonObject` |
 
-```json5
+```json
 {
   "retcode": 200,
   "message": "success",

README_en-US.md

@@ -4,10 +4,6 @@
 
 A plugin that opens the GC command execution interface for third-party clients
 
-## Branch Description
-
-The purpose of this branch is to be compatible with the 'unstable' branch of GC
-
 ## Applications using this plug-in
 - [GrasscutterTools](https://github.com/jie65535/GrasscutterCommandGenerator) —— Windows Client Tools
 - [JGrasscutterCommand](https://github.com/jie65535/JGrasscutterCommand) —— [Mirai](https://github.com/mamoe/mirai) Plugin, run commands in QQ
@@ -248,7 +244,7 @@ Success
 | message | `Success`     | `String`     |
 | data    | `{}`          | `JsonObject` |
 
-```json5
+```json
 {
   "retcode": 200,
   "message": "success",

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.github.jie65535.opencommand'
-version '1.5.2'
+version '1.6.1'
 
 sourceCompatibility = 17
 targetCompatibility = 17
@@ -18,7 +18,7 @@ dependencies {
 }
 
 jar {
-    jar.baseName = 'opencommand-for-unstable'
+    jar.baseName = 'opencommand'
 
     destinationDir = file(".")
 }

src/main/java/com/github/jie65535/opencommand/EventListeners.java

@@ -44,13 +44,11 @@ public final class EventListeners {
      * @param uid 玩家uid
      * @return 新的玩家消息处理类
      */
-    public static StringBuilder getPlayerNewMessageHandler(int uid) {
+    public static StringBuilder getPlayerMessageHandler(int uid) {
         var handler = playerMessageHandlers.get(uid);
         if (handler == null) {
             handler = new StringBuilder();
             playerMessageHandlers.put(uid, handler);
-        } else {
-            handler.setLength(0);
         }
         return handler;
     }

src/main/java/com/github/jie65535/opencommand/OpenCommandHandler.java

@@ -58,7 +58,7 @@ public final class OpenCommandHandler implements Router {
 
             var req = context.bodyAsClass(JsonRequest.class);
             if (req.action.equals("sendCode")) {
-                int playerId = (int) req.data;
+                int playerId = (int)Double.parseDouble(req.data.toString());
                 var player = plugin.getServer().getPlayerByUid(playerId);
                 if (player == null) {
                     context.json(new JsonResponse(404, "Player Not Found."));
@@ -152,11 +152,12 @@ public final class OpenCommandHandler implements Router {
                         context.json(new JsonResponse(404, "Player not found"));
                         return;
                     }
-                    //noinspection SynchronizationOnLocalVariableOrMethodParameter
-                    synchronized (player) {
                     // Player MessageHandler do not support concurrency
-                        var handler = EventListeners.getPlayerNewMessageHandler(player.getUid());
+                    var handler = EventListeners.getPlayerMessageHandler(player.getUid());
+                    //noinspection SynchronizationOnLocalVariableOrMethodParameter
+                    synchronized (handler) {
                         try {
+                            handler.setLength(0);
                             CommandMap.getInstance().invoke(player, player, command);
                             context.json(new JsonResponse(handler.toString()));
                         } catch (Exception e) {

src/main/java/com/github/jie65535/opencommand/OpenCommandOnlyHttpHandler.java

@@ -61,7 +61,7 @@ public final class OpenCommandOnlyHttpHandler implements Router {
 
             var req = context.bodyAsClass(JsonRequest.class);
             if (req.action.equals("sendCode")) {
-                int playerId = (int) req.data;
+                int playerId = (int)Double.parseDouble(req.data.toString());
                 var player = SocketData.getPlayer(playerId);
                 if (player == null) {
                     context.json(new JsonResponse(404, "Player Not Found."));

src/main/java/com/github/jie65535/opencommand/socket/SocketClient.java

@@ -159,11 +159,12 @@ public class SocketClient {
                                         sendPacket(new HttpPacket(404, "Player not found."), packet.packetID);
                                         return;
                                     }
-                                    //noinspection SynchronizationOnLocalVariableOrMethodParameter
-                                    synchronized (playerData) {
                                     // Player MessageHandler do not support concurrency
-                                        var handler = EventListeners.getPlayerNewMessageHandler(playerData.getUid());
+                                    var handler = EventListeners.getPlayerMessageHandler(playerData.getUid());
+                                    //noinspection SynchronizationOnLocalVariableOrMethodParameter
+                                    synchronized (handler) {
                                         try {
+                                            handler.setLength(0);
                                             CommandMap.getInstance().invoke(playerData, playerData, command);
                                             sendPacket(new HttpPacket(200, handler.toString()), packet.packetID);
                                         } catch (Exception e) {

src/main/resources/plugin.json

@@ -1,7 +1,8 @@
 {
   "name": "opencommand-plugin",
   "description": "Open command interface for third-party clients",
-  "version": "dev-1.5.2",
+  "version": "1.6.1",
   "mainClass": "com.github.jie65535.opencommand.OpenCommandPlugin",
-  "authors": ["jie65535", "方块君"]
+  "authors": ["jie65535", "方块君"],
+  "api": 2
 }