github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-09 02:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

use: net.mamoe.mirai-console

Browse Source
This commit is contained in:
cssxsh 2023-07-10 14:06:15 +08:00 committed by Karlatemp
parent cd1c297e11
commit c9c0da0f36
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
1 changed files with 12 additions and 7 deletions

19
mirai-console/backend/mirai-console/src/plugin/jvm/JvmPluginDescription.kt
View File

@ -167,7 +167,12 @@ public class JvmPluginDescriptionBuilder(
public fun setDependencies(
value: Set<PluginDependency>,
): JvmPluginDescriptionBuilder = apply {
this.dependencies = value.toMutableSet()
this.dependencies = value.toMutableSet().apply {
find { dependency -> dependency.id == "net.mamoe.mirai-console" }?.let { dependency ->
remove(dependency)
consoleRequirement = dependency.versionRequirement
}
}
}
@ILoveKuriyamaMiraiForever
@ -175,7 +180,7 @@ public class JvmPluginDescriptionBuilder(
vararg dependencies: PluginDependency,
): JvmPluginDescriptionBuilder = apply {
for (dependency in dependencies) {
if (dependency.id == "net.mamoe.mirai.console" || dependency.id == "net.mamoe.mirai") {
if (dependency.id == "net.mamoe.mirai-console") {
consoleRequirement = dependency.versionRequirement
continue
}
@ -192,7 +197,7 @@ public class JvmPluginDescriptionBuilder(
@ResolveContext(VERSION_REQUIREMENT) versionRequirement: String,
isOptional: Boolean = false,
): JvmPluginDescriptionBuilder = apply {
if (pluginId == "net.mamoe.mirai.console" || pluginId == "net.mamoe.mirai") {
if (pluginId == "net.mamoe.mirai-console") {
consoleRequirement = versionRequirement
return@apply
}
@ -268,15 +273,15 @@ internal data class SimpleJvmPluginDescription
val version: SemVersion,
val author: String = "",
val info: String = "",
val dependencies: Set<PluginDependency> = setOf(),
val consoleRequirement: String? = null
val dependencies: Set<PluginDependency> = setOf()
) {
fun toJvmPluginDescription(): JvmPluginDescription {
return SimpleJvmPluginDescription(
id,
name ?: id,
version, author, info, dependencies,
consoleRequirement
version, author, info,
dependencies.filterTo(HashSet()) { it.id != "net.mamoe.mirai-console" },
dependencies.find { it.id == "net.mamoe.mirai-console" }?.versionRequirement
)
}
}