Merge remote-tracking branch 'upstream/master' into runelite-master-1

# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java

cache-client/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache-client</artifactId>

cache-updater/pom.xml

@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 	
 	<name>Cache Updater</name>

cache/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache</artifactId>

cache/src/test/java/net/runelite/cache/FrameDumper.java

@@ -88,7 +88,7 @@ public class FrameDumper
 
 					int framemapArchiveId = (contents[0] & 0xff) << 8 | contents[1] & 0xff;
 
-					Archive framemapArchive = framemapIndex.getArchives().get(framemapArchiveId);
+					Archive framemapArchive = framemapIndex.getArchive(framemapArchiveId);
 					archiveData = storage.loadArchive(framemapArchive);
 					byte[] framemapContents = framemapArchive.decompress(archiveData);
 

http-api/pom.xml

@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<name>Web API</name>

http-service/pom.xml

@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<name>Web Service</name>

pom.xml

@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.5.28-SNAPSHOT</version>
+	<version>1.5.29-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>

protocol-api/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol-api</artifactId>

protocol/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol</artifactId>

runelite-api/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>

runelite-api/src/main/java/net/runelite/api/Varbits.java

@@ -541,117 +541,7 @@ public enum Varbits
 	EXPLORER_RING_ALCHS(4554),
 	EXPLORER_RING_RUNENERGY(4553),
 
