From 69dff6338368fe46dcde00932b3799d8d301f3a3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 18 Jun 2019 23:45:57 +0800 Subject: close stuff and add focus keybind Close #102 Close #100 Close #29 --- src/main/java/me/shedaniel/rei/api/ClientHelper.java | 2 ++ src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java | 9 ++++++++- src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/me/shedaniel/rei/api/ClientHelper.java b/src/main/java/me/shedaniel/rei/api/ClientHelper.java index bd377c2ba..7560564e2 100644 --- a/src/main/java/me/shedaniel/rei/api/ClientHelper.java +++ b/src/main/java/me/shedaniel/rei/api/ClientHelper.java @@ -78,6 +78,8 @@ public interface ClientHelper { */ boolean executeUsageKeyBind(ItemStack stack); + FabricKeyBinding getFocusSearchFieldKeyBinding(); + /** * Gets the mod from an item * diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java b/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java index 268cbf578..54485fd3f 100644 --- a/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java @@ -52,8 +52,9 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer { private final Identifier hideKeybind = new Identifier("roughlyenoughitems", "hide_keybind"); private final Identifier previousPageKeybind = new Identifier("roughlyenoughitems", "previous_page"); private final Identifier nextPageKeybind = new Identifier("roughlyenoughitems", "next_page"); + private final Identifier focusSearchFieldKeybind = new Identifier("roughlyenoughitems", "focus_search"); private final Map modNameCache = Maps.newHashMap(); - public FabricKeyBinding recipe, usage, hide, previousPage, nextPage; + public FabricKeyBinding recipe, usage, hide, previousPage, nextPage,focusSearchField; public String getFormattedModNoItalicFromItem(Item item) { String mod = getModFromItem(item); @@ -103,6 +104,11 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer { return nextPage; } + @Override + public FabricKeyBinding getFocusSearchFieldKeyBinding() { + return focusSearchField; + } + @Override public String getModFromItem(Item item) { if (item.equals(Items.AIR)) @@ -260,6 +266,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer { KeyBindingRegistryImpl.INSTANCE.register(hide = FabricKeyBinding.Builder.create(hideKeybind, InputUtil.Type.KEYSYM, 79, category).build()); KeyBindingRegistryImpl.INSTANCE.register(previousPage = FabricKeyBinding.Builder.create(previousPageKeybind, InputUtil.Type.KEYSYM, -1, category).build()); KeyBindingRegistryImpl.INSTANCE.register(nextPage = FabricKeyBinding.Builder.create(nextPageKeybind, InputUtil.Type.KEYSYM, -1, category).build()); + KeyBindingRegistryImpl.INSTANCE.register(focusSearchField = FabricKeyBinding.Builder.create(focusSearchFieldKeybind, InputUtil.Type.KEYSYM, -1, category).build()); } } diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 67ef5e30c..3cdd4cb0e 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -500,6 +500,11 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra else if (ClientHelper.getInstance().getUsageKeyBinding().matchesKey(int_1, int_2)) return ClientHelper.getInstance().executeUsageKeyBind(itemStack); } + if (ClientHelper.getInstance().getFocusSearchFieldKeyBinding().matchesKey(int_1, int_2)) { + ScreenHelper.searchField.setFocused(true); + setFocused(ScreenHelper.searchField); + return true; + } return false; } -- cgit