Fixed mouse rotation unlocks after doing /warp garden (with Sensitivity Reducer on). #1007

1 files changed, 27 insertions, 6 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
index b7dd83d5f..194b2e310 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
@@ -1,9 +1,11 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.features.garden.SensitivityReducer
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import net.minecraft.client.Minecraft
@@ -12,7 +14,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 object LockMouseLook {
 
     private val config get() = SkyHanniMod.feature.misc
-    private var lockedMouse = false
+    private val storage get() = SkyHanniMod.feature.storage
+    var lockedMouse = false
     private const val lockedPosition = -1F / 3F
 
     @SubscribeEvent
@@ -20,29 +23,33 @@ object LockMouseLook {
         if (lockedMouse) toggleLock()
         val gameSettings = Minecraft.getMinecraft().gameSettings
         if (gameSettings.mouseSensitivity == lockedPosition) {
-            gameSettings.mouseSensitivity = SkyHanniMod.feature.storage.savedMouselockedSensitivity
+            gameSettings.mouseSensitivity = storage.savedMouselockedSensitivity
             ChatUtils.chat("§bMouse rotation is now unlocked because you left it locked.")
         }
     }
 
     @SubscribeEvent
-    fun onChat (event: LorenzChatEvent) {
+    fun onChat(event: LorenzChatEvent) {
         if (!event.message.startsWith("§aTeleported you to §r§aPlot")) return
         if (lockedMouse) toggleLock()
     }
 
     fun toggleLock() {
-        val gameSettings = Minecraft.getMinecraft().gameSettings ?: return
         lockedMouse = !lockedMouse
 
+        val gameSettings = Minecraft.getMinecraft().gameSettings ?: return
+        var mouseSensitivity = gameSettings.mouseSensitivity
+        if (SensitivityReducer.isEnabled()) mouseSensitivity = SensitivityReducer.doTheMath(mouseSensitivity, true)
+
         if (lockedMouse) {
-            SkyHanniMod.feature.storage.savedMouselockedSensitivity = gameSettings.mouseSensitivity
+            storage.savedMouselockedSensitivity = mouseSensitivity
             gameSettings.mouseSensitivity = lockedPosition
             if (config.lockMouseLookChatMessage) {
                 ChatUtils.chat("§bMouse rotation is now locked. Type /shmouselock to unlock your rotation")
             }
         } else {
-            gameSettings.mouseSensitivity = SkyHanniMod.feature.storage.savedMouselockedSensitivity
+            if (!SensitivityReducer.isEnabled()) gameSettings.mouseSensitivity = storage.savedMouselockedSensitivity
+            else gameSettings.mouseSensitivity = SensitivityReducer.doTheMath(storage.savedMouselockedSensitivity)
             if (config.lockMouseLookChatMessage) {
                 ChatUtils.chat("§bMouse rotation is now unlocked.")
             }
@@ -60,4 +67,18 @@ object LockMouseLook {
             toggleLock()
         }
     }
+
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Mouse Lock")
+
+        if (!lockedMouse) {
+            event.addIrrelevant("not enabled")
+            return
+        }
+
+        event.addData {
+            add("Stored Sensitivity: ${storage.savedMouselockedSensitivity}")
+        }
+    }
 }