-	/**
+	WINTERTODT_TIMER(7980);
-	 * Temple Trekking
-	 */
-	TREK_POINTS(1955),
-	TREK_STARTED(1956),
-	TREK_EVENT(1958),
-	TREK_STATUS(6719),
-	BLOAT_ENTERED_ROOM(6447),
-
-	/**
-	 * f2p Quest varbits, these don't hold the completion value.
-	 */
-	QUEST_DEMON_SLAYER(2561),
-	QUEST_GOBLIN_DIPLOMACY(2378),
-	QUEST_MISTHALIN_MYSTERY(3468),
-	QUEST_THE_CORSAIR_CURSE(6071),
-	QUEST_X_MARKS_THE_SPOT(8063),
-
-	/**
-	 * member Quest varbits, these don't hold the completion value.
-	 */
-	QUEST_ANIMAL_MAGNETISM(3185),
-	QUEST_BETWEEN_A_ROCK(299),
-	QUEST_CONTACT(3274),
-	QUEST_ZOGRE_FLESH_EATERS(487),
-	QUEST_DARKNESS_OF_HALLOWVALE(2573),
-	QUEST_DEATH_TO_THE_DORGESHUUN(2258),
-	QUEST_DESERT_TREASURE(358),
-	QUEST_DEVIOUS_MINDS(1465),
-	QUEST_EAGLES_PEAK(2780),
-	QUEST_ELEMENTAL_WORKSHOP_II(2639),
-	QUEST_ENAKHRAS_LAMENT(1560),
-	QUEST_ENLIGHTENED_JOURNEY(2866),
-	QUEST_THE_EYES_OF_GLOUPHRIE(2497),
-	QUEST_FAIRYTALE_I_GROWING_PAINS(1803),
-	QUEST_FAIRYTALE_II_CURE_A_QUEEN(2326),
-	QUEST_THE_FEUD(334), // 14 = able to pickpocket
-	QUEST_FORGETTABLE_TALE(822),
-	QUEST_GARDEN_OF_TRANQUILLITY(961),
-	QUEST_GHOSTS_AHOY(217),
-	QUEST_THE_GIANT_DWARF(571),
-	QUEST_THE_GOLEM(346),
-	QUEST_HORROR_FROM_THE_DEEP(34),
-	QUEST_ICTHLARINS_LITTLE_HELPER(418),
-	QUEST_IN_AID_OF_THE_MYREQUE(1990),
-	QUEST_THE_LOST_TRIBE(532),
-	QUEST_LUNAR_DIPLOMACY(2448),
-	QUEST_MAKING_HISTORY(1383),
-	QUEST_MOUNTAIN_DAUGHTER(260),
-	QUEST_MOURNINGS_ENDS_PART_II(1103),
-	QUEST_MY_ARMS_BIG_ADVENTURE(2790),
-	QUEST_RATCATCHERS(1404),
-	QUEST_RECIPE_FOR_DISASTER(1850),
-	QUEST_RECRUITMENT_DRIVE(657),
-	QUEST_ROYAL_TROUBLE(2140),
-	QUEST_THE_SLUG_MENACE(2610),
-	QUEST_SHADOW_OF_THE_STORM(1372),
-	QUEST_A_SOULS_BANE(2011),
-	QUEST_SPIRITS_OF_THE_ELID(1444),
-	QUEST_SWAN_SONG(2098),
-	QUEST_A_TAIL_OF_TWO_CATS(1028),
-	QUEST_TEARS_OF_GUTHIX(451),
-	QUEST_WANTED(1051),
-	QUEST_COLD_WAR(3293),
-	QUEST_THE_FREMENNIK_ISLES(3311),
-	QUEST_TOWER_OF_LIFE(3337),
-	QUEST_WHAT_LIES_BELOW(3523),
-	QUEST_OLAFS_QUEST(3534),
-	QUEST_ANOTHER_SLICE_OF_HAM(3550),
-	QUEST_DREAM_MENTOR(3618),
-	QUEST_GRIM_TALES(2783),
-	QUEST_KINGS_RANSOM(3888),
-	QUEST_MONKEY_MADNESS_II(5027),
-	QUEST_CLIENT_OF_KOUREND(5619),
-	QUEST_BONE_VOYAGE(5795),
-	QUEST_THE_QUEEN_OF_THIEVES(6037),
-	QUEST_THE_DEPTHS_OF_DESPAIR(6027),
-	QUEST_DRAGON_SLAYER_II(6104),
-	QUEST_TALE_OF_THE_RIGHTEOUS(6358),
-	QUEST_A_TASTE_OF_HOPE(6396),
-	QUEST_MAKING_FRIENDS_WITH_MY_ARM(6528),
-	QUEST_THE_ASCENT_OF_ARCEUUS(7856),
-	QUEST_THE_FORSAKEN_TOWER(7796),
-
-	/**
-	 * mini-quest varbits, these don't hold the completion value.
-	 */
-	QUEST_ARCHITECTURAL_ALLIANCE(4982),
-	QUEST_BEAR_YOUR_SOUL(5078),
-	QUEST_CURSE_OF_THE_EMPTY_LORD(821),
-	QUEST_ENCHANTED_KEY(1391),
-	QUEST_THE_GENERALS_SHADOW(3330),
-	QUEST_SKIPPY_AND_THE_MOGRES(1344),
-	QUEST_LAIR_OF_TARN_RAZORLOR(3290),
-	QUEST_FAMILY_PEST(5347),
-	QUEST_THE_MAGE_ARENA_II(6067),
-
-	/**
-	 * Active spellbook (see enumID)
-	 */
-	SPELLBOOK(4070),
-
-	/**
-	 * Spellbook filtering (1 = unfiltered, 0 = filtered)
-	 */
-	FILTER_SPELLBOOK(6718),
-
-	/**
-	 * POH Building mode (1 = yes, 0 = no)
-	 */
-	BUILDING_MODE(2176);
 
 	/**
 	 * The raw varbit ID.

runelite-client/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>client</artifactId>

runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java

@@ -296,17 +296,18 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
 		else
 		{
 			location = null;
-
-			final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message);
-			hotColdSolver.signal(localWorld, temperature, temperatureChange);
 		}
 
+		final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message);
+		hotColdSolver.signal(localWorld, temperature, temperatureChange);
+
 		return true;
 	}
 
 	@Override
 	public void reset()
 	{
+		location = null;
 		initializeSolver();
 	}
 
@@ -339,7 +340,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
 	private void markFinalSpot(WorldPoint wp)
 	{
 		this.location = wp;
-		reset();
 	}
 
 	public String[] getNpcs()

runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java

@@ -32,6 +32,7 @@ import java.util.Set;
 import javax.annotation.Nullable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.runelite.client.util.Text;
 
 @AllArgsConstructor
 @Getter
@@ -93,11 +94,12 @@ public enum HotColdTemperature
 			return null;
 		}
 
+		final String messageStart = Text.fromCSV(message).get(0);
 		final List<HotColdTemperature> possibleTemperatures = new ArrayList<>();
 
 		for (final HotColdTemperature temperature : temperatureSet)
 		{
-			if (message.contains(temperature.getText()))
+			if (messageStart.contains(temperature.getText()))
 			{
 				possibleTemperatures.add(temperature);
 			}

runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java

@@ -33,6 +33,7 @@ public enum CustomCursor
 	RS3_GOLD("RS3 Gold", "cursor-rs3-gold.png"),
 	RS3_SILVER("RS3 Silver", "cursor-rs3-silver.png"),
 	DRAGON_DAGGER("Dragon Dagger", "cursor-dragon-dagger.png"),
+	DRAGON_DAGGER_POISON("Dragon Dagger (p)", "cursor-dragon-dagger-p.png"),
 	TROUT("Trout", "cursor-trout.png"),
 	DRAGON_SCIMITAR("Dragon Scimitar", "cursor-dragon-scimitar.png"),
 	ARMADYL_GODSWORD("Armadyl Godsword", "cursor-armadyl-godsword.png"),

runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java

@@ -29,6 +29,7 @@ import java.awt.Color;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
+import net.runelite.client.config.Range;
 import net.runelite.client.plugins.wintertodt.config.WintertodtNotifyMode;
 
 @ConfigGroup("wintertodt")
@@ -55,4 +56,18 @@ public interface WintertodtConfig extends Config
 	{
 		return Color.CYAN;
 	}
+
+	@ConfigItem(
+		position = 3,
+		keyName = "roundNotification",
+		name = "Wintertodt round notification",
+		description = "Notifies you before the round starts (in seconds)"
+	)
+	@Range(
+		max = 60
+	)
+	default int roundNotification()
+	{
+		return 5;
+	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java

@@ -42,10 +42,12 @@ import static net.runelite.api.ItemID.BRUMA_KINDLING;
 import static net.runelite.api.ItemID.BRUMA_ROOT;
 import net.runelite.api.MessageNode;
 import net.runelite.api.Player;
+import net.runelite.api.Varbits;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.ItemContainerChanged;
+import net.runelite.api.events.VarbitChanged;
 import net.runelite.client.Notifier;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ConfigManager;
@@ -100,6 +102,8 @@ public class WintertodtPlugin extends Plugin
 
 	private Instant lastActionTime;
 
+	private int previousTimerValue;
+
 	@Provides
 	WintertodtConfig getConfig(ConfigManager configManager)
 	{
@@ -163,6 +167,30 @@ public class WintertodtPlugin extends Plugin
 		checkActionTimeout();
 	}
 
+	@Subscribe
+	public void onVarbitChanged(VarbitChanged varbitChanged)
+	{
+		int timerValue = client.getVar(Varbits.WINTERTODT_TIMER);
+		if (timerValue != previousTimerValue)
+		{
+			int timeToNotify = config.roundNotification();
+			if (timeToNotify > 0)
+			{
+				int timeInSeconds = timerValue * 30 / 50;
+				int prevTimeInSeconds = previousTimerValue * 30 / 50;
+
+				log.debug("Seconds left until round start: {}", timeInSeconds);
+
+				if (prevTimeInSeconds > timeToNotify && timeInSeconds <= timeToNotify)
+				{
+					notifier.notify("Wintertodt round is about to start");
+				}
+			}
+
+			previousTimerValue = timerValue;
+		}
+	}
+
 	private void checkActionTimeout()
 	{
 		if (currentActivity == WintertodtActivity.IDLE)

runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java

@@ -102,11 +102,22 @@ public interface WorldHopperConfig extends Config
 		return true;
 	}
 
+	@ConfigItem(
+		keyName = "menuOption",
+		name = "Show Hop-to menu option",
+		description = "Adds Hop-to menu option to the friends list and clan members list",
+		position = 6
+	)
+	default boolean menuOption()
+	{
+		return true;
+	}
+
 	@ConfigItem(
 		keyName = "subscriptionFilter",
 		name = "Show subscription types",
 		description = "Only show free worlds, member worlds, or both types of worlds in sidebar",
-		position = 6
+		position = 7
 	)
 	default SubscriptionFilterMode subscriptionFilter()
 	{

runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java

@@ -327,6 +327,11 @@ public class WorldHopperPlugin extends Plugin
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
 	{
+		if (!config.menuOption())
+		{
+			return;
+		}
+
 		int groupId = WidgetInfo.TO_GROUP(event.getActionParam1());
 		String option = event.getOption();
 

runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019, Jordan Atwood <nightfirecat@protonmail.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.cluescrolls.clues.hotcold;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
+
+public class HotColdTemperatureTest
+{
+	private static final String[] VALID_MESSAGES = {
+		"The device is warm, and warmer than last time.",
+		"The device is visibly shaking and burns to the touch. This must be the spot.",
+		"The device is cold.",
+		"The device is ice cold.",
+		"The device is very cold.",
+		"The device is hot.",
+		"The device is incredibly hot.",
+	};
+	private static final String[] INVALID_MESSAGES = {
+		"The device is an octopus, and is wetter than last time.",
+		"foobar",
+		"a q p w",
+		"My feet are cold, I should put them in some lukewarm water, or run hot water over them.",
+	};
+
+	@Test
+	public void testValidTemperatureMessages()
+	{
+		for (final String message : VALID_MESSAGES)
+		{
+			assertNotNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, message));
+			assertNotNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, message));
+		}
+	}
+
+	@Test
+	public void testInvalidTemperatureMessages()
+	{
+		for (final String message : INVALID_MESSAGES)
+		{
+			assertNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, message));
+			assertNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, message));
+		}
+	}
+
+	@Test
+	public void testAmbiguousTemperatureMessages()
+	{
+		assertEquals(HotColdTemperature.ICE_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is ice cold."));
+		assertEquals(HotColdTemperature.VERY_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very cold."));
+		assertEquals(HotColdTemperature.VERY_HOT, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very hot."));
+		assertEquals(HotColdTemperature.COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is cold, and warmer than last time."));
+		assertEquals(HotColdTemperature.WARM, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is warm, but colder than last time."));
+	}
+}

runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2019, Kusha Gharahi<kusha.me>
+ * Copyright (c) 2019, Adam <Adam@sigterm.info>
+ * 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.wintertodt;
+
+import com.google.inject.Guice;
+import com.google.inject.testing.fieldbinder.Bind;
+import com.google.inject.testing.fieldbinder.BoundFieldModule;
+import javax.inject.Inject;
+import net.runelite.api.Client;
+import net.runelite.api.Varbits;
+import net.runelite.api.events.VarbitChanged;
+import net.runelite.client.Notifier;
+import net.runelite.client.chat.ChatMessageManager;
+import net.runelite.client.ui.overlay.OverlayManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class WintertodtPluginTest
+{
+	@Inject
+	WintertodtPlugin wintertodtPlugin;
+
+	@Mock
+	@Bind
+	WintertodtConfig config;
+
+	@Mock
+	@Bind
+	WintertodtOverlay wintertodtOverlay;
+
+	@Mock
+	@Bind
+	OverlayManager overlayManager;
+
+	@Mock
+	@Bind
+	ChatMessageManager chatMessageManager;
+
+	@Mock
+	@Bind
+	Notifier notifier;
+
+	@Mock
+	@Bind
+	Client client;
+
+	@Before
+	public void before()
+	{
+		Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotify_when15SecondsOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(15);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(35);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		//(15 * 50) / 30 = ~25
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotify_when10SecondsOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(10);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(20);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		//(10 * 50) / 30 = ~16
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(16);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotify_when5SecondsOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(5);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		//(5 * 50) / 30 = ~8
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotifyOnce()
+	{
+		when(config.roundNotification()).thenReturn(5);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(0);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(6);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(5);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(4);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotNotify_whenNoneOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(5);
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25);
+
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		verify(notifier, times(0)).notify("Wintertodt round is about to start");
+	}
+}

runelite-mixins/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mixins</artifactId>

runelite-script-assembler-plugin/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>script-assembler-plugin</artifactId>

runescape-api/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<groupId>net.runelite.rs</groupId>