From 32e435e42d0027c910d164d8643f8adac76c5d7a Mon Sep 17 00:00:00 2001 From: TheStonedTurtle Date: Mon, 23 Mar 2020 00:45:03 -0700 Subject: [PATCH 1/2] Revert "opponentinfo: add opponent's opponent for npcs" This reverts commit 34f94e973c18627a3d7f20faf8160647b87c09c9. --- .../opponentinfo/OpponentInfoConfig.java | 11 --------- .../opponentinfo/OpponentInfoOverlay.java | 23 ------------------- 2 files changed, 34 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java index 9f08e128af..6adb3af1f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java @@ -53,17 +53,6 @@ public interface OpponentInfoConfig extends Config return HitpointsDisplayStyle.HITPOINTS; } - @ConfigItem( - keyName = "showOpponentsOpponent", - name = "Show opponent's opponent", - description = "Toggle showing opponent's opponent if within a multi-combat area", - position = 2 - ) - default boolean showOpponentsOpponent() - { - return true; - } - @ConfigItem( keyName = "showOpponentsInMenu", name = "Show opponents in menu", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java index 1ebc861ba3..8e838cc49b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java @@ -37,7 +37,6 @@ import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.NPC; import net.runelite.api.Player; -import net.runelite.api.Varbits; import net.runelite.client.game.HiscoreManager; import net.runelite.client.game.NPCManager; import net.runelite.client.ui.overlay.Overlay; @@ -69,7 +68,6 @@ class OpponentInfoOverlay extends Overlay private int lastRatio = 0; private int lastHealthScale = 0; private String opponentName; - private String opponentsOpponentName; @Inject private OpponentInfoOverlay( @@ -128,17 +126,6 @@ class OpponentInfoOverlay extends Overlay } } } - - final Actor opponentsOpponent = opponent.getInteracting(); - if (opponent instanceof NPC && opponentsOpponent != null - && (opponentsOpponent != client.getLocalPlayer() || client.getVar(Varbits.MULTICOMBAT_AREA) == 1)) - { - opponentsOpponentName = Text.removeTags(opponentsOpponent.getName()); - } - else - { - opponentsOpponentName = null; - } } if (opponentName == null) @@ -218,16 +205,6 @@ class OpponentInfoOverlay extends Overlay panelComponent.getChildren().add(progressBarComponent); } - // Opponents opponent - if (opponentsOpponentName != null && opponentInfoConfig.showOpponentsOpponent()) - { - panelWidth = Math.max(panelWidth, fontMetrics.stringWidth(opponentsOpponentName) + ComponentConstants.STANDARD_BORDER + ComponentConstants.STANDARD_BORDER); - panelComponent.setPreferredSize(new Dimension(panelWidth, 0)); - panelComponent.getChildren().add(TitleComponent.builder() - .text(opponentsOpponentName) - .build()); - } - return panelComponent.render(graphics); } } From 8ac2637c830267a774e87bfc6b40daeba10a565c Mon Sep 17 00:00:00 2001 From: Kyle <48519776+xKylee@users.noreply.github.com> Date: Mon, 23 Mar 2020 20:23:52 +0000 Subject: [PATCH 2/2] ffs --- .../java/net/runelite/client/ui/overlay/OverlayRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 09483f41df..010a703331 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -316,7 +316,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener graphics.setColor(previous); } - if (!client.isMenuOpen() && !client.getSpellSelected() && bounds.contains(mouse)) + if (!client.isMenuOpen() && !client.isSpellSelected() && bounds.contains(mouse)) { if (menuEntries == null) { @@ -639,4 +639,4 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener return entries; } -} \ No newline at end of file +}