From b33e8757e53594f92a8f05110530216be81c5b15 Mon Sep 17 00:00:00 2001 From: Him188moe Date: Sun, 8 Sep 2019 14:49:05 +0800 Subject: [PATCH] Moduled project --- mirai-api/pom.xml | 37 +++++++++++++++++++ mirai-console/pom.xml | 37 +++++++++++++++++++ .../java/net/mamoe/mirai/MiraiServer.java | 8 +--- .../src/main/java/net/mamoe/mirai/Robot.java | 8 +++- .../java/net/mamoe/mirai/contact/Contact.kt | 3 +- .../java/net/mamoe/mirai/message/Message.kt | 2 +- .../mirai/network/RobotNetworkHandler.kt | 9 ++++- .../mirai/network/packet/ServerPacket.kt | 3 +- pom.xml | 2 + 9 files changed, 96 insertions(+), 13 deletions(-) create mode 100644 mirai-api/pom.xml create mode 100644 mirai-console/pom.xml diff --git a/mirai-api/pom.xml b/mirai-api/pom.xml new file mode 100644 index 000000000..244586af7 --- /dev/null +++ b/mirai-api/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + + net.mamoe + mirai + 1.0 + + + mirai-api + 1.0 + + + + + + + + + + /src/main/resources + + + **/*.* + + + + + + + + + + \ No newline at end of file diff --git a/mirai-console/pom.xml b/mirai-console/pom.xml new file mode 100644 index 000000000..aebff0feb --- /dev/null +++ b/mirai-console/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + + net.mamoe + mirai + 1.0 + + + mirai-console + 1.0 + + + + + + + + + + /src/main/resources + + + **/*.* + + + + + + + + + + \ No newline at end of file diff --git a/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java b/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java index 5d7e4ddb1..59f8f01ad 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java @@ -178,13 +178,7 @@ public class MiraiServer { getLogger().info("Initializing [Robot]s"); - try { - getAvailableRobot(); - } catch (ExecutionException | InterruptedException e) { - e.printStackTrace(); - } - /* this.qqs.keySet().stream().map(key -> this.qqs.getSection(key)).forEach(section -> { getLogger().info("Initializing [Robot] " + section.getString("account")); try { @@ -205,7 +199,7 @@ public class MiraiServer { getLogger().error("Could not load QQ robots config!"); System.exit(1); } - });*/ + }); } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/Robot.java b/mirai-core/src/main/java/net/mamoe/mirai/Robot.java index 352eca716..8121b9cea 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/Robot.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/Robot.java @@ -36,7 +36,6 @@ public final class Robot implements Closeable { public static final List instances = Collections.synchronizedList(new LinkedList<>()); public final int id = _id.getAndAdd(1); - private static final AtomicInteger _id = new AtomicInteger(0); public final RobotAccount account; @@ -118,5 +117,12 @@ public final class Robot implements Closeable { this.contacts.qqs.clear(); } + public void addFriend(long qq) { + + } + + /* PRIVATE */ + + private static final AtomicInteger _id = new AtomicInteger(0); } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt index 251786779..f50a7520c 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt @@ -11,8 +11,7 @@ import net.mamoe.mirai.message.defaults.PlainText * @param robot Owner [Robot] * @author Him188moe */ -abstract class Contact(val robot: Robot, val number: Long) { - +abstract class Contact internal constructor(val robot: Robot, val number: Long) { /** * Async */ diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/Message.kt b/mirai-core/src/main/java/net/mamoe/mirai/message/Message.kt index 15cfc30a9..65adab3dd 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/message/Message.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/message/Message.kt @@ -15,7 +15,7 @@ import java.util.* * 可发送的或从服务器接收的消息. * 采用这样的消息模式是因为 QQ 的消息多元化, 一条消息中可包含 [纯文本][PlainText], [图片][Image] 等. * - * 在 Kotlin, 使用 [Message] 与使用 [String] 几乎没有什么用法上的区别. + * 在 Kotlin, 使用 [Message] 与使用 [String] 几乎没有什么用法上的区别, 除了 * * @author Him188moe * @see Contact.sendMessage diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt index 4a47a5e7e..17e2711c4 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt @@ -508,7 +508,10 @@ class RobotNetworkHandler(private val robot: Robot) : Closeable { //GroupMessageEvent(this.robot, robot.contacts.getGroupByNumber(packet.groupNumber), robot.contacts.getQQ(packet.qq), packet.message) } - is UnknownServerEventPacket, + is UnknownServerEventPacket -> { + //todo + } + is ServerSendFriendMessageResponsePacket, is ServerSendGroupMessageResponsePacket -> { //ignored @@ -546,6 +549,10 @@ class RobotNetworkHandler(private val robot: Robot) : Closeable { } + fun addFriend(qqNumber: Long): Unit { + + } + override fun close() { } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerPacket.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerPacket.kt index f1811c4c1..d21b3fc72 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerPacket.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerPacket.kt @@ -62,8 +62,9 @@ abstract class ServerPacket(val input: DataInputStream) : Packet { return ServerLoginResponseSuccessPacket.Encrypted(stream).apply { this.idHex = idHex } } + println(bytes.size) return ServerLoginResponseFailedPacket(when (bytes.size) { - 63, 319, 135, 351 -> LoginState.WRONG_PASSWORD + 63, 319, 135, 351 -> LoginState.WRONG_PASSWORD//这四个其中一个也是被冻结 //135 -> LoginState.RETYPE_PASSWORD 279 -> LoginState.BLOCKED 263 -> LoginState.UNKNOWN_QQ_NUMBER diff --git a/pom.xml b/pom.xml index 7c26ba49b..b09b4bdbf 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,8 @@ mirai-core mirai-native mirai-ui + mirai-console + mirai-api