From 3d53f7f7bcb475ff713b1932e19cfdf528d16bf8 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Mon, 25 May 2020 16:32:14 +0800
Subject: [PATCH] Rename package `plugins` to `plugin`

---
 PluginDocs/java/source.java                           |  8 ++++----
 .../kotlin/net/mamoe/mirai/console/MiraiConsole.kt    |  4 ++--
 .../net/mamoe/mirai/console/command/CommandManager.kt |  2 +-
 .../mamoe/mirai/console/{plugins => plugin}/Plugin.kt |  4 ++--
 .../mirai/console/{plugins => plugin}/PluginLoader.kt |  2 +-
 .../console/{plugins => plugin}/PluginManager.kt      |  2 +-
 .../console/{plugins => plugin}/PluginsLoader.kt      |  2 +-
 .../{plugins => plugin}/builtin/JarPluginLoader.kt    |  9 ++++-----
 .../console/{plugins => plugin}/builtin/JvmPlugin.kt  |  6 +++---
 .../builtin/JvmPluginDescription.kt                   | 10 +++++-----
 .../mirai/console/{plugins => plugin}/description.kt  |  2 +-
 .../mamoe/mirai/console/setting/internal/internal.kt  | 11 +++++------
 .../kotlin/net/mamoe/mirai/console/utils/BotHelper.kt |  3 ---
 .../mamoe/mirai/console/utils/JavaPluginScheduler.kt  |  2 +-
 .../net/mamoe/mirai/console/command/TestCommands.kt   |  2 +-
 15 files changed, 32 insertions(+), 37 deletions(-)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/Plugin.kt (85%)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/PluginLoader.kt (98%)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/PluginManager.kt (99%)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/PluginsLoader.kt (99%)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/builtin/JarPluginLoader.kt (93%)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/builtin/JvmPlugin.kt (96%)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/builtin/JvmPluginDescription.kt (87%)
 rename backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/{plugins => plugin}/description.kt (98%)

diff --git a/PluginDocs/java/source.java b/PluginDocs/java/source.java
index 92ff7d906..d60cf7367 100644
--- a/PluginDocs/java/source.java
+++ b/PluginDocs/java/source.java
@@ -3,10 +3,10 @@ package net.mamoe.n;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import net.mamoe.mirai.console.command.*;
-import net.mamoe.mirai.console.plugins.Config;
-import net.mamoe.mirai.console.plugins.ConfigSection;
-import net.mamoe.mirai.console.plugins.ConfigSectionFactory;
-import net.mamoe.mirai.console.plugins.PluginBase;
+import net.mamoe.mirai.console.plugin.Config;
+import net.mamoe.mirai.console.plugin.ConfigSection;
+import net.mamoe.mirai.console.plugin.ConfigSectionFactory;
+import net.mamoe.mirai.console.plugin.PluginBase;
 import net.mamoe.mirai.console.utils.Utils;
 import net.mamoe.mirai.message.GroupMessage;
 import org.jetbrains.annotations.NotNull;
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
index 82b299f82..6abed19eb 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
@@ -13,8 +13,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.io.charsets.Charset
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.console.plugins.PluginLoader
-import net.mamoe.mirai.console.plugins.builtin.JarPluginLoader
+import net.mamoe.mirai.console.plugin.PluginLoader
+import net.mamoe.mirai.console.plugin.builtin.JarPluginLoader
 import net.mamoe.mirai.utils.DefaultLogger
 import net.mamoe.mirai.utils.MiraiExperimentalAPI
 import net.mamoe.mirai.utils.MiraiLogger
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt
index cd3a229f2..b3211d9b5 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt
@@ -13,7 +13,7 @@
 package net.mamoe.mirai.console.command
 
 import kotlinx.atomicfu.locks.withLock
-import net.mamoe.mirai.console.plugins.Plugin
+import net.mamoe.mirai.console.plugin.Plugin
 import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.data.SingleMessage
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/Plugin.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/Plugin.kt
similarity index 85%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/Plugin.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/Plugin.kt
index d9ecf24e4..f590be7a4 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/Plugin.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/Plugin.kt
@@ -7,9 +7,9 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-package net.mamoe.mirai.console.plugins
+package net.mamoe.mirai.console.plugin
 
