优化代码

Author: NatJerry

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ChatWithGroup</groupId>
     <artifactId>ChatWithGroup</artifactId>
-    <version>1.3.2 rc2</version>
+    <version>1.3.2</version>
     <packaging>jar</packaging>
 
     <name>ChatWithGroup</name>

src/main/java/server/natural/ChatServer/ConnectHandler.java

@@ -1,6 +1,5 @@
 package server.natural.ChatServer;
 
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.group.ChannelGroup;
@@ -15,7 +14,10 @@
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import server.natural.Utils;
 
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 //todo 汉化
 //todo 摆烂了，不汉化了 -- wangxyper

src/main/java/server/natural/Main.java

@@ -6,12 +6,10 @@
 import server.natural.ChatServer.ConnectHandler;
 import server.natural.ChatServer.InitChatServer;
 import server.natural.command.*;
-//import server.natural.command.CommandSystemInfo;
 import server.natural.events.AddToTheGroup;
 import server.natural.events.RequestSelectorListener;
 import server.natural.events.onGroupMessage;
 
-
 import java.util.Objects;
 
 public class Main extends JavaPlugin {
@@ -48,8 +46,6 @@ public void onEnable() {
 
          }
          getLogger().info(ChatColor.GREEN + "准备就绪!");
-//         getLogger().info(ChatColor.GREEN + "The Version of CWG(ChatWithGroup) is 1.3.2");
-//         getLogger().info(ChatColor.GREEN + "This Version is released by Jerry!");
          //Advise the owner to update the config.yml again
          if(cfver != 2){
              getLogger().warning("ChatWithGroup配置出现问题，请尽快修复");

src/main/java/server/natural/command/CommandMFG.java

@@ -1,11 +1,10 @@
 package server.natural.command;
-import org.bukkit.Bukkit;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
-import server.natural.ChatServer.BaseServer;
 import server.natural.ChatServer.InitChatServer;
 import server.natural.Utils;
 public class CommandStartChatServer implements CommandExecutor{

src/main/java/server/natural/command/CommandStartChatServer.java

@@ -1,14 +1,11 @@
 package server.natural.command;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import server.natural.ChatServer.BaseServer;
-import server.natural.ChatServer.InitChatServer;
-import server.natural.Utils;
 
 public class CommandStopChatServer implements CommandExecutor {
     @Override

src/main/java/server/natural/command/CommandStopChatServer.java

@@ -1,7 +1,9 @@
 package server.natural.events;
 
 import me.albert.amazingbot.bot.Bot;
-import me.albert.amazingbot.events.*;
+import me.albert.amazingbot.events.GroupMemberJoinEvent;
+import me.albert.amazingbot.events.GroupMemberLeaveEvent;
+import me.albert.amazingbot.events.TempMessageEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import server.natural.Utils;

src/main/java/server/natural/events/AddToTheGroup.java

@@ -1,11 +1,13 @@
 package server.natural.events;
+
 import me.albert.amazingbot.bot.Bot;
 import me.albert.amazingbot.events.GroupRequestJoinEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import server.natural.Utils;
+
 import java.util.Objects;
 public class RequestSelectorListener implements Listener {
     //当有用户请求进群时执行
@@ -17,8 +19,11 @@ public void onAddGroupRequest(GroupRequestJoinEvent e) {
             } else if (Objects.equals(Utils.config.getString("JoinRequestSelector"), "DROP")) {
                 e.getEvent().reject();
             } else if (Objects.equals(Utils.config.getString("JoinRequestSelector"), "NOTHING")){
-                e.getEvent().getFromNick();
-                e.getEvent().getGroupId();
+                String nick = e.getEvent().getFromNick();
+                String id = String.valueOf(e.getEvent().getGroupId());
+                Bot.getApi().sendPrivateMsg(Utils.config.getString("owner"), "有玩家申请加入群");
+                Bot.getApi().sendPrivateMsg(Utils.config.getString("owner"),nick );
+                Bot.getApi().sendPrivateMsg(Utils.config.getString("owner"),id );
             }
             else {
                 Bukkit.getLogger().warning(ChatColor.RED + "错误的配置文件！");

src/main/java/server/natural/events/RequestSelectorListener.java

@@ -24,7 +24,11 @@ public void onGroupMessageEvent(GroupMessageEvent event){
                List<Player> players = (List<Player>) Bukkit.getOnlinePlayers();
                for(Player player:players){
                    if(booleans.get(player)) {
-                       player.sendMessage(ChatColor.BLUE + "[QQ}" + event.getEvent().getSenderName() + "(" + event.getUserID() + ")" + ":" + ChatColor.GRAY + event.getRawMessage());
+                       /*
+                       getRawMessage方法已过时
+                       我已更换 -- NaT_Jerry
+                        */
+                       player.sendMessage(ChatColor.BLUE + "[QQ]" + event.getEvent().getSenderName() + "(" + event.getUserID() + ")" + ":" + ChatColor.GRAY + event.getMsg());
                    }
                }
            }

src/main/java/server/natural/events/onGroupMessage.java

@@ -1,6 +1,6 @@
   name: ChatWithGroup
   main: server.natural.Main
-  version: "1.3.2 rc1"
+  version: "1.3.2"
   api-version: 1.17
   author: [Jerry , wangxyper]
   commands: