Fix controlify compat

isXander · Aug 30, 2023 · e4f3800 · e4f3800
1 parent 8abbd55
commit e4f3800
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 32 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "2.11.1"
+version = "2.11.2"
 
 repositories {
     mavenCentral()
@@ -50,7 +50,7 @@ dependencies {
 
     modImplementation(libs.mod.menu)
 
-    //modCompileOnly(libs.controlify)
+    modImplementation(libs.controlify)
 
     libs.mixin.extras.let {
         implementation(it)

diff --git a/changelogs/2.11.2.md b/changelogs/2.11.2.md
@@ -0,0 +1 @@
+- Fix broken Controlify compatibility
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ 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.4.4+1.20"
+controlify = "1.6.0+1.20"
 
 settxi = "2.10.6"
 

diff --git a/src/main/kotlin/dev/isxander/zoomify/integrations/ControlifyIntegration.kt b/src/main/kotlin/dev/isxander/zoomify/integrations/ControlifyIntegration.kt
@@ -1,30 +1,30 @@
 package dev.isxander.zoomify.integrations
-//
-//import dev.isxander.controlify.api.ControlifyApi
-//import dev.isxander.controlify.api.entrypoint.ControlifyEntrypoint
-//import dev.isxander.controlify.api.event.ControlifyEvents
-//import dev.isxander.controlify.api.ingameinput.LookInputModifier
-//import dev.isxander.controlify.controller.Controller
-//import dev.isxander.zoomify.Zoomify
-//import dev.isxander.zoomify.config.ZoomifySettings
-//import net.minecraft.util.Mth
-//
-//object ControlifyIntegration : ControlifyEntrypoint {
-//    override fun onControlifyPreInit(controlify: ControlifyApi) {
-//        ControlifyEvents.LOOK_INPUT_MODIFIER.register(SensitivityModifier)
-//    }
-//
-//    override fun onControllersDiscovered(controlify: ControlifyApi) {
-//
-//    }
-//
-//    object SensitivityModifier : LookInputModifier {
-//        override fun modifyX(x: Float, controller: Controller<*, *>): Float {
-//            return x * Mth.lerp(ZoomifySettings.relativeSensitivity / 100.0, 1.0, Zoomify.previousZoomDivisor).toFloat()
-//        }
-//
-//        override fun modifyY(y: Float, controller: Controller<*, *>): Float {
-//            return y * Mth.lerp(ZoomifySettings.relativeSensitivity / 100.0, 1.0, Zoomify.previousZoomDivisor).toFloat()
-//        }
-//    }
-//}
+
+import dev.isxander.controlify.api.ControlifyApi
+import dev.isxander.controlify.api.entrypoint.ControlifyEntrypoint
+import dev.isxander.controlify.api.event.ControlifyEvents
+import dev.isxander.controlify.api.ingameinput.LookInputModifier
+import dev.isxander.controlify.controller.Controller
+import dev.isxander.zoomify.Zoomify
+import dev.isxander.zoomify.config.ZoomifySettings
+import net.minecraft.util.Mth
+
+object ControlifyIntegration : ControlifyEntrypoint {
+    override fun onControlifyPreInit(controlify: ControlifyApi) {
+        ControlifyEvents.LOOK_INPUT_MODIFIER.register(SensitivityModifier)
+    }
+
+    override fun onControllersDiscovered(controlify: ControlifyApi) {
+
+    }
+
+    object SensitivityModifier : LookInputModifier {
+        override fun modifyX(x: Float, controller: Controller<*, *>): Float {
+            return x * Mth.lerp(ZoomifySettings.relativeSensitivity / 100.0, 1.0, Zoomify.previousZoomDivisor).toFloat()
+        }
+
+        override fun modifyY(y: Float, controller: Controller<*, *>): Float {
+            return y * Mth.lerp(ZoomifySettings.relativeSensitivity / 100.0, 1.0, Zoomify.previousZoomDivisor).toFloat()
+        }
+    }
+}