Merge pull request #783 from SkyblockerMod/api-changes

Api changes the Aaron of the Azure color made

5 files changed, 273 insertions, 37 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java b/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java
new file mode 100644
index 00000000..d8cd6e48
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java
@@ -0,0 +1,149 @@
+package de.hysky.skyblocker.skyblock;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.util.concurrent.CompletableFuture;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+
+import com.google.gson.JsonParser;
+import com.mojang.logging.LogUtils;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.JsonOps;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+
+import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.utils.ItemUtils;
+import de.hysky.skyblocker.utils.Utils;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.screen.slot.Slot;
+
+/**
+ * Doesn't work with auto pet right now because thats complicated.
+ * 
+ * Want support? Ask the Admins for a Mod API event or open your pets menu.
+ */
+public class PetCache {
+	private static final Logger LOGGER = LogUtils.getLogger();
+	private static final Path FILE = SkyblockerMod.CONFIG_DIR.resolve("pet_cache.json");
+	private static final Object2ObjectOpenHashMap<String, Object2ObjectOpenHashMap<String, PetInfo>> CACHED_PETS = new Object2ObjectOpenHashMap<>();
+
+	/**
+	 * Used in case the server lags to prevent the screen tick check from overwriting the clicked pet logic
+	 */
+	private static boolean shouldLook4Pets;
+
+	public static void init() {
+		load();
+
+		ScreenEvents.BEFORE_INIT.register((_client, screen, _scaledWidth, _scaledHeight) -> {
+			if (Utils.isOnSkyblock() && screen instanceof GenericContainerScreen genericContainerScreen) {
+				if (genericContainerScreen.getTitle().getString().startsWith("Pets")) {
+					shouldLook4Pets = true;
+
+					ScreenEvents.afterTick(screen).register(screen1 -> {
+						if (shouldLook4Pets) {
+							for (Slot slot : genericContainerScreen.getScreenHandler().slots) {
+								ItemStack stack = slot.getStack();
+
+								if (!stack.isEmpty() && ItemUtils.getLoreLineIf(stack, line -> line.equals("Click to despawn!")) != null) {
+									shouldLook4Pets = false;
+									parsePet(stack, false);
+
+									break;
+								}
+							}
+						}
+					});
+				}
+			}
+		});
+	}
+
+	private static void load() {
+		CompletableFuture.runAsync(() -> {
+			try (BufferedReader reader = Files.newBufferedReader(FILE)) {
+				CACHED_PETS.putAll(PetInfo.SERIALIZATION_CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).getOrThrow());
+			} catch (NoSuchFileException ignored) {
+			} catch (Exception e) {
+				LOGGER.error("[Skyblocker Pet Cache] Failed to load saved pet!", e);
+			}
+		});
+	}
+
+	private static void save() {
+		CompletableFuture.runAsync(() -> {
+			try (BufferedWriter writer = Files.newBufferedWriter(FILE)) {
+				SkyblockerMod.GSON.toJson(PetInfo.SERIALIZATION_CODEC.encodeStart(JsonOps.INSTANCE, CACHED_PETS).getOrThrow(), writer);
+			} catch (Exception e) {
+				LOGGER.error("[Skyblocker Pet Cache] Failed to save pet data to the cache!", e);
+			}
+		});
+	}
+
+	public static void handlePetEquip(Slot slot, int slotId) {
+		//Ignore inventory clicks
+		if (slotId >= 0 && slotId <= 53) {
+			ItemStack stack = slot.getStack();
+
+			if (!stack.isEmpty()) parsePet(stack, true);
+		}
+	}
+
+	private static void parsePet(ItemStack stack, boolean clicked) {
+		String id = ItemUtils.getItemId(stack);
+		String profileId = Utils.getProfileId();
+
+		if (id.equals("PET") && !profileId.isEmpty()) {
+			NbtCompound customData = ItemUtils.getCustomData(stack);
+
+			//Should never fail, all pets must have this but you never know with Hypixel
+			try {
+				PetInfo petInfo = PetInfo.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseString(customData.getString("petInfo"))).getOrThrow();
+				shouldLook4Pets = false;
+
+				Object2ObjectOpenHashMap<String, PetInfo> playerData = CACHED_PETS.computeIfAbsent(Utils.getUndashedUuid(), _uuid -> new Object2ObjectOpenHashMap<>());
+
+				//Handle deselecting pets
+				if (clicked && getCurrentPet() != null && getCurrentPet().uuid().orElse("").equals(petInfo.uuid().orElse(""))) {
+					playerData.remove(profileId);
+				} else {
+					playerData.put(profileId, petInfo);
+				}
+
+				save();
+			} catch (Exception e) {
+				LOGGER.error(LogUtils.FATAL_MARKER, "[Skyblocker Pet Cache] Failed to parse pet's pet info!", e);
+			}
+		}
+	}
+
+	@Nullable
+	public static PetInfo getCurrentPet() {
+		String uuid = Utils.getUndashedUuid();
+		String profileId = Utils.getProfileId();
+
+		return CACHED_PETS.containsKey(uuid) && CACHED_PETS.get(uuid).containsKey(profileId) ? CACHED_PETS.get(uuid).get(profileId) : null;
+	}
+
+	public record PetInfo(String type, double exp, String tier, Optional<String> uuid) {
+		public static final Codec<PetInfo> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+				Codec.STRING.fieldOf("type").forGetter(PetInfo::type),
+				Codec.DOUBLE.fieldOf("exp").forGetter(PetInfo::exp),
+				Codec.STRING.fieldOf("tier").forGetter(PetInfo::tier),
+				Codec.STRING.optionalFieldOf("uuid").forGetter(PetInfo::uuid))
+				.apply(instance, PetInfo::new));
+		private static final Codec<Object2ObjectOpenHashMap<String, Object2ObjectOpenHashMap<String, PetInfo>>> SERIALIZATION_CODEC = Codec.unboundedMap(Codec.STRING,
+				Codec.unboundedMap(Codec.STRING, CODEC).xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new)
+				).xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new);
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java
index 96c21d22..93d29714 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java
@@ -1,9 +1,9 @@
 package de.hysky.skyblocker.skyblock.item;
 
