diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/searchoverlay')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java | 10 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java | 21 |
2 files changed, 15 insertions, 16 deletions
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 b8907e27..66d817e4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java @@ -35,7 +35,7 @@ public class OverlayScreen extends Screen { super.init(); int rowWidth = (int) (this.width * 0.4); int startX = (int) (this.width * 0.5) - rowWidth / 2; - int startY = (int) ((int) (this.height * 0.5) - (rowHeight * (1 + SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions + 0.75 + SkyblockerConfigManager.get().general.searchOverlay.historyLength)) / 2); + int startY = (int) ((int) (this.height * 0.5) - (rowHeight * (1 + SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions + 0.75 + SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.historyLength)) / 2); // Search field this.searchField = new TextFieldWidget(textRenderer, startX, startY, rowWidth - rowHeight, rowHeight, Text.translatable("gui.recipebook.search_hint")); @@ -50,7 +50,7 @@ public class OverlayScreen extends Screen { // suggested item buttons int rowOffset = rowHeight; - int totalSuggestions = SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions; + int totalSuggestions = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions; this.suggestionButtons = new ButtonWidget[totalSuggestions]; for (int i = 0; i < totalSuggestions; i++) { suggestionButtons[i] = ButtonWidget.builder(Text.literal(SearchOverManager.getSuggestion(i)).setStyle(Style.EMPTY), a -> { @@ -64,7 +64,7 @@ public class OverlayScreen extends Screen { } // history item buttons rowOffset += (int) (rowHeight * 0.75); - int historyLength = SkyblockerConfigManager.get().general.searchOverlay.historyLength; + int historyLength = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.historyLength; this.historyButtons = new ButtonWidget[historyLength]; for (int i = 0; i < historyLength; i++) { String text = SearchOverManager.getHistory(i); @@ -106,7 +106,7 @@ public class OverlayScreen extends Screen { int renderOffset = (rowHeight - 16) / 2; context.drawGuiTexture(SEARCH_ICON_TEXTURE, finishedButton.getX() + renderOffset, finishedButton.getY() + renderOffset, 16, 16); if (historyButtons.length > 0 && historyButtons[0] != null) { - context.drawText(textRenderer, Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.historyLabel"), historyButtons[0].getX() + renderOffset, historyButtons[0].getY() - rowHeight / 2, 0xFFFFFFFF, true); + context.drawText(textRenderer, Text.translatable("skyblocker.option.general.searchOverlay.historyLabel"), historyButtons[0].getX() + renderOffset, historyButtons[0].getY() - rowHeight / 2, 0xFFFFFFFF, true); } //draw item stacks and tooltip to buttons @@ -140,7 +140,7 @@ public class OverlayScreen extends Screen { public final void tick() { super.tick(); //update suggestion buttons text - for (int i = 0; i < SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions; i++) { + for (int i = 0; i < SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions; i++) { String text = SearchOverManager.getSuggestion(i); if (!text.isEmpty()) { suggestionButtons[i].visible = true; 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 1d740601..f8c4742d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java @@ -2,13 +2,12 @@ package de.hysky.skyblocker.skyblock.searchoverlay; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; +import de.hysky.skyblocker.config.configs.UiAndVisualsConfig; import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType; -import de.hysky.skyblocker.utils.Http; import de.hysky.skyblocker.utils.NEURepoManager; import de.hysky.skyblocker.utils.scheduler.MessageScheduler; import io.github.moulberry.repo.data.NEUItem; @@ -75,7 +74,7 @@ public class SearchOverManager { } private static void registerSearchCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) { - if (SkyblockerConfigManager.get().general.searchOverlay.enableCommands) { + if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.enableCommands) { dispatcher.register(literal("ahs").executes(context -> startCommand(true))); dispatcher.register(literal("bzs").executes(context -> startCommand(false))); } @@ -199,7 +198,7 @@ public class SearchOverManager { SearchOverManager.sign = sign; isCommand = false; SearchOverManager.isAuction = isAuction; - if (SkyblockerConfigManager.get().general.searchOverlay.keepPreviousSearches) { + if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.keepPreviousSearches) { Text[] messages = SearchOverManager.sign.getText(signFront).getMessages(CLIENT.shouldFilterText()); search = messages[0].getString(); if (!messages[1].getString().isEmpty()) { @@ -221,7 +220,7 @@ public class SearchOverManager { protected static void updateSearch(String newValue) { search = newValue; //update the suggestion values - int totalSuggestions = SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions; + int totalSuggestions = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions; if (newValue.isBlank() || totalSuggestions == 0) return; //do not search for empty value suggestionsArray = (isAuction ? auctionItems : bazaarItems).stream().filter(item -> item.toLowerCase().contains(search.toLowerCase())).limit(totalSuggestions).toArray(String[]::new); } @@ -248,12 +247,12 @@ public class SearchOverManager { */ protected static String getHistory(int index) { if (isAuction) { - if (SkyblockerConfigManager.get().general.searchOverlay.auctionHistory.size() > index) { - return SkyblockerConfigManager.get().general.searchOverlay.auctionHistory.get(index); + if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.auctionHistory.size() > index) { + return SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.auctionHistory.get(index); } } else { - if (SkyblockerConfigManager.get().general.searchOverlay.bazaarHistory.size() > index) { - return SkyblockerConfigManager.get().general.searchOverlay.bazaarHistory.get(index); + if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.bazaarHistory.size() > index) { + return SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.bazaarHistory.get(index); } } return null; @@ -268,9 +267,9 @@ public class SearchOverManager { */ private static void saveHistory() { //save to history - SkyblockerConfig.SearchOverlay config = SkyblockerConfigManager.get().general.searchOverlay; + UiAndVisualsConfig.SearchOverlay config = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay; if (isAuction) { - if (config.auctionHistory.isEmpty() || !config.auctionHistory.get(0).equals(search)) { + if (config.auctionHistory.isEmpty() || !config.auctionHistory.getFirst().equals(search)) { config.auctionHistory.add(0, search); if (config.auctionHistory.size() > config.historyLength) { config.auctionHistory = config.auctionHistory.subList(0, config.historyLength); |