diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java index f11b758a064..81a025450b6 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -823,6 +823,14 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig newValue -> config.uiAndVisuals.searchOverlay.enableAuctionHouse = newValue) .controller(ConfigUtils.createBooleanController()) .build()) + .option(Option.createBuilder() + .name(Component.translatable("skyblocker.config.uiAndVisuals.searchOverlay.enableIronmanAuctionHouse")) + .description(Component.translatable("skyblocker.config.uiAndVisuals.searchOverlay.enableIronmanAuctionHouse.@Tooltip")) + .binding(defaults.uiAndVisuals.searchOverlay.enableIronmanAuctionHouse, + () -> config.uiAndVisuals.searchOverlay.enableIronmanAuctionHouse, + newValue -> config.uiAndVisuals.searchOverlay.enableIronmanAuctionHouse = newValue) + .controller(ConfigUtils.createBooleanController()) + .build()) .option(Option.createBuilder() .name(Component.translatable("skyblocker.config.uiAndVisuals.searchOverlay.enableMuseum")) .description(Component.translatable("skyblocker.config.uiAndVisuals.searchOverlay.enableMuseum.@Tooltip")) diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java index e45ad9fa9c1..141d40fae7e 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -411,6 +411,8 @@ public static class SearchOverlay { public boolean enableAuctionHouse = true; + public boolean enableIronmanAuctionHouse = false; + public boolean enableMuseum = true; public boolean keepPreviousSearches = false; diff --git a/src/main/java/de/hysky/skyblocker/mixins/LocalPlayerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/LocalPlayerMixin.java index eb8ac92e3d0..c8a440c46ee 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/LocalPlayerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/LocalPlayerMixin.java @@ -14,7 +14,9 @@ import de.hysky.skyblocker.skyblock.searchoverlay.OverlayScreen; import de.hysky.skyblocker.skyblock.searchoverlay.SearchOverManager; import de.hysky.skyblocker.utils.Utils; + import java.util.Locale; + import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,15 +80,17 @@ public LocalPlayerMixin(ClientLevel world, GameProfile profile) { boolean isInputSign = sign.getText(front).getMessage(3, false).getString().equalsIgnoreCase("enter query"); if (!isInputSign) return; - if (config.enableAuctionHouse && minecraft.gui.screen().getTitle().getString().toLowerCase(Locale.ENGLISH).contains("auction")) { + String title = minecraft.gui.screen().getTitle().getString(); + if (config.enableAuctionHouse && title.contains("Auction") || + config.enableIronmanAuctionHouse && title.contains("Cosmetics")) { SearchOverManager.updateSign(sign, front, SearchOverManager.SearchLocation.AUCTION); minecraft.gui.setScreen(new OverlayScreen()); ci.cancel(); - } else if (config.enableBazaar && minecraft.gui.screen().getTitle().getString().toLowerCase(Locale.ENGLISH).contains("bazaar")) { + } else if (config.enableBazaar && title.contains("Bazaar")) { SearchOverManager.updateSign(sign, front, SearchOverManager.SearchLocation.BAZAAR); minecraft.gui.setScreen(new OverlayScreen()); ci.cancel(); - } else if (config.enableMuseum && minecraft.gui.screen().getTitle().getString().contains("Museum")) { + } else if (config.enableMuseum && title.contains("Museum")) { SearchOverManager.updateSign(sign, front, SearchOverManager.SearchLocation.MUSEUM); minecraft.gui.setScreen(new OverlayScreen()); ci.cancel(); diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index e7466b62458..98d7fdc71b4 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -1420,6 +1420,8 @@ "skyblocker.config.uiAndVisuals.searchOverlay.enableBazaar.@Tooltip": "Show custom search overlay when searching in the Bazaar.", "skyblocker.config.uiAndVisuals.searchOverlay.enableCommands": "Open from commands", "skyblocker.config.uiAndVisuals.searchOverlay.enableCommands.@Tooltip": "Opens the bazaar search with \"/bzs\" and auction house with \"/ahs\". A re-log is required for this setting to be updated.", + "skyblocker.config.uiAndVisuals.searchOverlay.enableIronmanAuctionHouse": "Enable For Ironman Cosmetics Auction House", + "skyblocker.config.uiAndVisuals.searchOverlay.enableIronmanAuctionHouse.@Tooltip": "Show custom search overlay when searching in the Cosmetics Auction House.", "skyblocker.config.uiAndVisuals.searchOverlay.enableMuseum": "Enable for Museum", "skyblocker.config.uiAndVisuals.searchOverlay.enableMuseum.@Tooltip": "Show custom search overlay when searching in the Museum.", "skyblocker.config.uiAndVisuals.searchOverlay.historyLength": "Saved Search History Length",