From 0036baee3e6c5761d78ec8e1ed7f3efc565d610d Mon Sep 17 00:00:00 2001
From: Motschen <motschen@midnightdust.eu>
Date: Thu, 5 Jan 2023 18:05:19 +0100
Subject: [PATCH] Fix #158 (I hate gradle...)

---
 build.gradle                                         | 12 +++++++++---
 gradle.properties                                    |  2 +-
 .../client/MidnightControlsClient.java               |  6 +++---
 .../client/mixin/KeyBindingRegistryImplAccessor.java |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 71cea55..fe25d7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,7 +102,9 @@ dependencies {
     }
     include 'org.aperlambda:lambdajcommon:1.8.1'
 
-    modCompileOnlyApi "com.terraformersmc:modmenu:${project.modmenu_version}"
+    modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
 
     // Compatibility mods
 
@@ -110,13 +112,17 @@ dependencies {
     // modImplementation("maven.modrinth:ok-zoomer:${project.ok_zoomer_version}")
     // modImplementation "io.github.ennuil:LibZoomer:${project.libzoomer_version}"
 
-    modCompileOnlyApi "io.github.cottonmc:LibGui:${project.libgui_version}"
+    modCompileOnlyApi ("io.github.cottonmc:LibGui:${project.libgui_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
     modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
     modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
     modImplementation "maven.modrinth:emi:${project.emi_version}"
     modCompileOnlyApi "maven.modrinth:emotecraft:${project.emotecraft_version}"
     modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
-    modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
+    modImplementation ("dev.isxander:yet-another-config-lib:${project.yacl_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
     modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
     modCompileOnlyApi "maven.modrinth:bedrockify:${project.bedrockify_version}"
     // Required for Inventory Tabs
diff --git a/gradle.properties b/gradle.properties
index b094119..c1a27fe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ modrinth_id=bXX9h73M
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.71.0+1.19.2
+fabric_version=0.72.0+1.19.2
 sodium_version=mc1.19.2-0.4.4
 spruceui_version=4.0.0+1.19
 midnightlib_version=1.0.0-fabric
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
index 40915ff..5ff513f 100644
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
@@ -173,9 +173,9 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
             voxelmapInitDone = true;
         }
         if (lateInitDone) return;
-        if (KeyBindingRegistryImplAccessor.getModdedKeyBindings() == null || KeyBindingRegistryImplAccessor.getModdedKeyBindings().isEmpty()) return;
-        for (int i = 0; i < KeyBindingRegistryImplAccessor.getModdedKeyBindings().size(); ++i) {
-            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getModdedKeyBindings().get(i);
+        if (KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS() == null || KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().isEmpty()) return;
+        for (int i = 0; i < KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().size(); ++i) {
+            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().get(i);
             if (!keyBinding.getTranslationKey().contains("midnightcontrols") && !keyBinding.getTranslationKey().contains("ok_zoomer") && !keyBinding.getTranslationKey().contains("okzoomer")) {
                 category = null;
                 InputManager.streamCategories().forEach(buttonCategory -> {
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java
index 4129194..efd6d6e 100644
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java
@@ -12,7 +12,7 @@ import java.util.List;
 public interface KeyBindingRegistryImplAccessor {
 
     @Accessor @Final
-    static List<KeyBinding> getModdedKeyBindings() {
+    static List<KeyBinding> getMODDED_KEY_BINDINGS() {
         return null;
     }