feat: Support Minecraft 1.21.6

Author: magicus

gradle.properties

@@ -3,10 +3,10 @@ mod_version=1.2.0
 
 # Minecraft/Java version
 # Also hardcoded in fabric.mod.json and *.mixin.json
-minecraft_version=1.21
+minecraft_version=1.21.6
 java_version=21
 
 # Fabric versions -- check these on https://fabricmc.net/develop
 # Also hardcoded in fabric.mod.json
-yarn_mappings=1.21+build.1
-loader_version=0.15.11
+yarn_mappings=1.21.6+build.1
+loader_version=0.16.14

src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java

@@ -27,13 +27,13 @@ public abstract class StatusEffectTimerMixin {
 	private MinecraftClient client;
 
 	@Inject(method = "renderStatusEffectOverlay",
-			at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", shift = At.Shift.AFTER))
+			at = @At(value = "INVOKE",
+					target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIII)V",
+					shift = At.Shift.AFTER))
 	private void appendOverlayDrawing(DrawContext context, RenderTickCounter tickCounter, CallbackInfo c,
-									  @Local List<Runnable> list, @Local StatusEffectInstance statusEffectInstance,
-									  @Local(ordinal = 4) int x, @Local(ordinal = 3) int y) {
-		list.add(() -> {
-			drawStatusEffectOverlay(context, statusEffectInstance, x, y);
-		});
+									  @Local StatusEffectInstance statusEffectInstance,
+									  @Local(ordinal = 2) int x, @Local(ordinal = 3) int y) {
+		drawStatusEffectOverlay(context, statusEffectInstance, x, y);
 	}
 
 	private void drawStatusEffectOverlay(DrawContext context, StatusEffectInstance statusEffectInstance, int x, int y) {

src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
   ],
 
   "depends": {
-    "minecraft": "~1.21",
-    "fabricloader": ">=0.15.6"
+    "minecraft": ">=1.21.6",
+    "fabricloader": ">=0.16.14"
   }
 }