From e045d88cfcf3ad876f6a06792d3076cb93113e23 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Tue, 3 Dec 2024 18:34:30 +0700 Subject: [PATCH] fix: fix format checker even though it's not going to be used --- build-number.txt | 2 +- .../chomens_bot/plugins/FormatCheckerPlugin.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build-number.txt b/build-number.txt index c00ea42d..65150d2b 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1147 \ No newline at end of file +1153 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java index 12c9540f..746ec2ee 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java @@ -10,7 +10,6 @@ import net.kyori.adventure.text.TranslationArgument; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.TextDecoration; -import org.jetbrains.annotations.NotNull; import java.nio.charset.StandardCharsets; import java.util.List; @@ -61,7 +60,7 @@ public class FormatCheckerPlugin extends ChatPlugin.Listener { final List args = format.arguments(); if (args.size() < 3 || !format.key().equals("[%s] %s › %s")) return false; - final TranslationArgument nameComponent = format.arguments().get(1); + final Object nameComponent = format.arguments().get(1).value(); if (!(nameComponent instanceof TextComponent)) return false; @@ -69,7 +68,7 @@ public class FormatCheckerPlugin extends ChatPlugin.Listener { if (!name.equals(bot.config.ownerName)) return false; - final Component prefix = (Component) format.arguments().get(0); + final Object prefix = format.arguments().get(0).value(); if ( ((prefix instanceof TextComponent text) && text.content().equals(bot.username + " Console")) || // ohio @@ -78,9 +77,7 @@ public class FormatCheckerPlugin extends ChatPlugin.Listener { if (!(prefix instanceof TranslatableComponent translatablePrefix)) return true; - final TranslationArgument userHash = translatablePrefix.arguments().get(0); - - if (userHash == null) return true; + final Object userHash = translatablePrefix.arguments().get(0).value(); if (!(userHash instanceof TextComponent userHashComponent)) return true;