-import net.mamoe.mirai.console.plugins.builtin.JvmPlugin
+import net.mamoe.mirai.console.plugin.builtin.JvmPlugin
 
 /**
  * 表示一个 mirai-console 插件.
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginLoader.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginLoader.kt
similarity index 98%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginLoader.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginLoader.kt
index 43af25148..f5345e7f3 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginLoader.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginLoader.kt
@@ -9,7 +9,7 @@
 
 @file:Suppress("unused")
 
-package net.mamoe.mirai.console.plugins
+package net.mamoe.mirai.console.plugin
 
 import java.io.File
 
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginManager.kt
similarity index 99%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginManager.kt
index 09724d3ee..459951b2c 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginManager.kt
@@ -9,7 +9,7 @@
 
 @file:Suppress("NOTHING_TO_INLINE")
 
-package net.mamoe.mirai.console.plugins
+package net.mamoe.mirai.console.plugin
 
 import kotlinx.atomicfu.locks.withLock
 import net.mamoe.mirai.console.MiraiConsole
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginsLoader.kt
similarity index 99%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginsLoader.kt
index 08051d2cc..069b4d925 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/PluginsLoader.kt
@@ -7,7 +7,7 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-package net.mamoe.mirai.console.plugins
+package net.mamoe.mirai.console.plugin
 
 import net.mamoe.mirai.console.MiraiConsole
 import java.io.File
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JarPluginLoader.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JarPluginLoader.kt
similarity index 93%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JarPluginLoader.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JarPluginLoader.kt
index 476a863af..2ad708b21 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JarPluginLoader.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JarPluginLoader.kt
@@ -7,15 +7,14 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-package net.mamoe.mirai.console.plugins.builtin
+package net.mamoe.mirai.console.plugin.builtin
 
 import kotlinx.coroutines.*
 import net.mamoe.mirai.console.MiraiConsole
-import net.mamoe.mirai.console.plugins.AbstractFilePluginLoader
-import net.mamoe.mirai.console.plugins.PluginLoadException
-import net.mamoe.mirai.console.plugins.PluginsLoader
+import net.mamoe.mirai.console.plugin.AbstractFilePluginLoader
+import net.mamoe.mirai.console.plugin.PluginLoadException
+import net.mamoe.mirai.console.plugin.PluginsLoader
 import net.mamoe.mirai.utils.MiraiLogger
-import net.mamoe.mirai.utils.error
 import net.mamoe.yamlkt.Yaml
 import java.io.File
 import java.net.URL
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPlugin.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JvmPlugin.kt
similarity index 96%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPlugin.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JvmPlugin.kt
index 970f0b8ae..b0da3802c 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPlugin.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JvmPlugin.kt
@@ -9,7 +9,7 @@
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "EXPOSED_SUPER_CLASS")
 
-package net.mamoe.mirai.console.plugins.builtin
+package net.mamoe.mirai.console.plugin.builtin
 
 import kotlinx.atomicfu.locks.withLock
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -17,8 +17,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import net.mamoe.mirai.console.MiraiConsole
-import net.mamoe.mirai.console.plugins.Plugin
-import net.mamoe.mirai.console.plugins.PluginLoader
+import net.mamoe.mirai.console.plugin.Plugin
+import net.mamoe.mirai.console.plugin.PluginLoader
 import net.mamoe.mirai.console.utils.JavaPluginScheduler
 import net.mamoe.mirai.utils.MiraiLogger
 import java.util.concurrent.locks.ReentrantLock
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPluginDescription.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JvmPluginDescription.kt
similarity index 87%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPluginDescription.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JvmPluginDescription.kt
index 562ad58f2..39b285670 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPluginDescription.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/builtin/JvmPluginDescription.kt
@@ -7,15 +7,15 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-package net.mamoe.mirai.console.plugins.builtin
+package net.mamoe.mirai.console.plugin.builtin
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import net.mamoe.mirai.console.plugins.FilePluginDescription
-import net.mamoe.mirai.console.plugins.PluginDependency
-import net.mamoe.mirai.console.plugins.PluginDescription
-import net.mamoe.mirai.console.plugins.PluginKind
+import net.mamoe.mirai.console.plugin.FilePluginDescription
+import net.mamoe.mirai.console.plugin.PluginDependency
+import net.mamoe.mirai.console.plugin.PluginDescription
+import net.mamoe.mirai.console.plugin.PluginKind
 import java.io.File
 
 @Serializable
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/description.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/description.kt
similarity index 98%
rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/description.kt
rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/description.kt
index 4d23c90e4..e267c0cd8 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/description.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/description.kt
@@ -7,7 +7,7 @@
  * https://github.com/mamoe/mirai/blob/master/LICENSE
  */
 
