ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #5403 from deathbeam/idle-notifier-use-mouse-state

Browse Source 
Use mouse press events and not mouse movement events in idle notifier
This commit is contained in:
Tomas Slusny
2018-09-11 10:11:30 +02:00
committed by GitHub
parent e0966a6e07 b90d37c8ec
commit d6ee7b0672
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -927,6 +927,11 @@ public interface Client extends GameEngine
*/ */
int getMouseIdleTicks(); int getMouseIdleTicks();
/**
* Gets the number of milliseconds since the last mouse press occurred.
*/
long getMouseLastPressedMillis();
/** /**
* Gets the amount of ticks since the last keyboard press occurred. * Gets the amount of ticks since the last keyboard press occurred.
* *

13
runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
View File

@@ -61,7 +61,9 @@ import net.runelite.client.plugins.PluginDescriptor;
public class IdleNotifierPlugin extends Plugin public class IdleNotifierPlugin extends Plugin
{ {
private static final int LOGOUT_WARNING_AFTER_TICKS = 280 * 50; // 4 minutes and 40 seconds private static final int LOGOUT_WARNING_AFTER_TICKS = 280 * 50; // 4 minutes and 40 seconds
private static final long LOGOUT_WARNING_AFTER_MILLIS = (long) (LOGOUT_WARNING_AFTER_TICKS * 0.6 * 1000);
private static final int LOGOUT_WARNING_AFTER_TICKS_IN_COMBAT = 1140 * 50; // 19 minutes private static final int LOGOUT_WARNING_AFTER_TICKS_IN_COMBAT = 1140 * 50; // 19 minutes
private static final long LOGOUT_WARNING_AFTER_MILLIS_IN_COMBAT = (long) (LOGOUT_WARNING_AFTER_TICKS_IN_COMBAT * 0.6 * 1000);
private static final int HIGHEST_MONSTER_ATTACK_SPEED = 8; // Except Scarab Mage, but they are with other monsters private static final int HIGHEST_MONSTER_ATTACK_SPEED = 8; // Except Scarab Mage, but they are with other monsters
private static final Duration SIX_HOUR_LOGOUT_WARNING_AFTER_DURATION = Duration.ofMinutes(340); private static final Duration SIX_HOUR_LOGOUT_WARNING_AFTER_DURATION = Duration.ofMinutes(340);
@@ -304,7 +306,10 @@ public class IdleNotifierPlugin extends Plugin
final Duration waitDuration = Duration.ofMillis(config.getIdleNotificationDelay()); final Duration waitDuration = Duration.ofMillis(config.getIdleNotificationDelay());
lastCombatCountdown = Math.max(lastCombatCountdown - 1, 0); lastCombatCountdown = Math.max(lastCombatCountdown - 1, 0);
if (client.getGameState() != GameState.LOGGED_IN || local == null || client.getMouseIdleTicks() < 10) if (client.getGameState() != GameState.LOGGED_IN
|| local == null
|| System.currentTimeMillis() - client.getMouseLastPressedMillis() < 200
|| client.getKeyboardIdleTicks() < 10)
{ {
resetTimers(); resetTimers();
return; return;
@@ -419,12 +424,14 @@ public class IdleNotifierPlugin extends Plugin
private boolean checkIdleLogout() private boolean checkIdleLogout()
{ {
if (client.getMouseIdleTicks() > LOGOUT_WARNING_AFTER_TICKS final long mouseDiff = System.currentTimeMillis() - client.getMouseLastPressedMillis();
if (mouseDiff > LOGOUT_WARNING_AFTER_MILLIS
&& client.getKeyboardIdleTicks() > LOGOUT_WARNING_AFTER_TICKS) && client.getKeyboardIdleTicks() > LOGOUT_WARNING_AFTER_TICKS)
{ {
if (lastCombatCountdown > 0) if (lastCombatCountdown > 0)
{ {
if (client.getMouseIdleTicks() > LOGOUT_WARNING_AFTER_TICKS_IN_COMBAT if (mouseDiff > LOGOUT_WARNING_AFTER_MILLIS_IN_COMBAT
&& client.getKeyboardIdleTicks() > LOGOUT_WARNING_AFTER_TICKS_IN_COMBAT && notifyIdleLogout) && client.getKeyboardIdleTicks() > LOGOUT_WARNING_AFTER_TICKS_IN_COMBAT && notifyIdleLogout)
{ {
notifyIdleLogout = false; notifyIdleLogout = false;

5
runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
View File

@@ -113,7 +113,8 @@ public class IdleNotifierPluginTest
// Mock client // Mock client
when(client.getGameState()).thenReturn(GameState.LOGGED_IN); when(client.getGameState()).thenReturn(GameState.LOGGED_IN);
when(client.getMouseIdleTicks()).thenReturn(42); when(client.getKeyboardIdleTicks()).thenReturn(42);
when(client.getMouseLastPressedMillis()).thenReturn(System.currentTimeMillis() - 100_000L);
} }
@Test @Test
@@ -231,7 +232,7 @@ public class IdleNotifierPluginTest
public void checkCombatLogoutIdle() public void checkCombatLogoutIdle()
{ {
// Player is idle // Player is idle
when(client.getMouseIdleTicks()).thenReturn(282 * 50); when(client.getMouseLastPressedMillis()).thenReturn(System.currentTimeMillis() - 300_000L);
// But player is being damaged (is in combat) // But player is being damaged (is in combat)
final HitsplatApplied hitsplatApplied = new HitsplatApplied(); final HitsplatApplied hitsplatApplied = new HitsplatApplied();

4
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
View File

@@ -479,6 +479,10 @@ public interface RSClient extends RSGameEngine, Client
@Override @Override
int getMouseIdleTicks(); int getMouseIdleTicks();
@Import("mouseLastPressedTimeMillis")
@Override
long getMouseLastPressedMillis();
@Import("keyboardIdleTicks") @Import("keyboardIdleTicks")
@Override @Override
int getKeyboardIdleTicks(); int getKeyboardIdleTicks();