From 7866cc612b7cea44c35b202569e0dde437f03180 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 8 Nov 2019 04:36:47 +0100 Subject: [PATCH 1/2] client: make error logging opt out --- cache/cache.gradle.kts | 2 +- deobfuscator/deobfuscator.gradle.kts | 4 ++-- http-api/http-api.gradle.kts | 2 +- runelite-client/runelite-client.gradle.kts | 14 +++++++++-- .../runelite/client/RuneLiteProperties.java | 10 +++++++- .../client/config/OpenOSRSConfig.java | 23 +++++++++++++++++++ .../runelite/client/eventbus/EventBus.java | 20 ++++++++++++++-- runelite-mixins/runelite-mixins.gradle.kts | 6 +++-- 8 files changed, 70 insertions(+), 11 deletions(-) diff --git a/cache/cache.gradle.kts b/cache/cache.gradle.kts index e85a59a7d8..032f43e09c 100644 --- a/cache/cache.gradle.kts +++ b/cache/cache.gradle.kts @@ -52,7 +52,7 @@ dependencies { } tasks { - "processTestResources"(ProcessResources::class) { + processTestResources { val tokens = mapOf( "rs.version" to ProjectVersions.rsversion.toString(), "cache.version" to ProjectVersions.cacheversion.toString() diff --git a/deobfuscator/deobfuscator.gradle.kts b/deobfuscator/deobfuscator.gradle.kts index a307aa9b04..41985db08a 100644 --- a/deobfuscator/deobfuscator.gradle.kts +++ b/deobfuscator/deobfuscator.gradle.kts @@ -59,7 +59,7 @@ tasks { "rs.client" to deobjars.find { it.name.startsWith("runescape-client") }.toString().replace("\\", "/") ) - "processResources"(ProcessResources::class) { + processResources { inputs.properties(tokens) from("src/main/resources") { @@ -69,7 +69,7 @@ tasks { } } - "processTestResources"(ProcessResources::class) { + processTestResources { inputs.properties(tokens) from("src/test/resources") { diff --git a/http-api/http-api.gradle.kts b/http-api/http-api.gradle.kts index 9f5dfac4af..16bb02edf6 100644 --- a/http-api/http-api.gradle.kts +++ b/http-api/http-api.gradle.kts @@ -47,7 +47,7 @@ dependencies { } tasks { - "processResources"(ProcessResources::class) { + processResources { val tokens = mapOf( "projectver" to ProjectVersions.rlVersion, "rsver" to ProjectVersions.rsversion.toString(), diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index 87c90e5bbf..7535a28ce2 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -106,18 +106,27 @@ fun formatDate(date: Date?) = with(date ?: Date()) { SimpleDateFormat("MM-dd-yyyy").format(this) } +fun launcherVersion(): String { + if (project.hasProperty("releaseBuild")) { + return ProjectVersions.launcherVersion + } + return "-1" +} + tasks { build { finalizedBy("shadowJar") } - "processResources"(ProcessResources::class) { + processResources { + + val tokens = mapOf( "project.version" to ProjectVersions.rlVersion, "rs.version" to ProjectVersions.rsversion.toString(), "open.osrs.version" to ProjectVersions.openosrsVersion, "open.osrs.builddate" to formatDate(Date()), - "launcher.version" to ProjectVersions.launcherVersion + "launcher.version" to launcherVersion() ) inputs.properties(tokens) @@ -130,6 +139,7 @@ tasks { } jar { + manifest { attributes(mutableMapOf("Main-Class" to "net.runelite.client.RuneLite")) } diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java index 78e5fc33d8..17c8c3d1ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java @@ -27,6 +27,7 @@ package net.runelite.client; import java.io.IOException; import java.io.InputStream; import java.util.Properties; +import javax.annotation.Nullable; public class RuneLiteProperties { @@ -40,7 +41,7 @@ public class RuneLiteProperties private static final String GITHUB_LINK = "runelite.github.link"; private static final String WIKI_LINK = "runelite.wiki.link"; private static final String PATREON_LINK = "runelite.patreon.link"; - private static final String LAUNCHER_VERSION_PROPERTY = "runelite.launcher.version"; + private static final String LAUNCHER_VERSION_PROPERTY = "launcher.version"; private static final String TROUBLESHOOTING_LINK = "runelite.wiki.troubleshooting.link"; private static final String BUILDING_LINK = "runelite.wiki.building.link"; private static final String DNS_CHANGE_LINK = "runelite.dnschange.link"; @@ -129,4 +130,11 @@ public class RuneLiteProperties { return properties.getProperty(DNS_CHANGE_LINK); } + + @Nullable + public static String getLauncherVersion() + { + String launcherVersion = properties.getProperty(LAUNCHER_VERSION_PROPERTY); + return launcherVersion.equals("-1") ? null : launcherVersion; + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/config/OpenOSRSConfig.java b/runelite-client/src/main/java/net/runelite/client/config/OpenOSRSConfig.java index 9d9e7936a5..d566d25296 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/OpenOSRSConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/OpenOSRSConfig.java @@ -50,6 +50,29 @@ public interface OpenOSRSConfig extends Config } } + @ConfigTitleSection( + keyName = "logTitle", + name = "Error data", + description = "", + position = 1 + ) + default Title logTitle() + { + return new Title(); + } + + @ConfigItem( + position = 3, + keyName = "shareLogs", + name = "Anonymous error data", + description = "Share anonymous error data with the OpenOSRS developers", + titleSection = "logTitle" + ) + default boolean shareLogs() + { + return true; + } + @ConfigTitleSection( keyName = "pluginsTitle", name = "Plugins", diff --git a/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java b/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java index 40cf5035cc..458c101158 100644 --- a/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java @@ -10,9 +10,12 @@ import io.sentry.Sentry; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.events.Event; +import net.runelite.client.RuneLiteProperties; +import net.runelite.client.config.OpenOSRSConfig; @Slf4j @Singleton @@ -22,6 +25,9 @@ public class EventBus implements EventBusInterface private Map, Relay> subjectList = new HashMap<>(); private Map subscriptionsMap = new HashMap<>(); + @Inject + private OpenOSRSConfig openOSRSConfig; + @NonNull private Relay getSubject(Class eventClass) { @@ -55,7 +61,12 @@ public class EventBus implements EventBusInterface .cast(eventClass) // Cast it for easier usage .subscribe(action, error -> { - Sentry.capture(error); + log.error("Exception in eventbus", error); + + if (RuneLiteProperties.getLauncherVersion() != null && openOSRSConfig.shareLogs()) + { + Sentry.capture(error); + } }); getCompositeDisposable(lifecycle).add(disposable); @@ -77,7 +88,12 @@ public class EventBus implements EventBusInterface .doFinally(() -> unregister(lifecycle)) .subscribe(action, error -> { - Sentry.capture(error); + log.error("Exception in eventbus", error); + + if (RuneLiteProperties.getLauncherVersion() != null && openOSRSConfig.shareLogs()) + { + Sentry.capture(error); + } }); getCompositeDisposable(lifecycle).add(disposable); diff --git a/runelite-mixins/runelite-mixins.gradle.kts b/runelite-mixins/runelite-mixins.gradle.kts index 1fba54af2c..671ec4055f 100644 --- a/runelite-mixins/runelite-mixins.gradle.kts +++ b/runelite-mixins/runelite-mixins.gradle.kts @@ -33,6 +33,8 @@ dependencies { implementation(project(":runescape-api")) } -tasks.withType { - options.compilerArgs.addAll(arrayOf("-source", "7", "-Xlint:-unchecked")) +tasks { + withType { + options.compilerArgs.addAll(arrayOf("-source", "7", "-Xlint:-unchecked")) + } } From 46c7f53112c41f10dfce0da6aace71fa2ab2b7d1 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 8 Nov 2019 05:36:30 +0100 Subject: [PATCH 2/2] client: Fix tests --- .../plugins/objectindicators/ObjectIndicatorsPlugin.java | 3 +-- .../net/runelite/client/chat/ChatMessageManagerTest.java | 6 ++++++ .../java/net/runelite/client/config/ConfigManagerTest.java | 4 ++++ .../client/plugins/attackstyles/AttackStylesPluginTest.java | 5 +++++ .../net/runelite/client/plugins/bank/BankPluginTest.java | 5 +++++ .../client/plugins/banktags/ItemValueSearchTest.java | 5 +++++ .../client/plugins/cerberus/CerberusPluginTest.java | 5 +++++ .../client/plugins/chatcommands/ChatCommandsPluginTest.java | 5 +++++ .../client/plugins/chatfilter/ChatFilterPluginTest.java | 5 +++++ .../chatnotifications/ChatNotificationsPluginTest.java | 5 +++++ .../runelite/client/plugins/cooking/CookingPluginTest.java | 5 +++++ .../net/runelite/client/plugins/emojis/EmojiPluginTest.java | 5 +++++ .../runelite/client/plugins/examine/ExaminePluginTest.java | 5 +++++ .../client/plugins/idlenotifier/IdleNotifierPluginTest.java | 5 +++++ .../client/plugins/itemcharges/ItemChargePluginTest.java | 5 +++++ .../itemskeptondeath/ItemsKeptOnDeathPluginTest.java | 5 +++++ .../client/plugins/motherlode/MotherlodePluginTest.java | 5 +++++ .../plugins/npchighlight/NpcIndicatorsPluginTest.java | 5 +++++ .../client/plugins/screenshot/ScreenshotPluginTest.java | 5 +++++ .../runelite/client/plugins/slayer/SlayerPluginTest.java | 5 +++++ .../client/plugins/smelting/SmeltingPluginTest.java | 5 +++++ .../runelite/client/plugins/timers/TimersPluginTest.java | 5 +++++ .../client/plugins/timestamp/TimestampPluginTest.java | 5 +++++ .../client/plugins/wintertodt/WintertodtPluginTest.java | 5 +++++ .../client/plugins/xptracker/XpTrackerPluginTest.java | 5 +++++ 25 files changed, 121 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index ccb16f3aa3..56aafdf018 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -359,8 +359,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener && (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY()) { // Transform object to get the name which matches against what we've stored - if (getObjectDefinition(object.getId()) != null && - objectPoint.getName().equals(getObjectDefinition(object.getId()).getName())) + if (objectPoint.getName().equals(getObjectDefinition(object.getId()).getName())) { log.debug("Marking object {} due to matching {}", object, objectPoint); objects.add(object); diff --git a/runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java b/runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java index 24e3539106..2e79d50a81 100644 --- a/runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java @@ -34,6 +34,8 @@ import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.events.ChatMessage; import net.runelite.client.config.ChatColorConfig; +import net.runelite.client.config.OpenOSRSConfig; +import net.runelite.client.eventbus.EventBus; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,6 +57,10 @@ public class ChatMessageManagerTest @Bind private ChatColorConfig chatColorConfig; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private ChatMessageManager chatMessageManager; diff --git a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java index 14e4b80f06..63ca4d6a64 100644 --- a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java @@ -56,6 +56,10 @@ public class ConfigManagerTest @Bind RuneLiteConfig runeliteConfig; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject ConfigManager manager; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java index f84e1fddad..d47ae44d81 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java @@ -37,6 +37,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.ui.overlay.OverlayManager; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -63,6 +64,10 @@ public class AttackStylesPluginTest @Bind AttackStylesConfig attackConfig; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject AttackStylesPlugin attackPlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java index 69b89af80d..0c9e79f662 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java @@ -35,6 +35,7 @@ import net.runelite.api.Item; import net.runelite.api.ItemContainer; import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.ItemManager; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -61,6 +62,10 @@ public class BankPluginTest @Bind private BankConfig bankConfig; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private BankPlugin bankPlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/banktags/ItemValueSearchTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/banktags/ItemValueSearchTest.java index 63f4f66312..f5779cefcd 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/banktags/ItemValueSearchTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/banktags/ItemValueSearchTest.java @@ -34,6 +34,7 @@ import net.runelite.api.Client; import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; import net.runelite.client.callback.ClientThread; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; @@ -110,6 +111,10 @@ public class ItemValueSearchTest @Bind private ScheduledExecutorService scheduledExecutorService; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java index b6785c5267..9d04e2eacd 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java @@ -33,6 +33,7 @@ import javax.inject.Inject; import net.runelite.api.NPC; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.GameTick; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.ui.overlay.OverlayManager; import static org.junit.Assert.assertEquals; import org.junit.Before; @@ -50,6 +51,10 @@ public class CerberusPluginTest @Bind OverlayManager overlayManager; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject CerberusPlugin cerberusPlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java index 86d863e660..2774f5cad8 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java @@ -35,6 +35,7 @@ import net.runelite.api.Client; import net.runelite.api.events.ChatMessage; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.OpenOSRSConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,6 +68,10 @@ public class ChatCommandsPluginTest @Bind ChatCommandsConfig chatCommandsConfig; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject ChatCommandsPlugin chatCommandsPlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java index 36b6a0038f..65569eb2cf 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java @@ -31,6 +31,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Player; +import net.runelite.client.config.OpenOSRSConfig; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -54,6 +55,10 @@ public class ChatFilterPluginTest @Bind private ChatFilterConfig chatFilterConfig; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Mock private Player localPlayer; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java index 7a9c02001a..429001408f 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java @@ -37,6 +37,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.util.Text; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.config.OpenOSRSConfig; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; @@ -66,6 +67,10 @@ public class ChatNotificationsPluginTest @Bind private Notifier notifier; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private ChatNotificationsPlugin chatNotificationsPlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java index 9fa299524e..6e24cdfe11 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java @@ -34,6 +34,7 @@ import net.runelite.api.GraphicID; import net.runelite.api.Player; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.SpotAnimationChanged; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @@ -89,6 +90,10 @@ public class CookingPluginTest @Bind OverlayManager overlayManager; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java index 326ea07a38..2846dd1993 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java @@ -36,6 +36,7 @@ import net.runelite.api.MessageNode; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.config.OpenOSRSConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,6 +59,10 @@ public class EmojiPluginTest @Bind private ChatMessageManager chatMessageManager; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private EmojiPlugin emojiPlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java index e4844ad860..a6ef8d9351 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java @@ -38,6 +38,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.widgets.Widget; import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.ItemManager; import net.runelite.http.api.examine.ExamineClient; import org.junit.Before; @@ -78,6 +79,10 @@ public class ExaminePluginTest @Bind ScheduledExecutorService scheduledExecutorService; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { 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 fa6aa6a3c0..5a7371e45f 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 @@ -46,6 +46,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.InteractingChanged; import net.runelite.client.Notifier; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.SoundManager; import org.junit.Before; import org.junit.Test; @@ -81,6 +82,10 @@ public class IdleNotifierPluginTest @Bind private Notifier notifier; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private IdleNotifierPlugin plugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java index 3cfa3a55ce..c93c56d850 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java @@ -38,6 +38,7 @@ import net.runelite.api.ItemContainer; import net.runelite.api.ItemID; import net.runelite.api.events.ChatMessage; import net.runelite.client.Notifier; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.ui.overlay.OverlayManager; import org.junit.Before; @@ -88,6 +89,10 @@ public class ItemChargePluginTest @Bind private ItemChargeConfig config; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private ItemChargePlugin itemChargePlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java index 0a60baffaa..a4410851b0 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java @@ -35,6 +35,7 @@ import net.runelite.api.Client; import net.runelite.api.Item; import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemReclaimCost; import static net.runelite.client.plugins.itemskeptondeath.ItemsKeptOnDeathPlugin.DeathItems; @@ -60,6 +61,10 @@ public class ItemsKeptOnDeathPluginTest @Bind private ItemManager itemManager; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private ItemsKeptOnDeathPlugin plugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java index 7006cb17ee..162a78ac18 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java @@ -41,6 +41,7 @@ import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.client.Notifier; import net.runelite.client.config.ChatColorConfig; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.config.RuneLiteConfig; import org.junit.Before; import org.junit.Test; @@ -102,6 +103,10 @@ public class MotherlodePluginTest @Bind private Notifier notifier; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java index f5a6b06000..14b295a338 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; import net.runelite.api.Client; +import net.runelite.client.config.OpenOSRSConfig; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; @@ -54,6 +55,10 @@ public class NpcIndicatorsPluginTest @Bind private NpcIndicatorsConfig npcIndicatorsConfig; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject private NpcIndicatorsPlugin npcIndicatorsPlugin; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java index c9ba436f27..df840c4e34 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java @@ -41,6 +41,7 @@ import static net.runelite.api.widgets.WidgetID.LEVEL_UP_GROUP_ID; import static net.runelite.api.widgets.WidgetInfo.DIALOG_SPRITE_TEXT; import static net.runelite.api.widgets.WidgetInfo.LEVEL_UP_LEVEL; import net.runelite.client.Notifier; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.DrawManager; @@ -97,6 +98,10 @@ public class ScreenshotPluginTest @Bind ScheduledExecutorService service; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java index 2264531825..b2e5b15173 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java @@ -49,6 +49,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatCommandManager; import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @@ -149,6 +150,10 @@ public class SlayerPluginTest @Bind SlayerTaskPanel panel; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/smelting/SmeltingPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/smelting/SmeltingPluginTest.java index 581307f27f..6bc033e300 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/smelting/SmeltingPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/smelting/SmeltingPluginTest.java @@ -30,6 +30,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule; import javax.inject.Inject; import net.runelite.api.ChatMessageType; import net.runelite.api.events.ChatMessage; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.ui.overlay.OverlayManager; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -60,6 +61,10 @@ public class SmeltingPluginTest @Bind OverlayManager overlayManager; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java index f2b1dd1db6..fda280c0b9 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java @@ -33,6 +33,7 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.WorldType; import net.runelite.api.events.ChatMessage; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.ui.overlay.infobox.InfoBox; @@ -77,6 +78,10 @@ public class TimersPluginTest @Bind private InfoBoxManager infoBoxManager; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java index 7520de61fd..cb4539647c 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java @@ -31,6 +31,7 @@ import java.util.TimeZone; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; +import net.runelite.client.config.OpenOSRSConfig; import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; @@ -50,6 +51,10 @@ public class TimestampPluginTest @Bind TimestampConfig config; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Inject TimestampPlugin plugin; 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 index 3abf2f919f..68e9308aa2 100644 --- 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 @@ -34,6 +34,7 @@ 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.config.OpenOSRSConfig; import net.runelite.client.ui.overlay.OverlayManager; import org.junit.Before; import org.junit.Test; @@ -74,6 +75,10 @@ public class WintertodtPluginTest @Bind Client client; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java index 97994295d0..9a3267f6f6 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java @@ -35,6 +35,7 @@ import net.runelite.api.Skill; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.StatChanged; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.game.NPCManager; import net.runelite.client.game.SkillIconManager; import net.runelite.client.ui.ClientToolbar; @@ -78,6 +79,10 @@ public class XpTrackerPluginTest @Bind private OverlayManager overlayManager; + @Mock + @Bind + private OpenOSRSConfig openOSRSConfig; + @Before public void before() {