-package net.mamoe.mirai.console.plugins
+package net.mamoe.mirai.console.plugin
 
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/internal/internal.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/internal/internal.kt
index ee3e4418b..5dd1f7183 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/internal/internal.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/internal/internal.kt
@@ -24,7 +24,7 @@ import kotlin.reflect.full.findAnnotation
 internal abstract class SettingImpl {
 
     @JvmField
-    internal var valueList: MutableList<Pair<Value<*>, KProperty<*>>> = mutableListOf()
+    internal var valueList: MutableList<Pair<Value<*>, Setting.PropertyInfo>> = mutableListOf()
 
     @JvmField
     internal var built: Boolean = false
@@ -53,9 +53,7 @@ internal abstract class SettingImpl {
         }
     }
 
-    internal fun onElementChanged(value: Value<*>) {
-        println("my value changed!")
-    }
+    protected abstract fun onElementChanged(value: Value<*>)
 
     companion object {
         @JvmStatic
@@ -78,8 +76,9 @@ internal class SettingUpdaterSerializer(
     override val descriptor: SerialDescriptor by lazy {
         @OptIn(MiraiExperimentalAPI::class)
         SerialDescriptor(instance.serialName) {
-            for ((value, property) in instance.valueList) {
-                element(property.serialNameOrPropertyName, value.serializer.descriptor, annotations, true)
+            for ((value, prop) in instance.valueList) {
+                val (serialName, annotations) = prop
+                element(serialName, value.serializer.descriptor, annotations, true)
             }
         }
     }
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt
index 5bef2c575..8932df2a0 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt
@@ -10,10 +10,7 @@
 package net.mamoe.mirai.console.utils
 
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.console.MiraiConsole
-import net.mamoe.mirai.console.plugins.*
 import net.mamoe.mirai.contact.User
-import java.io.File
 
 
 /**
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/JavaPluginScheduler.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/JavaPluginScheduler.kt
index ab334872c..89f3bb44e 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/JavaPluginScheduler.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/JavaPluginScheduler.kt
@@ -11,7 +11,7 @@ package net.mamoe.mirai.console.utils
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.future.future
-import net.mamoe.mirai.console.plugins.builtin.JavaPlugin
+import net.mamoe.mirai.console.plugin.builtin.JavaPlugin
 import java.util.concurrent.Callable
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Future
diff --git a/backend/mirai-console/src/test/kotlin/net/mamoe/mirai/console/command/TestCommands.kt b/backend/mirai-console/src/test/kotlin/net/mamoe/mirai/console/command/TestCommands.kt
index 11350c771..4b8e70f3a 100644
--- a/backend/mirai-console/src/test/kotlin/net/mamoe/mirai/console/command/TestCommands.kt
+++ b/backend/mirai-console/src/test/kotlin/net/mamoe/mirai/console/command/TestCommands.kt
@@ -12,7 +12,7 @@
 package net.mamoe.mirai.console.command
 
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.console.plugins.builtin.KotlinPlugin
+import net.mamoe.mirai.console.plugin.builtin.KotlinPlugin
 import net.mamoe.mirai.message.data.*
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals