MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix gui not closing when pressing activation button

Browse Source
This commit is contained in:
Marcel Konrad
2020-11-02 17:22:43 +01:00
parent 80ec385ff8
commit 1596ce8dff
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/exopandora/worldhandler/event/KeyHandler.java
View File

@@ -3,8 +3,6 @@ package exopandora.worldhandler.event;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import com.google.common.base.Objects;
import exopandora.worldhandler.Main; import exopandora.worldhandler.Main;
import exopandora.worldhandler.config.Config; import exopandora.worldhandler.config.Config;
import exopandora.worldhandler.util.ActionHelper; 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.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.InputEvent.KeyInputEvent; import net.minecraftforge.client.event.InputEvent.KeyInputEvent;
import net.minecraftforge.client.settings.KeyModifier;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.client.registry.ClientRegistry; 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() public static void updatePosKeys()
{ {
boolean isRegistered = KeyHandler.arePosKeysRegistered(); boolean isRegistered = KeyHandler.arePosKeysRegistered();

5
src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java
View File

@@ -332,9 +332,9 @@ public class GuiWorldHandler extends Container
focused = ((Widget) this.getListener()).isFocused(); 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; return true;
} }
@@ -443,6 +443,7 @@ public class GuiWorldHandler extends Container
@Override @Override
public void onClose() public void onClose()
{ {
System.out.println("onClose");
ActionHelper.tryRun(this.content::onGuiClosed); ActionHelper.tryRun(this.content::onGuiClosed);
} }