Update to 1.20.2

isXander · Sep 28, 2023 · 28fb286 · 28fb286
1 parent e4f3800
commit 28fb286
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 28 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,11 +15,10 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "2.11.2"
+version = "2.12.0"
 
 repositories {
     mavenCentral()
-    mavenLocal()
     maven("https://maven.isxander.dev/releases")
     maven("https://maven.isxander.dev/snapshots")
     maven("https://maven.shedaniel.me/")
@@ -104,7 +103,7 @@ if (modrinthId.isNotEmpty()) {
         versionNumber.set("${project.version}")
         versionType.set("release")
         uploadFile.set(tasks["remapJar"])
-        gameVersions.set(listOf("1.20", "1.20.1"))
+        gameVersions.set(listOf("1.20.2"))
         loaders.set(listOf("fabric", "quilt"))
         changelog.set(changelogText)
         syncBodyFrom.set(file("README.md").readText())
@@ -128,8 +127,7 @@ if (hasProperty("curseforge.token") && curseforgeId.isNotEmpty()) {
 
             id = curseforgeId
             releaseType = "release"
-            addGameVersion("1.20")
-            addGameVersion("1.20.1")
+            addGameVersion("1.20.2")
             addGameVersion("Fabric")
             addGameVersion("Quilt")
             addGameVersion("Java 17")

diff --git a/changelogs/2.12.0.md b/changelogs/2.12.0.md
@@ -0,0 +1,3 @@
+# Zoomify 2.12.0 for 1.20.2
+
+- Update to 1.20.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,19 @@
 [versions]
-kotlin = "1.9.0"
+kotlin = "1.9.10"
 loom = "1.3.+"
 loom_vineflower = "1.11.+"
 
-minecraft = "1.20.1"
-fabric_loader = "0.14.21"
-quilt_mappings = "23"
-
-fabric_api = "0.86.1+1.20.1"
-fabric_language_kotlin = "1.10.8+kotlin.1.9.0"
-ktoml = "0.4.1"
-yet_another_config_lib = "3.1.1+1.20"
-mod_menu = "7.0.0"
-mixin_extras = "0.2.0-beta.9"
-controlify = "1.6.0+1.20"
+minecraft = "1.20.2"
+fabric_loader = "0.14.22"
+quilt_mappings = "2"
+
+fabric_api = "0.89.1+1.20.2"
+fabric_language_kotlin = "1.10.10+kotlin.1.9.10"
+ktoml = "0.5.0"
+yet_another_config_lib = "3.2.1+1.20.2"
+mod_menu = "8.0.0-beta.2"
+mixin_extras = "0.2.0-rc.4"
+controlify = "1.7.0-beta.2+1.20"
 
 settxi = "2.10.6"
 

diff --git a/src/main/java/dev/isxander/zoomify/mixins/zoom/MouseMixin.java b/src/main/java/dev/isxander/zoomify/mixins/zoom/MouseMixin.java
@@ -1,6 +1,7 @@
 package dev.isxander.zoomify.mixins.zoom;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
 import dev.isxander.zoomify.Zoomify;
 import dev.isxander.zoomify.config.SpyglassBehaviour;
 import dev.isxander.zoomify.config.ZoomifySettings;
@@ -15,16 +16,14 @@
 
 @Mixin(MouseHandler.class)
 public class MouseMixin {
-    @Shadow private double accumulatedScroll;
-
     @Inject(
         method = "onScroll",
-        at = @At(value = "FIELD", target = "Lnet/minecraft/client/MouseHandler;accumulatedScroll:D", ordinal = 7),
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isSpectator()Z"),
         cancellable = true
     )
-    private void scrollStepCounter(CallbackInfo ci) {
-        if (ZoomifySettings.INSTANCE.getScrollZoom() && Zoomify.INSTANCE.getZooming() && accumulatedScroll != 0 && !ZoomifySettings.INSTANCE.getKeybindScrolling()) {
-            Zoomify.mouseZoom(accumulatedScroll);
+    private void scrollStepCounter(CallbackInfo ci, @Local(ordinal = 1) int scrollY) {
+        if (ZoomifySettings.INSTANCE.getScrollZoom() && Zoomify.INSTANCE.getZooming() && scrollY != 0 && !ZoomifySettings.INSTANCE.getKeybindScrolling()) {
+            Zoomify.mouseZoom(scrollY);
             ci.cancel();
         }
     }

diff --git a/src/main/kotlin/dev/isxander/zoomify/config/demo/ZoomDemoImageRenderer.kt b/src/main/kotlin/dev/isxander/zoomify/config/demo/ZoomDemoImageRenderer.kt
@@ -8,7 +8,6 @@ import dev.isxander.zoomify.utils.pushPose
 import dev.isxander.zoomify.utils.scale
 import dev.isxander.zoomify.utils.translate
 import dev.isxander.zoomify.zoom.ZoomHelper
-import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.resources.ResourceLocation
 import java.util.Optional

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -43,11 +43,11 @@
   ],
   "depends": {
     "fabric-api": "*",
-    "fabricloader": ">=0.14.21",
-    "fabric-language-kotlin": ">=1.10.8+kotlin.1.9.0",
-    "minecraft": "1.20.x",
+    "fabricloader": ">=0.14.22",
+    "fabric-language-kotlin": ">=1.10.10+kotlin.1.9.10",
+    "minecraft": "~1.20.2",
     "java": ">=17",
-    "yet_another_config_lib_v3": ">=3.1.1+1.20"
+    "yet_another_config_lib_v3": ">=3.2.1+1.20.2"
   },
   "suggests": {
     "modmenu": ">=4.0.0"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Zoomify 2.12.0 for 1.20.2

		- Update to 1.20.2