From 0178f5e684ef97d02c67996dd3a37144773cf323 Mon Sep 17 00:00:00 2001
From: joaoh1 <7559492+joaoh1@users.noreply.github.com>
Date: Fri, 14 Aug 2020 12:40:45 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=20Fix=20compatibility=20with=20Ok?=
 =?UTF-8?q?=20Zoomer=204.0.0=20betas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fabric/build.gradle                               |  2 +-
 .../client/compat/OkZoomerCompat.java             | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index a08cac0..64d6bd0 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     include "com.github.lambdaurora:spruceui:${project.spruceui_version}"
 
     // Compatibility mods
-    modImplementation "com.github.joaoh1:okzoomer:4.0.0-alpha.4plus1.1.16.1"
+    modImplementation "com.github.joaoh1:okzoomer:e13183c59b"
     modImplementation "me.shedaniel:RoughlyEnoughItems:4.5.5"
 
     api project(":core")
diff --git a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java
index aa39012..6aa7815 100644
--- a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java
+++ b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java
@@ -9,8 +9,7 @@
 
 package me.lambdaurora.lambdacontrols.client.compat;
 
-import io.github.joaoh1.okzoomer.client.OkZoomerClientMod;
-import io.github.joaoh1.okzoomer.client.utils.ZoomUtils;
+import io.github.joaoh1.okzoomer.client.keybinds.ZoomKeybinds;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import org.jetbrains.annotations.NotNull;
@@ -25,8 +24,6 @@ import org.lwjgl.glfw.GLFW;
  */
 public class OkZoomerCompat implements CompatHandler
 {
-    public static final String OKZOOMER_CLASS_PATH = "io.github.joaoh1.okzoomer.client.OkZoomerClientMod";
-
     @Override
     public void handle(@NotNull LambdaControlsClient mod)
     {
@@ -35,29 +32,29 @@ public class OkZoomerCompat implements CompatHandler
                 .onlyInGame()
                 .cooldown(true)
                 .category(ButtonBinding.MISC_CATEGORY)
-                .linkKeybind(OkZoomerClientMod.zoomKeyBinding)
+                .linkKeybind(ZoomKeybinds.zoomKey)
                 .register();
 
-        if (ZoomUtils.areExtraKeybindsEnabled()) {
+        if (ZoomKeybinds.areExtraKeybindsEnabled()) {
                 new ButtonBinding.Builder("zoom.in")
                         .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true))
                         .onlyInGame()
                         .cooldown(true)
                         .category(ButtonBinding.MISC_CATEGORY)
-                        .linkKeybind(OkZoomerClientMod.increaseZoomKeyBinding)
+                        .linkKeybind(ZoomKeybinds.increaseZoomKey)
                         .register();
                 new ButtonBinding.Builder("zoom.out")
                         .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true))
                         .onlyInGame()
                         .cooldown(true)
                         .category(ButtonBinding.MISC_CATEGORY)
-                        .linkKeybind(OkZoomerClientMod.decreaseZoomKeyBinding)
+                        .linkKeybind(ZoomKeybinds.decreaseZoomKey)
                         .register();
                 new ButtonBinding.Builder("zoom.reset")
                         .onlyInGame()
                         .cooldown(true)
                         .category(ButtonBinding.MISC_CATEGORY)
-                        .linkKeybind(OkZoomerClientMod.resetZoomKeyBinding)
+                        .linkKeybind(ZoomKeybinds.resetZoomKey)
                         .register();
         }
     }