From ea3f51dca99f6cf5c7917e7c56e1bfd931ae73a5 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Thu, 30 Apr 2020 11:51:47 +0800
Subject: [PATCH] Opt in config APIs

---
 .../kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt | 3 +++
 .../kotlin/net/mamoe/mirai/console/utils/BotHelper.kt    | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt
index 55f1bfd35..f17dea146 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt
@@ -79,6 +79,7 @@ abstract class PluginBase
      * 加载一个 [dataFolder] 中的 [Config]
      */
     fun loadConfig(fileName: String): Config {
+        @OptIn(ToBeRemoved::class)
         return Config.load(dataFolder.absolutePath + "/" + fileName)
     }
 
@@ -112,6 +113,7 @@ abstract class PluginBase
      */
     fun getResourcesConfig(fileName: String): Config {
         require(fileName.contains(".")) { "Unknown Config Type" }
+        @OptIn(ToBeRemoved::class)
         return Config.load(getResources(fileName) ?: error("No such file: $fileName"), fileName.substringAfter('.'))
     }
 
@@ -188,6 +190,7 @@ class PluginDescription(
     }
 
     companion object {
+        @OptIn(ToBeRemoved::class)
         fun readFromContent(content_: String, file: File): PluginDescription {
             with(Config.load(content_, "yml")) {
                 try {
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt
index cd324888c..bdecf40d2 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt
@@ -11,13 +11,11 @@ package net.mamoe.mirai.console.utils
 
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.console.MiraiConsole
-import net.mamoe.mirai.console.plugins.ConfigSection
-import net.mamoe.mirai.console.plugins.ConfigSectionImpl
-import net.mamoe.mirai.console.plugins.loadAsConfig
-import net.mamoe.mirai.console.plugins.withDefaultWriteSave
+import net.mamoe.mirai.console.plugins.*
 import net.mamoe.mirai.console.utils.BotManagers.BOT_MANAGERS
 import java.io.File
 
+@OptIn(ToBeRemoved::class)
 internal object BotManagers {
     val config = File("${MiraiConsole.path}/bot.yml").loadAsConfig()
     val BOT_MANAGERS: ConfigSection by config.withDefaultWriteSave { ConfigSectionImpl() }
@@ -30,6 +28,7 @@ fun Bot.addManagerDeprecated(long: Long) {
     addManager(long)
 }
 
+@OptIn(ToBeRemoved::class)
 fun Bot.addManager(long: Long): Boolean {
     BOT_MANAGERS.putIfAbsent(this.id.toString(), mutableListOf<Long>())
     BOT_MANAGERS[this.id.toString()] =
@@ -41,6 +40,7 @@ fun Bot.addManager(long: Long): Boolean {
     return true
 }
 
+@OptIn(ToBeRemoved::class)
 fun Bot.removeManager(long: Long) {
     BOT_MANAGERS.putIfAbsent(this.id.toString(), mutableListOf<Long>())
     BOT_MANAGERS[this.id.toString()] =
@@ -49,6 +49,7 @@ fun Bot.removeManager(long: Long) {
 }
 
 val Bot.managers: List<Long>
+    @OptIn(ToBeRemoved::class)
     get() {
         BOT_MANAGERS.putIfAbsent(this.id.toString(), mutableListOf<Long>())
         return BOT_MANAGERS.getLongList(this.id.toString())