Playerstats command (#139)

Implement the `/playerstats` command. 

- make API wrappers async & thread-safe
- implement playerstats command for 1.8.9
- bundle brigadier client-side (on 1.8.9) to hopefully enable better
abstraction cross-version
- move class `LevelHead` -> module `common` since it doesn't depend on
MC.

TODO:
- [x] split `HypixelAbstractionLayer` to two parts: one to handle API
and the other to handle game/transient state
- [ ] configurable cache size
- [x] port to other versions
- [x] clean up rate-limit logic
- [x] implement for other games
- [x] add pretty colors

Non goals (for this PR):
- Overlay

Author: moehreag

1.16_combat-6/src/main/java/io/github/axolotlclient/api/AddFriendScreen.java

@@ -22,8 +22,6 @@
 
 package io.github.axolotlclient.api;
 
-import java.util.UUID;
-
 import io.github.axolotlclient.api.requests.FriendRequest;
 import io.github.axolotlclient.api.util.UUIDHelper;
 import io.github.axolotlclient.util.notifications.Notifications;
@@ -36,13 +34,7 @@ public AddFriendScreen(Screen parent) {
 		super(parent, new TranslatableText("api.screen.friends.add"),
 			new TranslatableText("api.screen.friends.add.name"), s -> {
 				if (API.getInstance().isSocketConnected()) {
-					String uuid;
-					try {
-						uuid = API.getInstance().sanitizeUUID(UUID.fromString(s).toString());
-					} catch (IllegalArgumentException e) {
-						uuid = UUIDHelper.getUuid(s);
-					}
-					FriendRequest.getInstance().addFriend(uuid);
+					UUIDHelper.ensureUuid(s).thenAccept(FriendRequest.getInstance()::addFriend);
 				} else {
 					Notifications.getInstance().addStatus("api.error.notLoggedIn", "api.error.notLoggedIn.desc");
 				}

1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChannelInvitesScreen.java

@@ -22,6 +22,8 @@
 
 package io.github.axolotlclient.api.chat;
 
+import java.util.concurrent.CompletableFuture;
+
 import io.github.axolotlclient.AxolotlClientConfig.impl.ui.vanilla.widgets.PlainTextButtonWidget;
 import io.github.axolotlclient.api.requests.ChannelRequest;
 import io.github.axolotlclient.api.types.ChannelInvite;
@@ -105,16 +107,19 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
 		private class InvitesListEntry extends Entry<InvitesListEntry> {
 
 			private final ChannelInvite invite;
+			private final CompletableFuture<String> fromName;
 
 			public InvitesListEntry(ChannelInvite invite) {
 				this.invite = invite;
+				this.fromName = UUIDHelper.tryGetUsernameAsync(invite.fromUuid());
 			}
 
 			@Override
 			public void render(MatrixStack graphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) {
 				drawTextWithShadow(graphics, textRenderer, new TranslatableText("api.channels.invite.name", invite.channelName()), left + 2, top + 2, -1);
-				drawTextWithShadow(graphics, textRenderer, new TranslatableText("api.channels.invite.from", UUIDHelper.getUsername(invite.fromUuid())).setStyle(Style.EMPTY.withItalic(true)), left + 15, top + height - textRenderer.fontHeight - 1, 0x808080);
-
+				if (fromName.isDone()) {
+					drawTextWithShadow(graphics, textRenderer, new TranslatableText("api.channels.invite.from", fromName.join()).setStyle(Style.EMPTY.withItalic(true)), left + 15, top + height - textRenderer.fontHeight - 1, 0x808080);
+				}
 			}
 		}
 	}

1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/CreateChannelScreen.java

@@ -33,7 +33,6 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.util.DrawUtil;
 import io.github.axolotlclient.api.requests.ChannelRequest;
 import io.github.axolotlclient.api.types.Persistence;
-import io.github.axolotlclient.api.util.UUIDHelper;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.AbstractButtonWidget;
@@ -148,7 +147,7 @@ public Persistence.Type getValue() {
 		addButton(new ButtonWidget(width / 2 + 4, footerY, 150, 20, ScreenTexts.DONE, widget -> {
 			ChannelRequest.createChannel(nameField.getText(),
 					Persistence.of(persistence.getValue(), count.get().get(), duration.get().get()),
-					Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).map(UUIDHelper::ensureUuid).toArray(String[]::new))
+					Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).toArray(String[]::new))
 				.thenRun(() -> client.execute(() -> client.openScreen(parent)));
 			;
 		}));

1.16_combat-6/src/main/java/io/github/axolotlclient/commands/PlayerArgument.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2024 moehreag <moehreag@gmail.com> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.commands;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.regex.Pattern;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import io.github.axolotlclient.api.util.UUIDHelper;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import org.jetbrains.annotations.Nullable;
+
+public class PlayerArgument implements ArgumentType<PlayerArgument.PlayerInfo> {
+	public static final class PlayerInfo {
+		private final String playerName;
+		@Nullable
+		private CompletableFuture<Optional<String>> uuid;
+
+		public PlayerInfo(String playerName) {
+			this.playerName = playerName;
+		}
+
+		public String playerName() {
+			return playerName;
+		}
+
+		public CompletableFuture<Optional<String>> uuid() {
+			if (uuid == null) {
+				uuid = UUIDHelper.USERNAME_TO_UUID.getAsync(playerName);
+			}
+
+			return uuid;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj == this) return true;
+			if (obj == null || obj.getClass() != this.getClass()) return false;
+			var that = (PlayerInfo) obj;
+			return Objects.equals(this.playerName, that.playerName) &&
+				Objects.equals(this.uuid, that.uuid);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(playerName, uuid);
+		}
+
+		@Override
+		public String toString() {
+			return "PlayerInfo[" +
+				"playerName=" + playerName + ", " +
+				"uuid=" + uuid + ']';
+		}
+
+	}
+
+	private static final Pattern NAME_REGEX = Pattern.compile("[a-zA-Z0-9_]{2,16}");
+
+	@Override
+	public PlayerInfo parse(StringReader stringReader) {
+		String playerName = stringReader.readUnquotedString();
+		return new PlayerInfo(playerName);
+	}
+
+	@Override
+	public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+		ClientPlayNetworkHandler handler = MinecraftClient.getInstance().getNetworkHandler();
+		if (handler == null) {
+			return builder.buildFuture();
+		}
+
+		handler.getPlayerList()
+			.stream()
+			.map(playerInfo -> playerInfo.getProfile().getName())
+			.filter(name -> NAME_REGEX.matcher(name).matches())
+			.filter(name -> name.toLowerCase(Locale.ROOT).startsWith(builder.getRemaining().toLowerCase(Locale.ROOT)))
+			.forEach(builder::suggest);
+
+		return builder.buildFuture();
+	}
+
+	public static PlayerInfo get(CommandContext<?> context, String name) {
+		return context.getArgument(name, PlayerInfo.class);
+	}
+
+	public static PlayerArgument player() {
+		return new PlayerArgument();
+	}
+}

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/ClientWorldMixin.java

