Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Even more minimessage pain

Browse Source
This commit is contained in:
Auxilor
2022-03-04 10:50:02 +00:00
parent 2fdbe0da28
commit 1fc9d66457
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eco-api/src/main/java/com/willfp/eco/util/StringUtils.java
View File

@@ -323,10 +323,11 @@ public final class StringUtils {
private static String processFormatting(@NotNull final String message) {
String processedMessage = message;
// Run MiniMessage first so it doesn't complain
processedMessage = translateMiniMessage(processedMessage);
processedMessage = ChatColor.translateAlternateColorCodes('&', processedMessage);
processedMessage = translateGradients(processedMessage);
processedMessage = translateHexColorCodes(processedMessage);
processedMessage = translateMiniMessage(processedMessage);
return processedMessage;
}

5
eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/MiniMessageTranslator.kt
View File

@@ -3,9 +3,12 @@ package com.willfp.eco.internal.spigot.proxy.v1_18_R2
import com.willfp.eco.internal.spigot.proxy.MiniMessageTranslatorProxy
import com.willfp.eco.util.toLegacy
import net.kyori.adventure.text.minimessage.MiniMessage
import net.md_5.bungee.api.ChatColor
class MiniMessageTranslator : MiniMessageTranslatorProxy {
override fun format(message: String): String {
return MiniMessage.miniMessage().deserialize(message).toLegacy()
return MiniMessage.miniMessage().deserialize(
ChatColor.stripColor(message) // 4.10.0 is annoying
).toLegacy()
}
}