From b1334a0455ffb913bce72b6a676a2d09a55a338b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karen/=E3=81=82=E3=81=91=E3=81=BF?= <karen@akemi.ai>
Date: Wed, 8 Jun 2022 20:40:35 -0700
Subject: [PATCH] OkZoomerCompat, MidnightControlsCompat: Added compatibility
 with Ok Zoomer 5.0.0-beta.7 (Quilt). Tested with Minecraft 1.18.2, Ok Zoomer
 5.0.0-beta.7, quilted-fabric-api/QSL 1.1.0-beta.17 (implementing Fabric API
 0.55.1 and QFAPI 1.0.0-beta.19), and Quilt Loader 0.17.0-beta.2. And yes,
 MidnightControls works with Quilt.

---
 .../client/compat/MidnightControlsCompat.java      |  2 +-
 .../client/compat/OkZoomerCompat.java              | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java
index 25bf0a4..ea3599f 100644
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java
@@ -39,7 +39,7 @@ public class MidnightControlsCompat {
      * @param mod the mod instance
      */
     public static void init(@NotNull MidnightControlsClient mod) {
-        if (FabricLoader.getInstance().isModLoaded("okzoomer")) {
+        if (FabricLoader.getInstance().isModLoaded("okzoomer") || FabricLoader.getInstance().isModLoaded("ok_zoomer")) {
             mod.log("Adding Ok Zoomer compatibility...");
             HANDLERS.add(new OkZoomerCompat());
         }
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/OkZoomerCompat.java b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/OkZoomerCompat.java
index b76516a..e7b7beb 100644
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/OkZoomerCompat.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/OkZoomerCompat.java
@@ -71,7 +71,7 @@ public class OkZoomerCompat implements CompatHandler {
             okZoomerAreExtraKeyBindsEnabledMethodNameString = "areExtraKeybindsEnabled";
         } else if (LambdaReflection.doesClassExist("io.github.ennuil.okzoomer.key_binds.ZoomKeyBinds")) {
             // https://github.com/EnnuiL/OkZoomer/blob/5.0.0-beta.6+1.18.2/src/main/java/io/github/ennuil/okzoomer/key_binds/ZoomKeyBinds.java
-            MidnightControlsClient.get().log("Ok Zoomer version 5.0.0-beta.4 or above detected!");
+            MidnightControlsClient.get().log("Ok Zoomer version 5.0.0-beta.6, 5.0.0-beta.5, or 5.0.0-beta.4 detected!");
 
             okZoomerZoomKeybindsClassString = "io.github.ennuil.okzoomer.key_binds.ZoomKeyBinds";
 
@@ -80,6 +80,18 @@ public class OkZoomerCompat implements CompatHandler {
             okZoomerDecreaseZoomKeyFieldString = "DECREASE_ZOOM_KEY";
             okZoomerResetZoomKeyFieldString = "RESET_ZOOM_KEY";
 
+            okZoomerAreExtraKeyBindsEnabledMethodNameString = "areExtraKeyBindsEnabled";
+        } else if (LambdaReflection.doesClassExist("io.github.ennuil.ok_zoomer.key_binds.ZoomKeyBinds")) {
+            // https://github.com/EnnuiL/OkZoomer/blob/5.0.0-beta.7+1.18.2/src/main/java/io/github/ennuil/ok_zoomer/key_binds/ZoomKeyBinds.java
+            MidnightControlsClient.get().log("Ok Zoomer version 5.0.0-beta.7 (Quilt) or above detected!");
+
+            okZoomerZoomKeybindsClassString = "io.github.ennuil.ok_zoomer.key_binds.ZoomKeyBinds";
+
+            okZoomerZoomKeyFieldString = "ZOOM_KEY";
+            okZoomerIncreaseZoomKeyFieldString = "INCREASE_ZOOM_KEY";
+            okZoomerDecreaseZoomKeyFieldString = "DECREASE_ZOOM_KEY";
+            okZoomerResetZoomKeyFieldString = "RESET_ZOOM_KEY";
+
             okZoomerAreExtraKeyBindsEnabledMethodNameString = "areExtraKeyBindsEnabled";
         } else {
             // If both of the above checks fail, then the version of the Ok Zoomer API that the user is trying to use is too new.