Add autocomplete to /ahs, /bzs, & /bz

Author: LJNeon

src/main/java/de/hysky/skyblocker/mixins/ClientboundCommandsPacketMixin.java

@@ -4,6 +4,7 @@
 import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 
+import de.hysky.skyblocker.skyblock.AuctionBazaarAutocomplete;
 import de.hysky.skyblocker.skyblock.CallAutocomplete;
 import de.hysky.skyblocker.skyblock.ChaptersAutocomplete;
 import de.hysky.skyblocker.skyblock.JoinInstanceAutocomplete;
@@ -34,6 +35,11 @@ public CommandNode<? extends SharedSuggestionProvider> modifyCommandSuggestions(
 				case String s when s.equals("rngmeter") && RngMeterAutocomplete.longCommand != null -> RngMeterAutocomplete.longCommand;
 				case String s when s.equals("rng") && RngMeterAutocomplete.shortCommand != null -> RngMeterAutocomplete.shortCommand;
 				case String s when s.equals("call") && CallAutocomplete.commandNode != null -> CallAutocomplete.commandNode;
+				case String s when s.equals("ahs") && AuctionBazaarAutocomplete.ahsNode != null -> AuctionBazaarAutocomplete.ahsNode;
+				case String s when s.equals("ahsearch") && AuctionBazaarAutocomplete.ahsearchNode != null -> AuctionBazaarAutocomplete.ahsearchNode;
+				case String s when s.equals("bzs") && AuctionBazaarAutocomplete.bzsNode != null -> AuctionBazaarAutocomplete.bzsNode;
+				case String s when s.equals("bz") && AuctionBazaarAutocomplete.bzNode != null -> AuctionBazaarAutocomplete.bzNode;
+				case String s when s.equals("bazaar") && AuctionBazaarAutocomplete.bazaarNode != null -> AuctionBazaarAutocomplete.bazaarNode;
 				case String s when s.equals("chapter") && ChaptersAutocomplete.singularCommandNode != null -> ChaptersAutocomplete.singularCommandNode;
 				case String s when s.equals("chapters") && ChaptersAutocomplete.pluralCommandNode != null -> ChaptersAutocomplete.pluralCommandNode;
 				default -> original;

src/main/java/de/hysky/skyblocker/skyblock/AuctionBazaarAutocomplete.java

@@ -0,0 +1,48 @@
+package de.hysky.skyblocker.skyblock;
+
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal;
+
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import de.hysky.skyblocker.annotations.Init;
+import de.hysky.skyblocker.skyblock.searchoverlay.SearchOverManager;
+import de.hysky.skyblocker.utils.NEURepoManager;
+import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.command.CommandUtils;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
+import org.jspecify.annotations.Nullable;
+
+import java.util.function.Supplier;
+
+public class AuctionBazaarAutocomplete {
+	public static @Nullable LiteralCommandNode<FabricClientCommandSource> ahsNode;
+	public static @Nullable LiteralCommandNode<FabricClientCommandSource> ahsearchNode;
+	public static @Nullable LiteralCommandNode<FabricClientCommandSource> bzsNode;
+	public static @Nullable LiteralCommandNode<FabricClientCommandSource> bzNode;
+	public static @Nullable LiteralCommandNode<FabricClientCommandSource> bazaarNode;
+
+	@Init(priority = 100) // Load after SearchOverManager
+	public static void init() {
+		NEURepoManager.runAsyncAfterLoad(AuctionBazaarAutocomplete::createNodes);
+	}
+
+	private static void createNodes() {
+		ahsNode = createNode("ahs", SearchOverManager::getAuctionItems);
+		ahsearchNode = createNode("ahsearch", SearchOverManager::getAuctionItems);
+		bzsNode = createNode("bzs", SearchOverManager::getBazaarItems);
+		bzNode = createNode("bz", SearchOverManager::getBazaarItems);
+		bazaarNode = createNode("bazaar", SearchOverManager::getBazaarItems);
+	}
+
+	private static LiteralCommandNode<FabricClientCommandSource> createNode(String command, Supplier<Iterable<String>> suggester) {
+		return literal(command)
+				.requires(_ -> Utils.isOnSkyblock())
+				.executes(CommandUtils.noOp)
+				.then(argument("item", StringArgumentType.greedyString())
+						.suggests((_, builder) -> SharedSuggestionProvider.suggest(suggester.get(), builder))
+						.executes(CommandUtils.noOp))
+				.build();
+	}
+}

src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java

@@ -90,11 +90,15 @@ public static void init() {
 	private static void registerSearchCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext registryAccess) {
 		if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.enableCommands) {
 			dispatcher.register(literal("ahs").executes(_ -> startCommand(true, "")));
+			dispatcher.register(literal("ahsearch").executes(_ -> startCommand(true, "")));
 			dispatcher.register(literal("bzs").executes(_ -> startCommand(false, "")));
 
 			dispatcher.register(literal("ahs").then(argument("item", StringArgumentType.greedyString())
 					.executes(context -> startCommand(true, StringArgumentType.getString(context, "item"))
 					)));
+			dispatcher.register(literal("ahsearch").then(argument("item", StringArgumentType.greedyString())
+					.executes(context -> startCommand(true, StringArgumentType.getString(context, "item"))
+					)));
 			dispatcher.register(literal("bzs").then(argument("item", StringArgumentType.greedyString())
 					.executes(context -> startCommand(false, StringArgumentType.getString(context, "item"))
 					)));
@@ -215,6 +219,14 @@ private static void loadItems() {
 		SearchOverManager.namesToNeuId = namesToNeuId;
 	}
 
+	public static HashSet<String> getBazaarItems() {
+		return bazaarItems;
+	}
+
+	public static HashSet<String> getAuctionItems() {
+		return auctionItems;
+	}
+
 	/**
 	 * Receives data when a search is started and resets values
 	 *