ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Refactor changes of #7951 to use doesPlayerContainBook

Browse Source
This commit is contained in:
Koekkruimels
2019-02-24 10:37:03 +01:00
parent 78f16f28f0
commit fbd9bce202
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
View File

@@ -31,7 +31,6 @@ import java.awt.FontMetrics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Polygon; import java.awt.Polygon;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@@ -40,8 +39,6 @@ import javax.annotation.Nullable;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Setter; import lombok.Setter;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.InventoryID;
import net.runelite.api.ItemContainer;
import net.runelite.api.Perspective; import net.runelite.api.Perspective;
import static net.runelite.api.Perspective.getCanvasTilePoly; import static net.runelite.api.Perspective.getCanvasTilePoly;
import net.runelite.api.Player; import net.runelite.api.Player;
@@ -224,13 +221,10 @@ class KourendLibraryOverlay extends Overlay
.forEach(n -> .forEach(n ->
{ {
Book b = library.getCustomerBook(); Book b = library.getCustomerBook();
ItemContainer itemContainer = client.getItemContainer(InventoryID.INVENTORY); boolean doesPlayerContainBook = b != null && plugin.doesPlayerContainBook(b);
boolean hasBookInInventory = itemContainer != null
&& b != null
&& Arrays.stream(itemContainer.getItems()).anyMatch(item -> item.getId() == b.getItem());
LocalPoint local = n.getLocalLocation(); LocalPoint local = n.getLocalLocation();
Polygon poly = getCanvasTilePoly(client, local); Polygon poly = getCanvasTilePoly(client, local);
OverlayUtil.renderPolygon(g, poly, hasBookInInventory ? Color.GREEN : Color.WHITE); OverlayUtil.renderPolygon(g, poly, doesPlayerContainBook ? Color.GREEN : Color.WHITE);
Point screen = Perspective.localToCanvas(client, local, client.getPlane(), n.getLogicalHeight()); Point screen = Perspective.localToCanvas(client, local, client.getPlane(), n.getLogicalHeight());
if (screen != null) if (screen != null)
{ {