build.gradle

@@ -1,9 +1,9 @@
 plugins {
-	id 'fabric-loom' version '0.10-SNAPSHOT'
+	id 'fabric-loom' version '1.0-SNAPSHOT'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -52,13 +52,8 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+	it.options.release = 17
-	// We'll use that if it's available, but otherwise we'll use the older option.
-	def targetVersion = 8
-	if (JavaVersion.current().isJava9Compatible()) {
-		 it.options.release = targetVersion
-	}
 }
 
 java {

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.16.5
+	minecraft_version=1.19.2
-	yarn_mappings=1.16.5+build.10
+	yarn_mappings=1.19.2+build.18
-	loader_version=0.12.11
+	loader_version=0.14.9
 # Mod Properties
-	mod_version = 1.1.3
+	mod_version = 1.1.5
 	maven_group = net.saltymc.eaa
 	archives_base_name = EAA_MOD
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api (or https://fabricmc.net/versions.html)
-	fabric_version=0.42.0+1.16
+	fabric_version=0.61.0+1.19.2
 
 #SQL
 jdbc_mysql=8.0.27

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/saltymc/eaa/commands/CheckLobbyCommand.java

@@ -2,14 +2,14 @@ package net.saltymc.eaa.commands;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.saltymc.eaa.function.LobbyFunction;
 import net.saltymc.eaa.util.database.DB_Tag;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.literal;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class CheckLobbyCommand extends EaaModCommand{
 

src/main/java/net/saltymc/eaa/commands/CheckPlayerCommand.java

@@ -3,12 +3,12 @@ package net.saltymc.eaa.commands;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.command.argument.EntityArgumentType;
 import net.saltymc.eaa.function.CheckFunction;
 
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.literal;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class CheckPlayerCommand extends EaaModCommand{
 

src/main/java/net/saltymc/eaa/commands/EaaModCommand.java

@@ -3,13 +3,15 @@ package net.saltymc.eaa.commands;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 
 public abstract class EaaModCommand implements Command<FabricClientCommandSource> {
 
     public EaaModCommand() {
-        this(ClientCommandManager.DISPATCHER);
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> this.register(dispatcher));
     }
 
     public EaaModCommand(CommandDispatcher<FabricClientCommandSource> dispatcher) {

src/main/java/net/saltymc/eaa/commands/EchoCommand.java

@@ -3,14 +3,13 @@ package net.saltymc.eaa.commands;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.toast.*;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.literal;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class EchoCommand extends EaaModCommand{
 
@@ -22,9 +21,9 @@ public class EchoCommand extends EaaModCommand{
         SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.TUTORIAL_HINT, Text.of("ECHO"), Text.of(nachricht));
 
         source.sendFeedback(
-                new LiteralText("You said: ")
+                Text.literal("You said: ")
                             .formatted(Formatting.RED)
-                            .append(new LiteralText(nachricht + ""))
+                            .append(Text.literal(nachricht + ""))
                             );
         return 1;
     }

src/main/java/net/saltymc/eaa/commands/ReloadCommand.java

@@ -2,12 +2,12 @@ package net.saltymc.eaa.commands;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.text.Text;
 import net.saltymc.eaa.function.TagFunction;
 
 
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.literal;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class ReloadCommand extends EaaModCommand{
 

src/main/java/net/saltymc/eaa/commands/TagCommand.java

@@ -4,16 +4,16 @@ import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.command.argument.EntityArgumentType;
 
 import net.saltymc.eaa.function.TagFunction;
 import net.saltymc.eaa.util.database.DB_Tag;
 
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
-import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.literal;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
-public class TagCommand extends EaaModCommand{
+public class TagCommand extends EaaModCommand {
 
     @Override
     public int run(CommandContext<FabricClientCommandSource> context) {

src/main/java/net/saltymc/eaa/custom/ping/CustomPlayerListHud.java

@@ -1,32 +1,14 @@
 package net.saltymc.eaa.custom.ping;
 
-import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.Ordering;
-import com.mojang.authlib.GameProfile;
 import com.mojang.blaze3d.systems.RenderSystem;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.hud.PlayerListHud;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.client.render.entity.PlayerModelPart;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.scoreboard.Scoreboard;
-import net.minecraft.scoreboard.ScoreboardCriterion;
-import net.minecraft.scoreboard.ScoreboardObjective;
-import net.minecraft.scoreboard.Team;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.Text;
-import net.minecraft.world.GameMode;
 import net.saltymc.eaa.function.TagFunction;
+import net.saltymc.eaa.mixin.PlayerListHudInvoker;
 
 /**
  * By: https://github.com/vladmarica/better-ping-display-fabric/
@@ -34,223 +16,58 @@ import net.saltymc.eaa.function.TagFunction;
 public final class CustomPlayerListHud {
 
     public static final PingConfig config = new PingConfig();
-
-    private static final Ordering<PlayerListEntry> ENTRY_ORDERING = Ordering.from(new EntryOrderComparator());
     private static final int PING_TEXT_RENDER_OFFSET = -13;
-    private static final int PLAYER_SLOT_EXTRA_WIDTH = 45;
-    private static final int PLAYER_ICON_WIDTH = 9;
     private static final int PING_BARS_WIDTH = 11;
+    private static final int OFFSET = 1;
 
-    public static void render(PlayerListHud hud, MatrixStack stack, int width, Scoreboard scoreboard, ScoreboardObjective obj) {
+    public static void renderPingDisplay(
-        MinecraftClient mc = MinecraftClient.getInstance();
+            MinecraftClient client, PlayerListHud hud, MatrixStack matrixStack, int width, int x, int y, PlayerListEntry player) {
-        TextRenderer textRenderer = mc.textRenderer;
+        TextRenderer textRenderer = client.textRenderer;
-        Text header = PlayerListHudUtil.getHeader(hud);
-        Text footer = PlayerListHudUtil.getFooter(hud);
 
-        ClientPlayNetworkHandler clientPlayNetworkHandler = mc.player.networkHandler;
+        String pingString = String.format(config.getTextFormatString(), player.getLatency());
-        List<PlayerListEntry> playerList = ENTRY_ORDERING.sortedCopy(clientPlayNetworkHandler.getPlayerList());
+        int pingStringWidth = textRenderer.getWidth(pingString);
-        int i = 0;
+        int pingTextColor = config.shouldAutoColorPingText() ? PingColors.getColor(player.getLatency()) : config.getTextColor();
-        int j = 0;
+        int textX = width + x - pingStringWidth + PING_TEXT_RENDER_OFFSET;
-        Iterator playerListIterator = playerList.iterator();
 
-        int n;
+        if (!config.shouldRenderPingBars()) {
-        while(playerListIterator.hasNext()) {
+            textX += PING_BARS_WIDTH;
-            PlayerListEntry playerListEntry = (PlayerListEntry)playerListIterator.next();
-            n = mc.textRenderer.getWidth(hud.getPlayerName(playerListEntry));
-            i = Math.max(i, n);
-            if (obj != null && obj.getRenderType() != ScoreboardCriterion.RenderType.HEARTS) {
-                n = textRenderer.getWidth(" " + scoreboard.getPlayerScore(playerListEntry.getProfile().getName(), obj).getScore());
-                j = Math.max(j, n);
-            }
         }
 
-        playerList = playerList.subList(0, Math.min(playerList.size(), 80));
+        // Draw the ping text for the given player
-        int l = playerList.size();
+        textRenderer.drawWithShadow(matrixStack, pingString, (float) textX, (float) y, pingTextColor);
-        int m = l;
 
-        for(n = 1; m > 20; m = (l + n - 1) / n) {
+        /*
-            ++n;
+         * PLAYER TAG
-        }
+         */
+        // Calculate position before ping display
+        String pingStringWith3Digits = String.format(config.getTextFormatString(), 900);    // Generate pingtext for 900ms
+        int pingStringWith3DigitsWidth = textRenderer.getWidth(pingStringWith3Digits); // calculate legth of text
+        int newX = x + width - pingStringWith3DigitsWidth + PING_TEXT_RENDER_OFFSET;        // fix offset looks nicer should be right before ping text if 3 digits long
+        int twoDigits = textRenderer.getWidth("10") + OFFSET ;
 
-        boolean displayPlayerIcons = mc.isInSingleplayer() || mc.getNetworkHandler().getConnection().isEncrypted();
+        int offset_tag_playername = newX - twoDigits;             // behind ping - length of grade text
-        int q;
+        TagDTO playerTAG = TagFunction.getScoreboardTag(player.getProfile().getId().toString()); // retrieve Tag object
-        if (obj != null) {
+
-            if (obj.getRenderType() == ScoreboardCriterion.RenderType.HEARTS) {
+        //float tmp_x = offset_tag_playername - ((twoDigits - textRenderer.getWidth(playerTAG.getGrade() < 1 ? "|" : playerTAG.getGrade() +"")) / 2.0f);
-                q = 90;
+        String gradeText = playerTAG.getGrade() < 1 ? "|" : playerTAG.getGrade() +""; // if not given draw a pipe
-            } else {
+        textRenderer.drawWithShadow(matrixStack,
-                q = j;
+                gradeText,
-            }
+                (float) offset_tag_playername + ((float)twoDigits - (textRenderer.getWidth(gradeText) / 2.0F )), (float) y, playerTAG.getGradeColor());
+
+        offset_tag_playername -= textRenderer.getWidth(playerTAG.getType().getTag()) + OFFSET;    // subtract tag name length to offset
+
+        textRenderer.drawWithShadow(matrixStack, playerTAG.getType().getTag(), (float)offset_tag_playername, (float)y, playerTAG.getType().getColor()); // draw tag name
+
+        /*
+         * END
+         */
+
+        if (config.shouldRenderPingBars()) {
+            ((PlayerListHudInvoker) hud).invokeRenderLatencyIcon(matrixStack, width, x, y, player);
         } else {
-            q = 0;
+            // If we don't render ping bars, we need to reset the render system color so the rest
-        }
+            // of the player list renders properly
-        int r = Math.min(n * ((displayPlayerIcons ? PLAYER_ICON_WIDTH : 0) + i + q + 13 + PLAYER_SLOT_EXTRA_WIDTH), width - 50) / n;
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        int s = width / 2 - (r * n + (n - 1) * 5) / 2;
-        int t = 10;
-        int u = r * n + (n - 1) * 5;
-        List<OrderedText> headerLines = null;
-        if (header != null) {
-            headerLines = mc.textRenderer.wrapLines(header, width - 50);
-
-            for (OrderedText headerLine : headerLines) {
-                u = Math.max(u, mc.textRenderer.getWidth(headerLine));
-            }
-        }
-
-        List<OrderedText> footerLines = null;
-        if (footer != null) {
-            footerLines = mc.textRenderer.wrapLines(footer, width - 50);
-
-            for (OrderedText footerLine : footerLines) {
-                u = Math.max(u, mc.textRenderer.getWidth(footerLine));
-            }
-        }
-
-        int var10000;
-        int var10001;
-        int var10002;
-        int var10004;
-        int y;
-        if (headerLines != null) {
-            var10000 = width / 2 - u / 2 - 1;
-            var10001 = t - 1;
-            var10002 = width / 2 + u / 2 + 1;
-            var10004 = headerLines.size();
-            DrawableHelper.fill(stack, var10000, var10001, var10002, t + var10004 * 9, Integer.MIN_VALUE);
-
-            for (OrderedText headerLine : headerLines) {
-                y = mc.textRenderer.getWidth(headerLine);
-                mc.textRenderer.drawWithShadow(stack, headerLine, (float)(width / 2 - y / 2), (float)t, -1);
-                t += 9;
-            }
-
-            ++t;
-        }
-
-        DrawableHelper.fill(stack, width / 2 - u / 2 - 1, t - 1, width / 2 + u / 2 + 1, t + m * 9, Integer.MIN_VALUE);
-        int w = mc.options.getTextBackgroundColor(553648127);
-
-        int ai;
-        for(int x = 0; x < l; ++x) {
-            y = x / m;
-            ai = x % m;
-            int aa = s + y * r + y * 5;
-            int ab = t + ai * 9;
-            DrawableHelper.fill(stack, aa, ab, aa + r, ab + 8, w);
-            RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-            RenderSystem.enableAlphaTest();
-            RenderSystem.enableBlend();
-            RenderSystem.defaultBlendFunc();
-            if (x < playerList.size()) {
-                PlayerListEntry player = playerList.get(x);
-                GameProfile gameProfile = player.getProfile();
-                int ah;
-                if (displayPlayerIcons) {
-                    PlayerEntity playerEntity = mc.world.getPlayerByUuid(gameProfile.getId());
-                    boolean bl2 = playerEntity != null && playerEntity.isPartVisible(PlayerModelPart.CAPE) && ("Dinnerbone".equals(gameProfile.getName()) || "Grumm".equals(gameProfile.getName()));
-                    mc.getTextureManager().bindTexture(player.getSkinTexture());
-                    ah = 8 + (bl2 ? 8 : 0);
-                    int ad = 8 * (bl2 ? -1 : 1);
-                    DrawableHelper.drawTexture(stack, aa, ab, 8, 8, 8.0F, (float)ah, 8, ad, 64, 64);
-                    if (playerEntity != null && playerEntity.isPartVisible(PlayerModelPart.HAT)) {
-                        int ae = 8 + (bl2 ? 8 : 0);
-                        int af = 8 * (bl2 ? -1 : 1);
-                        DrawableHelper.drawTexture(stack, aa, ab, 8, 8, 40.0F, (float)ae, 8, af, 64, 64);
-                    }
-
-                    aa += 9;
-                }
-
-                /*
-                 * PLAYER TAG
-                 */
-                int offset_tag_playername = aa;             // safe current x offset ->
-                TagDTO playerTAG = TagFunction.getScoreboardTag(player.getProfile().getId().toString()); // retrieve Tag object
-                mc.textRenderer.drawWithShadow(stack, playerTAG.getType().getTag(), (float)aa, (float)ab, playerTAG.getType().getColor()); // draw tag name
-
-                offset_tag_playername += mc.textRenderer.getWidth(playerTAG.getType().getTag()) + 1;    // add tag name length to offset
-
-                // current offset plus amount to center grade text
-                float tmp_x = offset_tag_playername
-                        + ((mc.textRenderer.getWidth("10") - mc.textRenderer.getWidth(playerTAG.getGrade() < 1 ? "|" : playerTAG.getGrade() +""))
-                                / 2.0f);
-                mc.textRenderer.drawWithShadow(stack,
-                        playerTAG.getGrade() < 1 ? "|" : playerTAG.getGrade() +"",  // if not given draw a pipe
-                        (float) tmp_x, (float) ab, playerTAG.getGradeColor());
-
-                offset_tag_playername += mc.textRenderer.getWidth("10") + 2;     // add offset of largest character
-
-
-                Text playerName = hud.getPlayerName(player);
-                if (player.getGameMode() == GameMode.SPECTATOR) {
-                    mc.textRenderer.drawWithShadow(stack, playerName, (float)offset_tag_playername, (float)ab, -1862270977);
-                } else {
-                    mc.textRenderer.drawWithShadow(stack, playerName, (float)offset_tag_playername, (float)ab, -1);
-                }
-
-                if (obj != null && player.getGameMode() != GameMode.SPECTATOR) {
-                    int ag = offset_tag_playername + i + 1;
-                    ah = ag + q;
-                    if (ah - ag > 5) {
-                        PlayerListHudUtil.renderScoreboardObjective(hud, stack, obj, ab, gameProfile.getName(), ag, ah, player);
-                    }
-                }
-
-                // Here is the magic, rendering the ping text
-                String pingString = String.format(config.getTextFormatString(), player.getLatency());
-                int pingStringWidth = textRenderer.getWidth(pingString);
-                int textX = r + aa - pingStringWidth + PING_TEXT_RENDER_OFFSET;
-
-                if (displayPlayerIcons) {
-                    textX -= PLAYER_ICON_WIDTH;
-                }
-
-                if (!config.shouldRenderPingBars()) {
-                    textX += PING_BARS_WIDTH;
-                }
-
-                int pingTextColor = config.shouldAutoColorPingText()
-                        ? PingColors.getColor(player.getLatency())
-                        : config.getTextColor();
-
-                textRenderer.drawWithShadow(stack, pingString, (float) textX, (float) ab, pingTextColor);
-
-                if (config.shouldRenderPingBars()) {
-                    PlayerListHudUtil.renderLatencyIcon(
-                            hud, stack, r, aa - (displayPlayerIcons ? PLAYER_ICON_WIDTH : 0), ab, player);
-                } else {
-                    // If we don't render ping bars, we need to reset the render system color so the rest
-                    // of the player list renders properly
-                    RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-                }
-            }
-        }
-
-        if (footerLines != null) {
-            t += m * 9 + 1;
-            var10000 = width / 2 - u / 2 - 1;
-            var10001 = t - 1;
-            var10002 = width / 2 + u / 2 + 1;
-            var10004 = footerLines.size();
-            DrawableHelper.fill(stack, var10000, var10001, var10002, t + var10004 * 9, Integer.MIN_VALUE);
-
-            for (OrderedText footerLine : footerLines) {
-                ai = textRenderer.getWidth(footerLine);
-                textRenderer.drawWithShadow(stack, footerLine, (float)(width / 2 - ai / 2), (float)t, -1);
-                t += 9;
-            }
-        }
-    }
-
-    @Environment(EnvType.CLIENT)
-    static class EntryOrderComparator implements Comparator<PlayerListEntry> {
-        public int compare(PlayerListEntry p1, PlayerListEntry p2) {
-            Team team = p1.getScoreboardTeam();
-            Team team2 = p2.getScoreboardTeam();
-            return ComparisonChain.start()
-                    .compareTrueFirst(p1.getGameMode() != GameMode.SPECTATOR, p2.getGameMode() != GameMode.SPECTATOR)
-                    .compare(team != null ? team.getName() : "", team2 != null ? team2.getName() : "")
-                    .compare(p1.getProfile().getName(), p2.getProfile().getName(), String::compareToIgnoreCase)
-                    .result();
         }
     }
 }

src/main/java/net/saltymc/eaa/custom/ping/PlayerListHudUtil.java

@@ -1,31 +0,0 @@
-package net.saltymc.eaa.custom.ping;
-
-import net.minecraft.client.gui.hud.PlayerListHud;
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.scoreboard.ScoreboardObjective;
-import net.minecraft.text.Text;
-import net.saltymc.eaa.mixin.PlayerListHudAccessor;
-
-/**
- * By: https://github.com/vladmarica/better-ping-display-fabric/
- */
-public class PlayerListHudUtil {
-    /** Calls {@link net.minecraft.client.gui.hud.PlayerListHud#renderLatencyIcon}. */
-    static void renderLatencyIcon(PlayerListHud hud, MatrixStack stack, int x, int offsetX, int y, PlayerListEntry player) {
-        ((PlayerListHudAccessor) hud).invokeRenderLatencyIcon(stack, x, offsetX, y, player);
-    }
-
-    /** Calls {@link net.minecraft.client.gui.hud.PlayerListHud#renderScoreboardObjective} */
-    static void renderScoreboardObjective(PlayerListHud hud, MatrixStack stack, ScoreboardObjective obj, int i, String str, int j, int k, PlayerListEntry player) {
-        ((PlayerListHudAccessor) hud).invokeRenderScoreboardObjective(obj, i, str, j, k, player, stack);
-    }
-
-    static Text getHeader(PlayerListHud hud) {
-        return ((PlayerListHudAccessor) hud).getHeader();
-    }
-
-    static Text getFooter(PlayerListHud hud) {
-        return ((PlayerListHudAccessor) hud).getFooter();
-    }
-}

src/main/java/net/saltymc/eaa/function/CheckFunction.java

@@ -1,9 +1,8 @@
 package net.saltymc.eaa.function;
 
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.toast.SystemToast;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextColor;
@@ -47,9 +46,8 @@ public class CheckFunction {
 
                 TagFunction.loadPlayer(playerUUID, true);
 
-                List<String> names = PlayerInfo.playerUUIDToNames(playerUUID);
+                String name = PlayerInfo.playerUUIDToName(playerUUID);
-                for (int i = 1; i <= names.size(); i++)
+                source.sendFeedback(Text.of(name));
-                    source.sendFeedback(Text.of(i + ". " + names.get(i-1)));
 
                 List<DB_Tag> tags = DB_Tag.getTagsFromPlayer(DB_Player.getPlayer(playerUUID));
                 if (tags.size() > 0) {
@@ -57,10 +55,10 @@ public class CheckFunction {
                     while (it.hasPrevious()) {
                         DB_Tag curr = it.previous();
 
-                        source.sendFeedback(new LiteralText(dateformat.format(curr.getTagDate())).formatted(Formatting.GRAY)
+                        source.sendFeedback(Text.literal(dateformat.format(curr.getTagDate())).formatted(Formatting.GRAY)
-                                .append(new LiteralText(" | "))
+                                .append(Text.literal(" | "))
-                                .append(new LiteralText(curr.getType().getTag()).setStyle(Style.EMPTY.withColor(TextColor.fromRgb(curr.getType().getColor()))))
+                                .append(Text.literal(curr.getType().getTag()).setStyle(Style.EMPTY.withColor(TextColor.fromRgb(curr.getType().getColor()))))
-                                .append(new LiteralText(" (" + curr.getGrade() + ") ").formatted(getScaleFormat(curr.getGrade())))
+                                .append(Text.literal(" (" + curr.getGrade() + ") ").formatted(getScaleFormat(curr.getGrade())))
                         );
                     }
                 } else {

src/main/java/net/saltymc/eaa/function/LobbyFunction.java

@@ -1,6 +1,6 @@
 package net.saltymc.eaa.function;
 
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.text.Text;
@@ -44,15 +44,13 @@ public class LobbyFunction {
                     }
                 }
 
-                switch (dangerLvl){
+                switch (dangerLvl) {
-                    case 0:
+                    case 0 ->
-                        SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.WORLD_BACKUP, Text.of("OKAY!"), Text.of("No Hackers found"));
+                            SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.WORLD_BACKUP, Text.of("OKAY!"), Text.of("No Hackers found"));
-                        break;
+                    case 1 ->
-                    case 1:
+                            SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.TUTORIAL_HINT, Text.of("MEH!"), Text.of("There is an Idiot or Noob!"));
-                        SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.TUTORIAL_HINT, Text.of("MEH!"), Text.of("There is an Idiot or Noob!"));
+                    case 2 ->
-                        break;
+                            SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.WORLD_ACCESS_FAILURE, Text.of("ALARM!"), Text.of("There is a Hacker!"));
-                    case 2:
-                        SystemToast.add(source.getClient().getToastManager(), SystemToast.Type.WORLD_ACCESS_FAILURE, Text.of("ALARM!"), Text.of("There is a Hacker!"));
                 }
 
             } catch (Exception e) {

src/main/java/net/saltymc/eaa/function/TagFunction.java

@@ -1,6 +1,6 @@
 package net.saltymc.eaa.function;
 
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.text.Text;
 import net.saltymc.eaa.custom.ping.TagDTO;

src/main/java/net/saltymc/eaa/mixin/InGameHudMixin.java

@@ -1,23 +0,0 @@
-package net.saltymc.eaa.mixin;
-
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.gui.hud.PlayerListHud;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.scoreboard.Scoreboard;
-import net.minecraft.scoreboard.ScoreboardObjective;
-import net.saltymc.eaa.custom.ping.CustomPlayerListHud;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-/**
- * By: https://github.com/vladmarica/better-ping-display-fabric/
- */
-@Mixin(InGameHud.class)
-abstract class InGameHudMixin {
-    @Redirect(method = "render",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;render(Lnet/minecraft/client/util/math/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreboardObjective;)V"))
-    private void render(PlayerListHud hud, MatrixStack stack, int width, Scoreboard scoreboard, ScoreboardObjective objective) {
-        CustomPlayerListHud.render(hud, stack, width, scoreboard, objective);
-    }
-}

src/main/java/net/saltymc/eaa/mixin/PlayerListHudAccessor.java

@@ -1,29 +0,0 @@
-package net.saltymc.eaa.mixin;
-
-import net.minecraft.client.gui.hud.PlayerListHud;
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.scoreboard.ScoreboardObjective;
-import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-/**
- * By: https://github.com/vladmarica/better-ping-display-fabric/
- */
-
-@Mixin(PlayerListHud.class)
-public interface PlayerListHudAccessor {
-    @Invoker
-    void invokeRenderLatencyIcon(MatrixStack stack, int x, int offsetX, int y, PlayerListEntry player);
-
-    @Invoker
-    void invokeRenderScoreboardObjective(ScoreboardObjective obj, int i, String str, int j, int k, PlayerListEntry player, MatrixStack stack);
-
-    @Accessor("header")
-    Text getHeader();
-
-    @Accessor("footer")
-    Text getFooter();
-}

src/main/java/net/saltymc/eaa/mixin/PlayerListHudInvoker.java

@@ -0,0 +1,16 @@
+package net.saltymc.eaa.mixin;
+
+import net.minecraft.client.gui.hud.PlayerListHud;
+import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.util.math.MatrixStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+/**
+ * By: https://github.com/vladmarica/better-ping-display-fabric/
+ */
+@Mixin(PlayerListHud.class)
+public interface PlayerListHudInvoker {
+    @Invoker("renderLatencyIcon")
+    void invokeRenderLatencyIcon(MatrixStack matrices, int width, int x, int y, PlayerListEntry entry);
+}

src/main/java/net/saltymc/eaa/mixin/PlayerListHudMixin.java

@@ -0,0 +1,50 @@
+package net.saltymc.eaa.mixin;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.PlayerListHud;
+import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.util.math.MatrixStack;
+import net.saltymc.eaa.custom.ping.CustomPlayerListHud;
+import org.jetbrains.annotations.NotNull;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.*;
+
+/**
+ * By: https://github.com/vladmarica/better-ping-display-fabric/
+ */
+
+@Mixin(PlayerListHud.class)
+public abstract class PlayerListHudMixin {
+    @Unique
+    @Final
+    private static final int PLAYER_SLOT_EXTRA_WIDTH = 70; // 45
+
+    @Shadow
+    @Final
+    private MinecraftClient client;
+
+    /**
+     * Increases the int constant {@code 13} in the {@link PlayerListHud#render} method by
+     * {@value #PLAYER_SLOT_EXTRA_WIDTH}. This constant is used to define the width of the "slots" in the player list.
+     * In order to fit the ping text, this needs to be increased.
+     */
+    @ModifyConstant(method = "render", constant = @Constant(intValue = 13))
+    private int modifySlotWidthConstant(int original) {
+        return original + PLAYER_SLOT_EXTRA_WIDTH;
+    }
+
+    /**
+     * Redirects the call to {@code renderLatencyIcon} in {@link PlayerListHud#render} to instead call
+     * {@link CustomPlayerListHud#renderPingDisplay}.
+     */
+    @Redirect(method = "render",
+            at = @At(value = "INVOKE", target = "net/minecraft/client/gui/hud/PlayerListHud.renderLatencyIcon(Lnet/minecraft/client/util/math/MatrixStack;IIILnet/minecraft/client/network/PlayerListEntry;)V"))
+    private void redirectRenderLatencyIconCall(
+            PlayerListHud instance, MatrixStack matrices, int width, int x, int y, @NotNull PlayerListEntry entry) {
+        CustomPlayerListHud.renderPingDisplay(client, instance, matrices, width, x, y, entry);
+    }
+}
+

src/main/java/net/saltymc/eaa/util/mojangApi/PlayerInfo.java

@@ -57,6 +57,8 @@ public class PlayerInfo {
             if (responseJSON.containsKey("name") && ! ((String)responseJSON.get("name")).equalsIgnoreCase(playerName))
                 return null;
 
+            LOGGER.info("player: " + playerName + " is: " + responseJSON.get("id"));
+
             return (String) responseJSON.get("id");
 
         } catch (Exception ex) {
@@ -65,20 +67,22 @@ public class PlayerInfo {
         }
     }
 
-    public static List<String> playerUUIDToNames(String playerUUID) throws MojangUtilException {
+    //changed due to API changes ...
+    public static String playerUUIDToName(String playerUUID) throws MojangUtilException {
         try {
             HttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet request = new HttpGet("https://api.mojang.com/user/profiles/" + playerUUID.replaceAll("-", "") + "/names");
+            HttpGet request = new HttpGet("https://api.mojang.com/user/profile/" + playerUUID.replaceAll("-", ""));
             HttpResponse response = httpClient.execute(request);
 
-            List<String> ret = new ArrayList<>();
-
             // take the response body as a json formatted string
-            for (Object responseJSON : (JSONArray) new JSONParser().parse(EntityUtils.toString(response.getEntity()))) {
+            JSONObject responseJSON = (JSONObject) new JSONParser().parse(EntityUtils.toString(response.getEntity()));
-                ret.add((String) ((JSONObject)responseJSON).get("name"));
+            //doublecheck correct name
-            }
+            if (responseJSON.containsKey("id") && ! ((String)responseJSON.get("id")).equalsIgnoreCase(playerUUID.replaceAll("-", "")))
+                return null;
 
-            return ret;
+            LOGGER.info("player: " + playerUUID + " is: " + responseJSON.get("name"));
+
+            return (String) responseJSON.get("name");
 
         } catch (Exception e) {
             LOGGER.error("Could not parse UUID to username!", e);
@@ -87,8 +91,6 @@ public class PlayerInfo {
     }
 
     public static String playerUUIDToCurrentName(String playerUUID) throws MojangUtilException {
-        List<String> playernames = playerUUIDToNames(playerUUID);
+        return playerUUIDToName(playerUUID);
-
-        return playernames.get(playernames.size() - 1);
     }
 }

src/main/resources/eaamod.mixins.json

@@ -7,8 +7,8 @@
   ],
   "client": [
     "ExampleMixin",
-    "InGameHudMixin",
+    "PlayerListHudMixin",
-    "PlayerListHudAccessor"
+    "PlayerListHudInvoker"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/fabric.mod.json

@@ -4,14 +4,14 @@
   "version": "${version}",
 
   "name": "EAA Mod",
-  "description": "This is an example description! Tell everyone what your mod is about!",
+  "description": "Mod for keeping track of Players encountered in Minecraft servers. Especially hackers. Shows Hint in Playeroverview (Tab)",
   "authors": [
     "MPK1",
     "Hiajen"
   ],
   "contact": {
-    "homepage": "https://fabricmc.net/",
+    "homepage": "https://git.hiajen.de/hiajen/EAA_MOD",
-    "sources": "https://github.com/FabricMC/fabric-example-mod"
+    "sources": "https://git.hiajen.de/hiajen/EAA_MOD"
   },
 
   "license": "CC0-1.0",
@@ -28,9 +28,10 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.14.6",
     "fabric": "*",
-    "minecraft": "1.16.x"
+    "minecraft": "1.19.x",
+    "java": ">=17"
   },
   "suggests": {
     "another-mod": "*"