Update NickMMCommand.java

Author: Telesphoreo

src/main/java/dev/plex/module/nickmm/command/NickMMCommand.java

@@ -7,24 +7,12 @@
 import dev.plex.command.SimplePlexCommand;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.module.nickmm.NickMiniMessageModule;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.Context;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.ParsingException;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class NickMMCommand extends SimplePlexCommand
@@ -33,7 +21,6 @@ public class NickMMCommand extends SimplePlexCommand
     private final PlainTextComponentSerializer plainText = PlainTextComponentSerializer.plainText();
     private final LegacyComponentSerializer legacyComponent = LegacyComponentSerializer.builder()
             .character('\u00a7').hexColors().useUnusualXRepeatedCharacterHexFormat().build();
-    private final MiniMessage miniMessage = MiniMessage.builder().tags(new NicknameTagResolver()).build();
 
     public NickMMCommand(NickMiniMessageModule module)
     {
@@ -63,7 +50,7 @@ private Component executeTyped(CommandSender commandSender, Player player, @Null
             return usage();
         }
 
-        final Component nick = miniMessage.deserialize(input).clickEvent(null).hoverEvent(null);
+        final Component nick = module.api().messages().playerText(input);
         final String plain = plainText.serialize(nick);
         AdventureFacet adventure = module.getEssentials().getAdventureFacet();
 
@@ -96,33 +83,4 @@ private Component executeTyped(CommandSender commandSender, Player player, @Null
         adventure.send(commandSender, adventure.deserializeMiniMessage(I18n.tlLiteral("nickSet", legacy)));
         return null;
     }
-
-    private static class NicknameTagResolver implements TagResolver
-    {
-        private static final TagResolver STANDARD_RESOLVER = TagResolver.standard();
-        private static final List<String> IGNORED_TAGS = Arrays.asList(
-                "click",
-                "hover",
-                "insertion",
-                "insert",
-                "obfuscated",
-                "obf",
-                "br",
-                "newline",
-                "lang",
-                "key",
-                "translate");
-
-        @Override
-        public @Nullable Tag resolve(@NotNull String name, @NotNull ArgumentQueue arguments, @NotNull Context ctx) throws ParsingException
-        {
-            return IGNORED_TAGS.contains(name.toLowerCase()) ? null : STANDARD_RESOLVER.resolve(name, arguments, ctx);
-        }
-
-        @Override
-        public boolean has(@NotNull String name)
-        {
-            return STANDARD_RESOLVER.has(name);
-        }
-    }
 }