diff options
| author | NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> | 2022-12-31 13:40:10 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-31 03:40:10 +0100 |
| commit | 81a7db8fd001c99b846579547b1f7f1637fd73bb (patch) | |
| tree | f2a8d07e71317fc866c309b24069a5b93d81e595 | |
| parent | d6f67a21586947e22643592e4f419edf23f58638 (diff) | |
| download | NotEnoughUpdates-81a7db8fd001c99b846579547b1f7f1637fd73bb.tar.gz NotEnoughUpdates-81a7db8fd001c99b846579547b1f7f1637fd73bb.tar.bz2 NotEnoughUpdates-81a7db8fd001c99b846579547b1f7f1637fd73bb.zip | |
Fix daily powder resetting at the wrong time (#518)
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java | 32 |
1 files changed, 16 insertions, 16 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 6e20c77d..419c9785 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java @@ -726,7 +726,7 @@ public class TimersOverlay extends TextTabOverlay { // Daily Mithril Powder display long mithrilPowderCompleted = hidden.dailyMithrilPowerCompleted + 1000 * 60 * 60 * 24 - currentTime; - if (hidden.dailyMithrilPowerCompleted < midnightReset) { + if (hidden.dailyMithrilPowerCompleted < catacombsReset) { map.put( 7, DARK_AQUA + "Mithril Powder: " + @@ -734,29 +734,29 @@ public class TimersOverlay extends TextTabOverlay { ); } else if ( NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyMithrilPowderDisplay >= DISPLAYTYPE.VERYSOON.ordinal() && - (hidden.dailyMithrilPowerCompleted < (midnightReset - TimeEnums.HALFANHOUR.time))) { + (hidden.dailyMithrilPowerCompleted < (catacombsReset - TimeEnums.HALFANHOUR.time))) { map.put( 7, DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.verySoonColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } else if (NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyMithrilPowderDisplay >= DISPLAYTYPE.SOON.ordinal() && - (hidden.dailyMithrilPowerCompleted < (midnightReset - TimeEnums.HOUR.time))) { + (hidden.dailyMithrilPowerCompleted < (catacombsReset - TimeEnums.HOUR.time))) { map.put( 7, DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.soonColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } else if ( NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyMithrilPowderDisplay >= DISPLAYTYPE.KINDASOON.ordinal() && - (hidden.dailyMithrilPowerCompleted < (midnightReset - (TimeEnums.HOUR.time * 3)))) { + (hidden.dailyMithrilPowerCompleted < (catacombsReset - (TimeEnums.HOUR.time * 3)))) { map.put( 7, DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.kindaSoonColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } else if (NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyMithrilPowderDisplay >= DISPLAYTYPE.ALWAYS.ordinal()) { @@ -764,12 +764,12 @@ public class TimersOverlay extends TextTabOverlay { 7, DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.defaultColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } // Daily Gemstone Powder Display - if (hidden.dailyGemstonePowderCompleted < midnightReset) { + if (hidden.dailyGemstonePowderCompleted < catacombsReset) { map.put( 8, DARK_AQUA + "Gemstone Powder: " + @@ -777,29 +777,29 @@ public class TimersOverlay extends TextTabOverlay { ); } else if ( NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyGemstonePowderDisplay >= DISPLAYTYPE.VERYSOON.ordinal() && - (hidden.dailyGemstonePowderCompleted < (midnightReset - TimeEnums.HALFANHOUR.time))) { + (hidden.dailyGemstonePowderCompleted < (catacombsReset - TimeEnums.HALFANHOUR.time))) { map.put( 8, DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.verySoonColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } else if (NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyGemstonePowderDisplay >= DISPLAYTYPE.SOON.ordinal() && - (hidden.dailyGemstonePowderCompleted < (midnightReset - TimeEnums.HOUR.time))) { + (hidden.dailyGemstonePowderCompleted < (catacombsReset - TimeEnums.HOUR.time))) { map.put( 8, DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.soonColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } else if ( NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyGemstonePowderDisplay >= DISPLAYTYPE.KINDASOON.ordinal() && - (hidden.dailyGemstonePowderCompleted < (midnightReset - (TimeEnums.HOUR.time * 3)))) { + (hidden.dailyGemstonePowderCompleted < (catacombsReset - (TimeEnums.HOUR.time * 3)))) { map.put( 8, DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.kindaSoonColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } else if (NotEnoughUpdates.INSTANCE.config.miscOverlays.dailyGemstonePowderDisplay >= DISPLAYTYPE.ALWAYS.ordinal()) { @@ -807,7 +807,7 @@ public class TimersOverlay extends TextTabOverlay { 8, DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.defaultColour] + - Utils.prettyTime(timeDiffMidnightNow) + Utils.prettyTime(catacombsDiffNow) ); } |