From f0c85c96bb7e291bb200aca7146570910d6efacd Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 23 Dec 2020 16:10:07 +0800 Subject: [PATCH] Update linkie-core to 1.0.45 Signed-off-by: shedaniel --- build.gradle | 4 +--- .../commands/QueryTranslateFieldCommand.kt | 4 ++-- .../commands/QueryTranslateMethodCommand.kt | 7 +++--- .../discord/utils/QueryMessageBuilder.kt | 23 +++++++++++-------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 56a9917..c8b58b6 100644 --- a/build.gradle +++ b/build.gradle @@ -36,9 +36,7 @@ repositories { } dependencies { - compile("me.shedaniel:linkie-core:1.0.44") { - exclude module: "tiny-mappings-parser" - } + compile("me.shedaniel:linkie-core:1.0.45") compile("com.discord4j:discord4j-core:3.1.3-SNAPSHOT") { force = true } diff --git a/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateFieldCommand.kt b/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateFieldCommand.kt index 9feda2f..2fcf4ee 100644 --- a/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateFieldCommand.kt +++ b/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateFieldCommand.kt @@ -25,7 +25,7 @@ import me.shedaniel.linkie.discord.* import me.shedaniel.linkie.discord.utils.* import me.shedaniel.linkie.utils.dropAndTake import me.shedaniel.linkie.utils.onlyClass -import me.shedaniel.linkie.utils.remapFieldDescriptor +import me.shedaniel.linkie.utils.remapDescriptor import java.time.Duration import java.util.concurrent.atomic.AtomicInteger import kotlin.math.ceil @@ -105,7 +105,7 @@ class QueryTranslateFieldCommand(private val source: Namespace, private val targ val targetField = targetClass.fields.firstOrNull { it.obfName.merged == obfName } ?: return@inner remappedFields[FieldCompound( sourceClassParent.optimumName.onlyClass() + "#" + sourceField.optimumName, - sourceField.obfDesc.merged ?: sourceField.intermediaryDesc.remapFieldDescriptor { + sourceField.obfDesc.merged ?: sourceField.intermediaryDesc.remapDescriptor { sourceMappings.getClass(it)?.obfName?.merged ?: it } )] = diff --git a/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateMethodCommand.kt b/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateMethodCommand.kt index 25a3a64..79d6bbb 100644 --- a/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateMethodCommand.kt +++ b/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryTranslateMethodCommand.kt @@ -25,7 +25,7 @@ import me.shedaniel.linkie.discord.* import me.shedaniel.linkie.discord.utils.* import me.shedaniel.linkie.utils.dropAndTake import me.shedaniel.linkie.utils.onlyClass -import me.shedaniel.linkie.utils.remapFieldDescriptor +import me.shedaniel.linkie.utils.remapDescriptor import java.time.Duration import java.util.concurrent.atomic.AtomicInteger import kotlin.math.ceil @@ -106,11 +106,10 @@ class QueryTranslateMethodCommand(private val source: Namespace, private val tar val targetMethod = targetClass.methods.firstOrNull { it.obfName.merged == obfName && it.obfDesc.merged == obfDesc } ?: return@inner remappedMethods[MethodCompound( sourceClassParent.optimumName.onlyClass() + "#" + sourceMethod.optimumName, - sourceMethod.obfDesc.merged ?: sourceMethod.intermediaryDesc.remapFieldDescriptor { + sourceMethod.obfDesc.merged ?: sourceMethod.intermediaryDesc.remapDescriptor { sourceMappings.getClass(it)?.obfName?.merged ?: it } - )] = - targetClass.optimumName.onlyClass() + "#" + targetMethod.optimumName + )] = targetClass.optimumName.onlyClass() + "#" + targetMethod.optimumName } } } diff --git a/src/main/kotlin/me/shedaniel/linkie/discord/utils/QueryMessageBuilder.kt b/src/main/kotlin/me/shedaniel/linkie/discord/utils/QueryMessageBuilder.kt index 9a087f2..b1a5bc1 100644 --- a/src/main/kotlin/me/shedaniel/linkie/discord/utils/QueryMessageBuilder.kt +++ b/src/main/kotlin/me/shedaniel/linkie/discord/utils/QueryMessageBuilder.kt @@ -18,10 +18,15 @@ package me.shedaniel.linkie.discord.utils import discord4j.core.`object`.entity.User import discord4j.core.spec.EmbedCreateSpec -import me.shedaniel.linkie.* -import me.shedaniel.linkie.utils.MappingsQuery.localiseFieldDesc -import me.shedaniel.linkie.utils.MappingsQuery.mapObfDescToNamed -import me.shedaniel.linkie.utils.mapFieldIntermediaryDescToNamed +import me.shedaniel.linkie.Class +import me.shedaniel.linkie.Field +import me.shedaniel.linkie.MappingsContainer +import me.shedaniel.linkie.MappingsMetadata +import me.shedaniel.linkie.Method +import me.shedaniel.linkie.Namespace +import me.shedaniel.linkie.utils.localiseFieldDesc +import me.shedaniel.linkie.utils.mapIntermediaryDescToNamed +import me.shedaniel.linkie.utils.mapObfDescToNamed object QueryMessageBuilder { fun buildHeader(spec: EmbedCreateSpec, metadata: MappingsMetadata, page: Int, author: User, maxPage: Int) = spec.apply { @@ -53,14 +58,14 @@ object QueryMessageBuilder { append(field.mappedName.mapIfNotNullOrNotEquals(field.intermediaryName) { " => `$it`" } ?: "") if (namespace.supportsFieldDescription()) { appendLine().append("__Type__: ") - append((field.mappedDesc ?: field.intermediaryDesc.mapFieldIntermediaryDescToNamed(mappings)).localiseFieldDesc()) + append((field.mappedDesc ?: field.intermediaryDesc.mapIntermediaryDescToNamed(mappings)).localiseFieldDesc()) } if (namespace.supportsMixin()) { appendLine().append("__Mixin Target__: `") append("L${parent.optimumName};") append(field.optimumName) append(':') - append(field.mappedDesc ?: field.intermediaryDesc.mapFieldIntermediaryDescToNamed(mappings)) + append(field.mappedDesc ?: field.intermediaryDesc.mapIntermediaryDescToNamed(mappings)) append('`') } if (namespace.supportsAT()) { @@ -75,7 +80,7 @@ object QueryMessageBuilder { append(' ') append(field.optimumName) append(' ') - append(field.mappedDesc ?: field.intermediaryDesc.mapFieldIntermediaryDescToNamed(mappings)) + append(field.mappedDesc ?: field.intermediaryDesc.mapIntermediaryDescToNamed(mappings)) append('`') } } @@ -90,7 +95,7 @@ object QueryMessageBuilder { appendLine().append("__Mixin Target__: `") append("L${parent.optimumName};") append(method.optimumName) - append(method.mappedDesc ?: method.intermediaryDesc.mapFieldIntermediaryDescToNamed(mappings)) + append(method.mappedDesc ?: method.intermediaryDesc.mapIntermediaryDescToNamed(mappings)) append('`') } if (namespace.supportsAT()) { @@ -106,7 +111,7 @@ object QueryMessageBuilder { append(' ') append(method.optimumName) append(' ') - append(method.mappedDesc ?: method.intermediaryDesc.mapFieldIntermediaryDescToNamed(mappings)) + append(method.mappedDesc ?: method.intermediaryDesc.mapIntermediaryDescToNamed(mappings)) append('`') } }