Fix /bzs autocomplete & a related bug

Author: LJNeon

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

@@ -37,7 +37,6 @@ public CommandNode<? extends SharedSuggestionProvider> modifyCommandSuggestions(
 				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;

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

@@ -4,6 +4,9 @@
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import de.hysky.skyblocker.annotations.Init;
 import de.hysky.skyblocker.skyblock.searchoverlay.SearchOverManager;
@@ -14,12 +17,12 @@
 import net.minecraft.commands.SharedSuggestionProvider;
 import org.jspecify.annotations.Nullable;
 
+import java.util.concurrent.CompletableFuture;
 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;
 
@@ -28,10 +31,14 @@ public static void init() {
 		NEURepoManager.runAsyncAfterLoad(AuctionBazaarAutocomplete::createNodes);
 	}
 
+	// since /bzs is only client-side it needs separate handling
+	public static CompletableFuture<Suggestions> suggestBzs(CommandContext<FabricClientCommandSource> context, SuggestionsBuilder builder) {
+		return SharedSuggestionProvider.suggest(SearchOverManager.getBazaarItems(), builder);
+	}
+
 	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);
 	}

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

@@ -10,6 +10,7 @@
 import de.hysky.skyblocker.config.configs.UIAndVisualsConfig;
 import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.injected.SkyblockerStack;
+import de.hysky.skyblocker.skyblock.AuctionBazaarAutocomplete;
 import de.hysky.skyblocker.skyblock.item.tooltip.info.TooltipInfoType;
 import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.skyblock.museum.Donation;
@@ -19,6 +20,7 @@
 import de.hysky.skyblocker.utils.FlexibleItemStack;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.NEURepoManager;
+import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
 import io.github.moulberry.repo.data.NEUItem;
 import io.github.moulberry.repo.util.NEUId;
@@ -89,17 +91,30 @@ 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())
+			dispatcher.register(literal("ahs")
+					.requires(_ -> Utils.isOnSkyblock())
+					.executes(_ -> startCommand(true, "")));
+			dispatcher.register(literal("ahsearch")
+					.requires(_ -> Utils.isOnSkyblock())
+					.executes(_ -> startCommand(true, "")));
+			dispatcher.register(literal("bzs")
+					.requires(_ -> Utils.isOnSkyblock())
+					.executes(_ -> startCommand(false, "")));
+
+			dispatcher.register(literal("ahs")
+					.requires(_ -> Utils.isOnSkyblock())
+					.then(argument("item", StringArgumentType.greedyString())
 					.executes(context -> startCommand(true, StringArgumentType.getString(context, "item"))
 					)));
-			dispatcher.register(literal("ahsearch").then(argument("item", StringArgumentType.greedyString())
+			dispatcher.register(literal("ahsearch")
+					.requires(_ -> Utils.isOnSkyblock())
+					.then(argument("item", StringArgumentType.greedyString())
 					.executes(context -> startCommand(true, StringArgumentType.getString(context, "item"))
 					)));
-			dispatcher.register(literal("bzs").then(argument("item", StringArgumentType.greedyString())
+			dispatcher.register(literal("bzs")
+					.requires(_ -> Utils.isOnSkyblock())
+					.then(argument("item", StringArgumentType.greedyString())
+					.suggests(AuctionBazaarAutocomplete::suggestBzs)
 					.executes(context -> startCommand(false, StringArgumentType.getString(context, "item"))
 					)));
 		}