diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 59b213541f..3073c9f439 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 4eb3f28217..b57857a714 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 9fd6153b3b..169f016084 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT cache diff --git a/cache/src/test/java/net/runelite/cache/FrameDumper.java b/cache/src/test/java/net/runelite/cache/FrameDumper.java index 8e856cd2f8..f6cc20532d 100644 --- a/cache/src/test/java/net/runelite/cache/FrameDumper.java +++ b/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); diff --git a/deobfuscator/pom.xml b/deobfuscator/pom.xml index babd26ed24..32ffa4c8c8 100644 --- a/deobfuscator/pom.xml +++ b/deobfuscator/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT deobfuscator diff --git a/http-api/pom.xml b/http-api/pom.xml index ccd886a376..b797107a20 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 3a532c422f..7435193988 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT Web Service diff --git a/injected-client/pom.xml b/injected-client/pom.xml index 474adda69b..02899fa99b 100644 --- a/injected-client/pom.xml +++ b/injected-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT injected-client diff --git a/injector-plugin/pom.xml b/injector-plugin/pom.xml index a80ce1afb3..46c1477263 100644 --- a/injector-plugin/pom.xml +++ b/injector-plugin/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT net.runelite.rs diff --git a/pom.xml b/pom.xml index 6a3fe52405..9437d2f488 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT pom RuneLite diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index cb85d612f9..ea06134acf 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 1e03da9e36..8e504698b7 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index bfcbf4c4a7..36f337646e 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT runelite-api diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index 1d6709bc0a..5afca13486 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -651,7 +651,9 @@ public enum Varbits /** * POH Building mode (1 = yes, 0 = no) */ - BUILDING_MODE(2176); + BUILDING_MODE(2176), + + WINTERTODT_TIMER(7980); /** * The raw varbit ID. diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 70c5c83000..50735fa911 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT client diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 5fad4e4207..219916d240 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/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() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java index 2dc5909000..21171eec8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java +++ b/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 possibleTemperatures = new ArrayList<>(); for (final HotColdTemperature temperature : temperatureSet) { - if (message.contains(temperature.getText())) + if (messageStart.contains(temperature.getText())) { possibleTemperatures.add(temperature); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java index ec89729654..78e34ab41f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java @@ -34,6 +34,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"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java index 8fd6e6e446..6b1adb7e9d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java +++ b/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; + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index a27565a015..910b9ae241 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -44,11 +44,13 @@ 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.ConfigChanged; 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; @@ -105,6 +107,7 @@ public class WintertodtPlugin extends Plugin private Instant lastActionTime; + private int previousTimerValue; private WintertodtNotifyMode notifyCondition; private Color damageNotificationColor; @@ -186,6 +189,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) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java index f7a75781fd..8035af73fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java +++ b/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() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 1ee270ed2c..1136fffc31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -338,6 +338,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(); diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png b/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png new file mode 100644 index 0000000000..86f1751afa Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png differ diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java new file mode 100644 index 0000000000..e4ea28eb7f --- /dev/null +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2019, Jordan Atwood + * 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.")); + } +} \ No newline at end of file diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java new file mode 100644 index 0000000000..7069d4f06a --- /dev/null +++ b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2019, Kusha Gharahi + * Copyright (c) 2019, Adam + * 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"); + } +} diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index f299e82ec5..4885636cac 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT mixins diff --git a/runelite-plugin-archetype/pom.xml b/runelite-plugin-archetype/pom.xml index 1fd933b70e..15ff5ed7f8 100644 --- a/runelite-plugin-archetype/pom.xml +++ b/runelite-plugin-archetype/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT runelite-plugin-archetype diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 25f0b49f51..6387f338e7 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index 710b68be9f..cfe8d98273 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT net.runelite.rs diff --git a/runescape-client/pom.xml b/runescape-client/pom.xml index 04e2850dde..611fd54161 100644 --- a/runescape-client/pom.xml +++ b/runescape-client/pom.xml @@ -5,7 +5,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT net.runelite.rs @@ -16,7 +16,7 @@ net.runelite.rs runescape-api - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT