Added pinning scores to the top of the list!

Author: SomeKitten

src/main/java/space/cutekitten/commandhelper/client/ClientDB.java

@@ -10,6 +10,7 @@ public class ClientDB {
     public static MinecraftClient client = MinecraftClient.getInstance();
     public static List<ScoreboardPlayerScore> scores = new ArrayList<>();
     public static List<ScoreboardPlayerScore> showScores = new ArrayList<>();
+    public static List<ScoreboardPlayerScore> pinnedScores = new ArrayList<>();
     public static String currentSearch = "";
     public static boolean customScoreboardActive = true;
 }

src/main/java/space/cutekitten/commandhelper/client/ScoreboardRenderer.java

@@ -10,16 +10,21 @@
 import space.cutekitten.commandhelper.mixin.HandledScreenAccessor;
 
 public class ScoreboardRenderer {
-    public static void renderScore(CreativeInventoryScreen screen, MatrixStack matrices, ScoreboardPlayerScore score, int index) {
+    public static void renderScore(CreativeInventoryScreen screen, MatrixStack matrices,
+                                   ScoreboardPlayerScore score, int index, boolean pinned) {
         TextRenderer textRenderer = ClientDB.client.textRenderer;
 
         int x = ((HandledScreenAccessor) screen).getX() + 9;
         int y = ((HandledScreenAccessor) screen).getY() + 18 + index * 18;
 
+        int colour = 0xFFFFFFFF;
+        if (pinned) {
+            colour = 0xFFFFFF00; // yellow
+        }
 //        main background
         fill(matrices.peek().getPositionMatrix(),
                 x - 1, y - 1, x + 18 * 9 - 2 + 1, y + 18 - 2 + 1, // rect bounds
-                0xFFFFFFFF, // argb color
+                colour, // argb color
                 screen.getZOffset());
         fill(matrices.peek().getPositionMatrix(),
                 x, y, x + 18 * 9 - 2, y + 18 - 2, // rect bounds

src/main/java/space/cutekitten/commandhelper/mixin/CreativeInventoryScreenMixin.java

@@ -55,7 +55,7 @@ private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, C
 
         for (int i = 0; i < Math.min(ClientDB.showScores.size(), 5); i++) {
             ScoreboardPlayerScore score = ClientDB.showScores.get(i);
-            ScoreboardRenderer.renderScore(screen, matrices, score, i);
+            ScoreboardRenderer.renderScore(screen, matrices, score, i, ClientDB.pinnedScores.contains(score));
         }
 
         for (int i = 0; i < Math.min(ClientDB.showScores.size(), 5); i++) {
@@ -156,14 +156,28 @@ private void search(CallbackInfo ci) {
                 }
             }
 
-//            don't sort if the amount of scores is too high!!!
+            Collator collator = Collator.getInstance(Locale.ROOT);
+            ClientDB.pinnedScores.sort((score1, score2) -> {
+                String score1Name = score1.getPlayerName();
+                String score2Name = score2.getPlayerName();
+                return collator.compare(score1Name, score2Name);
+            });
+            List<ScoreboardPlayerScore> sortedPins =
+                    ClientDB.pinnedScores.stream().filter(score ->
+                            score.getPlayerName().toLowerCase(Locale.ROOT).contains(searched)).toList();
+
+//            if the amount of scores is too high
             if (ClientDB.scores.size() > 10000) {
+                ClientDB.scores.removeAll(sortedPins);
+                ClientDB.scores.addAll(0, sortedPins);
                 return;
             }
 
 //            hopefully faster sorting than just sorting the whole list at once
             HashMap<Character, List<ScoreboardPlayerScore>> scoreByFirstChar = new HashMap<>();
             for (ScoreboardPlayerScore score : ClientDB.scores) {
+                if (sortedPins.contains(score)) continue;
+
                 char firstChar = score.getPlayerName().charAt(0);
                 if (!scoreByFirstChar.containsKey(firstChar)) {
                     scoreByFirstChar.put(firstChar, new ArrayList<>());
@@ -172,8 +186,8 @@ private void search(CallbackInfo ci) {
             }
 
             ClientDB.scores.clear();
+            ClientDB.scores.addAll(sortedPins);
 
-            Collator collator = Collator.getInstance(Locale.ROOT);
             for (char key : scoreByFirstChar.keySet().stream().sorted().toList()) {
                 List<ScoreboardPlayerScore> sortedScores = scoreByFirstChar.get(key);
                 sortedScores.sort((score1, score2) -> {
@@ -198,4 +212,28 @@ private void mouseScrolled(double mouseX, double mouseY, double amount, Callback
         ((CreativeInventoryScreen.CreativeScreenHandler)ClientDB.client.player.currentScreenHandler).scrollItems(this.scrollPosition);
         cir.setReturnValue(true);
     }
+
+    @Inject(method = "mouseClicked", at = @At("HEAD"))
+    private void onMouseClick(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
+        if (selectedTab != CommandHelper.ITEM_GROUP.getIndex()) return;
+        if (ClientDB.client.player == null) return;
+        if (button != 0) return;
+
+        for (int i = 0; i < Math.min(ClientDB.showScores.size(), 5); i++) {
+            ScoreboardPlayerScore score = ClientDB.showScores.get(i);
+
+            if (((HandledScreenAccessor)this).invokeIsPointWithinBounds(
+                    9,
+                    18 + 18 * i,
+                    18*9, 16, mouseX, mouseY)) {
+                if (ClientDB.pinnedScores.contains(score)) {
+                    ClientDB.pinnedScores.remove(score);
+                } else {
+                    ClientDB.pinnedScores.add(score);
+                }
+
+                this.search();
+            }
+        }
+    }
 }

src/main/java/space/cutekitten/commandhelper/mixin/InGameHudMixin.java

@@ -20,10 +20,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import space.cutekitten.commandhelper.client.ClientDB;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import static net.minecraft.client.gui.DrawableHelper.fill;
 
@@ -54,6 +51,8 @@ private void customRenderScoreboardSidebar(InGameHud instance, MatrixStack matri
             list.remove(list.size() - 1);
         }
 
+        Collections.reverse(list);
+
         List<Pair<ScoreboardPlayerScore, Text>> list2 = Lists.newArrayListWithCapacity(list.size());
         Text text = Text.of(ClientDB.currentSearch);
         int i = this.getTextRenderer().getWidth(text);
@@ -92,7 +91,8 @@ private void customRenderScoreboardSidebar(InGameHud instance, MatrixStack matri
             int var10001 = o - 2;
             Objects.requireNonNull(this.getTextRenderer());
             fill(matrices, var10001, t, u, t + 9, q);
-            this.getTextRenderer().draw(matrices, text3, (float) o, (float) t, -1);
+            this.getTextRenderer().draw(matrices, text3, (float) o, (float) t,
+                    ClientDB.pinnedScores.contains(scoreboardPlayerScore2) ? 0xFFFFFF00 : 0xFFFFFFFF);
             this.getTextRenderer().draw(matrices, string, (float) (u - this.getTextRenderer().getWidth(string)), (float) t, -1);
             if (p == list.size()) {
                 var10001 = o - 2;