From 401f56100289fb97aebb20c08385a369663d475b Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:37:27 -0500 Subject: [PATCH 1/3] Update adventure versions --- Essentials/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Essentials/build.gradle b/Essentials/build.gradle index f6b35b3686f..3b91c946ebf 100644 --- a/Essentials/build.gradle +++ b/Essentials/build.gradle @@ -14,9 +14,9 @@ dependencies { implementation 'org.checkerframework:checker-qual:3.21.0' implementation 'nu.studer:java-ordered-properties:1.0.4' - implementation 'net.kyori:adventure-api:4.17.0' - implementation 'net.kyori:adventure-text-minimessage:4.17.0' - implementation 'net.kyori:adventure-platform-bukkit:4.3.3' + implementation 'net.kyori:adventure-api:4.18.0' + implementation 'net.kyori:adventure-text-minimessage:4.18.0' + implementation 'net.kyori:adventure-platform-bukkit:4.3.4' // Providers api project(':providers:BaseProviders') From b48e9479e13760d6f146cdff37697c82bd67ed71 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:42:36 -0500 Subject: [PATCH 2/3] Revert 421945070545843e031d36f78d575e4747a11513 Hotfix is no longer needed as it has been fixed in adventure. --- .../essentials/utils/AdventureUtil.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/AdventureUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/AdventureUtil.java index e32d4d218f8..aa5cd68d595 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/AdventureUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/AdventureUtil.java @@ -4,17 +4,10 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.flattener.ComponentFlattener; import net.kyori.adventure.text.format.NamedTextColor; -import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; -import net.kyori.adventure.text.serializer.legacy.CharacterAndFormat; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import net.kyori.adventure.text.serializer.legacy.Reset; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; public final class AdventureUtil { private static final LegacyComponentSerializer LEGACY_SERIALIZER; @@ -25,25 +18,8 @@ public final class AdventureUtil { private static MiniMessage miniMessageInstance; static { - final List formats = new ArrayList<>(); - formats.addAll(CharacterAndFormat.defaults()); - formats.addAll(Arrays.asList( - CharacterAndFormat.characterAndFormat('A', NamedTextColor.GREEN), - CharacterAndFormat.characterAndFormat('B', NamedTextColor.AQUA), - CharacterAndFormat.characterAndFormat('C', NamedTextColor.RED), - CharacterAndFormat.characterAndFormat('D', NamedTextColor.LIGHT_PURPLE), - CharacterAndFormat.characterAndFormat('E', NamedTextColor.YELLOW), - CharacterAndFormat.characterAndFormat('F', NamedTextColor.WHITE), - CharacterAndFormat.characterAndFormat('K', TextDecoration.OBFUSCATED), - CharacterAndFormat.characterAndFormat('L', TextDecoration.BOLD), - CharacterAndFormat.characterAndFormat('M', TextDecoration.STRIKETHROUGH), - CharacterAndFormat.characterAndFormat('N', TextDecoration.UNDERLINED), - CharacterAndFormat.characterAndFormat('O', TextDecoration.ITALIC), - CharacterAndFormat.characterAndFormat('R', Reset.INSTANCE) - )); final LegacyComponentSerializer.Builder builder = LegacyComponentSerializer.builder() .flattener(ComponentFlattener.basic()) - .formats(formats) .useUnusualXRepeatedCharacterHexFormat(); if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_16_1_R01)) { builder.hexColors(); From 382f301d9d392f4b3bfd84d8cff26121ddf9de80 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:50:42 -0500 Subject: [PATCH 3/3] Fix adventure error when using color in local chat We were feeding legacy text into miniToLegacy which logs an annoying message in console --- .../essentials/chat/processing/AbstractChatHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java index 6853d1bf14d..8bdd79f7f2d 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java @@ -228,7 +228,7 @@ protected void handleChatRecipients(AsyncPlayerChatEvent event) { server.getPluginManager().callEvent(spyEvent); if (!spyEvent.isCancelled()) { - final String legacyString = AdventureUtil.miniToLegacy(String.format(spyEvent.getFormat(), AdventureUtil.legacyToMini(user.getDisplayName()), AdventureUtil.escapeTags(spyEvent.getMessage()))); + final String legacyString = AdventureUtil.miniToLegacy(String.format(spyEvent.getFormat(), AdventureUtil.legacyToMini(user.getDisplayName()), AdventureUtil.legacyToMini(AdventureUtil.escapeTags(spyEvent.getMessage())))); for (final Player onlinePlayer : spyEvent.getRecipients()) { onlinePlayer.sendMessage(legacyString);