Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-9-2020

 Conflicts:

	runelite-client/src/main/java/net/runelite/client/RuneLite.java

	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java

	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java

	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java

	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelConfig.java

	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java

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

	runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java

	runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java

runelite-client/src/main/java/net/runelite/client/RuneLite.java

@@ -87,6 +87,7 @@ import net.runelite.client.ui.overlay.WidgetOverlay;
 import net.runelite.client.ui.overlay.arrow.ArrowMinimapOverlay;
 import net.runelite.client.ui.overlay.arrow.ArrowWorldOverlay;
 import net.runelite.client.ui.overlay.infobox.InfoBoxOverlay;
+import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import net.runelite.client.ui.overlay.tooltip.TooltipOverlay;
 import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay;
 import net.runelite.client.util.Groups;
@@ -145,6 +146,12 @@ public class RuneLite
 	@Inject
 	private OverlayManager overlayManager;
 
+	@Inject
+	private TooltipManager tooltipManager;
+
+	@Inject
+	private Provider<PartyService> partyService;
+
 	@Inject
 	private Provider<ItemManager> itemManager;
 
@@ -421,6 +428,15 @@ public class RuneLite
 		// Initialize Discord service
 		discordService.init();
 
+		// Register event listeners
+		eventBus.register(clientUI);
+		eventBus.register(pluginManager);
+		eventBus.register(externalPluginManager);
+		eventBus.register(overlayManager);
+		eventBus.register(drawManager);
+		eventBus.register(infoBoxManager);
+		eventBus.register(tooltipManager);
+
 		if (!isOutdated)
 		{
 			// Initialize chat colors

runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java

@@ -60,8 +60,8 @@ public class WidgetOverlay extends Overlay
 		.put(WidgetInfo.MULTICOMBAT_FIXED, OverlayPosition.BOTTOM_RIGHT)
 		.put(WidgetInfo.MULTICOMBAT_RESIZEABLE, OverlayPosition.CANVAS_TOP_RIGHT)
 		.put(WidgetInfo.PYRAMID_PLUNDER_DATA, OverlayPosition.TOP_CENTER)
-		.put(WidgetInfo.LMS_INFO, OverlayPosition.TOP_CENTER)
-		.put(WidgetInfo.LMS_KDA, OverlayPosition.TOP_CENTER)
+		.put(WidgetInfo.LMS_INFO, OverlayPosition.TOP_RIGHT)
+		.put(WidgetInfo.LMS_KDA, OverlayPosition.TOP_RIGHT)
 		.put(WidgetInfo.THEATRE_OF_BLOOD_HEALTH_ORBS, OverlayPosition.TOP_LEFT)
 		.put(WidgetInfo.GAUNTLET_TIMER_CONTAINER, OverlayPosition.TOP_LEFT)
 		.build();

runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java

@@ -24,14 +24,27 @@
  */
 package net.runelite.client.ui.overlay.tooltip;
 
+import com.google.common.base.Strings;
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.Getter;
+import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.events.ConfigChanged;
 
 @Singleton
 public class TooltipManager
 {
+	private final ConfigManager configManager;
+
+	@Inject
+	private TooltipManager(final ConfigManager configManager)
+	{
+		this.configManager = configManager;
+	}
+
 	@Getter
 	private final List<Tooltip> tooltips = new ArrayList<>();
 
@@ -49,4 +62,17 @@ public class TooltipManager
 	{
 		tooltips.clear();
 	}
+
+	@Subscribe
+	public void onConfigChanged(final ConfigChanged event)
+	{
+		// Temporary fix for resetting repositioned tooltip overlay
+		// TODO: Remove this eventually
+		if (event.getGroup().equals("runelite") &&
+			event.getKey().equals("TooltipOverlay_preferredLocation") &&
+			!Strings.isNullOrEmpty(event.getNewValue()))
+		{
+			configManager.unsetConfiguration(event.getGroup(), event.getKey());
+		}
+	}
 }