diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JvmPluginInternal.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JvmPluginInternal.kt index c03276164..d6a914a9d 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JvmPluginInternal.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JvmPluginInternal.kt @@ -15,10 +15,10 @@ import kotlinx.coroutines.* import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.plugin.Plugin import net.mamoe.mirai.console.plugin.PluginManager +import net.mamoe.mirai.console.plugin.ResourceContainer.Companion.asResourceContainer import net.mamoe.mirai.console.plugin.jvm.JvmPlugin import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription import net.mamoe.mirai.console.plugin.safeLoader -import net.mamoe.mirai.console.util.ResourceContainer.Companion.asResourceContainer import net.mamoe.mirai.utils.MiraiLogger import java.io.File import java.io.InputStream diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/ResourceContainer.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/ResourceContainer.kt similarity index 95% rename from backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/ResourceContainer.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/ResourceContainer.kt index 0184bb302..b20090ddf 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/util/ResourceContainer.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/ResourceContainer.kt @@ -9,10 +9,10 @@ @file:Suppress("unused") -package net.mamoe.mirai.console.util +package net.mamoe.mirai.console.plugin +import net.mamoe.mirai.console.plugin.ResourceContainer.Companion.asResourceContainer import net.mamoe.mirai.console.plugin.jvm.JvmPlugin -import net.mamoe.mirai.console.util.ResourceContainer.Companion.asResourceContainer import java.io.InputStream import java.nio.charset.Charset import kotlin.reflect.KClass diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPlugin.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPlugin.kt index 426d56428..f926f76fb 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPlugin.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugin/jvm/JvmPlugin.kt @@ -17,7 +17,7 @@ import net.mamoe.mirai.console.data.PluginConfig import net.mamoe.mirai.console.data.PluginData import net.mamoe.mirai.console.plugin.Plugin import net.mamoe.mirai.console.plugin.PluginFileExtensions -import net.mamoe.mirai.console.util.ResourceContainer +import net.mamoe.mirai.console.plugin.ResourceContainer import net.mamoe.mirai.utils.MiraiLogger import kotlin.reflect.KClass