Skip to content

Add Search Overlay for Cosmetics Auction House #2644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alex33856 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Search Overlay for Cosmetics Auction House #2644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,14 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
newValue -> config.uiAndVisuals.searchOverlay.enableAuctionHouse = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>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.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.uiAndVisuals.searchOverlay.enableMuseum"))
.description(Component.translatable("skyblocker.config.uiAndVisuals.searchOverlay.enableMuseum.@Tooltip"))
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,8 @@ public static class SearchOverlay {

public boolean enableAuctionHouse = true;

public boolean enableIronmanAuctionHouse = false;

public boolean enableMuseum = true;

public boolean keepPreviousSearches = false;
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/de/hysky/skyblocker/mixins/LocalPlayerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/skyblocker/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down