From e591a0c9c312ee92e523dff28989b46a37926964 Mon Sep 17 00:00:00 2001 From: akastijn Date: Fri, 4 Jul 2025 21:33:18 +0200 Subject: [PATCH] Refactor Login command to not crash you when you use it - Replace `TagResolver` with string replacement for resolving login messages. - Remove unused imports related to `TagResolver` and `Placeholder`. - Update `resolveLogin` method signature and logic to use string replacements. --- .../java/com/alttd/webinterface/commands/Login.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/alttd/webinterface/commands/Login.java b/src/main/java/com/alttd/webinterface/commands/Login.java index d99af46..d20b47c 100644 --- a/src/main/java/com/alttd/webinterface/commands/Login.java +++ b/src/main/java/com/alttd/webinterface/commands/Login.java @@ -10,8 +10,6 @@ import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.jetbrains.annotations.NotNull; public class Login { @@ -27,7 +25,7 @@ public class Login { } AuthService.getLoginCodeAsync(player.getUniqueId()).thenAccept(optionalLoginCode -> { optionalLoginCode.ifPresentOrElse((loginCode) -> { - player.sendMessage(MiniMessage.miniMessage().deserialize(Config.YOUR_LOGIN_CODE, resolveLogin(loginCode))); + player.sendMessage(MiniMessage.miniMessage().deserialize(resolveLogin(Config.YOUR_LOGIN_CODE, loginCode))); }, () -> { player.sendMessage(MiniMessage.miniMessage().deserialize("Failed to get login code.")); }); @@ -44,10 +42,9 @@ public class Login { proxyServer.getCommandManager().register(metaStart, brigadierCommandStart); } - private @NotNull TagResolver resolveLogin(String loginCode) { - return TagResolver.resolver( - Placeholder.unparsed("login_endpoint", Config.LOGIN_ENDPOINT), - Placeholder.unparsed("code", loginCode) - ); + private @NotNull String resolveLogin(String message, String loginCode) { + return message + .replace("", Config.LOGIN_ENDPOINT) + .replace("", loginCode); } }