-import com.google.gson.JsonElement;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.PetCache;
+import de.hysky.skyblocker.skyblock.PetCache.PetInfo;
 import de.hysky.skyblocker.utils.ItemUtils;
-import de.hysky.skyblocker.utils.ProfileUtils;
 import net.fabricmc.fabric.api.event.client.player.ClientPlayerBlockBreakEvents;
 import net.fabricmc.fabric.api.event.player.UseItemCallback;
 import net.minecraft.block.BlockState;
@@ -36,8 +36,8 @@ public class ItemCooldowns {
             561700, 611700, 666700, 726700, 791700, 861700, 936700, 1016700, 1101700, 1191700,
             1286700, 1386700, 1496700, 1616700, 1746700, 1886700
     };
-    public static int monkeyLevel = 1;
-    public static double monkeyExp = 0;
+    private static int monkeyLevel = 1;
+    private static double monkeyExp = 0;
 
     public static void init() {
         ClientPlayerBlockBreakEvents.AFTER.register(ItemCooldowns::afterBlockBreak);
@@ -45,30 +45,24 @@ public class ItemCooldowns {
     }
 
     public static void updateCooldown() {
-        ProfileUtils.updateProfile().thenAccept(player -> {
-            for (JsonElement pet : player.getAsJsonObject("pets_data").getAsJsonArray("pets")) {
-                if (!pet.getAsJsonObject().get("type").getAsString().equals("MONKEY")) continue;
-                if (!pet.getAsJsonObject().get("active").getAsString().equals("true")) continue;
-                if (pet.getAsJsonObject().get("tier").getAsString().equals("LEGENDARY")) {
-                    monkeyExp = Double.parseDouble(pet.getAsJsonObject().get("exp").getAsString());
-                    monkeyLevel = 0;
-                    for (int xpLevel : EXPERIENCE_LEVELS) {
-                        if (monkeyExp < xpLevel) {
-                            break;
-                        } else {
-                            monkeyExp -= xpLevel;
-                            monkeyLevel++;
-                        }
-                    }
+        PetInfo pet = PetCache.getCurrentPet();
+
+        if (pet != null && pet.tier().equals("LEGENDARY")) {
+            monkeyExp = pet.exp();
+
+            monkeyLevel = 0;
+            for (int xpLevel : EXPERIENCE_LEVELS) {
+                if (monkeyExp < xpLevel) {
+                    break;
+                } else {
+                    monkeyExp -= xpLevel;
+                    monkeyLevel++;
                 }
             }
-        }).exceptionally(e -> {
-            ProfileUtils.LOGGER.error("[Skyblocker Item Cooldown] Failed to get Player Pet Data, is the API Down/Limited?", e);
-            return null;
-        });
+        }
     }
 
-    private static int getCooldown() {
+    private static int getCooldown4Foraging() {
         int baseCooldown = 2000;
         int monkeyPetCooldownReduction = baseCooldown * monkeyLevel / 200;
         return baseCooldown - monkeyPetCooldownReduction;
@@ -82,7 +76,7 @@ public class ItemCooldowns {
             if (usedItemId.equals(JUNGLE_AXE_ID) || usedItemId.equals(TREECAPITATOR_ID)) {
                 updateCooldown();
                 if (!isOnCooldown(JUNGLE_AXE_ID) || !isOnCooldown(TREECAPITATOR_ID)) {
-                    ITEM_COOLDOWNS.put(usedItemId, new CooldownEntry(getCooldown()));
+                    ITEM_COOLDOWNS.put(usedItemId, new CooldownEntry(getCooldown4Foraging()));
                 }
             }
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java b/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
index c78724ca..50982d29 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
@@ -1,22 +1,36 @@
 package de.hysky.skyblocker.skyblock.item;
 
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
+
 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 com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.mojang.util.UndashedUuid;
 import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.Http;
 import de.hysky.skyblocker.utils.Http.ApiResponse;
+import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.command.CommandRegistryAccess;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.*;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.collection.DefaultedList;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,11 +50,29 @@ public class MuseumItemCache {
 	private static final Path CACHE_FILE = SkyblockerMod.CONFIG_DIR.resolve("museum_item_cache.json");
 	private static final Map<String, Object2ObjectOpenHashMap<String, ProfileMuseumData>> MUSEUM_ITEM_CACHE = new Object2ObjectOpenHashMap<>();
 	private static final String ERROR_LOG_TEMPLATE = "[Skyblocker] Failed to refresh museum item data for profile {}";
+	public static final String DONATION_CONFIRMATION_SCREEN_TITLE = "Confirm Donation";
+	private static final int CONFIRM_DONATION_BUTTON_SLOT = 20;
 
 	private static CompletableFuture<Void> loaded;
 
 	public static void init() {
 		ClientLifecycleEvents.CLIENT_STARTED.register(MuseumItemCache::load);
+		ClientCommandRegistrationCallback.EVENT.register(MuseumItemCache::registerCommands);
+	}
+
+	private static void registerCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
+		dispatcher.register(literal(SkyblockerMod.NAMESPACE)
+				.then(literal("museum")
+						.then(literal("resync")
+								.executes(context -> {
+									if (tryResync(context.getSource())) {
+										context.getSource().sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.museum.attemptingResync")));
+									} else {
+										context.getSource().sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.museum.cannotResync")));
+									}
+
+									return Command.SINGLE_SUCCESS;
+								}))));
 	}
 
 	private static void load(MinecraftClient client) {
@@ -67,7 +99,35 @@ public class MuseumItemCache {
 		});
 	}
 
+	public static void handleClick(Slot slot, int slotId, DefaultedList<Slot> slots) {
+		if (slotId == CONFIRM_DONATION_BUTTON_SLOT) {
+			//Slots 0 to 17 can have items, well not all but thats the general range
+			for (int i = 0; i < 17; i++) {
+				ItemStack stack = slots.get(i).getStack();
+
+				if (!stack.isEmpty()) {
+					String itemId = ItemUtils.getItemId(stack);
+					String profileId = Utils.getProfileId();
+
+					if (!itemId.isEmpty() && !profileId.isEmpty()) {
+						String uuid = Utils.getUndashedUuid();
+						//Be safe about access to avoid NPEs
+						Map<String, ProfileMuseumData> playerData =  MUSEUM_ITEM_CACHE.computeIfAbsent(uuid, _uuid -> new Object2ObjectOpenHashMap<>());
+						playerData.putIfAbsent(profileId, ProfileMuseumData.EMPTY);
+
+						playerData.get(profileId).collectedItemIds().add(itemId);
+						save();
+					}
+				}
+			}
+		}
+	}
+
 	private static void updateData4ProfileMember(String uuid, String profileId) {
+		updateData4ProfileMember(uuid, profileId, null);
+	}
+
+	private static void updateData4ProfileMember(String uuid, String profileId, FabricClientCommandSource source) {
 		CompletableFuture.runAsync(() -> {
 			try (ApiResponse response = Http.sendHypixelRequest("skyblock/museum", "?profile=" + profileId)) {
 				//The request was successful
@@ -103,58 +163,85 @@ public class MuseumItemCache {
 						MUSEUM_ITEM_CACHE.get(uuid).put(profileId, new ProfileMuseumData(System.currentTimeMillis(), itemIds));
 						save();
 
+						if (source != null) source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.museum.resyncSuccess")));
+
 						LOGGER.info("[Skyblocker] Successfully updated museum item cache for profile {}", profileId);
 					} else {
 						//If the player's Museum API is disabled
 						putEmpty(uuid, profileId);
 
+						if (source != null) source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.museum.resyncFailure")));
+
 						LOGGER.warn(ERROR_LOG_TEMPLATE + " because the Museum API is disabled!", profileId);
 					}
 				} else {
 					//If the request returns a non 200 status code
 					putEmpty(uuid, profileId);
 
+					if (source != null) source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.museum.resyncFailure")));
+
 					LOGGER.error(ERROR_LOG_TEMPLATE + " because a non 200 status code was encountered! Status Code: {}", profileId, response.statusCode());
 				}
 			} catch (Exception e) {
 				//If an exception was somehow thrown
 				putEmpty(uuid, profileId);
 
+				if (source != null) source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.museum.resyncFailure")));
+
 				LOGGER.error(ERROR_LOG_TEMPLATE, profileId, e);
 			}
 		});
 	}
 
 	private static void putEmpty(String uuid, String profileId) {
-		MUSEUM_ITEM_CACHE.get(uuid).put(profileId, new ProfileMuseumData(System.currentTimeMillis(), ObjectOpenHashSet.of()));
+		//Only put new data if they didn't have any before
+		if (!MUSEUM_ITEM_CACHE.get(uuid).containsKey(profileId)) {
+			MUSEUM_ITEM_CACHE.get(uuid).put(profileId, new ProfileMuseumData(System.currentTimeMillis(), ObjectOpenHashSet.of()));
+		}
+
 		save();
 	}
 
+	private static boolean tryResync(FabricClientCommandSource source) {
+		String uuid = Utils.getUndashedUuid();
+		String profileId = Utils.getProfileId();
+
+		//Only allow resyncing if the data is actually present yet, otherwise the player needs to swap servers for the tick method to be called
+		if (loaded.isDone() && !profileId.isEmpty() && MUSEUM_ITEM_CACHE.containsKey(uuid) && MUSEUM_ITEM_CACHE.get(uuid).containsKey(profileId) && MUSEUM_ITEM_CACHE.get(uuid).get(profileId).canResync()) {
+			updateData4ProfileMember(uuid, profileId, source);
+
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
-	 * The cache is ticked upon switching skyblock servers
+	 * The cache is ticked upon switching Skyblock servers. Only loads from the API if the profile wasn't cached yet.
 	 */
 	public static void tick(String profileId) {
-		if (loaded.isDone()) {
-			String uuid = UndashedUuid.toString(MinecraftClient.getInstance().getSession().getUuidOrNull());
+		String uuid = Utils.getUndashedUuid();
+
+		if (loaded.isDone() && (!MUSEUM_ITEM_CACHE.containsKey(uuid) || !MUSEUM_ITEM_CACHE.getOrDefault(uuid, new Object2ObjectOpenHashMap<>()).containsKey(profileId))) {
 			Map<String, ProfileMuseumData> playerData = MUSEUM_ITEM_CACHE.computeIfAbsent(uuid, _uuid -> new Object2ObjectOpenHashMap<>());
 			playerData.putIfAbsent(profileId, ProfileMuseumData.EMPTY);
 
-			if (playerData.get(profileId).stale()) updateData4ProfileMember(uuid, profileId);
+			updateData4ProfileMember(uuid, profileId);
 		}
 	}
 
 	public static boolean hasItemInMuseum(String id) {
-		String uuid = UndashedUuid.toString(MinecraftClient.getInstance().getSession().getUuidOrNull());
+		String uuid = Utils.getUndashedUuid();
 		ObjectOpenHashSet<String> collectedItemIds = (!MUSEUM_ITEM_CACHE.containsKey(uuid) || Utils.getProfileId().isBlank() || !MUSEUM_ITEM_CACHE.get(uuid).containsKey(Utils.getProfileId())) ? null : MUSEUM_ITEM_CACHE.get(uuid).get(Utils.getProfileId()).collectedItemIds();
 
 		return collectedItemIds != null && collectedItemIds.contains(id);
 	}
 
-	private record ProfileMuseumData(long lastUpdated, ObjectOpenHashSet<String> collectedItemIds) {
+	private record ProfileMuseumData(long lastResync, ObjectOpenHashSet<String> collectedItemIds) {
 		private static final ProfileMuseumData EMPTY = new ProfileMuseumData(0L, null);
-		private static final long MAX_AGE = 86_400_000;
+		private static final long TIME_BETWEEN_RESYNCING_ALLOWED = 600_000L;
 		private static final Codec<ProfileMuseumData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-				Codec.LONG.fieldOf("lastUpdated").forGetter(ProfileMuseumData::lastUpdated),
+				Codec.LONG.fieldOf("lastResync").forGetter(ProfileMuseumData::lastResync),
 				Codec.STRING.listOf()
 						.xmap(ObjectOpenHashSet::new, ObjectArrayList::new)
 						.fieldOf("collectedItemIds")
@@ -165,8 +252,8 @@ public class MuseumItemCache {
 				.xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new)
 		).xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new);
 
-		private boolean stale() {
-			return System.currentTimeMillis() > lastUpdated + MAX_AGE;
+		private boolean canResync() {
+			return this.lastResync + TIME_BETWEEN_RESYNCING_ALLOWED < System.currentTimeMillis();
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index 2f5408a1..cc3d2099 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -52,6 +52,11 @@ public class ItemTooltip {
             case "POTION" -> apiId = "";
             case "ATTRIBUTE_SHARD" ->
                     apiId = id + "+" + apiId.replace("SHARD-", "").replaceAll("_(?!.*_)", ";");
+            case "NEW_YEAR_CAKE" -> apiId = id + "+" + apiId.replace("NEW_YEAR_CAKE_", "");
+            case "PARTY_HAT_CRAB_ANIMATED" -> apiId = "PARTY_HAT_CRAB_" + apiId.replace("PARTY_HAT_CRAB_ANIMATED_", "") + "_ANIMATED";
+            case "CRIMSON_HELMET", "CRIMSON_CHESTPLATE", "CRIMSON_LEGGINGS", "CRIMSON_BOOTS",
+            "AURORA_HELMET", "AURORA_CHESTPLATE", "AURORA_LEGGINGS", "AURORA_BOOTS",
+            "TERROR_HELMET", "TERROR_CHESTPLATE", "TERROR_LEGGINGS", "TERROR_BOOTS" -> apiId = id;
             default -> apiId = apiId.replace(":", "-");
         }
         return apiId;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java
index 89d41290..10e12ace 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java
@@ -78,7 +78,8 @@ public class ItemListTab extends ItemListWidget.TabContainerWidget {
             return true;
         } else if (results != null) {
             this.searchField.setFocused(false);
-            this.results.mouseClicked(mouseX, mouseY, button);
+
+            return this.results.mouseClicked(mouseX, mouseY, button);
         }
 
         return false;