aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
diff options
context:
space:
mode:
authorNopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>2024-06-13 02:38:36 +1000
committerGitHub <noreply@github.com>2024-06-12 18:38:36 +0200
commitfc45d59ebdb7ed846ad5be2ddb077de4c6b779fe (patch)
tree5d596e720ff346fdbbd88d231747ff1630684e8b /src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
parent01917a751c087ddb97e899611777a6f6de24ad01 (diff)
downloadnotenoughupdates-fc45d59ebdb7ed846ad5be2ddb077de4c6b779fe.tar.gz
notenoughupdates-fc45d59ebdb7ed846ad5be2ddb077de4c6b779fe.tar.bz2
notenoughupdates-fc45d59ebdb7ed846ad5be2ddb077de4c6b779fe.zip
Add NeuCalendar improvements (#1204)
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java14
1 files changed, 11 insertions, 3 deletions
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 bd869c90..0cada57e 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,8 +252,13 @@ public class GuiCustomHex extends Gui {
return INSTANCE;
}
+ boolean hexTurnedOffTheCalendar = false;
+
public boolean shouldOverride(String containerName) {
- CalendarOverlay.ableToClickCalendar = true;
+ if (hexTurnedOffTheCalendar) {
+ CalendarOverlay.ableToClickCalendar = true;
+ hexTurnedOffTheCalendar = false;
+ }
if (containerName == null) {
shouldOverrideET = false;
shouldOverrideFast = false;
@@ -307,8 +312,11 @@ public class GuiCustomHex extends Gui {
ContainerChest cc = (ContainerChest) chest.inventorySlots;
ItemStack hexStack = cc.getLowerChestInventory().getStackInSlot(50);
ItemStack bookStack = cc.getLowerChestInventory().getStackInSlot(32);
- CalendarOverlay.ableToClickCalendar =
- !(shouldOverrideET || shouldOverrideFast || shouldOverrideGemstones || shouldOverrideXp);
+ boolean shouldDisableCalendar = !(shouldOverrideET || shouldOverrideFast || shouldOverrideGemstones || shouldOverrideXp);
+ if (!shouldDisableCalendar && CalendarOverlay.ableToClickCalendar) {
+ CalendarOverlay.ableToClickCalendar = false;
+ hexTurnedOffTheCalendar = true;
+ }
if (bookStack != null && bookStack.getItem() == Items.book) {
shouldOverrideGemstones = false;
}