From 22a113ef38a6f3daa090cac175d651cae001de21 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Tue, 28 Apr 2020 23:15:55 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E8=B0=83=E6=95=B4CGJ=E5=8C=85?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84,=20=E5=B0=86=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9B=B8=E5=85=B3=E7=B1=BB=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=A8framework=E5=8C=85=E5=86=85;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/lamgc/cgj/Main.java                       | 4 ++--
 .../net/lamgc/cgj/bot/{ => framework/coolq}/CQConfig.java   | 2 +-
 .../lamgc/cgj/bot/{ => framework/coolq}/CQPluginMain.java   | 4 ++--
 .../coolq/message}/SpringCQMessageEvent.java                | 4 ++--
 .../coolq}/message/SpringCQMessageSender.java               | 4 +++-
 .../coolq}/message/SpringCQMessageSenderFactory.java        | 5 ++++-
 .../net/lamgc/cgj/bot/{ => framework/mirai}/MiraiMain.java  | 6 +++---
 .../mirai/message}/MiraiMessageEvent.java                   | 4 ++--
 .../{ => framework/mirai}/message/MiraiMessageSender.java   | 4 +++-
 .../mirai}/message/MiraiMessageSenderFactory.java           | 5 ++++-
 10 files changed, 26 insertions(+), 16 deletions(-)
 rename src/main/java/net/lamgc/cgj/bot/{ => framework/coolq}/CQConfig.java (95%)
 rename src/main/java/net/lamgc/cgj/bot/{ => framework/coolq}/CQPluginMain.java (94%)
 rename src/main/java/net/lamgc/cgj/bot/{event => framework/coolq/message}/SpringCQMessageEvent.java (96%)
 rename src/main/java/net/lamgc/cgj/bot/{ => framework/coolq}/message/SpringCQMessageSender.java (85%)
 rename src/main/java/net/lamgc/cgj/bot/{ => framework/coolq}/message/SpringCQMessageSenderFactory.java (66%)
 rename src/main/java/net/lamgc/cgj/bot/{ => framework/mirai}/MiraiMain.java (91%)
 rename src/main/java/net/lamgc/cgj/bot/{event => framework/mirai/message}/MiraiMessageEvent.java (93%)
 rename src/main/java/net/lamgc/cgj/bot/{ => framework/mirai}/message/MiraiMessageSender.java (98%)
 rename src/main/java/net/lamgc/cgj/bot/{ => framework/mirai}/message/MiraiMessageSenderFactory.java (76%)

diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java
index ca4d43e..a75918a 100644
--- a/src/main/java/net/lamgc/cgj/Main.java
+++ b/src/main/java/net/lamgc/cgj/Main.java
@@ -7,8 +7,8 @@ import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import net.lamgc.cgj.bot.CQConfig;
-import net.lamgc.cgj.bot.MiraiMain;
+import net.lamgc.cgj.bot.framework.coolq.CQConfig;
+import net.lamgc.cgj.bot.framework.mirai.MiraiMain;
 import net.lamgc.cgj.pixiv.*;
 import net.lamgc.cgj.proxy.PixivAccessProxyServer;
 import net.lamgc.plps.PixivLoginProxyServer;
diff --git a/src/main/java/net/lamgc/cgj/bot/CQConfig.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQConfig.java
similarity index 95%
rename from src/main/java/net/lamgc/cgj/bot/CQConfig.java
rename to src/main/java/net/lamgc/cgj/bot/framework/coolq/CQConfig.java
index c74fce5..f71fec3 100644
--- a/src/main/java/net/lamgc/cgj/bot/CQConfig.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQConfig.java
@@ -1,4 +1,4 @@
-package net.lamgc.cgj.bot;
+package net.lamgc.cgj.bot.framework.coolq;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import net.lz1998.cq.CQGlobal;
diff --git a/src/main/java/net/lamgc/cgj/bot/CQPluginMain.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
similarity index 94%
rename from src/main/java/net/lamgc/cgj/bot/CQPluginMain.java
rename to src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
index c15905e..74a00a5 100644
--- a/src/main/java/net/lamgc/cgj/bot/CQPluginMain.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
@@ -1,7 +1,7 @@
-package net.lamgc.cgj.bot;
+package net.lamgc.cgj.bot.framework.coolq;
 
 import net.lamgc.cgj.bot.event.BotEventHandler;
-import net.lamgc.cgj.bot.event.SpringCQMessageEvent;
+import net.lamgc.cgj.bot.framework.coolq.message.SpringCQMessageEvent;
 import net.lamgc.utils.event.EventHandler;
 import net.lz1998.cq.event.message.CQDiscussMessageEvent;
 import net.lz1998.cq.event.message.CQGroupMessageEvent;
diff --git a/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java
similarity index 96%
rename from src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
rename to src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java
index a0a37c3..d9b2067 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java
@@ -1,9 +1,9 @@
-package net.lamgc.cgj.bot.event;
+package net.lamgc.cgj.bot.framework.coolq.message;
 
 import net.lamgc.cgj.bot.BotCode;
