From 3ad4aa942b139858bab92dd7d8b72b993a545b6d Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 7 Sep 2018 10:03:07 +0200 Subject: [PATCH] Make Kourend library use hidden field instead of manager Signed-off-by: Tomas Slusny --- .../plugins/kourendlibrary/KourendLibraryOverlay.java | 10 ++++++++++ .../plugins/kourendlibrary/KourendLibraryPlugin.java | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java index 094ff365ca..23dec3329e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java @@ -35,6 +35,8 @@ import java.util.List; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import lombok.AccessLevel; +import lombok.Setter; import net.runelite.api.Client; import net.runelite.api.Perspective; import static net.runelite.api.Perspective.getCanvasTilePoly; @@ -53,6 +55,9 @@ class KourendLibraryOverlay extends Overlay private final Library library; private final Client client; + @Setter(AccessLevel.PACKAGE) + private boolean hidden; + @Inject private KourendLibraryOverlay(Library library, Client client) { @@ -66,6 +71,11 @@ class KourendLibraryOverlay extends Overlay @Override public Dimension render(Graphics2D g) { + if (hidden) + { + return null; + } + Player player = client.getLocalPlayer(); if (player == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java index 2cefb003e8..8eeaf81daa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java @@ -118,6 +118,8 @@ public class KourendLibraryPlugin extends Plugin .panel(panel) .build(); + overlayManager.add(overlay); + if (!config.hideButton()) { clientToolbar.addNavigation(navButton); @@ -127,6 +129,7 @@ public class KourendLibraryPlugin extends Plugin @Override protected void shutDown() { + overlay.setHidden(true); overlayManager.remove(overlay); clientToolbar.removeNavigation(navButton); buttonAttached = false; @@ -170,7 +173,7 @@ public class KourendLibraryPlugin extends Plugin if (MenuAction.GAME_OBJECT_FIRST_OPTION == menuOpt.getMenuAction() && menuOpt.getMenuTarget().contains("Bookshelf")) { lastBookcaseClick = WorldPoint.fromScene(client, menuOpt.getActionParam(), menuOpt.getWidgetId(), client.getPlane()); - overlayManager.add(overlay); + overlay.setHidden(false); } } @@ -256,7 +259,7 @@ public class KourendLibraryPlugin extends Plugin return; } - overlayManager.add(overlay); + overlay.setHidden(false); library.setCustomer(cust, book); panel.update(); }