meta: Make the calender disable itself automatically (#1277)

* Make the calender disable itself automatically

* Remove leftovers from manual disabling

3 files changed, 5 insertions, 21 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
index 4e743b50..f4ca5fe6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
@@ -307,8 +307,6 @@ public class RenderListener {
 		}
 	}
 
-	boolean storageTurnedOffTheCalendar = false;
-
 	/**
 	 * Sets hoverInv and focusInv variables, representing whether the NEUOverlay should render behind the inventory when
 	 * (hoverInv == true) and whether mouse/kbd inputs shouldn't be sent to NEUOverlay (focusInv == true).
@@ -414,14 +412,9 @@ public class RenderListener {
 		boolean storageOverlayActive = StorageManager.getInstance().shouldRenderStorageOverlay(containerName);
 
 		if (storageOverlayActive) {
-			storageTurnedOffTheCalendar = true;
-			CalendarOverlay.ableToClickCalendar = false;
 			StorageOverlay.getInstance().render();
 			event.setCanceled(true);
 			return;
-		} else if (storageTurnedOffTheCalendar) {
-			CalendarOverlay.ableToClickCalendar = true;
-			storageTurnedOffTheCalendar = false;
 		}
 
 		if (tradeWindowActive) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index 3bee456c..1013e4ba 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -91,7 +91,8 @@ public class CalendarOverlay {
 
 	private static boolean enabled = false;
 
-	public static boolean ableToClickCalendar = true;
+	private boolean isTimerRendered = false;
+
 	long thunderStormEpoch = 1692826500000L;
 	long oringoEpoch = 1583153700000L;
 	long oringoInterval = 223200000L;
@@ -692,7 +693,6 @@ public class CalendarOverlay {
 
 		//Daily Events
 		int index = 0;
-		out:
 		for (Map.Entry<Long, Set<SBEvent>> sbEvents : eventMap.entrySet()) {
 			for (SBEvent sbEvent : sbEvents.getValue()) {
 				long timeUntilMillis = sbEvents.getKey() - currentTime;
@@ -1021,7 +1021,7 @@ public class CalendarOverlay {
 
 				guiLeft = (width - xSize) / 2;
 				guiTop = 5;
-				if (mouseX >= guiLeft && mouseX <= guiLeft + xSize && ableToClickCalendar) {
+				if (mouseX >= guiLeft && mouseX <= guiLeft + xSize && isTimerRendered) {
 					if (mouseY >= guiTop && mouseY <= guiTop + ySize) {
 						ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/neucalendar");
 					}
@@ -1376,6 +1376,7 @@ public class CalendarOverlay {
 
 	@SubscribeEvent
 	public void onGuiScreenDrawTimer(GuiScreenEvent.DrawScreenEvent.Post event) {
+		isTimerRendered = false;
 		if (drawTimerForeground) {
 			drawTimer();
 		}
@@ -1467,6 +1468,7 @@ public class CalendarOverlay {
 				boolean toastRendered = renderToast(nextEvent, timeUntilNext);
 				GlStateManager.translate(0, 0, -50);
 				if (!toastRendered && !enabled && NotEnoughUpdates.INSTANCE.config.calendar.showEventTimerInInventory) {
+					isTimerRendered = true;
 					List<String> tooltipToDisplay = null;
 					FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
index 0cada57e..eee7f100 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
@@ -252,13 +252,7 @@ public class GuiCustomHex extends Gui {
 		return INSTANCE;
 	}
 
-	boolean hexTurnedOffTheCalendar = false;
-
 	public boolean shouldOverride(String containerName) {
-		if (hexTurnedOffTheCalendar) {
-			CalendarOverlay.ableToClickCalendar = true;
-			hexTurnedOffTheCalendar = false;
-		}
 		if (containerName == null) {
 			shouldOverrideET = false;
 			shouldOverrideFast = false;
@@ -312,11 +306,6 @@ public class GuiCustomHex extends Gui {
 		ContainerChest cc = (ContainerChest) chest.inventorySlots;
 		ItemStack hexStack = cc.getLowerChestInventory().getStackInSlot(50);
 		ItemStack bookStack = cc.getLowerChestInventory().getStackInSlot(32);
-		boolean shouldDisableCalendar = !(shouldOverrideET || shouldOverrideFast || shouldOverrideGemstones || shouldOverrideXp);
-		if (!shouldDisableCalendar && CalendarOverlay.ableToClickCalendar) {
-			CalendarOverlay.ableToClickCalendar = false;
-			hexTurnedOffTheCalendar = true;
-		}
 		if (bookStack != null && bookStack.getItem() == Items.book) {
 			shouldOverrideGemstones = false;
 		}