From d824171262521557c73688068804c5d9119fbc7c Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sat, 29 Jun 2024 14:01:33 +0800 Subject: Refactor profile viewer command and update open screen commands --- .../skyblock/profileviewer/ProfileViewerScreen.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock/profileviewer') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java index 4829a712..1d0b21ca 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/ProfileViewerScreen.java @@ -3,7 +3,6 @@ package de.hysky.skyblocker.skyblock.profileviewer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.mojang.brigadier.Command; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import de.hysky.skyblocker.SkyblockerMod; @@ -190,17 +189,9 @@ public class ProfileViewerScreen extends Screen { ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> { LiteralArgumentBuilder literalArgumentBuilder = ClientCommandManager.literal("pv") .then(ClientCommandManager.argument("username", StringArgumentType.string()) - .executes(context -> { - String username = StringArgumentType.getString(context, "username"); - Command cmd = Scheduler.queueOpenScreenCommand(() -> new ProfileViewerScreen(username)); - return cmd.run(context); - }) + .executes(Scheduler.queueOpenScreenFactoryCommand(context -> new ProfileViewerScreen(StringArgumentType.getString(context, "username")))) ) - .executes(context -> { - String username = MinecraftClient.getInstance().getSession().getUsername(); - Command cmd = Scheduler.queueOpenScreenCommand(() -> new ProfileViewerScreen(username)); - return cmd.run(context); - }); + .executes(Scheduler.queueOpenScreenCommand(() -> new ProfileViewerScreen(MinecraftClient.getInstance().getSession().getUsername()))); dispatcher.register(literalArgumentBuilder); dispatcher.register(ClientCommandManager.literal(SkyblockerMod.NAMESPACE).then(literalArgumentBuilder)); }); -- cgit