From e97628ef491a2027306b57c81d97a4af9de6e332 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:08:38 +0200 Subject: [PATCH] ui: Interface instead of type --- .../src/main/java/net/runelite/client/ui/FontManager.java | 3 ++- .../client/ui/overlay/arrow/ArrowMinimapOverlay.java | 4 ++-- .../net/runelite/client/ui/overlay/arrow/ArrowPoint.java | 8 ++++---- .../net/runelite/client/ui/overlay/arrow/ArrowUtil.java | 5 +++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java index 64a271c7e6..1205c6b3a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java @@ -34,6 +34,7 @@ import java.awt.Font; import java.awt.FontFormatException; import java.awt.GraphicsEnvironment; import java.io.IOException; +import java.util.Map; import lombok.Getter; import net.runelite.client.config.FontType; @@ -59,7 +60,7 @@ public class FontManager } private static final ImmutableBiMap fontMap; - private static final HashMap derivedFontMap = new HashMap<>(); + private static final Map derivedFontMap = new HashMap<>(); static { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java index 59e3784686..91be8caeca 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java @@ -28,8 +28,8 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; -import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -106,7 +106,7 @@ public class ArrowMinimapOverlay extends Overlay else if (arrowPoint.types.contains(ArrowType.OBJECT)) { - ArrayList objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); + List objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); if (objects.isEmpty() && fallBackPoint != null) { renderMinimapArrow(graphics, arrowPoint, null, localPlayerPos, worldPlayerPos); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java index 9969869356..2b381ca9cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java @@ -27,7 +27,7 @@ package net.runelite.client.ui.overlay.arrow; import java.awt.Color; import java.awt.image.BufferedImage; import java.util.EnumSet; -import java.util.HashSet; +import java.util.Set; import lombok.Builder; import lombok.Data; import lombok.NonNull; @@ -44,15 +44,15 @@ public class ArrowPoint @NonNull private WorldPoint worldPoint; - private HashSet npcIDs; + private Set npcIDs; - private HashSet objectIDs; + private Set objectIDs; /** * The regions that an NPC or Object has to be in to be marked (eg. Exam Centre locked chest Hard Clue requires * killing a Barbarian in Barbarian Village, or Konar Slayer requires killing monsters in a certain area) */ - private HashSet region; + private Set region; private BufferedImage worldImage; @Builder.Default diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java index a4380ae9a4..3d3b864b51 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java @@ -1,7 +1,8 @@ package net.runelite.client.ui.overlay.arrow; import java.util.ArrayList; -import java.util.HashSet; +import java.util.List; +import java.util.Set; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.ObjectDefinition; @@ -10,7 +11,7 @@ import net.runelite.api.Tile; class ArrowUtil { - static ArrayList getObjects(final Client client, HashSet objectIDs) + static List getObjects(final Client client, Set objectIDs) { final Scene scene = client.getScene(); final Tile[][] tiles = scene.getTiles()[client.getPlane()];