diff --git a/dependencies.gradle b/dependencies.gradle index 18fd195..58f46a2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,6 @@ // Add your dependencies here dependencies { - compile('com.github.GTNewHorizons:NotEnoughItems:2.2.6-GTNH:dev') + compile('com.github.GTNewHorizons:NotEnoughItems:2.2.27-GTNH:dev') compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.33:dev') } 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 eea8f20..579341a 100644 --- a/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java +++ b/src/main/java/com/gtnh/findit/service/blockfinder/ClientBlockFindService.java @@ -1,5 +1,6 @@ package com.gtnh.findit.service.blockfinder; +import codechicken.nei.NEIClientUtils; import codechicken.nei.api.API; import codechicken.nei.guihook.GuiContainerManager; import com.gtnh.findit.FindIt; @@ -15,7 +16,7 @@ public class ClientBlockFindService extends BlockFindService { public ClientBlockFindService() { - API.addKeyBind("gui.findit.find_block", Keyboard.KEY_Y); + API.addHashBind("gui.findit.find_block", Keyboard.KEY_Y + NEIClientUtils.SHIFT_HASH); 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 6d1700f..4948b5f 100644 --- a/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java +++ b/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java @@ -1,5 +1,6 @@ package com.gtnh.findit.service.itemfinder; +import codechicken.nei.NEIClientUtils; import codechicken.nei.api.API; import codechicken.nei.guihook.GuiContainerManager; import com.gtnh.findit.FindIt; @@ -32,7 +33,7 @@ public class ClientItemFindService extends ItemFindService { public ClientItemFindService() { if (!FindIt.isExtraUtilitiesLoaded()) { - API.addKeyBind("gui.findit.find_item", Keyboard.KEY_T); + API.addHashBind("gui.findit.find_item", Keyboard.KEY_T + NEIClientUtils.SHIFT_HASH); } 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 6f00b58..2b3d7cb 100644 --- a/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java +++ b/src/main/java/com/gtnh/findit/util/AbstractStackFinder.java @@ -15,8 +15,8 @@ public abstract class AbstractStackFinder implements IContainerInputHandler { @Override public boolean keyTyped(GuiContainer window, char c, int key) { - int keyBinding = NEIClientConfig.getKeyBinding(getKeyBindId()); - if (key != keyBinding) { + + if (!NEIClientConfig.isKeyHashDown(getKeyBindId())) { return false; }