Fix Muscle Memory (#581)

* Added old SkyBlock Menu.

* Execution!

* Add cache.

* Bingo has already enough to do.

* Typo.

* Revert "Typo."

This reverts commit b4a1c385e0c410b1e111797b8d39e7ff64b09ef5.

* Revert "Bingo has already enough to do."

This reverts commit 6e004d2d65dff47ea3bee5c5789cb725724df6ed.

* I am lazy.

* The map is lazy too.

* Hypixel moving features behind paywall.

* Add red text to the setting too.

* SEALED

* Fixed Booster Cookie checks. Reworked CookieWarning, kept same logic but accidentally added profile switch support.

* /trades does not require booster cookie.

* Allowing middle clicks (and any other mouse click combination)

---------

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

4 files changed, 164 insertions, 100 deletions

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":
-							case "h":
-								minutes += val * 60;
-								break;
-							case "Minutes":
-							case "Minute":
-							case "m":
-								minutes += val;
-								break;
-						} // ignore seconds
-					}
-				} 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;
-					}
-					hasNotified = true;
-				}
-				if (minutes < NotEnoughUpdates.INSTANCE.config.notifications.boosterCookieWarningMins && !hasNotified) {
-					NotificationHandler.displayNotification(Lists.newArrayList(
-						"\u00a7cBooster Cookie Running Low!",
-						"\u00a77Your Booster Cookie will expire in " + timeLine,
-						"\u00a77",
-						"\u00a77Press X on your keyboard to close this notification"
-					), true, true);
-					hasNotified = true;
-				}
+	private static String getTimeLine() {
+		String[] lines;
+		try {
+			lines = ((AccessorGuiPlayerTabOverlay) Minecraft.getMinecraft().ingameGUI.getTabList())
+				.getFooter()
+				.getUnformattedText()
+				.split("\n");
+		} catch (NullPointerException ignored) {
+			return null;
+		}
+		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 timeLine;
+	}
+
+	public static boolean hasActiveBoosterCookie() {
+		long cookieEndTime = getCookieEndTime();
+		return cookieEndTime > System.currentTimeMillis();
+	}
+
+	private static long getCookieEndTime() {
+		// Only updating every 10 seconds
+//		if (System.currentTimeMillis() > lastChecked + 10_000) return cookieEndTime;
+		if (lastChecked + 3_000 > System.currentTimeMillis()) return cookieEndTime;
+
+		String timeLine = getTimeLine();
+		if (hasCookie && timeLine != null) {
+			int minutes = getMinutesRemaining(timeLine);
+			cookieEndTime = System.currentTimeMillis() + (long) minutes * 60 * 1000;
+		} else {
+			cookieEndTime = 0;
+		}
+
+		lastChecked = System.currentTimeMillis();
+		return cookieEndTime;
+	}
 
