From ca49a00e8b5fbd1979b58da837ef119fca25f607 Mon Sep 17 00:00:00 2001
From: arcade_kappa <gkappa@outlands.top>
Date: Sat, 15 Jun 2024 16:55:02 +0800
Subject: [PATCH] Fix dwheel patch

---
 gradle.properties                                            | 2 +-
 src/main/java/com/cleanroommc/fugue/config/FugueConfig.java  | 3 +++
 .../fugue/transformer/universal/DWheelTransformer.java       | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9d81532..1bfd226 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ mappings_version=39-1.12
 mod_id=fugue
 mod_name=Fugue
 mod_main_class=Fugue
-mod_version=0.15.3
+mod_version=0.15.4
 mod_base_package=com.cleanroommc.fugue
 mod_authors=kappa_maintainer
 mod_description=A mod that patch dead mods for Cleanroom
diff --git a/src/main/java/com/cleanroommc/fugue/config/FugueConfig.java b/src/main/java/com/cleanroommc/fugue/config/FugueConfig.java
index d904420..f9f03e3 100644
--- a/src/main/java/com/cleanroommc/fugue/config/FugueConfig.java
+++ b/src/main/java/com/cleanroommc/fugue/config/FugueConfig.java
@@ -183,6 +183,7 @@ Add them to list could redirect their toURI() to a decent jar URL.
     @Config.Comment(
             """
             Used when mouse wheel related operation being weird.
+            Classes in this list will get their Mouse.getDWheel() and Mouse.getEventDWheel() redirected.
             Consult Cleanroom developers before using it!
             """)
     @Config.Name("Mouse.getEventDWheel() Patching List")
@@ -193,6 +194,8 @@ Add them to list could redirect their toURI() to a decent jar URL.
             "xaero.map.gui.GuiMap",
             "betterquesting.api2.client.gui.GuiContainerCanvas",
             "betterquesting.api2.client.gui.GuiScreenCanvas",
+            "yalter.mousetweaks.MouseState",
+            "yalter.mousetweaks.SimpleMouseState",
     };
 
     @Config.Comment(
diff --git a/src/main/java/com/cleanroommc/fugue/transformer/universal/DWheelTransformer.java b/src/main/java/com/cleanroommc/fugue/transformer/universal/DWheelTransformer.java
index bad081b..263eaa8 100644
--- a/src/main/java/com/cleanroommc/fugue/transformer/universal/DWheelTransformer.java
+++ b/src/main/java/com/cleanroommc/fugue/transformer/universal/DWheelTransformer.java
@@ -20,7 +20,10 @@ public byte[] transform(byte[] bytes) {
                 @Override
                 public void edit(MethodCall m) throws CannotCompileException {
                     if (m.getMethodName().equals("getEventDWheel") && m.getClassName().equals("org.lwjgl.input.Mouse")) {
-                        m.replace("$_ = $proceed($$) * 120.0;");
+                        m.replace("$_ = $proceed($$) * 120;");
+                    }
+                    if (m.getMethodName().equals("getDWheel") && m.getClassName().equals("org.lwjgl.input.Mouse")) {
+                        m.replace("$_ = $proceed($$) * 120;");
                     }
                 }
             });