From 331a9fd638241401c89135da8dda50d1ecc89122 Mon Sep 17 00:00:00 2001 From: slprime Date: Tue, 11 Jun 2024 00:15:24 +0300 Subject: [PATCH] code refactoring --- src/main/java/codechicken/nei/ClientHandler.java | 1 + src/main/java/codechicken/nei/LayoutManager.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index 7d1ccab2..f002dcd4 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -149,6 +149,7 @@ public class ClientHandler { loadSerialHandlers(); loadHeightHackHandlers(); loadHiddenHandlers(); + loadEnableAutoFocus(); ItemInfo.preInit(); StackInfo.loadGuidFilters(); } diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index cfe89029..77ac7b00 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -89,7 +89,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public static PresetsWidget presetsPanel; public static SearchField searchField; public static boolean searchInitFocusedCancellable = false; - public static int mousePriorX, mousePriorY; + protected static int mousePriorX; + protected static int mousePriorY; public static ButtonCycled options; public static ButtonCycled bookmarksButton; @@ -166,7 +167,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return getSideWidth(gui); } - public boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) { + protected boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) { if (gui instanceof INEIAutoFocusSearchEnable) { return true; } @@ -179,7 +180,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return false; } - public void searchFocusInitCancelCheck() { + protected void searchFocusInitCancelCheck() { if (searchInitFocusedCancellable) { if (searchField.isVisible() && NEIClientConfig.isFocusSearchWidgetOnOpen() && getInputFocused() == searchField) { @@ -296,8 +297,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH if (mousePriorX == -1) { mousePriorX = mousex; mousePriorY = mousey; - } - if (mousePriorX != mousex || mousePriorY != mousey) { + } else if (mousePriorX != mousex || mousePriorY != mousey) { searchFocusInitCancelCheck(); mousePriorX = mousex; mousePriorY = mousey;