From b1d3f94aefa38398ac52803150d07d0a842e2403 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Fri, 14 Jun 2024 00:10:44 +0200 Subject: [PATCH] feat: Support Minecraft 1.21 --- gradle.properties | 6 +++--- .../mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java | 3 ++- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index b7301ef..d059e4e 100644 --- a/gradle.properties +++ b/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.20.5 +minecraft_version=1.21 java_version=21 # Fabric versions -- check these on https://fabricmc.net/develop # Also hardcoded in fabric.mod.json -yarn_mappings=1.20.5+build.1 -loader_version=0.15.10 +yarn_mappings=1.21+build.1 +loader_version=0.15.11 diff --git a/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java b/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java index 690f3af..8a004c6 100644 --- a/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java +++ b/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java @@ -6,6 +6,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.render.RenderTickCounter; import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.util.math.MathHelper; @@ -27,7 +28,7 @@ public abstract class StatusEffectTimerMixin { @Inject(method = "renderStatusEffectOverlay", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", shift = At.Shift.AFTER)) - private void appendOverlayDrawing(DrawContext context, float tickDelta, CallbackInfo c, + private void appendOverlayDrawing(DrawContext context, RenderTickCounter tickCounter, CallbackInfo c, @Local List list, @Local StatusEffectInstance statusEffectInstance, @Local(ordinal = 4) int x, @Local(ordinal = 3) int y) { list.add(() -> { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index be4df49..e74950c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ ], "depends": { - "minecraft": "~1.20.5", + "minecraft": "~1.21", "fabricloader": ">=0.15.6" } }