From 9a9f40b862aa6fe5f5ae231bb3b66ce369e29825 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 16 Apr 2020 16:58:16 -0400 Subject: [PATCH] Revert "Reset repositioned tooltip overlays" This reverts commit 1fccba9fda84b1f22375c50bafb8af4c1b7fd0bc. --- .../java/net/runelite/client/RuneLite.java | 5 ---- .../ui/overlay/tooltip/TooltipManager.java | 26 ------------------- 2 files changed, 31 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 9a0c8f87d9..463f93b639 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -73,7 +73,6 @@ import net.runelite.client.ui.overlay.OverlayRenderer; import net.runelite.client.ui.overlay.WidgetOverlay; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; 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.ws.PartyService; @@ -128,9 +127,6 @@ public class RuneLite @Inject private OverlayManager overlayManager; - @Inject - private TooltipManager tooltipManager; - @Inject private Provider partyService; @@ -341,7 +337,6 @@ public class RuneLite eventBus.register(overlayManager); eventBus.register(drawManager); eventBus.register(infoBoxManager); - eventBus.register(tooltipManager); eventBus.register(configManager); eventBus.register(discordService); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java index 9ed020b72b..6472381ec3 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java @@ -24,27 +24,14 @@ */ 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 tooltips = new ArrayList<>(); @@ -62,17 +49,4 @@ 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()); - } - } }