From cba8a4e1d416b4b57446fcbf47585243d9d65758 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 14 Feb 2024 10:47:52 +0100 Subject: [PATCH] Fix EMI compat --- gradle.properties | 2 +- .../midnightcontrols/client/compat/EMICompat.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8581208..37ece25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ midnightlib_version=1.5.3-fabric modmenu_version=7.0.0 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric bendylib_version=2.0.+ -emi_version=0.5.0+1.19.3 +emi_version=1.1.1+1.20.4+fabric libgui_version=6.0.0+1.19 inventorytabs_version=inventorytabs-0.9.beta-1.19.x clothconfig_version=7.0.72 diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java index 7809fab..bcbbd3e 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java @@ -1,13 +1,12 @@ package eu.midnightdust.midnightcontrols.client.compat; +import dev.emi.emi.api.EmiApi; import dev.emi.emi.config.EmiConfig; -import dev.emi.emi.screen.EmiScreen; import dev.emi.emi.screen.EmiScreenManager; import eu.midnightdust.midnightcontrols.client.MidnightControlsClient; import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding; import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory; import eu.midnightdust.midnightcontrols.client.controller.InputManager; -import net.minecraft.client.gui.screen.ingame.HandledScreen; import org.aperlambda.lambdacommon.Identifier; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; @@ -30,13 +29,13 @@ public class EMICompat implements CompatHandler { .buttons(GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true)) .category(category) .action((client,action,value,buttonState)->handleTabs(false)).cooldown() - .filter(((client, buttonBinding) -> client.currentScreen instanceof HandledScreen || client.currentScreen instanceof EmiScreen)) + .filter(((client, buttonBinding) -> EmiApi.getHandledScreen() != null)) .register(); new ButtonBinding.Builder("emi_page_right") .buttons(GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true)) .category(category) .action((client,action,value,buttonState)->handleTabs(true)).cooldown() - .filter(((client, buttonBinding) -> client.currentScreen instanceof HandledScreen || client.currentScreen instanceof EmiScreen)) + .filter(((client, buttonBinding) -> EmiApi.getHandledScreen() != null)) .register(); } public static boolean isEMIEnabled() {