From d58cecdb8d5a2d6958a5bcf1381805c6d64be7b8 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Mon, 13 Sep 2021 23:30:04 -0700 Subject: [PATCH] idle notifier: Support filling water vessels, Shades of Mort'ton LOOKING_INTO is a generic animation used for numerous activities, and was previously used as an intermediate animation in a test case. Now that it is used to trigger idle notifications, a dummy animation has been inserted to ensure the affected test case will not be broken in the same way in the future. Co-authored-by: Nick Wolff Co-authored-by: Arnaud Peralta --- runelite-api/src/main/java/net/runelite/api/AnimationID.java | 2 +- .../client/plugins/idlenotifier/IdleNotifierPlugin.java | 1 + .../client/plugins/idlenotifier/IdleNotifierPluginTest.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index fc8303ac04..0d4350fbcf 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -179,7 +179,7 @@ public final class AnimationID public static final int MAGIC_ENCHANTING_BOLTS = 4462; public static final int BURYING_BONES = 827; public static final int USING_GILDED_ALTAR = 3705; - public static final int LOOKING_INTO = 832; + public static final int LOOKING_INTO = 832; // Generic animation used for filling water vessels, Shades of Mort'ton, etc. public static final int DIG = 830; public static final int DEMONIC_GORILLA_MAGIC_ATTACK = 7225; public static final int DEMONIC_GORILLA_MELEE_ATTACK = 7226; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index bfc455b405..987ecedabb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -292,6 +292,7 @@ public class IdleNotifierPlugin extends Plugin case PISCARILIUS_CRANE_REPAIR: case HOME_MAKE_TABLET: case SAND_COLLECTION: + case LOOKING_INTO: resetTimers(); lastAnimation = animation; lastAnimating = Instant.now(); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java index bb91fffcb8..481a507609 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java @@ -62,6 +62,8 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class IdleNotifierPluginTest { + private static final int UNKNOWN_ANIMATION = -2; + @Mock @Bind private Client client; @@ -153,7 +155,7 @@ public class IdleNotifierPluginTest animationChanged.setActor(player); plugin.onAnimationChanged(animationChanged); plugin.onGameTick(new GameTick()); - when(player.getAnimation()).thenReturn(AnimationID.LOOKING_INTO); + when(player.getAnimation()).thenReturn(UNKNOWN_ANIMATION); plugin.onAnimationChanged(animationChanged); plugin.onGameTick(new GameTick()); when(player.getAnimation()).thenReturn(AnimationID.IDLE);