From 8092c07888779b2e4f32cf08ff5387946beb4648 Mon Sep 17 00:00:00 2001
From: KrLite <68179735+KrLite@users.noreply.github.com>
Date: Fri, 12 Jul 2024 11:13:52 +0800
Subject: [PATCH] maintenance

---
 CHANGELOG.md                                         | 10 ++--------
 build.gradle.kts                                     |  6 +++---
 gradle/libs.versions.toml                            | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 .../flash/mixin/GameRendererMixin.java               |  2 +-
 src/main/resources/fabric.mod.json                   |  2 +-
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7997347..24f532a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,3 @@
-### Changes
+### Maintenance Update
 
-- Unified publishing using **modpublisher.**
-- Jar name migrate: `{id}-{mcversion}-{modversion}` -> `{id}-{modversion}-{loader}{mcversion}`.
-- Tag name migrate: `{id}-{modversion}-mc{mcversion}` -> `{id}-{modversion}-{loader}{mcversion}`.
-
-### Ownership Transfer
-
-- **Transferred** ownership to **[Kessoku Tea Time.](https://github.com/KessokuTeaTime)**
+- **Supported** `1.20.5+`.
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 8443d0b..2eaa2f4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,8 +42,8 @@ dependencies {
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 
 	withSourcesJar()
 }
@@ -74,7 +74,7 @@ publisher {
 
 	versionType.set("release")
 	projectVersion.set(project.version.toString())
-	gameVersions.set(listOf("1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4"))
+	gameVersions.set(listOf("1.20.5", "1.20.6"))
 	loaders.set(listOf("fabric", "quilt"))
 	curseEnvironment.set("client")
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0915fac..eb1c158 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,11 +4,11 @@ archives-name = "flash"
 mod = "2.1.0"
 loader = "fabric"
 
-minecraft = "1.20"
-yarn = "1.20+build.1"
-fabric-loader = "0.15.10"
-fabric-api = "0.83.0+1.20"
-fabric-loom = "1.5-SNAPSHOT"
+minecraft = "1.20.5"
+yarn = "1.20.5+build.1"
+fabric-loader = "0.16.0"
+fabric-api = "0.97.8+1.20.5"
+fabric-loom = "1.6-SNAPSHOT"
 modpublisher = "2.1.0"
 
 equator = "2.6.4-mc1.20"
@@ -20,7 +20,7 @@ id-curseforge = "998416"
 # display
 display-name = "Flash"
 display-loader = "Fabric"
-display-version = "1.20.x"
+display-version = "1.20.5~1.20.6"
 
 [libraries]
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c30b486..20db9ad 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java b/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java
index 482b4c9..0b1d0fd 100644
--- a/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java
+++ b/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java
@@ -33,7 +33,7 @@ private DrawContext getMatrixStack(DrawContext context) {
 			method = "render",
 			at = @At(
 					value = "INVOKE",
-					target = "Lnet/minecraft/client/util/math/MatrixStack;pop()V",
+					target = "Lorg/joml/Matrix4fStack;popMatrix()Lorg/joml/Matrix4fStack;",
 					shift = At.Shift.AFTER
 			)
 	)
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index f21fa56..9ea775f 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -32,7 +32,7 @@
     "fabricloader": "*",
     "fabric-api": "*",
     "fabric-key-binding-api-v1": "*",
-    "minecraft": "1.20.x"
+    "minecraft": ["~1.20.5", "~1.20.6"]
   },
   "suggests": {
   }