1.20.5

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "2.13.2"
+version = "2.13.3"
 
 repositories {
     mavenCentral()
@@ -37,8 +37,18 @@ dependencies {
         officialMojangMappings()
     })
     modImplementation(libs.fabric.loader)
-    modImplementation(libs.fabric.api)
-    modImplementation(libs.fabric.language.kotlin)
+
+    listOf(
+        "fabric-key-binding-api-v1",
+        "fabric-lifecycle-events-v1",
+        "fabric-command-api-v2",
+    ).forEach {
+        modImplementation(fabricApi.module(it, libs.versions.fabric.api.get()))
+    }
+
+    modImplementation(libs.fabric.language.kotlin) {
+        exclude(module = "fabric-api")
+    }
 
     implementation(libs.ktoml.core)
     include(libs.ktoml.core)
@@ -50,12 +60,8 @@ dependencies {
 
     modImplementation(libs.mod.menu)
 
-    modImplementation(libs.controlify)
-
-    libs.mixin.extras.let {
-        implementation(it)
-        annotationProcessor(it)
-        include(it)
+    modImplementation(libs.controlify) {
+        exclude(group = "net.fabricmc.fabric-api")
     }
 }
 
@@ -65,12 +71,12 @@ java {
 
 tasks {
     withType<JavaCompile> {
-        options.release.set(17)
+        options.release.set(21)
     }
 
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions {
-            jvmTarget = "17"
+            jvmTarget = "21"
         }
     }
 
@@ -104,7 +110,7 @@ if (modrinthId.isNotEmpty()) {
         versionNumber.set("${project.version}")
         versionType.set("release")
         uploadFile.set(tasks["remapJar"])
-        gameVersions.set(listOf("1.20.3", "1.20.2"))
+        gameVersions.set(listOf("1.20.5"))
         loaders.set(listOf("fabric", "quilt"))
         changelog.set(changelogText)
         syncBodyFrom.set(file("README.md").readText())
@@ -128,11 +134,10 @@ if (hasProperty("curseforge.token") && curseforgeId.isNotEmpty()) {
 
             id = curseforgeId
             releaseType = "release"
-            addGameVersion("1.20.3")
-            addGameVersion("1.20.2")
+            addGameVersion("1.20.5")
             addGameVersion("Fabric")
             addGameVersion("Quilt")
-            addGameVersion("Java 17")
+            addGameVersion("Java 21")
 
             relations(closureOf<me.hypherionmc.cursegradle.CurseRelation> {
                 requiredDependency("fabric-api")

changelogs/2.13.3.md

@@ -0,0 +1 @@
+- Update to 1.20.5

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2G
 
 kotlin.code.style=official
-systemProp.kotlinVersion=1.8.0
+systemProp.kotlinVersion=1.9.23
 
 modrinthId=zoomify
 curseforgeId=574741

gradle/libs.versions.toml

@@ -1,18 +1,17 @@
 [versions]
-kotlin = "1.9.22"
-loom = "1.5.+"
+kotlin = "1.9.23"
+loom = "1.6.+"
 
-minecraft = "1.20.4"
-fabric_loader = "0.15.5"
+minecraft = "1.20.5"
+fabric_loader = "0.15.10"
 quilt_mappings = "0"
 
-fabric_api = "0.94.0+1.20.4"
-fabric_language_kotlin = "1.10.17+kotlin.1.9.22"
+fabric_api = "0.97.5+1.20.5"
+fabric_language_kotlin = "1.10.19+kotlin.1.9.23"
 ktoml = "0.5.1"
-yet_another_config_lib = "3.3.1+1.20.4"
-mod_menu = "9.0.0"
-mixin_extras = "0.3.2"
-controlify = "2.0.0-beta.1+1.20.4"
+yet_another_config_lib = "3.4.0+1.20.5-fabric"
+mod_menu = "10.0.0-beta.1"
+controlify = "2.0.0-beta.5+1.20.5-rc2"
 
 settxi = "2.10.6"
 
@@ -23,9 +22,8 @@ fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_l
 fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 fabric_language_kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric_language_kotlin" }
 ktoml_core = { module = "com.akuleshov7:ktoml-core-jvm", version.ref = "ktoml" }
-yet_another_config_lib = { module = "dev.isxander.yacl:yet-another-config-lib-fabric", version.ref = "yet_another_config_lib" }
+yet_another_config_lib = { module = "dev.isxander:yet-another-config-lib", version.ref = "yet_another_config_lib" }
 mod_menu = { module = "com.terraformersmc:modmenu", version.ref = "mod_menu" }
-mixin_extras = { module = "io.github.llamalad7:mixinextras-fabric", version.ref = "mixin_extras" }
 controlify = { module = "dev.isxander:controlify", version.ref = "controlify" }
 settxi_core = { module = "dev.isxander.settxi:settxi-core", version.ref = "settxi" }
 settxi_serialization_kotlinx = { module = "dev.isxander.settxi:settxi-kotlinx-serialization", version.ref = "settxi" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/dev/isxander/zoomify/mixins/spyglass/InGameHudMixin.java

@@ -14,7 +14,7 @@ public class InGameHudMixin {
     @Shadow @Final private Minecraft minecraft;
 
     @ModifyExpressionValue(
-        method = "render",
+        method = "renderCameraOverlays",
         at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/client/player/LocalPlayer;isScoping()Z"

src/main/java/dev/isxander/zoomify/mixins/spyglass/SpyglassItemMixin.java

@@ -1,6 +1,6 @@
 package dev.isxander.zoomify.mixins.spyglass;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import dev.isxander.zoomify.config.OverlayVisibility;
 import dev.isxander.zoomify.config.SoundBehaviour;
 import dev.isxander.zoomify.config.ZoomifySettings;

src/main/java/dev/isxander/zoomify/mixins/zoom/GameRendererMixin.java

@@ -2,6 +2,7 @@
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.vertex.PoseStack;
 import dev.isxander.zoomify.Zoomify;
 import dev.isxander.zoomify.config.ZoomifySettings;
@@ -43,7 +44,7 @@ private float modifyBobbingIntensity(float p) {
             target = "Lnet/minecraft/client/renderer/GameRenderer;getFov(Lnet/minecraft/client/Camera;FZ)D"
         )
     )
-    private double keepHandFov(double fov, PoseStack pose, Camera camera, float tickDelta) {
+    private double keepHandFov(double fov, @Local(argsOnly=true) float tickDelta) {
         if (!ZoomifySettings.INSTANCE.getAffectHandFov())
             return fov * Zoomify.getZoomDivisor(tickDelta);
         return fov;

src/main/resources/fabric.mod.json

@@ -44,8 +44,8 @@
   "depends": {
     "fabric-api": "*",
     "fabricloader": ">=0.14.22",
-    "fabric-language-kotlin": ">=1.10.10+kotlin.1.9.10",
-    "minecraft": "~1.20.2",
+    "fabric-language-kotlin": ">=1.10.19+kotlin.1.9.23",
+    "minecraft": "~1.20.4",
     "java": ">=17",
     "yet_another_config_lib_v3": ">=3.2.1+1.20.2"
   },