fix QuickShop's message

LinearBit · Jan 18, 2023 · b6fc7d2 · b6fc7d2
1 parent a4e7399
commit b6fc7d2
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,40 @@
+# Compiled class file
+*.class
+
+# Eclipse
+.project
+.classpath
+.settings/
+
+# Intellij
+*.ipr
+*.iml
+*.iws
+.idea/
+
+# Maven
+target/
+
+# Gradle
+build
+.gradle
+
+# Log file
+*.log
+log/
+
+# out
+**/out/
+
+# Mac
+.DS_Store
+
+# others
+*.jar
+*.war
+*.zip
+*.tar
+*.tar.gz
+*.pid
+*.orig
+temp/
diff --git a/LinearBot.iml b/LinearBot.iml
@@ -1,75 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="FacetManager">
     <facet type="minecraft" name="Minecraft">
       <configuration>
         <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
+          <platformType>ADVENTURE</platformType>
         </autoDetectTypes>
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.purpurmc.purpur:purpur-api:1.16.5-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-api:4.7.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-key:4.7.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:examination-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:examination-string:1.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.11.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-gson:4.7.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-legacy:4.7.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-plain:4.7.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:9.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:9.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:9.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:9.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid:MiraiMC:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid.MiraiMC:MiraiMC-Base:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid.MiraiMC:MiraiMC-Bukkit:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid.MiraiMC:MiraiMC-Bungee:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid.MiraiMC:MiraiMC-Integration:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid.MiraiMC:MiraiMC-Nukkit:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid.MiraiMC:MiraiMC-Sponge:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.github.dreamvoid.MiraiMC:MiraiMC-Velocity:1.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: fr.xephi:authme:5.6.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.maxgamer:QuickShop:5.1.1.2" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.bekvon.bukkit.residence:Residence:5.1.0.1">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/Residence5.1.0.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.linear</groupId>
     <artifactId>LinearBot</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <name>LinearBot</name>
@@ -94,7 +94,8 @@
         </dependency>
         <dependency>
             <groupId>io.github.dreamvoid</groupId>
-            <artifactId>MiraiMC</artifactId>
+            <artifactId>MiraiMC-Integration</artifactId>
+            <!--请确保版本为Github上的最新版本-->
             <version>1.7.1</version>
             <scope>provided</scope>
         </dependency>
@@ -116,6 +117,13 @@
             <version>5.1.1.2</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.ghostchu</groupId>
+            <artifactId>quickshop-bukkit</artifactId>
+            <version>3.6.1.5</version>
+            <scope>provided</scope>
+            <classifier>shaded</classifier>
+        </dependency>
         <dependency>
             <groupId>com.bekvon.bukkit.residence</groupId>
             <artifactId>Residence</artifactId>

diff --git a/src/main/java/org/linear/linearbot/LinearBot.java b/src/main/java/org/linear/linearbot/LinearBot.java
@@ -8,7 +8,8 @@
 import org.linear.linearbot.command.Commands;
 import org.linear.linearbot.config.Config;
 import org.linear.linearbot.event.qq.QQEvent;
-import org.linear.linearbot.event.server.HookEvent;
+import org.linear.linearbot.event.server.QsChatEvent;
+import org.linear.linearbot.event.server.QsHikariChatEvent;
 import org.linear.linearbot.event.server.ServerEvent;
 import org.linear.linearbot.hook.AuthMeHook;
 import org.linear.linearbot.hook.QuickShopHook;
