Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2021-09-07 07:48:07 +02:00
16 changed files with 413 additions and 360 deletions

View File

@@ -79,6 +79,7 @@ public class NpcIndicatorsPluginTest
public void setUp()
{
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
when(npcIndicatorsConfig.highlightColor()).thenReturn(Color.RED);
}
@Test

View File

@@ -56,7 +56,7 @@ import net.runelite.client.chat.ChatCommandManager;
import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.game.ItemManager;
import net.runelite.client.plugins.npchighlight.NpcIndicatorsService;
import net.runelite.client.game.npcoverlay.NpcOverlayService;
import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.http.api.chat.ChatClient;
@@ -176,7 +176,7 @@ public class SlayerPluginTest
@Mock
@Bind
NpcIndicatorsService npcIndicatorsService;
NpcOverlayService npcOverlayService;
@Inject
SlayerPlugin slayerPlugin;