From 6be6e2ee6b97d9807536d2205401dbfa963dce82 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 6 Feb 2024 19:39:16 +0000 Subject: Added keep previous search added option to keep the previous search --- .../java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 +++ .../hysky/skyblocker/config/categories/GeneralCategory.java | 7 +++++++ .../skyblocker/skyblock/searchOverlay/OverlayScreen.java | 1 + .../skyblocker/skyblock/searchOverlay/SearchOverManager.java | 11 ++++++++++- src/main/resources/assets/skyblocker/lang/en_us.json | 1 + 5 files changed, 22 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 7f945035..7a9cb721 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -421,6 +421,9 @@ public class SkyblockerConfig { @SerialEntry public boolean enableAuctionHouse = true; + @SerialEntry + public boolean keepPreviousSearches = false; + @SerialEntry public int maxSuggestions = 3; diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index f4674c2e..3618f112 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -660,6 +660,13 @@ public class GeneralCategory { newValue -> config.general.searchOverlay.enableAuctionHouse = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.keepPreviousSearches")) + .binding(defaults.general.searchOverlay.keepPreviousSearches, + () -> config.general.searchOverlay.keepPreviousSearches, + newValue -> config.general.searchOverlay.keepPreviousSearches = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.maxSuggestions")) .binding(defaults.general.searchOverlay.maxSuggestions, diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java index cf9a57f3..d6d7584e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java @@ -38,6 +38,7 @@ public class OverlayScreen extends Screen { // Search field this.searchField = new TextFieldWidget(textRenderer, startX, startY, rowWidth - rowHeight, rowHeight, Text.literal("Search...")); + searchField.setText(SearchOverManager.search); searchField.setChangedListener(SearchOverManager::updateSearch); searchField.setMaxLength(30); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java index 87f4a27f..e3b818d5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java @@ -95,7 +95,16 @@ public class SearchOverManager { SignFront = front; Sign = sign; IsAuction = isAuction; - search = ""; //todo load form sign data if needed + if (SkyblockerConfigManager.get().general.searchOverlay.keepPreviousSearches){ + Text[] messages = Sign.getText(SignFront).getMessages(CLIENT.shouldFilterText()); + search = messages[0].getString(); + if(!messages[1].getString().isEmpty()){ + search += " " + messages[1].getString(); + } + }else{ + search = ""; + } + suggestionsArray = new String[]{}; } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index d14a08fb..9800992b 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -132,6 +132,7 @@ "text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity": "Flame Opacity", "text.autoconfig.skyblocker.option.general.searchOverlay": "Search Overlay", "text.autoconfig.skyblocker.option.general.searchOverlay.enableBazaar": "Enable For Bazaar", + "text.autoconfig.skyblocker.option.general.searchOverlay.keepPreviousSearches": "Keep Previous Searches", "text.autoconfig.skyblocker.option.general.searchOverlay.enableAuctionHouse": "Enable For Auction House", "text.autoconfig.skyblocker.option.general.searchOverlay.maxSuggestions": "Maximum Suggestions", "text.autoconfig.skyblocker.option.general.searchOverlay.historyLength": "Saved Search History Length", -- cgit