Merge remote-tracking branch 'origin/master' into museumthing

39 files changed, 927 insertions, 495 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index 7159ef89..927b5e76 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -1500,7 +1500,14 @@ public class NEUOverlay extends Gui {
 			int actualIndex = index + getSlotsXSize() * getSlotsYSize() * page;
 			List<JsonObject> searchedItems = getSearchedItems();
 			if (0 <= actualIndex && actualIndex < searchedItems.size()) {
-				return searchedItems.get(actualIndex);
+				try {
+					return searchedItems.get(actualIndex);
+				} catch (IndexOutOfBoundsException e) {
+					System.out.println("searchedItems size: " + searchedItems.size());
+					System.out.println("actualIndex: " + actualIndex);
+					e.printStackTrace();
+					return null;
+				}
 			} else {
 				return null;
 			}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 94c7cc2b..ac1121ee 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -97,7 +97,7 @@ import java.util.Set;
 	guiFactory = "io.github.moulberry.notenoughupdates.core.config.MoulConfigGuiForgeInterop")
 public class NotEnoughUpdates {
 	public static final String MODID = "notenoughupdates";
-	public static final String VERSION = "2.1.0-REL";
+	public static final String VERSION = "2.1.1-PRE";
 	public static final int VERSION_ID = 20101; //2.1.1 only so update notif works
 	public static final int PRE_VERSION_ID = 0;
 	public static final int HOTFIX_VERSION_ID = 0;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
index 5ec3724a..ac60ffd9 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
@@ -292,7 +292,7 @@ public class APIManager {
 			.newMoulberryRequest("lowestbin.json.gz")
 			.gunzip()
 			.requestJson()
-			.thenAccept(jsonObject -> {
+			.thenAcceptAsync(jsonObject -> {
 				if (lowestBins == null) {
 					lowestBins = new JsonObject();
 				}
@@ -465,12 +465,12 @@ public class APIManager {
 		};
 
 		manager.apiUtils.newMoulberryRequest("auctionLast.json.gz")
-										.gunzip().requestJson().thenAccept(process);
+										.gunzip().requestJson().thenAcceptAsync(process);
 
 		manager.apiUtils
 			.newMoulberryRequest("auction.json.gz")
 			.gunzip().requestJson()
-			.thenAccept(jsonObject -> {
+			.thenAcceptAsync(jsonObject -> {
 				if (jsonObject.get("success").getAsBoolean()) {
 					long apiUpdate = (long) jsonObject.get("time").getAsFloat();
 					if (lastApiUpdate == apiUpdate) {
@@ -683,7 +683,7 @@ public class APIManager {
 		manager.apiUtils
 			.newAnonymousHypixelApiRequest("skyblock/auctions")
 			.requestJson()
-			.thenAccept(jsonObject -> {
+			.thenAcceptAsync(jsonObject -> {
 				if (jsonObject == null) return;
 
 				if (jsonObject.get("success").getAsBoolean()) {
@@ -733,7 +733,7 @@ public class APIManager {
 		manager.apiUtils
 			.newAnonymousHypixelApiRequest("skyblock/bazaar")
 			.requestJson()
-			.thenAccept(jsonObject -> {
+			.thenAcceptAsync(jsonObject -> {
 				if (!jsonObject.get("success").getAsBoolean()) return;
 
 				craftCost.clear();
@@ -789,7 +789,7 @@ public class APIManager {
 	public void updateAvgPrices() {
 		manager.apiUtils
 			.newMoulberryRequest("auction_averages/3day.json.gz")
-			.gunzip().requestJson().thenAccept((jsonObject) -> {
+			.gunzip().requestJson().thenAcceptAsync((jsonObject) -> {
 						 craftCost.clear();
 						 auctionPricesJson = jsonObject;
 						 lastAuctionAvgUpdate = System.currentTimeMillis();
@@ -797,7 +797,7 @@ public class APIManager {
 		manager.apiUtils
 			.newMoulberryRequest("auction_averages_lbin/1day.json.gz")
 			.gunzip().requestJson()
-			.thenAccept((jsonObject) -> {
+			.thenAcceptAsync((jsonObject) -> {
 				auctionPricesAvgLowestBinJson = jsonObject;
 			});
 	}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
index 0d882358..1a1400ab 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
@@ -33,11 +33,13 @@ import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.Locati
 import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.SpecialBlockZone;
 import io.github.moulberry.notenoughupdates.miscgui.GuiPriceGraph;
 import io.github.moulberry.notenoughupdates.miscgui.minionhelper.MinionHelperManager;
+import io.github.moulberry.notenoughupdates.util.ApiCache;
 import io.github.moulberry.notenoughupdates.util.PronounDB;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
 import io.github.moulberry.notenoughupdates.util.TabListUtils;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import io.github.moulberry.notenoughupdates.util.hypixelapi.ProfileCollectionInfo;
+import lombok.var;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.command.CommandException;
@@ -94,6 +96,8 @@ public class DevTestCommand extends ClientCommandBase {
 	};
 	private int devFailIndex = 0;
 
+	public static int testValue = 0;
+
 	public DevTestCommand() {
 		super("neudevtest");
 	}
@@ -126,6 +130,24 @@ public class DevTestCommand extends ClientCommandBase {
 			Utils.addChatMessage(EnumChatFormatting.RED + DEV_FAIL_STRINGS[devFailIndex++]);
 			return;
 		}
+		if (args.length == 1 && args[0].equalsIgnoreCase("dumpapihistogram")) {
+			synchronized (ApiCache.INSTANCE) {
+				Utils.addChatMessage("§e[NEU] API Request Histogram");
+				Utils.addChatMessage("§e[NEU] §bClass Name§e: §aCached§e/§cNonCached§e/§dTotal");
+				ApiCache.INSTANCE.getHistogramTotalRequests().forEach((className, totalRequests) -> {
+					var nonCachedRequests = ApiCache.INSTANCE.getHistogramNonCachedRequests().getOrDefault(className, 0);
+					var cachedRequests = totalRequests - nonCachedRequests;
+					Utils.addChatMessage(
+						String.format(
+							"§e[NEU] §b%s §a%d§e/§c%d§e/§d%d",
+							className,
+							cachedRequests,
+							nonCachedRequests,
+							totalRequests
+						));
+				});
+			}
+		}
 		if (args.length == 1 && args[0].equalsIgnoreCase("testprofile")) {
 			NotEnoughUpdates.INSTANCE.manager.apiUtils.newHypixelApiRequest("skyblock/profiles")
 																								.queryArgument(
@@ -254,5 +276,17 @@ public class DevTestCommand extends ClientCommandBase {
 			MiscUtils.copyToClipboard(builder.toString());
 			Utils.addChatMessage("§e[NEU] Copied tablist to clipboard!");
 		}
+		if (args.length >= 1 && args[0].equalsIgnoreCase("useragent")) {
+			String newUserAgent = args.length == 1 ? null : String.join(" ", Arrays.copyOfRange(args, 1, args.length));
+			Utils.addChatMessage("§e[NEU] Changed user agent override to: " + newUserAgent);
+			NotEnoughUpdates.INSTANCE.config.hidden.customUserAgent = newUserAgent;
+		}
+		if (args.length == 2 && args[0].equalsIgnoreCase("value")) {
+			try {
+				testValue = Integer.parseInt(args[1]);
+			} catch (NumberFormatException e) {
+				Utils.addChatMessage("NumberFormatException!");
+			}
+		}
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/PronounsCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/PronounsCommand.java
index 5a4f1400..cf0d0c56 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/PronounsCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/PronounsCommand.java
@@ -88,7 +88,7 @@ public class PronounsCommand extends ClientCommandBase {
 				"§e[NEU] Pronouns for §b" + user + " §eon §b" + platform + "§e:"), id);
 			betterPronounChoice.render().forEach(it -> nc.printChatMessage(new ChatComponentText("§e[NEU] §a" + it)));
 			return null;
-		}, MinecraftExecutor.INSTANCE);
+		}, MinecraftExecutor.OnThread);
 
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java
index 920cb326..ddd1e71f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java
@@ -30,6 +30,7 @@ public @interface ConfigOption {
 	String name();
 
 	String desc();
+
 	String[] searchTags() default "";
 
 	int subcategoryId() default -1;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/util/ArrowPagesUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/core/util/ArrowPagesUtils.java
index 86430804..1e70db7f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/util/ArrowPagesUtils.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/util/ArrowPagesUtils.java
@@ -173,7 +173,7 @@ public class ArrowPagesUtils {
 			BUTTON_WIDTH,
 			BUTTON_HEIGHT
 		) &&
-			currentPage < totalPages) {
+			currentPage < totalPages - 1) {
 			int newPage = currentPage + 1;
 			pageChange.accept(MathHelper.clamp_int(newPage, 0, totalPages - 1));
 			Utils.playPressSound();
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java b/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
index 4a7c1939..984a7931 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
@@ -150,7 +150,7 @@ public class CapeManager {
 		NotEnoughUpdates.INSTANCE.manager.apiUtils
 			.newMoulberryRequest("activecapes.json")
 			.requestJson()
-			.thenAccept(jsonObject -> {
+			.thenAcceptAsync(jsonObject -> {
 				if (jsonObject.get("success").getAsBoolean()) {
 					lastJsonSync = jsonObject;
 
@@ -171,7 +171,7 @@ public class CapeManager {
 			NotEnoughUpdates.INSTANCE.manager.apiUtils
 				.newMoulberryRequest("permscapes.json")
 				.requestJson()
-				.thenAccept(jsonObject -> {
+				.thenAcceptAsync(jsonObject -> {
 					if (!jsonObject.get("success").getAsBoolean()) return;
 
 					permSyncTries = 0;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/events/ProfileDataLoadedEvent.java b/src/main/java/io/github/moulberry/notenoughupdates/events/ProfileDataLoadedEvent.java
deleted file mode 100644
index 956acfe0..00000000
--- a/src/main/java/io/github/moulberry/notenoughupdates/events/ProfileDataLoadedEvent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 NotEnoughUpdates contributors
- *
- * This file is part of NotEnoughUpdates.
- *
- * NotEnoughUpdates is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- *
- * NotEnoughUpdates is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package io.github.moulberry.notenoughupdates.events;
-
-import com.google.gson.JsonObject;
-
-import javax.annotation.Nullable;
-
-//TODO extend the usage of this event (accessory bag and storage data)
-public class ProfileDataLoadedEvent extends NEUEvent {
-
-	@Nullable
-	private final JsonObject data;
-
-	public ProfileDataLoadedEvent(@Nullable JsonObject entireApiResponse) {
-		this.data = entireApiResponse;
-	}
-
-	@Nullable
-	public JsonObject getData() {
-		return data;
-	}
-}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CookieWarning.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CookieWarning.java
index 80751371..f130a993 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CookieWarning.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CookieWarning.java
@@ -31,9 +31,13 @@ public class CookieWarning {
 
 	private static boolean hasNotified;
 	private static boolean hasErrorMessage;
+	private static long cookieEndTime = 0;
+	private static boolean hasCookie = true;
+	private static long lastChecked = 0;
 
 	public static void resetNotification() {
 		hasNotified = false;
+		hasCookie = true;
 		NotificationHandler.cancelNotification();
 	}
 
@@ -41,96 +45,135 @@ public class CookieWarning {
 	 * Checks the tab list for a cookie timer, and sends a notification if the timer is within the tolerance
 	 */
 	public static void checkCookie() {
-		if (NotEnoughUpdates.INSTANCE.config.notifications.doBoosterNotif &&
-			NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
-			String[] lines;
-			try {
-				lines = ((AccessorGuiPlayerTabOverlay) Minecraft.getMinecraft().ingameGUI.getTabList())
-					.getFooter()
-					.getUnformattedText()
-					.split("\n");
-			} catch (NullPointerException e) {
-				return; // if the footer is null or somehow doesn't exist, stop
+		if (!NotEnoughUpdates.INSTANCE.config.notifications.doBoosterNotif ||
+			!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
+			return;
+		}
+		String timeLine = getTimeLine();
+		if (!hasCookie) {
+			if (!hasNotified) {
+				NotificationHandler.displayNotification(Lists.newArrayList(
+					"§cBooster Cookie Ran Out!",
+					"§7Your Booster Cookie expired!",
+					"§7",
+					"§7Press X on your keyboard to close this notification"
+				), true, true);
+				hasNotified = true;
 			}
-			boolean hasCookie = true;
-			String timeLine = null; // the line that contains the cookie timer
-			for (int i = 0; i < lines.length; i++) {
-				if (lines[i].startsWith("Cookie Buff")) {
-					timeLine = lines[i + 1]; // the line after the "Cookie Buff" line
-				}
-				if (lines[i].startsWith("Not active! Obtain booster cookies from the")) {
-					hasCookie = false;
-				}
+			return;
+		}
+		if (timeLine == null) return;
+
+		int minutes = getMinutesRemaining(timeLine);
+		if (minutes < NotEnoughUpdates.INSTANCE.config.notifications.boosterCookieWarningMins && !hasNotified) {
+			NotificationHandler.displayNotification(Lists.newArrayList(
+				"§cBooster Cookie Running Low!",
+				"§7Your Booster Cookie will expire in " + timeLine,
+				"§7",
+				"§7Press X on your keyboard to close this notification"
+			), true, true);
+			hasNotified = true;
+		}
+	}
+
+	private static int getMinutesRemaining(String timeLine) {
+		String clean = timeLine.replaceAll("(§.)", "");
+		clean = clean.replaceAll("(\\d)([smhdy])", "$1 $2");
+		String[] digits = clean.split(" ");
+		int minutes = 0;
+		try {
+			for (int i = 0; i < digits.length; i++) {
+				if (i % 2 == 1) continue;
+
+				String number = digits[i];
+				String unit = digits[i + 1];
+				long val = Integer.parseInt(number);
+				switch (unit) {
+					case "Years":
+					case "Year":
+						minutes += val * 525600;
+						break;
+					case "Months":
+					case "Month":
+						minutes += val * 43200;
+						break;
+					case "Days":
+					case "Day":
+						minutes += val * 1440;
+						break;
+					case "Hours":
+					case "Hour":
+					case "h":
+						minutes += val * 60;
+						break;
+					case "Minutes":
+					case "Minute":
+					case "m":
+						minutes += val;
+						break;
+				} // ignore seconds
 			}
-			if (!hasCookie) {
-				if (!hasNotified) {
-					NotificationHandler.displayNotification(Lists.newArrayList(
-						"\u00a7cBooster Cookie Ran Out!",
-						"\u00a77Your Booster Cookie expired!",
-						"\u00a77",
-						"\u00a77Press X on your keyboard to close this notification"
-					), true, true);
-					hasNotified = true;
-				}
-				return;
+		} catch (NumberFormatException e) {
+			if (!hasErrorMessage) {
+				e.printStackTrace();
+				Utils.addChatMessage(EnumChatFormatting.RED +
+					"NEU ran into an issue when retrieving the Booster Cookie Timer. Check the logs for details.");
+				hasErrorMessage = true;
 			}
-			if (timeLine != null) {
-				String clean = timeLine.replaceAll("(\u00a7.)", "");
-				clean = clean.replaceAll("(\\d)([smhdy])", "$1 $2");
-				String[] digits = clean.split(" ");
-				int minutes = 0;
-				try {
-					for (int i = 0; i < digits.length; i++) {
-						if (i % 2 == 1) continue;
+			hasNotified = true;
+		}
+		return minutes;
+	}
 
-						String number = digits[i];
-						String unit = digits[i + 1];
-						long val = Integer.parseInt(number);
-						switch (unit) {
-							case "Years":
-							case "Year":
-								minutes += val * 525600;
-								break;
-							case "Months":
-							case "Month":
-								minutes += val * 43200;
-								break;
-							case "Days":
-							case "Day":
-								minutes += val * 1440;
-								break;
-							case "Hours":
-							case "Hour":
-