From 17bd5f293faac5ddecedc28daf26840aa6168949 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <mag@icus.se>
Date: Fri, 26 Apr 2024 13:16:22 +0200
Subject: [PATCH] feat: Support Minecraft 1.20.5

---
 .github/workflows/build.yml                               | 2 +-
 .github/workflows/release.yml                             | 2 +-
 gradle.properties                                         | 8 ++++----
 .../statuseffecttimer/mixin/StatusEffectTimerMixin.java   | 2 +-
 src/main/resources/fabric.mod.json                        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0060f5c..f1d304b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
 
 jobs:
   build:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 52aebba..00bcc39 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
       - '*'
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   MODRINTH_ID: 'T9FDHbY5'
   CURSEFORGE_ID: '484738'
 
diff --git a/gradle.properties b/gradle.properties
index 8f9042f..b7301ef 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
+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+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<Runnable> 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..be4df49 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",
     "fabricloader": ">=0.15.6"
   }
 }