From 9af1ec820bb77283917d78eedaec422541095756 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Sat, 20 Apr 2024 17:08:00 +0200 Subject: [PATCH] feat: Support Minecraft 1.20.5 --- gradle.properties | 8 ++++---- .../statuseffecttimer/mixin/StatusEffectTimerMixin.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8f9042f..c39f2c9 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 -java_version=17 +minecraft_version=1.20.5-rc2 +java_version=21 # Fabric versions -- check these on https://fabricmc.net/develop # Also hardcoded in fabric.mod.json -yarn_mappings=1.20+build.1 -loader_version=0.15.6 +yarn_mappings=1.20.5-rc2+build.1 +loader_version=0.15.10 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 da65ed3..690f3af 100644 --- a/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java +++ b/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java @@ -27,7 +27,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, CallbackInfo c, + private void appendOverlayDrawing(DrawContext context, float tickDelta, 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 a4c5ad4..ce94153 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ ], "depends": { - "minecraft": "~1.20", + "minecraft": "~1.20.5-rc.2", "fabricloader": ">=0.15.6" } }