From 1596ce8dffafc6d7f39d32a3d82d4e6b048e64f4 Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Mon, 2 Nov 2020 17:22:43 +0100 Subject: [PATCH] Fix gui not closing when pressing activation button --- .../java/exopandora/worldhandler/event/KeyHandler.java | 8 -------- .../worldhandler/gui/container/impl/GuiWorldHandler.java | 5 +++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/exopandora/worldhandler/event/KeyHandler.java b/src/main/java/exopandora/worldhandler/event/KeyHandler.java index c7772b2..a6a72da 100644 --- a/src/main/java/exopandora/worldhandler/event/KeyHandler.java +++ b/src/main/java/exopandora/worldhandler/event/KeyHandler.java @@ -3,8 +3,6 @@ package exopandora.worldhandler.event; import org.apache.commons.lang3.ArrayUtils; import org.lwjgl.glfw.GLFW; -import com.google.common.base.Objects; - import exopandora.worldhandler.Main; import exopandora.worldhandler.config.Config; import exopandora.worldhandler.util.ActionHelper; @@ -14,7 +12,6 @@ import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.InputEvent.KeyInputEvent; -import net.minecraftforge.client.settings.KeyModifier; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -45,11 +42,6 @@ public class KeyHandler } } - public static boolean isPressed(KeyBinding keyBinding, int keyCode) - { - return keyCode == keyBinding.getKey().getKeyCode() && (KeyModifier.NONE.equals(keyBinding.getKeyModifier()) || Objects.equal(KeyModifier.getActiveModifier(), keyBinding.getKeyModifier())); - } - public static void updatePosKeys() { boolean isRegistered = KeyHandler.arePosKeysRegistered(); diff --git a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java index 39665c3..b4c3088 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java +++ b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java @@ -332,9 +332,9 @@ public class GuiWorldHandler extends Container focused = ((Widget) this.getListener()).isFocused(); } - if(!focused && KeyHandler.isPressed(KeyHandler.KEY_WORLD_HANDLER, keyCode)) + if(!focused && KeyHandler.KEY_WORLD_HANDLER.matchesKey(keyCode, scanCode) && KeyHandler.KEY_WORLD_HANDLER.getKeyModifier().isActive(null)) { - this.onClose(); + Minecraft.getInstance().displayGuiScreen(null); return true; } @@ -443,6 +443,7 @@ public class GuiWorldHandler extends Container @Override public void onClose() { + System.out.println("onClose"); ActionHelper.tryRun(this.content::onGuiClosed); }