From e5e74f30a05ac02548f0b5dcfee80281cdb71f1f Mon Sep 17 00:00:00 2001 From: James Lyne Date: Mon, 14 Aug 2023 23:32:40 +0100 Subject: [PATCH] Use minimessage for chat formatting/prefixes --- .idea/compiler.xml | 17 +++++++++-------- ...itypowered_velocity_api_3_2_0_SNAPSHOT.xml | 4 ++-- ...Gradle__net_kyori_adventure_api_4_13_1.xml | 9 --------- ...Gradle__net_kyori_adventure_key_4_13_1.xml | 9 --------- ...yori_adventure_text_minimessage_4_13_1.xml | 9 --------- ..._adventure_text_serializer_gson_4_13_1.xml | 9 --------- ...dventure_text_serializer_legacy_4_13_1.xml | 9 --------- ...adventure_text_serializer_plain_4_13_1.xml | 9 --------- .idea/modules/ProxyDiscord.main.iml | 17 +++++++++-------- .../ProxyDiscord.ProxyDiscordAPI.main.iml | 19 ++++++++++--------- src/java/uk/co/notnull/proxydiscord/Util.java | 8 ++------ .../logging/LoggingChannelHandler.java | 4 ++-- 12 files changed, 34 insertions(+), 89 deletions(-) delete mode 100644 .idea/libraries/Gradle__net_kyori_adventure_api_4_13_1.xml delete mode 100644 .idea/libraries/Gradle__net_kyori_adventure_key_4_13_1.xml delete mode 100644 .idea/libraries/Gradle__net_kyori_adventure_text_minimessage_4_13_1.xml delete mode 100644 .idea/libraries/Gradle__net_kyori_adventure_text_serializer_gson_4_13_1.xml delete mode 100644 .idea/libraries/Gradle__net_kyori_adventure_text_serializer_legacy_4_13_1.xml delete mode 100644 .idea/libraries/Gradle__net_kyori_adventure_text_serializer_plain_4_13_1.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a874630..c488ad4 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -5,20 +5,22 @@ - + - + + + + + + + - - - - @@ -26,7 +28,6 @@ - @@ -34,9 +35,9 @@ - + diff --git a/.idea/libraries/Gradle__com_velocitypowered_velocity_api_3_2_0_SNAPSHOT.xml b/.idea/libraries/Gradle__com_velocitypowered_velocity_api_3_2_0_SNAPSHOT.xml index 246abef..eee523a 100644 --- a/.idea/libraries/Gradle__com_velocitypowered_velocity_api_3_2_0_SNAPSHOT.xml +++ b/.idea/libraries/Gradle__com_velocitypowered_velocity_api_3_2_0_SNAPSHOT.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_kyori_adventure_api_4_13_1.xml b/.idea/libraries/Gradle__net_kyori_adventure_api_4_13_1.xml deleted file mode 100644 index a1e0d87..0000000 --- a/.idea/libraries/Gradle__net_kyori_adventure_api_4_13_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_kyori_adventure_key_4_13_1.xml b/.idea/libraries/Gradle__net_kyori_adventure_key_4_13_1.xml deleted file mode 100644 index 5010a33..0000000 --- a/.idea/libraries/Gradle__net_kyori_adventure_key_4_13_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_kyori_adventure_text_minimessage_4_13_1.xml b/.idea/libraries/Gradle__net_kyori_adventure_text_minimessage_4_13_1.xml deleted file mode 100644 index 8f12c1e..0000000 --- a/.idea/libraries/Gradle__net_kyori_adventure_text_minimessage_4_13_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_gson_4_13_1.xml b/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_gson_4_13_1.xml deleted file mode 100644 index 13a460d..0000000 --- a/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_gson_4_13_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_legacy_4_13_1.xml b/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_legacy_4_13_1.xml deleted file mode 100644 index 95ee4b5..0000000 --- a/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_legacy_4_13_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_plain_4_13_1.xml b/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_plain_4_13_1.xml deleted file mode 100644 index a668c8f..0000000 --- a/.idea/libraries/Gradle__net_kyori_adventure_text_serializer_plain_4_13_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/ProxyDiscord.main.iml b/.idea/modules/ProxyDiscord.main.iml index fe275c1..d9e6f6d 100644 --- a/.idea/modules/ProxyDiscord.main.iml +++ b/.idea/modules/ProxyDiscord.main.iml @@ -22,17 +22,17 @@ - + + + + + - - - - @@ -43,6 +43,10 @@ + + + + @@ -54,9 +58,6 @@ - - - diff --git a/.idea/modules/ProxyDiscordApi/ProxyDiscord.ProxyDiscordAPI.main.iml b/.idea/modules/ProxyDiscordApi/ProxyDiscord.ProxyDiscordAPI.main.iml index 0ccecf6..27291eb 100644 --- a/.idea/modules/ProxyDiscordApi/ProxyDiscord.ProxyDiscordAPI.main.iml +++ b/.idea/modules/ProxyDiscordApi/ProxyDiscord.ProxyDiscordAPI.main.iml @@ -12,21 +12,26 @@ - + + + + + - - - - + + + + + @@ -38,9 +43,5 @@ - - - - \ No newline at end of file diff --git a/src/java/uk/co/notnull/proxydiscord/Util.java b/src/java/uk/co/notnull/proxydiscord/Util.java index 777c789..7735deb 100644 --- a/src/java/uk/co/notnull/proxydiscord/Util.java +++ b/src/java/uk/co/notnull/proxydiscord/Util.java @@ -34,7 +34,6 @@ import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.flattener.ComponentFlattener; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.luckperms.api.model.user.User; import org.checkerframework.checker.nullness.qual.NonNull; @@ -83,9 +82,6 @@ public class Util { } }).build(); - public static final LegacyComponentSerializer legacySerializer = LegacyComponentSerializer.builder() - .extractUrls().character('&').hexColors().useUnusualXRepeatedCharacterHexFormat().build(); - public static final PlainTextComponentSerializer plainSerializer = PlainTextComponentSerializer.plainText(); public static final PlainTextComponentSerializer plainStripMarkdownSerializer = PlainTextComponentSerializer .builder().flattener(stripMarkdownFlattener).build(); @@ -239,9 +235,9 @@ public static String formatLogEntry(@NotNull String format, DateFormat dateForma */ public static String prepareLogMessage(String message, boolean codeBlock) { if(codeBlock) { - return plainSerializer.serialize(legacySerializer.deserialize(message)).replace("```", ""); + return plainSerializer.serialize(miniMessage.deserialize(message)).replace("```", ""); } else { - return plainStripMarkdownSerializer.serialize(legacySerializer.deserialize(message)); + return plainStripMarkdownSerializer.serialize(miniMessage.deserialize(message)); } } diff --git a/src/java/uk/co/notnull/proxydiscord/logging/LoggingChannelHandler.java b/src/java/uk/co/notnull/proxydiscord/logging/LoggingChannelHandler.java index 9047181..b14efde 100644 --- a/src/java/uk/co/notnull/proxydiscord/logging/LoggingChannelHandler.java +++ b/src/java/uk/co/notnull/proxydiscord/logging/LoggingChannelHandler.java @@ -404,8 +404,8 @@ private void handleDiscordMessage(User user, MessageCreateEvent originalEvent, S placeholders.resolver(Placeholder.parsed("prefix", prefix)); placeholders.resolver(Placeholder.parsed("suffix", suffix)); } else { - placeholders.resolver(Placeholder.parsed("prefix", Util.miniMessage.serialize(Util.legacySerializer.deserialize(prefix)))); - placeholders.resolver(Placeholder.parsed("suffix", Util.miniMessage.serialize(Util.legacySerializer.deserialize(suffix)))); + placeholders.resolver(Placeholder.parsed("prefix", Util.miniMessage.serialize(Util.miniMessage.deserialize(prefix)))); + placeholders.resolver(Placeholder.parsed("suffix", Util.miniMessage.serialize(Util.miniMessage.deserialize(suffix)))); } Component messageComponent = Util.miniMessage.deserialize(ingameChatFormat, placeholders.build());