Refactor changes of #7951 to use doesPlayerContainBook

This commit is contained in:
Koekkruimels
2019-02-24 10:37:03 +01:00
parent 78f16f28f0
commit fbd9bce202

View File

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