@@ -43,7 +43,7 @@ public abstract class ClientWorldMixin {
 		Entity entity = this.getEntityById(entityId);
 		if (entity instanceof PlayerEntity && HypixelMods.getInstance().cacheMode.get()
 			.equals(HypixelMods.HypixelCacheMode.ON_PLAYER_DISCONNECT.toString())) {
-			HypixelAbstractionLayer.handleDisconnectEvents(entity.getUuid());
+			HypixelAbstractionLayer.getInstance().handleDisconnectEvents(entity.getUuid());
 		}
 	}
 

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java

@@ -25,10 +25,8 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.api.requests.UserRequest;
-import io.github.axolotlclient.modules.hypixel.HypixelAbstractionLayer;
 import io.github.axolotlclient.modules.hypixel.bedwars.BedwarsMod;
 import io.github.axolotlclient.modules.hypixel.levelhead.LevelHead;
-import io.github.axolotlclient.modules.hypixel.levelhead.LevelHeadMode;
 import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
 import io.github.axolotlclient.util.Util;
 import net.minecraft.client.MinecraftClient;
@@ -131,11 +129,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
 							light);
 					}
 				} else if (LevelHead.getInstance().enabled.get()) {
-					String text = "Level: " + HypixelAbstractionLayer.getPlayerLevel(String.valueOf(entity.getUuid()), LevelHead.getInstance().mode.get());
-
-					if (LevelHead.getInstance().mode.get().equals(LevelHeadMode.BEDWARS)) {
-						text += "☆";
-					}
+					String text = LevelHead.getInstance().getDisplayString(entity.getUuid().toString());
 
 					float x = -textRenderer.getWidth(text) / 2F;
 					float y = string.getString().contains("deadmau5") ? -20 : -10;

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/GameMenuScreenMixin.java

@@ -86,7 +86,7 @@ public void addClientOptionsButton(Args args) {
 		return (buttonWidget) -> {
 			if (Objects.equals(HypixelMods.getInstance().cacheMode.get(),
 				HypixelMods.HypixelCacheMode.ON_CLIENT_DISCONNECT.toString())) {
-				HypixelAbstractionLayer.clearPlayerData();
+				HypixelAbstractionLayer.getInstance().clearPlayerData();
 			}
 			onPress.onPress(buttonWidget);
 		};

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java

@@ -30,10 +30,11 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.api.requests.UserRequest;
-import io.github.axolotlclient.modules.hypixel.HypixelAbstractionLayer;
+import io.github.axolotlclient.api.util.UUIDHelper;
 import io.github.axolotlclient.modules.hypixel.bedwars.BedwarsGame;
 import io.github.axolotlclient.modules.hypixel.bedwars.BedwarsMod;
 import io.github.axolotlclient.modules.hypixel.bedwars.BedwarsPlayer;
+import io.github.axolotlclient.modules.hypixel.levelhead.LevelHead;
 import io.github.axolotlclient.modules.hypixel.levelhead.LevelHeadMode;
 import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
 import io.github.axolotlclient.modules.tablist.Tablist;
@@ -181,9 +182,8 @@ private Text nickHider(PlayerListEntry entry, Operation<Text> original) {
 				return;
 			}
 
-			render = String.valueOf(HypixelAbstractionLayer.getPlayerLevel(playerListEntry2
-					.getProfile().getId().toString().replace("-", ""),
-				LevelHeadMode.BEDWARS));
+			String uuid = UUIDHelper.toUndashed(playerListEntry2.getProfile().getId());
+			render = LevelHead.getDisplayString(LevelHeadMode.BEDWARS, uuid);
 		} catch (Exception e) {
 			return;
 		}

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/ReloadableResourceManagerMixin.java

@@ -47,7 +47,7 @@ public abstract class ReloadableResourceManagerMixin {
 	@Inject(method = "beginMonitoredReload", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ReloadableResourceManagerImpl;beginReloadInner(Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/resource/ResourceReloadMonitor;"))
 	public void axolotlclient$reload(Executor prepareExecutor, Executor applyExecutor, CompletableFuture<Unit> initialStage,
 									 List<ResourcePack> packs, CallbackInfoReturnable<ResourceReloadMonitor> cir) {
-		HypixelAbstractionLayer.clearPlayerData();
+		HypixelAbstractionLayer.getInstance().clearPlayerData();
 
 		PackDisplayHud hud = (PackDisplayHud) HudManager.getInstance().get(PackDisplayHud.ID);
 		if (hud != null) {

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/ScreenshotRecorderMixin.java

@@ -23,20 +23,21 @@
 package io.github.axolotlclient.mixin;
 
 import java.io.File;
+import java.util.function.Consumer;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.axolotlclient.modules.screenshotUtils.ScreenshotUtils;
 import net.minecraft.text.MutableText;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(net.minecraft.client.util.ScreenshotUtils.class)
 public abstract class ScreenshotRecorderMixin {
 
-	@WrapOperation(method = "method_1661", at = @At(value = "INVOKE", target = "Lnet/minecraft/text/TranslatableText;<init>(Ljava/lang/String;[Ljava/lang/Object;)V", ordinal = 0))
-	private static MutableText axolotlclient$onScreenshotSaveSuccess(String s, Object[] objects, Operation<MutableText> original, @Local(argsOnly = true) File target) {
-		return ScreenshotUtils.getInstance().onScreenshotTaken(original.call(s, objects), target);
+	// for some reason @WrapOperation doesn't like injecting at <init>
+	@Redirect(method = "method_1661", at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V", ordinal = 0))
+	private static void axolotlclient$onScreenshotSaveSuccess(Consumer<MutableText> instance, Object t, @Local(argsOnly = true) File target) {
+		instance.accept(ScreenshotUtils.getInstance().onScreenshotTaken((MutableText) t, target));
 	}
 }