From 910842c46082a85988bff8bb6247692c1356b491 Mon Sep 17 00:00:00 2001
From: Qihan Cai <qcai8733@uni.sydney.edu.au>
Date: Fri, 24 Jun 2022 14:20:30 +1000
Subject: [PATCH 1/2] fix issue from grasscutter upgrade

---
 .../com/github/jie65535/opencommand/EventListeners.java     | 4 ++--
 .../com/github/jie65535/opencommand/OpenCommandPlugin.java  | 6 +++---
 src/main/resources/plugin.json                              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/jie65535/opencommand/EventListeners.java b/src/main/java/com/github/jie65535/opencommand/EventListeners.java
index 7c0bc6e..85cfd8f 100644
--- a/src/main/java/com/github/jie65535/opencommand/EventListeners.java
+++ b/src/main/java/com/github/jie65535/opencommand/EventListeners.java
@@ -1,6 +1,6 @@
 package com.github.jie65535.opencommand;
 
-import emu.grasscutter.server.event.game.ReceiveCommandFeedbackEvent;
+import emu.grasscutter.server.event.game.CommandResponseEvent;
 import emu.grasscutter.utils.MessageHandler;
 
 public final class EventListeners {
@@ -9,7 +9,7 @@ public final class EventListeners {
     public static void setConsoleMessageHandler(MessageHandler handler) {
         consoleMessageHandler = handler;
     }
-    public static void onCommandResponse(ReceiveCommandFeedbackEvent event) {
+    public static void onCommandResponse(CommandResponseEvent event) {
         if (consoleMessageHandler != null && event.getPlayer() == null) {
             consoleMessageHandler.setMessage(event.getMessage());
         }
diff --git a/src/main/java/com/github/jie65535/opencommand/OpenCommandPlugin.java b/src/main/java/com/github/jie65535/opencommand/OpenCommandPlugin.java
index 9bac25c..fad29db 100644
--- a/src/main/java/com/github/jie65535/opencommand/OpenCommandPlugin.java
+++ b/src/main/java/com/github/jie65535/opencommand/OpenCommandPlugin.java
@@ -21,7 +21,7 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.plugin.Plugin;
 import emu.grasscutter.server.event.EventHandler;
 import emu.grasscutter.server.event.HandlerPriority;
-import emu.grasscutter.server.event.game.ReceiveCommandFeedbackEvent;
+import emu.grasscutter.server.event.game.CommandResponseEvent;
 
 import java.io.File;
 import java.io.FileReader;
@@ -43,10 +43,10 @@ public final class OpenCommandPlugin extends Plugin {
 
     @Override
     public void onEnable() {
-        new EventHandler<>(ReceiveCommandFeedbackEvent.class)
+        new EventHandler<>(CommandResponseEvent.class)
                 .priority(HandlerPriority.HIGH)
                 .listener(EventListeners::onCommandResponse)
-                .register();
+                .register(this);
         getHandle().addRouter(OpenCommandHandler.class);
         getLogger().info("[OpenCommand] Enabled");
     }
diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json
index 9415774..70993de 100644
--- a/src/main/resources/plugin.json
+++ b/src/main/resources/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "opencommand-plugin",
   "description": "Open command interface for third-party clients",
-  "version": "dev-1.2.2",
+  "version": "dev-1.2.3",
   "mainClass": "com.github.jie65535.opencommand.OpenCommandPlugin",
   "authors": ["jie65535"]
 }
\ No newline at end of file

From 957098a2cf20ff3536bac3a3b395c4f0d6d95ed7 Mon Sep 17 00:00:00 2001
From: jie65535 <jie65535@qq.com>
Date: Fri, 24 Jun 2022 12:37:25 +0800
Subject: [PATCH 2/2] Update version to v1.2.3

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bb51c50..403342d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.github.jie65535.opencommand'
-version 'dev-1.2.2'
+version 'dev-1.2.3'
 
 sourceCompatibility = 17
 targetCompatibility = 17