Rename package `plugins` to `plugin`

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;

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

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

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/Plugin.kt → 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 插件.

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginLoader.kt → 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
 

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt → 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

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt → 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

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JarPluginLoader.kt → 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

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPlugin.kt → 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

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/builtin/JvmPluginDescription.kt → 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

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/description.kt → 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

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)
             }
         }
     }

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
 
 
 /**

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

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