+import net.lamgc.cgj.bot.event.MessageEvent;
 import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.bot.message.MessageSource;
-import net.lamgc.cgj.bot.message.SpringCQMessageSender;
 import net.lz1998.cq.event.message.CQDiscussMessageEvent;
 import net.lz1998.cq.event.message.CQGroupMessageEvent;
 import net.lz1998.cq.event.message.CQMessageEvent;
diff --git a/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSender.java
similarity index 85%
rename from src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java
rename to src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSender.java
index d2a05b8..eff65ef 100644
--- a/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSender.java
@@ -1,5 +1,7 @@
-package net.lamgc.cgj.bot.message;
+package net.lamgc.cgj.bot.framework.coolq.message;
 
+import net.lamgc.cgj.bot.message.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSource;
 import net.lz1998.cq.robot.CoolQ;
 
 public class SpringCQMessageSender implements MessageSender {
diff --git a/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSenderFactory.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSenderFactory.java
similarity index 66%
rename from src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSenderFactory.java
rename to src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSenderFactory.java
index a9ca6ef..af02139 100644
--- a/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSenderFactory.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSenderFactory.java
@@ -1,5 +1,8 @@
-package net.lamgc.cgj.bot.message;
+package net.lamgc.cgj.bot.framework.coolq.message;
 
+import net.lamgc.cgj.bot.message.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSenderFactory;
+import net.lamgc.cgj.bot.message.MessageSource;
 import net.lz1998.cq.robot.CoolQ;
 
 public class SpringCQMessageSenderFactory implements MessageSenderFactory {
diff --git a/src/main/java/net/lamgc/cgj/bot/MiraiMain.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
similarity index 91%
rename from src/main/java/net/lamgc/cgj/bot/MiraiMain.java
rename to src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
index 7443ff7..591a72e 100644
--- a/src/main/java/net/lamgc/cgj/bot/MiraiMain.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
@@ -1,9 +1,9 @@
-package net.lamgc.cgj.bot;
+package net.lamgc.cgj.bot.framework.mirai;
 
 import net.lamgc.cgj.bot.event.BotEventHandler;
-import net.lamgc.cgj.bot.event.MiraiMessageEvent;
+import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageEvent;
 import net.lamgc.cgj.bot.message.MessageSenderBuilder;
-import net.lamgc.cgj.bot.message.MiraiMessageSenderFactory;
+import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageSenderFactory;
 import net.mamoe.mirai.Bot;
 import net.mamoe.mirai.BotFactoryJvm;
 import net.mamoe.mirai.japt.Events;
diff --git a/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
similarity index 93%
rename from src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
rename to src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
index 2f22394..beae46c 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
@@ -1,8 +1,8 @@
-package net.lamgc.cgj.bot.event;
+package net.lamgc.cgj.bot.framework.mirai.message;
 
+import net.lamgc.cgj.bot.event.MessageEvent;
 import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.bot.message.MessageSource;
-import net.lamgc.cgj.bot.message.MiraiMessageSender;
 import net.mamoe.mirai.message.ContactMessage;
 import net.mamoe.mirai.message.GroupMessage;
 import net.mamoe.mirai.message.data.MessageUtils;
diff --git a/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
similarity index 98%
rename from src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java
rename to src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
index fba9165..8061f53 100644
--- a/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
@@ -1,4 +1,4 @@
-package net.lamgc.cgj.bot.message;
+package net.lamgc.cgj.bot.framework.mirai.message;
 
 import com.google.common.base.Strings;
 import net.lamgc.cgj.bot.BotCode;
@@ -7,6 +7,8 @@ import net.lamgc.cgj.bot.cache.HotDataCacheStore;
 import net.lamgc.cgj.bot.cache.LocalHashCacheStore;
 import net.lamgc.cgj.bot.cache.StringRedisCacheStore;
 import net.lamgc.cgj.bot.event.BotEventHandler;
+import net.lamgc.cgj.bot.message.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSource;
 import net.mamoe.mirai.Bot;
 import net.mamoe.mirai.contact.Contact;
 import net.mamoe.mirai.message.data.Image;
diff --git a/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSenderFactory.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSenderFactory.java
similarity index 76%
rename from src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSenderFactory.java
rename to src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSenderFactory.java
index 2bccf5d..f40616d 100644
--- a/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSenderFactory.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSenderFactory.java
@@ -1,5 +1,8 @@
-package net.lamgc.cgj.bot.message;
+package net.lamgc.cgj.bot.framework.mirai.message;
 
+import net.lamgc.cgj.bot.message.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSenderFactory;
+import net.lamgc.cgj.bot.message.MessageSource;
 import net.mamoe.mirai.Bot;
 
 public class MiraiMessageSenderFactory implements MessageSenderFactory {