From 617648cf572b6b9f895883febaecdc4bf57060ce Mon Sep 17 00:00:00 2001 From: HttpRafa Date: Tue, 3 Jan 2023 03:11:44 +0100 Subject: [PATCH] Fixed error with Fabric API version 0.71.0+1.19.3 --- gradle.properties | 6 +++--- .../midnightcontrols/client/MidnightControlsClient.java | 6 +++--- .../client/mixin/KeyBindingRegistryImplAccessor.java | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index c928629..ad3aa08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.2 -loader_version=0.14.11 +yarn_mappings=1.19.3+build.5 +loader_version=0.14.12 # Mod Properties mod_version = 1.7.2 @@ -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.68.1+1.19.3 +fabric_version=0.71.0+1.19.3 sodium_version=mc1.19.2-0.4.4 spruceui_version=4.1.0+1.19.3 midnightlib_version=1.1.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 d93e41d..efd6d6e 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java @@ -10,8 +10,10 @@ import java.util.List; @Mixin(value = KeyBindingRegistryImpl.class, remap = false) public interface KeyBindingRegistryImplAccessor { + @Accessor @Final - static List getModdedKeyBindings() { + static List getMODDED_KEY_BINDINGS() { return null; } + }