From db9977b715ff9396d237325aec67f14fc96ed481 Mon Sep 17 00:00:00 2001 From: repo_alt Date: Sat, 2 Apr 2022 11:51:49 +0300 Subject: [PATCH] Use AE2 config setting to save search string in WCT closes https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9848 --- .../client/gui/GuiWirelessCraftingTerminal.java | 6 +++--- .../wirelesscraftingterminal/handlers/ConfigHandler.java | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java index 541686e..d447330 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java @@ -202,7 +202,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo } else if( btn == this.searchStringSave ) { - ConfigHandler.saveSearchString = next == YesNo.YES; + AEConfig.instance.preserveSearchBar = next == YesNo.YES; } else { try { @@ -375,7 +375,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo this.buttonList.add(this.searchBoxSettings = new GuiImgButton(this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE))); offset += 20; - this.buttonList.add( this.searchStringSave = new GuiImgButton( this.guiLeft - 18, offset, Settings.SAVE_SEARCH, ConfigHandler.saveSearchString ? YesNo.YES : YesNo.NO ) ); + this.buttonList.add( this.searchStringSave = new GuiImgButton( this.guiLeft - 18, offset, Settings.SAVE_SEARCH, AEConfig.instance.preserveSearchBar ? YesNo.YES : YesNo.NO ) ); offset += 20; this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings.getSetting( Settings.TERMINAL_STYLE ) ) ); @@ -394,7 +394,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo final Enum setting = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE); this.searchField.setFocused(SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting); - if (ConfigHandler.saveSearchString || this.isSubGui()) { + if (AEConfig.instance.preserveSearchBar || this.isSubGui()) { this.searchField.setText(memoryText); this.repo.setSearchString(memoryText); } diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java index 9d0b5ff..7472155 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java @@ -29,7 +29,6 @@ public class ConfigHandler { public static boolean firstLoad = true; private static int pwrInCfgFile, boosterDropInCfgFile; private static boolean mtChanged = false; - public static boolean saveSearchString = false; public static void init(File configFile) { if (config == null) { @@ -60,7 +59,6 @@ public class ConfigHandler { boosterDropsEnabled = config.getBoolean("boosterDropsEnabled", Configuration.CATEGORY_GENERAL, true, boosterDropEnabledDesc); mineTweakerOverride = config.getBoolean("mineTweakerOverride", Configuration.CATEGORY_GENERAL, false, mineTweakerOverrideDesc); doVersionCheck = config.getBoolean("doVersionCheck", Configuration.CATEGORY_GENERAL, true, doVersionCheckDesc); - saveSearchString = config.getBoolean("saveSearchString", Configuration.CATEGORY_GENERAL, false, saveSearchStringDesc); /* * I did the max power cfg loading like this because while using * Configuration#getInt did enforce the min/max values in-game, it