From 98de5893d7880cf269d3fa460ffcfdad8f39c299 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 15 Feb 2020 14:13:07 +0800
Subject: [PATCH] Add @JvmStatic and @JvmOverloads

---
 mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt        | 3 +++
 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotFactoryJvm.kt | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
index 759c5041c..4430c4514 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
@@ -27,6 +27,7 @@ import net.mamoe.mirai.network.BotNetworkHandler
 import net.mamoe.mirai.network.LoginFailedException
 import net.mamoe.mirai.utils.*
 import net.mamoe.mirai.utils.io.transferTo
+import kotlin.jvm.JvmStatic
 
 /**
  * 机器人对象. 一个机器人实例登录一个 QQ 账号.
@@ -42,6 +43,7 @@ abstract class Bot : CoroutineScope {
         /**
          * 复制一份此时的 [Bot] 实例列表.
          */
+        @JvmStatic
         val instances: List<WeakRef<Bot>> get() = BotImpl.instances.toList()
 
         /**
@@ -52,6 +54,7 @@ abstract class Bot : CoroutineScope {
         /**
          * 获取一个 [Bot] 实例, 找不到则 [NoSuchElementException]
          */
+        @JvmStatic
         fun instanceWhose(qq: Long): Bot = BotImpl.instanceWhose(qq = qq)
     }
 
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotFactoryJvm.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotFactoryJvm.kt
index fdf712739..e1fff684c 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotFactoryJvm.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotFactoryJvm.kt
@@ -44,6 +44,7 @@ internal val factory: BotFactory = run {
 /**
  * 加载现有协议的 [BotFactory], 并使用指定的 [配置][configuration] 构造 [Bot] 实例
  */
+@JvmOverloads
 fun Bot(context: Context, qq: Long, password: String, configuration: BotConfiguration = BotConfiguration.Default): Bot =
     factory.Bot(context, qq, password, configuration)
 
@@ -57,6 +58,7 @@ inline fun Bot(context: Context, qq: Long, password: String, configuration: (Bot
 /**
  * 加载现有协议的 [BotFactory], 并使用指定的 [配置][configuration] 构造 [Bot] 实例
  */
+@JvmOverloads
 fun Bot(qq: Long, password: String, configuration: BotConfiguration = BotConfiguration.Default): Bot =
     factory.Bot(ContextImpl(), qq, password, configuration)