feat: update to 1.21.6

gradle.properties

@@ -2,16 +2,16 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.13
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.16.14
 # Mod Properties
 mod_version=1.2.6
 maven_group=io.toadlabs
 archives_base_name=numeralping
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.119.9+1.21.5
-yacl_version=3.6.6+1.21.5-fabric
-mod_menu_version=14.0.0-rc.2
+fabric_version=0.127.1+1.21.6
+yacl_version=3.7.1+1.21.6-fabric
+mod_menu_version=15.0.0-beta.3
 devauth_version=1.2.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/io/toadlabs/numeralping/mixin/PlayerListHudMixin.java

@@ -25,14 +25,13 @@ public void renderDetailedLatency(DrawContext context, int width, int x, int y,
 			String pingString = Integer.toString(entry.getLatency());
 			pingString = config.shiftPing(pingString);
 
-			context.getMatrices().push();
-			context.getMatrices().translate(0, 0, 100);
+			context.getMatrices().pushMatrix();
 
 			context.drawTextWithShadow(client.textRenderer, pingString,
 					x + width - client.textRenderer.getWidth(pingString) - 1, y - (config.smallPing ? 2 : 0),
 					Utils.getPingColour(entry.getLatency()));
 
-			context.getMatrices().pop();
+			context.getMatrices().popMatrix();
 		}
 	}
 

src/main/java/io/toadlabs/numeralping/mixin/ServerEntryMixin.java

@@ -1,14 +1,13 @@
 package io.toadlabs.numeralping.mixin;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
 import io.toadlabs.numeralping.config.NumeralConfig;
 import io.toadlabs.numeralping.util.Utils;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
 import net.minecraft.client.network.ServerInfo;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.Identifier;
@@ -21,14 +20,12 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
-import java.util.function.Function;
-
 // a priority of 2000 means it will apply later
 // this is combined with `require = 0` to allow other mods to apply more integral functionality first without the game crashing
 @Mixin(value = MultiplayerServerListWidget.ServerEntry.class, priority = 0)
 public class ServerEntryMixin {
 
-	@ModifyArgs(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)I", ordinal = 0))
+	@ModifyArgs(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V", ordinal = 0))
 	public void shiftText(Args args) {
 		NumeralConfig config = NumeralConfig.instance();
 
@@ -38,18 +35,18 @@ public void shiftText(Args args) {
 	}
 
 	// hide the tooltip if it's redundant
-	@WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;setTooltip(Lnet/minecraft/text/Text;)V"))
-	public boolean hideTooltip(MultiplayerScreen instance, Text text) {
+	@WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTooltip(Lnet/minecraft/text/Text;II)V"))
+	public boolean hideTooltip(DrawContext instance, Text text, int x, int y) {
 		return !(NumeralConfig.instance().serverList && text.getContent() instanceof TranslatableTextContent content && content.getKey().equalsIgnoreCase("multiplayer.status.ping"));
 	}
 
 	@Redirect(
 			method = "render",
 			at = @At(
 					value = "INVOKE",
-					target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V",
+					target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIII)V",
 					ordinal = 0))
-	public void renderDetailedLatency(DrawContext instance, Function<Identifier, RenderLayer> renderLayers, Identifier texture, int x, int y, int width, int height) {
+	public void renderDetailedLatency(DrawContext instance, RenderPipeline pipeline, Identifier sprite, int x, int y, int width, int height) {
 		NumeralConfig config = NumeralConfig.instance();
 
 		if (server.ping >= 0 && config.serverList) {
@@ -66,7 +63,7 @@ public void renderDetailedLatency(DrawContext instance, Function<Identifier, Ren
 			return;
 		}
 
-		instance.drawGuiTexture(renderLayers, texture, x, y, width, height);
+		instance.drawGuiTexture(pipeline, sprite, x, y, width, height);
 	}
 
 	@Unique

src/main/resources/fabric.mod.json

@@ -35,7 +35,7 @@
   "depends": {
     "fabricloader": ">=0.16",
     "fabric-api": "*",
-    "minecraft": "~1.21.5",
+    "minecraft": "~1.21.6",
     "yet_another_config_lib_v3": "*"
   },
   "suggests": {