+	public static void onProfileSwitch() {
+		resetNotification();
+		hasErrorMessage = false;
+		cookieEndTime = 0;
+		hasCookie = true;
+		lastChecked = 0;
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java
index 47e51eec..affaa68a 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java
@@ -311,4 +311,13 @@ public class Misc {
 	@ConfigEditorBoolean
 	public boolean dungeonGroupsPV = true;
 
+	@Expose
+	@ConfigOption(
+		name = "Old SkyBlock Menu",
+		desc = "Show old buttons in the SkyBlock Menu: Trade, Accessories, Potions, Quiver, Fishing and Sacks. " +
+			"§cOnly works with the booster cookie effect active."
+	)
+	@ConfigEditorBoolean
+	public boolean oldSkyBlockMenu = false;
+
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
index d0af9091..a89b281d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
@@ -24,6 +24,7 @@ import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.autosubscribe.NEUAutoSubscribe;
 import io.github.moulberry.notenoughupdates.listener.ScoreboardLocationChangeListener;
+import io.github.moulberry.notenoughupdates.miscfeatures.CookieWarning;
 import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.LocationChangeEvent;
 import io.github.moulberry.notenoughupdates.miscgui.minionhelper.MinionHelperManager;
 import io.github.moulberry.notenoughupdates.overlays.OverlayManager;
@@ -477,7 +478,6 @@ public class SBInfo {
 			.thenAccept(newJson -> mayorJson = newJson);
 	}
 
-
 	public JsonObject getMayorJson() {
 		return mayorJson;
 	}
@@ -486,6 +486,7 @@ public class SBInfo {
 		if (!newProfile.equals(currentProfile)) {
 			currentProfile = newProfile;
 			MinionHelperManager.getInstance().onProfileSwitch();
+			CookieWarning.onProfileSwitch();
 		}
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java b/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
index d5abcb77..38debbbc 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
@@ -925,6 +925,10 @@ public class Utils {
 		return createItemStack(item, displayName, 0, lore);
 	}
 
+	public static ItemStack createItemStackArray(Item item, String displayName, String[] lore) {
+		return createItemStack(item, displayName, 0, lore);
+	}
+
 	public static ItemStack createItemStack(Block item, String displayName, String... lore) {
 		return createItemStack(Item.getItemFromBlock(item), displayName, lore);
 	}
@@ -932,17 +936,7 @@ public class Utils {
 	public static ItemStack createItemStack(Item item, String displayName, int damage, String... lore) {
 		ItemStack stack = new ItemStack(item, 1, damage);
 		NBTTagCompound tag = new NBTTagCompound();
-		NBTTagCompound display = new NBTTagCompound();
-		NBTTagList Lore = new NBTTagList();
-
-		for (String line : lore) {
-			Lore.appendTag(new NBTTagString(line));
-		}
-
-		display.setString("Name", displayName);
-		display.setTag("Lore", Lore);
-
-		tag.setTag("display", display);
+		addNameAndLore(tag, displayName, lore);
 		tag.setInteger("HideFlags", 254);
 
 		stack.setTagCompound(tag);
@@ -950,6 +944,22 @@ public class Utils {
 		return stack;
 	}
 
+	private static void addNameAndLore(NBTTagCompound tag, String displayName, String[] lore) {
+		NBTTagCompound display = new NBTTagCompound();
+
+		display.setString("Name", displayName);
+
+		if (lore != null) {
+			NBTTagList tagLore = new NBTTagList();
+			for (String line : lore) {
+				tagLore.appendTag(new NBTTagString(line));
+			}
+			display.setTag("Lore", tagLore);
+		}
+
+		tag.setTag("display", display);
+	}
+
 	public static ItemStack editItemStackInfo(
 		ItemStack itemStack,
 		String displayName,
@@ -979,15 +989,17 @@ public class Utils {
 
 		return itemStack;
 	}
-
 	public static ItemStack createSkull(String displayName, String uuid, String value) {
+		return createSkull(displayName, uuid, value, null);
+	}
+
+	public static ItemStack createSkull(String displayName, String uuid, String value, String[] lore) {
 		ItemStack render = new ItemStack(Items.skull, 1, 3);
 		NBTTagCompound tag = new NBTTagCompound();
 		NBTTagCompound skullOwner = new NBTTagCompound();
 		NBTTagCompound properties = new NBTTagCompound();
 		NBTTagList textures = new NBTTagList();
 		NBTTagCompound textures_0 = new NBTTagCompound();
-		NBTTagCompound display = new NBTTagCompound();
 
 		skullOwner.setString("Id", uuid);
 		skullOwner.setString("Name", uuid);
@@ -995,8 +1007,7 @@ public class Utils {
 		textures_0.setString("Value", value);
 		textures.appendTag(textures_0);
 
-		display.setString("Name", displayName);
-		tag.setTag("display", display);
+		addNameAndLore(tag, displayName, lore);
 
 		properties.setTag("textures", textures);
 		skullOwner.setTag("Properties", properties);