Use LoopTimer in Barrows plugin

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java

@@ -27,6 +27,7 @@ package net.runelite.client.plugins.barrows;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.google.inject.Provides;
+import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
@@ -41,6 +42,7 @@ import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.NullObjectID;
 import net.runelite.api.ObjectID;
+import net.runelite.api.SpriteID;
 import net.runelite.api.WallObject;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameObjectChanged;
@@ -66,6 +68,8 @@ import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
+import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
+import net.runelite.client.ui.overlay.infobox.LoopTimer;
 import net.runelite.client.util.StackFormatter;
 
 @PluginDescriptor(
@@ -92,6 +96,7 @@ public class BarrowsPlugin extends Plugin
 		WidgetInfo.BARROWS_PUZZLE_ANSWER3
 	);
 
+	private static final long PRAYER_DRAIN_INTERVAL_MS = 18200;
 	private static final int CRYPT_REGION_ID = 14231;
 
 	@Getter(AccessLevel.PACKAGE)
@@ -100,6 +105,7 @@ public class BarrowsPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private final Set<GameObject> ladders = new HashSet<>();
 
+	private LoopTimer barrowsPrayerDrainTimer;
 	private boolean wasInCrypt = false;
 
 	@Getter
@@ -313,13 +319,25 @@ public class BarrowsPlugin extends Plugin
 	{
 		if (config.showPrayerDrainTimer())
 		{
-			infoBoxManager.addInfoBox(new BarrowsPrayerDrainTimer(this, spriteManager));
+			final LoopTimer loopTimer = new LoopTimer(
+				PRAYER_DRAIN_INTERVAL_MS,
+				ChronoUnit.MILLIS,
+				spriteManager.getSprite(SpriteID.TAB_PRAYER, 0),
+				this,
+				true);
+
+			loopTimer.setPriority(InfoBoxPriority.MED);
+			loopTimer.setTooltip("Prayer Drain");
+
+			infoBoxManager.addInfoBox(loopTimer);
+			barrowsPrayerDrainTimer = loopTimer;
 		}
 	}
 
 	private void stopPrayerDrainTimer()
 	{
-		infoBoxManager.removeIf(BarrowsPrayerDrainTimer.class::isInstance);
+		infoBoxManager.removeInfoBox(barrowsPrayerDrainTimer);
+		barrowsPrayerDrainTimer = null;
 	}
 
 	private boolean isInCrypt()

runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPrayerDrainTimer.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2019, Ryan <progrs.site@gmail.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.runelite.client.plugins.barrows;
-
-import java.awt.Color;
-import java.time.Duration;
-import java.time.Instant;
-import net.runelite.api.SpriteID;
-import net.runelite.client.game.SpriteManager;
-import net.runelite.client.ui.overlay.infobox.InfoBox;
-import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
-
-class BarrowsPrayerDrainTimer extends InfoBox
-{
-	private static final long PRAYER_DRAIN_INTERVAL_MS = 18200;
-
-	private final Instant startTime;
-
-	BarrowsPrayerDrainTimer(BarrowsPlugin plugin, SpriteManager spriteManager)
-	{
-		super(spriteManager.getSprite(SpriteID.TAB_PRAYER, 0), plugin);
-		setPriority(InfoBoxPriority.MED);
-		setTooltip("Prayer Drain");
-		startTime = Instant.now();
-	}
-
-	@Override
-	public String getText()
-	{
-		Duration timeLeft = Duration.between(Instant.now(), getNextPrayerDrainTime());
-		int seconds = (int) (timeLeft.toMillis() / 1000L);
-		return String.format("0:%02d", seconds);
-	}
-
-	@Override
-	public Color getTextColor()
-	{
-		Duration timeLeft = Duration.between(Instant.now(), getNextPrayerDrainTime());
-
-		//check if timer has 10% of time left
-		if (timeLeft.getSeconds() < (PRAYER_DRAIN_INTERVAL_MS / 1000 * .10))
-		{
-			return Color.RED.brighter();
-		}
-
-		return Color.WHITE;
-	}
-
-	private Instant getNextPrayerDrainTime()
-	{
-		Duration timePassed = Duration.between(startTime, Instant.now());
-		// Get how many intervals have passed so far and add one more to find the next prayer drain time
-		return startTime.plusMillis((timePassed.toMillis() / PRAYER_DRAIN_INTERVAL_MS + 1) * PRAYER_DRAIN_INTERVAL_MS);
-	}
-}