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

Fix tests

Browse Source
This commit is contained in:
Owain van Brakel
2019-07-14 13:47:26 +02:00
parent 8b647041f4
commit 19865173d8
17 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
View File

@@ -220,7 +220,7 @@ public class AttackStylesPlugin extends Plugin
} }
} }
private void onVarbitChanged(VarbitChanged event) void onVarbitChanged(VarbitChanged event)
{ {
if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE)) if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE))
{ {
@@ -247,7 +247,7 @@ public class AttackStylesPlugin extends Plugin
} }
} }
private void onConfigChanged(ConfigChanged event) void onConfigChanged(ConfigChanged event)
{ {
if (event.getGroup().equals("attackIndicator")) if (event.getGroup().equals("attackIndicator"))
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java
View File

@@ -106,7 +106,7 @@ public class CerberusPlugin extends Plugin
ghosts.remove(event.getNpc()); ghosts.remove(event.getNpc());
} }
private void onGameTick(GameTick gameTick) void onGameTick(GameTick gameTick)
{ {
if (ghosts.isEmpty()) if (ghosts.isEmpty())
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
View File

@@ -223,7 +223,7 @@ public class ChatCommandsPlugin extends Plugin
return personalBest == null ? 0 : personalBest; return personalBest == null ? 0 : personalBest;
} }
private void onChatMessage(ChatMessage chatMessage) void onChatMessage(ChatMessage chatMessage)
{ {
if (chatMessage.getType() != ChatMessageType.TRADE if (chatMessage.getType() != ChatMessageType.TRADE
&& chatMessage.getType() != ChatMessageType.GAMEMESSAGE && chatMessage.getType() != ChatMessageType.GAMEMESSAGE

2
runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
View File

@@ -162,7 +162,7 @@ public class ChatNotificationsPlugin extends Plugin
} }
} }
private void onChatMessage(ChatMessage chatMessage) void onChatMessage(ChatMessage chatMessage)
{ {
MessageNode messageNode = chatMessage.getMessageNode(); MessageNode messageNode = chatMessage.getMessageNode();
boolean update = false; boolean update = false;

4
runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
View File

@@ -140,7 +140,7 @@ public class CookingPlugin extends Plugin
} }
} }
private void onSpotAnimationChanged(SpotAnimationChanged graphicChanged) void onSpotAnimationChanged(SpotAnimationChanged graphicChanged)
{ {
Player player = client.getLocalPlayer(); Player player = client.getLocalPlayer();
@@ -169,7 +169,7 @@ public class CookingPlugin extends Plugin
} }
} }
private void onChatMessage(ChatMessage event) void onChatMessage(ChatMessage event)
{ {
if (event.getType() != ChatMessageType.SPAM) if (event.getType() != ChatMessageType.SPAM)
{ {

4
runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java
View File

@@ -89,7 +89,7 @@ public class EmojiPlugin extends Plugin
eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged); eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged);
} }
private void onGameStateChanged(GameStateChanged gameStateChanged) void onGameStateChanged(GameStateChanged gameStateChanged)
{ {
if (gameStateChanged.getGameState() == GameState.LOGGED_IN) if (gameStateChanged.getGameState() == GameState.LOGGED_IN)
{ {
@@ -129,7 +129,7 @@ public class EmojiPlugin extends Plugin
client.setModIcons(newModIcons); client.setModIcons(newModIcons);
} }
private void onChatMessage(ChatMessage chatMessage) void onChatMessage(ChatMessage chatMessage)
{ {
if (client.getGameState() != GameState.LOGGED_IN || modIconsStart == -1) if (client.getGameState() != GameState.LOGGED_IN || modIconsStart == -1)
{ {

4
runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
View File

@@ -123,7 +123,7 @@ public class ExaminePlugin extends Plugin
pending.clear(); pending.clear();
} }
private void onMenuOptionClicked(MenuOptionClicked event) void onMenuOptionClicked(MenuOptionClicked event)
{ {
if (!event.getOption().equals("Examine")) if (!event.getOption().equals("Examine"))
{ {
@@ -180,7 +180,7 @@ public class ExaminePlugin extends Plugin
pending.push(pendingExamine); pending.push(pendingExamine);
} }
private void onChatMessage(ChatMessage event) void onChatMessage(ChatMessage event)
{ {
ExamineType type; ExamineType type;
switch (event.getType()) switch (event.getType())

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

@@ -167,7 +167,7 @@ public class IdleNotifierPlugin extends Plugin
return configManager.getConfig(IdleNotifierConfig.class); return configManager.getConfig(IdleNotifierConfig.class);
} }
private void onAnimationChanged(AnimationChanged event) void onAnimationChanged(AnimationChanged event)
{ {
if (client.getGameState() != GameState.LOGGED_IN) if (client.getGameState() != GameState.LOGGED_IN)
{ {
@@ -402,7 +402,7 @@ public class IdleNotifierPlugin extends Plugin
itemQuantitiesPrevious = itemQuantities; itemQuantitiesPrevious = itemQuantities;
} }
private void onInteractingChanged(InteractingChanged event) void onInteractingChanged(InteractingChanged event)
{ {
final Actor source = event.getSource(); final Actor source = event.getSource();
if (source != client.getLocalPlayer()) if (source != client.getLocalPlayer())
@@ -452,7 +452,7 @@ public class IdleNotifierPlugin extends Plugin
} }
} }
private void onGameStateChanged(GameStateChanged gameStateChanged) void onGameStateChanged(GameStateChanged gameStateChanged)
{ {
lastInteracting = null; lastInteracting = null;
@@ -484,7 +484,7 @@ public class IdleNotifierPlugin extends Plugin
} }
} }
private void onHitsplatApplied(HitsplatApplied event) void onHitsplatApplied(HitsplatApplied event)
{ {
if (event.getActor() != client.getLocalPlayer()) if (event.getActor() != client.getLocalPlayer())
{ {
@@ -515,7 +515,7 @@ public class IdleNotifierPlugin extends Plugin
} }
} }
private void onGameTick(GameTick event) void onGameTick(GameTick event)
{ {
skullNotifier(); skullNotifier();

2
runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
View File

@@ -312,7 +312,7 @@ public class ItemChargePlugin extends Plugin
} }
} }
private void onChatMessage(ChatMessage event) void onChatMessage(ChatMessage event)
{ {
String message = event.getMessage(); String message = event.getMessage();
Matcher dodgyCheckMatcher = DODGY_CHECK_PATTERN.matcher(message); Matcher dodgyCheckMatcher = DODGY_CHECK_PATTERN.matcher(message);

6
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
View File

@@ -293,7 +293,7 @@ public class MotherlodePlugin extends Plugin
eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged); eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged);
} }
private void onVarbitChanged(VarbitChanged event) void onVarbitChanged(VarbitChanged event)
{ {
if (inMlm) if (inMlm)
{ {
@@ -621,7 +621,7 @@ public class MotherlodePlugin extends Plugin
rocks.remove(gameObject); rocks.remove(gameObject);
} }
private void onGameStateChanged(GameStateChanged event) void onGameStateChanged(GameStateChanged event)
{ {
if (event.getGameState() == GameState.LOADING) if (event.getGameState() == GameState.LOADING)
{ {
@@ -638,7 +638,7 @@ public class MotherlodePlugin extends Plugin
} }
} }
private void onItemContainerChanged(ItemContainerChanged event) void onItemContainerChanged(ItemContainerChanged event)
{ {
final ItemContainer container = event.getItemContainer(); final ItemContainer container = event.getItemContainer();

6
runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
View File

@@ -308,7 +308,7 @@ public class ScreenshotPlugin extends Plugin
} }
} }
private void onGameTick(GameTick event) void onGameTick(GameTick event)
{ {
if (this.screenshotFriendDeath) if (this.screenshotFriendDeath)
{ {
@@ -407,7 +407,7 @@ public class ScreenshotPlugin extends Plugin
} }
} }
private void onChatMessage(ChatMessage event) void onChatMessage(ChatMessage event)
{ {
if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.TRADE) if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.TRADE)
{ {
@@ -520,7 +520,7 @@ public class ScreenshotPlugin extends Plugin
} }
} }
private void onWidgetLoaded(WidgetLoaded event) void onWidgetLoaded(WidgetLoaded event)
{ {
String fileName; String fileName;
int groupId = event.getGroupId(); int groupId = event.getGroupId();

6
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
View File

@@ -436,7 +436,7 @@ public class SlayerPlugin extends Plugin
} }
} }
private void onVarbitChanged(VarbitChanged event) void onVarbitChanged(VarbitChanged event)
{ {
if (client.getVar(Varbits.SLAYER_REWARD_POINTS) == cachedPoints) if (client.getVar(Varbits.SLAYER_REWARD_POINTS) == cachedPoints)
{ {
@@ -543,7 +543,7 @@ public class SlayerPlugin extends Plugin
private static final int FORCED_WAIT = 2; private static final int FORCED_WAIT = 2;
private int forcedWait = -1; private int forcedWait = -1;
private void onGameTick(GameTick tick) void onGameTick(GameTick tick)
{ {
loginTick = false; loginTick = false;
@@ -624,7 +624,7 @@ public class SlayerPlugin extends Plugin
} }
} }
private void onChatMessage(ChatMessage event) void onChatMessage(ChatMessage event)
{ {
if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM)
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java
View File

@@ -101,7 +101,7 @@ public class SmeltingPlugin extends Plugin
eventBus.subscribe(GameTick.class, this, this::onGameTick); eventBus.subscribe(GameTick.class, this, this::onGameTick);
} }
private void onChatMessage(ChatMessage event) void onChatMessage(ChatMessage event)
{ {
if (event.getType() != ChatMessageType.SPAM) if (event.getType() != ChatMessageType.SPAM)
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -483,7 +483,7 @@ public class TimersPlugin extends Plugin
} }
} }
private void onChatMessage(ChatMessage event) void onChatMessage(ChatMessage event)
{ {
if (event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.GAMEMESSAGE) if (event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.GAMEMESSAGE)
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java
View File

@@ -90,7 +90,7 @@ public class TimestampPlugin extends Plugin
formatter = null; formatter = null;
} }
private void onConfigChanged(ConfigChanged event) void onConfigChanged(ConfigChanged event)
{ {
if (event.getGroup().equals("timestamp") && event.getKey().equals("format")) if (event.getGroup().equals("timestamp") && event.getKey().equals("format"))
{ {

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

@@ -204,7 +204,7 @@ public class WintertodtPlugin extends Plugin
checkActionTimeout(); checkActionTimeout();
} }
private void onVarbitChanged(VarbitChanged varbitChanged) void onVarbitChanged(VarbitChanged varbitChanged)
{ {
int timerValue = client.getVar(Varbits.WINTERTODT_TIMER); int timerValue = client.getVar(Varbits.WINTERTODT_TIMER);
if (timerValue != previousTimerValue) if (timerValue != previousTimerValue)

4
runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
View File

@@ -129,10 +129,6 @@ public class PluginManagerTest
pluginManager.loadCorePlugins(); pluginManager.loadCorePlugins();
plugins = pluginManager.getPlugins(); plugins = pluginManager.getPlugins();
// Check that the plugins register with the eventbus without errors
EventBus eventBus = new EventBus();
plugins.forEach(eventBus::register);
expected = pluginClasses.stream() expected = pluginClasses.stream()
.map(cl -> (PluginDescriptor) cl.getAnnotation(PluginDescriptor.class)) .map(cl -> (PluginDescriptor) cl.getAnnotation(PluginDescriptor.class))
.filter(Objects::nonNull) .filter(Objects::nonNull)