diff --git a/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java b/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java index 579341a..392d82a 100644 --- a/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java +++ b/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java @@ -16,7 +16,7 @@ import org.lwjgl.input.Keyboard; public class ClientBlockFindService extends BlockFindService { public ClientBlockFindService() { - API.addHashBind("gui.findit.find_block", Keyboard.KEY_Y + NEIClientUtils.SHIFT_HASH); + API.addHashBind("gui.findit.find_block", Keyboard.KEY_Y); GuiContainerManager.addInputHandler(new BlockFindInputHandler()); } diff --git a/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java b/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java index 4948b5f..0cf3cfd 100644 --- a/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java +++ b/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java @@ -33,7 +33,7 @@ public class ClientItemFindService extends ItemFindService { public ClientItemFindService() { if (!FindIt.isExtraUtilitiesLoaded()) { - API.addHashBind("gui.findit.find_item", Keyboard.KEY_T + NEIClientUtils.SHIFT_HASH); + API.addHashBind("gui.findit.find_item", Keyboard.KEY_T); } GuiContainerManager.addInputHandler(new ItemFindInputHandler()); diff --git a/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java b/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java index 2b3d7cb..22840a7 100644 --- a/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java +++ b/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java @@ -1,5 +1,6 @@ package com.gtnh.findit.util; +import appeng.client.gui.implementations.*; import codechicken.nei.LayoutManager; import codechicken.nei.NEIClientConfig; import codechicken.nei.guihook.GuiContainerManager; @@ -15,21 +16,7 @@ public abstract class AbstractStackFinder implements IContainerInputHandler { @Override public boolean keyTyped(GuiContainer window, char c, int key) { - - if (!NEIClientConfig.isKeyHashDown(getKeyBindId())) { - return false; - } - - LayoutManager layout = LayoutManager.instance(); - if (layout == null || LayoutManager.itemPanel == null || NEIClientConfig.isHidden()) { - return false; - } - - ItemStack stack = GuiContainerManager.getStackMouseOver(window); - if (stack == null || stack.getItem() == null) { - return false; - } - return findStack(stack); + return false; } @Override @@ -39,7 +26,20 @@ public abstract class AbstractStackFinder implements IContainerInputHandler { @Override public boolean lastKeyTyped(GuiContainer guiContainer, char c, int i) { - return false; + if (!NEIClientConfig.isKeyHashDown(getKeyBindId())) { + return false; + } + + LayoutManager layout = LayoutManager.instance(); + if (layout == null || LayoutManager.itemPanel == null || NEIClientConfig.isHidden()) { + return false; + } + + ItemStack stack = GuiContainerManager.getStackMouseOver(guiContainer); + if (stack == null || stack.getItem() == null) { + return false; + } + return findStack(stack); } @Override