From 593ecfa48c116134c1a6790e049a816c67ecbdcf Mon Sep 17 00:00:00 2001
From: 502647092 <admin@yumc.pw>
Date: Thu, 22 Dec 2016 20:31:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E8=BD=BD=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <admin@yumc.pw>
---
 pom.xml                                       | 18 ++-----
 .../java/pw/yumc/MiaoChat/MiaoChatBungee.java | 52 +++++++++++++++++--
 src/main/resources/group.yml                  | 15 ++++++
 3 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 05fb31d..f87ae16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,14 +13,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -78,16 +70,12 @@
         <url>http://ci.yumc.pw/job/${project.artifactId}/</url>
     </ciManagement>
     <properties>
-        <update.description></update.description>
-        <update.changes></update.changes>
-        <env.GIT_COMMIT>DEBUG</env.GIT_COMMIT>
+        <env.GIT_COMMIT>DEV</env.GIT_COMMIT>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
     <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
         <repository>
             <id>yumc-repo</id>
             <url>http://repo.yumc.pw/content/groups/public/</url>
diff --git a/src/main/java/pw/yumc/MiaoChat/MiaoChatBungee.java b/src/main/java/pw/yumc/MiaoChat/MiaoChatBungee.java
index 4887e3e..fd3f6ed 100644
--- a/src/main/java/pw/yumc/MiaoChat/MiaoChatBungee.java
+++ b/src/main/java/pw/yumc/MiaoChat/MiaoChatBungee.java
@@ -1,19 +1,22 @@
 package pw.yumc.MiaoChat;
 
 import java.net.InetSocketAddress;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.event.EventHandler;
 import pw.yumc.MiaoChat.bungee.FileConfig;
 
 public class MiaoChatBungee extends Plugin implements Listener {
-    private Map<InetSocketAddress, List<ServerInfo>> group;
+    private Map<InetSocketAddress, Set<InetSocketAddress>> groups;
     private FileConfig config;
+
     @EventHandler
     public void handle(final PluginMessageEvent event) {
         if (event.getTag().equals(MiaoMessage.CHANNEL) || event.getTag().equals(MiaoMessage.NORMALCHANNEL)) {
@@ -31,11 +34,54 @@ public class MiaoChatBungee extends Plugin implements Listener {
         config = new FileConfig(this, "group.yml");
     }
 
+    public void loadGroup() {
+        Map<String, InetSocketAddress> temp = new HashMap<>();
+        Set<InetSocketAddress> unused = new HashSet<>();
+        for (ServerInfo server : getProxy().getServers().values()) {
+            temp.put(server.getName(), server.getAddress());
+        }
+        Configuration groupSel = config.getSection("Groups");
+        Collection<String> groupname = groupSel.getKeys();
+        for (String gname : groupname) {
+            Set<String> servers = new HashSet<>(groupSel.getStringList(gname));
+            Set<InetSocketAddress> serISA = new HashSet<>();
+            for (String sname : servers) {
+                serISA.add(temp.get(sname));
+            }
+            serISA.remove(null);
+            for (String sname : servers) {
+                InetSocketAddress isadd = temp.get(sname);
+                if (isadd != null) {
+                    unused.remove(isadd);
+                    groups.put(isadd, serISA);
+                }
+            }
+        }
+        for (InetSocketAddress unser : unused) {
+            groups.put(unser, unused);
+        }
+    }
+
     @Override
     public void onEnable() {
         getProxy().registerChannel(MiaoMessage.CHANNEL);
         getProxy().registerChannel(MiaoMessage.NORMALCHANNEL);
         getProxy().getPluginManager().registerListener(this, this);
+        getProxy().getPluginManager().registerCommand(this, new Command("MiaoChat", "MiaoChat.admin", "mct") {
+            @Override
+            public void execute(CommandSender commandSender, String[] args) {
+                if (args.length > 1) {
+                    switch (args[0].toLowerCase()) {
+                    case "reload":
+                        onLoad();
+                        break;
+                    case "version":
+                        commandSender.sendMessage(getDescription().getVersion());
+                        break;
+                    }
+                }
+            }
+        });
         getLogger().info("注意: 通过BC转发的聊天信息将不会在控制台显示 仅客户端可见!");
     }
 }
diff --git a/src/main/resources/group.yml b/src/main/resources/group.yml
index e69de29..95982d5 100644
--- a/src/main/resources/group.yml
+++ b/src/main/resources/group.yml
@@ -0,0 +1,15 @@
+#配置版本号 请勿修改
+Version: 1.0
+
+#跨服分组
+#注: 未在分组内的服务器会被分配到独立的一组
+#注: 内部分组名称为 ungroup 下方如有定义将无效
+Groups:
+  #普通分组
+  normal:
+  - 'sc1'
+  - 'sc2'
+  #游戏分组
+  games:
+  - 'bw1'
+  - 'sg1'
\ No newline at end of file