From b56e0ace2e6ab682ae8b457c6b97c8e5202a3ab6 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 6 Dec 2019 19:29:25 +0800
Subject: [PATCH] Add @UseExperimental
---
.../src/main/java/japttest/SuspendTest.java | 15 +--------------
mirai-debug/src/main/kotlin/PacketDebuger.kt | 2 ++
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/mirai-debug/src/main/java/japttest/SuspendTest.java b/mirai-debug/src/main/java/japttest/SuspendTest.java
index 8a8df0f01..df87dd6d4 100644
--- a/mirai-debug/src/main/java/japttest/SuspendTest.java
+++ b/mirai-debug/src/main/java/japttest/SuspendTest.java
@@ -1,28 +1,15 @@
package japttest;
-import kotlinx.coroutines.BuildersKt;
-import kotlinx.coroutines.GlobalScope;
-import net.mamoe.mirai.Bot;
-import net.mamoe.mirai.BotAccount;
import net.mamoe.mirai.network.protocol.tim.packet.login.LoginResult;
-import net.mamoe.mirai.network.protocol.tim.packet.login.SubmitPasswordPacket;
import test.JaptTestKt;
@SuppressWarnings("unused")
public class SuspendTest {
- public static void main(String[] args) throws InterruptedException {
+ public static void main(String[] args) {
// TODO: 2019/12/6 Kotlin or IDE bug here
boolean bool = JaptTestKt.getLoginResult() == LoginResult.YOU_CAN_WRITE_ANY_THING;
- BuildersKt.runBlocking(GlobalScope.INSTANCE.getCoroutineContext(), (scope, continuation) -> {
- Bot bot = new Bot(new BotAccount(1994701021L, ""), scope.getCoroutineContext());
- if (bot.network.login(continuation) instanceof SubmitPasswordPacket.LoginResponse.Success) {
- System.out.println("login successful");
- }
- return null;
- });
-
System.out.println("Hello world finished");
}
diff --git a/mirai-debug/src/main/kotlin/PacketDebuger.kt b/mirai-debug/src/main/kotlin/PacketDebuger.kt
index 3af71e0c6..400d59d1f 100644
--- a/mirai-debug/src/main/kotlin/PacketDebuger.kt
+++ b/mirai-debug/src/main/kotlin/PacketDebuger.kt
@@ -18,6 +18,7 @@ import net.mamoe.mirai.network.protocol.tim.packet.login.LoginResult
import net.mamoe.mirai.network.protocol.tim.packet.login.ShareKey
import net.mamoe.mirai.network.protocol.tim.packet.login.TouchKey
import net.mamoe.mirai.utils.DecryptionFailedException
+import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.decryptBy
import net.mamoe.mirai.utils.io.*
import org.pcap4j.core.BpfProgram.BpfCompileMode
@@ -329,6 +330,7 @@ internal object DebugNetworkHandler : BotNetworkHandler<DataPacketSocketAdapter>
override suspend fun login(): LoginResult = LoginResult.SUCCESS
+ @UseExperimental(MiraiInternalAPI::class)
override suspend fun addHandler(temporaryPacketHandler: TemporaryPacketHandler<*, *>) {
}