Update and fix Ok Zoomer compatibility (#68)

build.gradle

@@ -94,6 +94,7 @@ repositories {
         }
     }
     maven { url 'https://maven.shedaniel.me/' }
+    maven { url 'https://jitpack.io' }
 }
 
 configurations {
@@ -116,10 +117,10 @@ dependencies {
     modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
 
     // Compatibility mods
-    /*modImplementation("com.github.joaoh1:okzoomer:e13183c59b") {
-        exclude group: 'me.shedaniel.cloth'
-        exclude group: 'io.github.prospector'
-    }*/
+    modImplementation("com.github.EnnuiL:okzoomer:e6a801b1a3") {
+        exclude group: 'com.terraformersmc'
+        exclude group: 'dev.lambdaurora'
+    }
 
     shadow 'com.electronwill.night-config:core:3.6.3'
     shadow 'com.electronwill.night-config:toml:3.6.3'

src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java

@@ -39,11 +39,11 @@ public class LambdaControlsCompat {
      * @param mod the mod instance
      */
     public static void init(@NotNull LambdaControlsClient mod) {
-        /*if (FabricLoader.getInstance().isModLoaded("okzoomer")) {
+        if (FabricLoader.getInstance().isModLoaded("okzoomer")) {
             mod.log("Adding okzoomer compatibility...");
             HANDLERS.add(new OkZoomerCompat());
         }
-        if (isReiPresent()) {
+        /*if (isReiPresent()) {
             mod.log("Adding REI compatiblity...");
             HANDLERS.add(new ReiCompat());
         }*/

src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java

@@ -10,7 +10,10 @@
 package dev.lambdaurora.lambdacontrols.client.compat;
 
 import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
+import io.github.ennuil.okzoomer.keybinds.ZoomKeybinds;
 import org.jetbrains.annotations.NotNull;
+import org.lwjgl.glfw.GLFW;
 
 /**
  * Represents a compatibility handler for OkZoomer.
@@ -22,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 public class OkZoomerCompat implements CompatHandler {
     @Override
     public void handle(@NotNull LambdaControlsClient mod) {
-        /*new ButtonBinding.Builder("zoom")
+        new ButtonBinding.Builder("zoom")
                 .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW.GLFW_GAMEPAD_BUTTON_X)
                 .onlyInGame()
                 .cooldown(true)
@@ -51,6 +54,6 @@ public class OkZoomerCompat implements CompatHandler {
                     .category(ButtonBinding.MISC_CATEGORY)
                     .linkKeybind(ZoomKeybinds.resetZoomKey)
                     .register();
-        }*/
+        }
     }
 }

src/main/resources/assets/lambdacontrols/lang/en_us.json

@@ -32,9 +32,9 @@
   "lambdacontrols.action.toggle_smooth_camera": "Toggle Cinematic Camera",
   "lambdacontrols.action.use": "Use",
   "lambdacontrols.action.zoom": "Zoom",
-  "lambdacontrols.action.zoom.in": "Increase Zoom",
-  "lambdacontrols.action.zoom.out": "Decrease Zoom",
-  "lambdacontrols.action.zoom.reset": "Reset Zoom",
+  "lambdacontrols.action.zoom_in": "Increase Zoom",
+  "lambdacontrols.action.zoom_out": "Decrease Zoom",
+  "lambdacontrols.action.zoom_reset": "Reset Zoom",
   "lambdacontrols.button.a": "A",
   "lambdacontrols.button.b": "B",
   "lambdacontrols.button.x": "X",

src/main/resources/assets/lambdacontrols/lang/es_mx.json

@@ -32,9 +32,9 @@
   "lambdacontrols.action.toggle_smooth_camera": "Cambiar cámara cinematográfica",
   "lambdacontrols.action.use": "Usar",
   "lambdacontrols.action.zoom": "Zoom",
-  "lambdacontrols.action.zoom.in": "Aumentar zoom",
-  "lambdacontrols.action.zoom.out": "Disminuir zoom",
-  "lambdacontrols.action.zoom.reset": "Restablecer zoom",
+  "lambdacontrols.action.zoom_in": "Aumentar zoom",
+  "lambdacontrols.action.zoom_out": "Disminuir zoom",
+  "lambdacontrols.action.zoom_reset": "Restablecer zoom",
   "lambdacontrols.button.a": "A",
   "lambdacontrols.button.b": "B",
   "lambdacontrols.button.x": "X",

src/main/resources/assets/lambdacontrols/lang/fr_ca.json

@@ -32,9 +32,9 @@
   "lambdacontrols.action.toggle_smooth_camera": "Basculer en mode cinématique",
   "lambdacontrols.action.use": "Utiliser",
   "lambdacontrols.action.zoom": "Zoom",
-  "lambdacontrols.action.zoom.in": "Augmenter le zoom",
-  "lambdacontrols.action.zoom.out": "Diminuer le zoom",
-  "lambdacontrols.action.zoom.reset": "Remettre le zoom à zéro",
+  "lambdacontrols.action.zoom_in": "Augmenter le zoom",
+  "lambdacontrols.action.zoom_out": "Diminuer le zoom",
+  "lambdacontrols.action.zoom_reset": "Remettre le zoom à zéro",
   "lambdacontrols.button.a": "A",
   "lambdacontrols.button.b": "B",
   "lambdacontrols.button.x": "X",

src/main/resources/assets/lambdacontrols/lang/fr_fr.json

@@ -32,9 +32,9 @@
   "lambdacontrols.action.toggle_smooth_camera": "Basculer en mode cinématique",
   "lambdacontrols.action.use": "Utiliser",
   "lambdacontrols.action.zoom": "Zoom",
-  "lambdacontrols.action.zoom.in": "Augmenter le zoom",
-  "lambdacontrols.action.zoom.out": "Diminuer le zoom",
-  "lambdacontrols.action.zoom.reset": "Remettre le zoom à zéro",
+  "lambdacontrols.action.zoom_in": "Augmenter le zoom",
+  "lambdacontrols.action.zoom_out": "Diminuer le zoom",
+  "lambdacontrols.action.zoom_reset": "Remettre le zoom à zéro",
   "lambdacontrols.button.a": "A",
   "lambdacontrols.button.b": "B",
   "lambdacontrols.button.x": "X",

src/main/resources/assets/lambdacontrols/lang/tr_tr.json

@@ -32,9 +32,9 @@
   "lambdacontrols.action.toggle_smooth_camera": "Sinemaitk Kameraya Geçme",
   "lambdacontrols.action.use": "Kullanma",
   "lambdacontrols.action.zoom": "Büyütme",
-  "lambdacontrols.action.zoom.in": "Büyütmeyi Arttır",
-  "lambdacontrols.action.zoom.out": "Büyütmeyi Azalt",
-  "lambdacontrols.action.zoom.reset": "Büyütmeyi Sıfırla",
+  "lambdacontrols.action.zoom_in": "Büyütmeyi Arttır",
+  "lambdacontrols.action.zoom_out": "Büyütmeyi Azalt",
+  "lambdacontrols.action.zoom_reset": "Büyütmeyi Sıfırla",
   "lambdacontrols.button.a": "A",
   "lambdacontrols.button.b": "B",
   "lambdacontrols.button.x": "X",

src/main/resources/assets/lambdacontrols/lang/zh_cn.json

@@ -32,9 +32,9 @@
   "lambdacontrols.action.toggle_smooth_camera": "切换电影视角",
   "lambdacontrols.action.use": "使用物品/放置方块",
   "lambdacontrols.action.zoom": "视野缩放",
-  "lambdacontrols.action.zoom.in": "缩放时将视野推近",
-  "lambdacontrols.action.zoom.out": "缩放时将视野拉远",
-  "lambdacontrols.action.zoom.reset": "缩放时重置缩放距离",
+  "lambdacontrols.action.zoom_in": "缩放时将视野推近",
+  "lambdacontrols.action.zoom_out": "缩放时将视野拉远",
+  "lambdacontrols.action.zoom_reset": "缩放时重置缩放距离",
   "lambdacontrols.button.a": "A",
   "lambdacontrols.button.b": "B",
   "lambdacontrols.button.x": "X",