@@ -35,7 +36,8 @@ public void onEnable() {
         QuickShopHook.hookQuickShop();
         getLogger().info("关联插件连接完毕");
         Bukkit.getPluginManager().registerEvents(new ServerEvent(), this);
-        if (QuickShopHook.hasQs) Bukkit.getPluginManager().registerEvents(new HookEvent(), this);
+        if (QuickShopHook.hasQs) Bukkit.getPluginManager().registerEvents(new QsChatEvent(),this);
+        if (QuickShopHook.hasQsHikari) Bukkit.getPluginManager().registerEvents(new QsHikariChatEvent(),this);
         getLogger().info("服务器事件监听器注册完毕");
         Bukkit.getPluginManager().registerEvents(new QQEvent(), this);
         getLogger().info("QQ事件监听器注册完毕");

diff --git a/...ear/linearbot/event/server/HookEvent.java → ...r/linearbot/event/server/QsChatEvent.java b/...ear/linearbot/event/server/HookEvent.java → ...r/linearbot/event/server/QsChatEvent.java
@@ -1,23 +1,24 @@
-package org.linear.linearbot.event.server;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.maxgamer.quickshop.api.event.QSHandleChatEvent;
-
-public class HookEvent implements Listener {
-    private static String qsMessage;
-    private static Player qsSender;
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onQSChat(QSHandleChatEvent e) {
-        setQsMessage(e.getMessage());
-        setQsSender(e.getSender());
-    }
-
-    public static String getQsMessage() {return qsMessage;}
-    public static Player getQsSender() {return qsSender;}
-    private static void setQsMessage(String s) {qsMessage = s;}
-    private static void setQsSender(Player p) {qsSender = p;}
-}
+package org.linear.linearbot.event.server;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public class QsChatEvent implements Listener {
+
+    private static String qsMessage;
+    private static Player qsSender;
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onQSChat (org.maxgamer.quickshop.api.event.QSHandleChatEvent e){
+        setQsMessage(e.getMessage());
+        setQsSender(e.getSender());
+    }
+
+
+    public static String getQsMessage() {return qsMessage;}
+    public static Player getQsSender() {return qsSender;}
+    private static void setQsMessage(String s) {qsMessage = s;}
+    private static void setQsSender(Player p) {qsSender = p;}
+}
diff --git a/src/main/java/org/linear/linearbot/event/server/QsHikariChatEvent.java b/src/main/java/org/linear/linearbot/event/server/QsHikariChatEvent.java
@@ -0,0 +1,24 @@
+package org.linear.linearbot.event.server;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public class QsHikariChatEvent implements Listener {
+
+    private static String qsMessage;
+    private static Player qsSender;
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onQSChat (com.ghostchu.quickshop.api.event.QSHandleChatEvent e){
+        setQsMessage(e.getMessage());
+        setQsSender(e.getSender());
+    }
+
+
+    public static String getQsMessage() {return qsMessage;}
+    public static Player getQsSender() {return qsSender;}
+    private static void setQsMessage(String s) {qsMessage = s;}
+    private static void setQsSender(Player p) {qsSender = p;}
+}
diff --git a/src/main/java/org/linear/linearbot/event/server/ServerEvent.java b/src/main/java/org/linear/linearbot/event/server/ServerEvent.java
@@ -30,7 +30,8 @@ public void onChat(AsyncPlayerChatEvent event) {
         String message = StringTool.filterColor(event.getMessage());
         if (AuthMeHook.hasAuthMe) {if (!AuthMeHook.authMeApi.isAuthenticated(event.getPlayer())) {return;} }
         if (ResidenceHook.hasRes) {if (resChatApi.getPlayerChannel(event.getPlayer().getName()) != null) {return;}}
-        if (QuickShopHook.hasQs) {if (event.getPlayer() == HookEvent.getQsSender() && event.getMessage() == HookEvent.getQsMessage()) {return;}}
+        if (QuickShopHook.hasQs) {if (event.getPlayer() == QsChatEvent.getQsSender() && event.getMessage() == QsChatEvent.getQsMessage()) {return;}}
+        if (QuickShopHook.hasQsHikari) {if (event.getPlayer() == QsHikariChatEvent.getQsSender() && event.getMessage() == QsHikariChatEvent.getQsMessage()) {return;}}
         List<Long> groups = Config.getGroupQQs();
         for (long groupID : groups){
             Bot.sendMsg("[服务器]"+name+":"+message,groupID);

diff --git a/src/main/java/org/linear/linearbot/hook/QuickShopHook.java b/src/main/java/org/linear/linearbot/hook/QuickShopHook.java
@@ -8,16 +8,30 @@ public class QuickShopHook {
 
     public static Boolean hasQs;
 
+    public static Boolean hasQsHikari;
+
     public static void hookQuickShop() {
 
         Plugin quickShop = Bukkit.getPluginManager().getPlugin("QuickShop");
         try {
             if (quickShop != null) {
                 hasQs = true;
-                LinearBot.INSTANCE.getLogger().info("QuickShop 关联成功");
+                hasQsHikari = false;
+                LinearBot.INSTANCE.getLogger().info("QuickShop-Reremake 关联成功");
             }else{
                 hasQs = false;
-                LinearBot.INSTANCE.getLogger().info("QuickShop 关联失败");
+                Plugin quickShopHikari = Bukkit.getPluginManager().getPlugin("QuickShop-Hikari");
+                try {
+                    if (quickShopHikari != null) {
+                        hasQsHikari = true;
+                        LinearBot.INSTANCE.getLogger().info("QuickShop-Hikari 关联成功");
+                    }else{
+                        hasQsHikari = false;
+                        LinearBot.INSTANCE.getLogger().info("QuickShop 关联失败");
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         } catch (Throwable e) {
             e.printStackTrace();