diff options
| author | NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> | 2024-08-14 07:02:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-13 23:02:14 +0200 |
| commit | ef07864e7e133d6ef879745dafecdf8f9a5f5082 (patch) | |
| tree | e112509e5f79028cef278cfde5bd609514fb793a | |
| parent | 03f1b5c48b78f9584c5946e21c9444689fab9cd5 (diff) | |
| download | notenoughupdates-ef07864e7e133d6ef879745dafecdf8f9a5f5082.tar.gz notenoughupdates-ef07864e7e133d6ef879745dafecdf8f9a5f5082.tar.bz2 notenoughupdates-ef07864e7e133d6ef879745dafecdf8f9a5f5082.zip | |
Fix inventory todos not working if you have only show in tab on (#1313)
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java index 95b8b56a..1c302b3c 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java @@ -310,11 +310,12 @@ public class TimersOverlay extends TextTabOverlay { NEUConfig.HiddenProfileSpecific hidden = NotEnoughUpdates.INSTANCE.config.getProfileSpecific(); if (hidden == null) return; - if (NotEnoughUpdates.INSTANCE.config.miscOverlays.todoOverlayOnlyShowTab && - !lastTabState) { - overlayStrings = null; - return; - } + long midnightReset = (currentTime - 18000000) / TimeEnums.DAY.time * TimeEnums.DAY.time + 18000000; // 12am est + long pearlsReset = midnightReset - 18000000; //8pm est + long catacombsReset = currentTime / TimeEnums.DAY.time * TimeEnums.DAY.time; // 7pm est + long timeDiffMidnightNow = midnightReset + TimeEnums.DAY.time - currentTime; + long catacombsDiffNow = catacombsReset + TimeEnums.DAY.time - currentTime; + long fetchurComplete = hidden.fetchurCompleted; if (Minecraft.getMinecraft().currentScreen instanceof GuiChest) { GuiChest chest = (GuiChest) Minecraft.getMinecraft().currentScreen; @@ -339,7 +340,7 @@ public class TimersOverlay extends TextTabOverlay { if (lower.getSizeInventory() < 18) { break; } - if (hidden.commissionsCompleted == 0) { + if (hidden.commissionsCompleted == 0 || hidden.commissionsCompleted < midnightReset) { hidden.commissionsCompleted = currentTime; } for (int i = 9; i < 18; i++) { @@ -469,6 +470,12 @@ public class TimersOverlay extends TextTabOverlay { } } + if (NotEnoughUpdates.INSTANCE.config.miscOverlays.todoOverlayOnlyShowTab && + !lastTabState) { + overlayStrings = null; + return; + } + boolean foundGodPotText = false; boolean foundEffectsText = false; if (SBInfo.getInstance().getLocation() != null && !SBInfo.getInstance().getLocation().equals("dungeon") && @@ -734,13 +741,6 @@ public class TimersOverlay extends TextTabOverlay { ); } - long midnightReset = (currentTime - 18000000) / TimeEnums.DAY.time * TimeEnums.DAY.time + 18000000; // 12am est - long pearlsReset = midnightReset - 18000000; //8pm est - long catacombsReset = currentTime / TimeEnums.DAY.time * TimeEnums.DAY.time; // 7pm est - long timeDiffMidnightNow = midnightReset + TimeEnums.DAY.time - currentTime; - long catacombsDiffNow = catacombsReset + TimeEnums.DAY.time - currentTime; - long fetchurComplete = hidden.fetchurCompleted; - //Fetchur Display if (fetchurComplete < midnightReset) { map.put( |