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

ui: Interface instead of type

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 22:08:38 +02:00
parent a5390e0a5d
commit e97628ef49
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/ui/FontManager.java
View File

@@ -34,6 +34,7 @@ import java.awt.Font;
import java.awt.FontFormatException; import java.awt.FontFormatException;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.io.IOException; import java.io.IOException;
import java.util.Map;
import lombok.Getter; import lombok.Getter;
import net.runelite.client.config.FontType; import net.runelite.client.config.FontType;
@@ -59,7 +60,7 @@ public class FontManager
} }
private static final ImmutableBiMap<String, Font> fontMap; private static final ImmutableBiMap<String, Font> fontMap;
private static final HashMap<Font, CachedFont> derivedFontMap = new HashMap<>(); private static final Map<Font, CachedFont> derivedFontMap = new HashMap<>();
static static
{ {

4
runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java
View File

@@ -28,8 +28,8 @@ import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -106,7 +106,7 @@ public class ArrowMinimapOverlay extends Overlay
else if (arrowPoint.types.contains(ArrowType.OBJECT)) else if (arrowPoint.types.contains(ArrowType.OBJECT))
{ {
ArrayList<GameObject> objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); List<GameObject> objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs());
if (objects.isEmpty() && fallBackPoint != null) if (objects.isEmpty() && fallBackPoint != null)
{ {
renderMinimapArrow(graphics, arrowPoint, null, localPlayerPos, worldPlayerPos); renderMinimapArrow(graphics, arrowPoint, null, localPlayerPos, worldPlayerPos);

8
runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java
View File

@@ -27,7 +27,7 @@ package net.runelite.client.ui.overlay.arrow;
import java.awt.Color; import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.Set;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NonNull; import lombok.NonNull;
@@ -44,15 +44,15 @@ public class ArrowPoint
@NonNull @NonNull
private WorldPoint worldPoint; private WorldPoint worldPoint;
private HashSet<Integer> npcIDs; private Set<Integer> npcIDs;
private HashSet<Integer> objectIDs; private Set<Integer> objectIDs;
/** /**
* The regions that an NPC or Object has to be in to be marked (eg. Exam Centre locked chest Hard Clue requires * 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) * killing a Barbarian in Barbarian Village, or Konar Slayer requires killing monsters in a certain area)
*/ */
private HashSet<Integer> region; private Set<Integer> region;
private BufferedImage worldImage; private BufferedImage worldImage;
@Builder.Default @Builder.Default

5
runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java
View File

@@ -1,7 +1,8 @@
package net.runelite.client.ui.overlay.arrow; package net.runelite.client.ui.overlay.arrow;
import java.util.ArrayList; 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.Client;
import net.runelite.api.GameObject; import net.runelite.api.GameObject;
import net.runelite.api.ObjectDefinition; import net.runelite.api.ObjectDefinition;
@@ -10,7 +11,7 @@ import net.runelite.api.Tile;
class ArrowUtil class ArrowUtil
{ {
static ArrayList<GameObject> getObjects(final Client client, HashSet<Integer> objectIDs) static List<GameObject> getObjects(final Client client, Set<Integer> objectIDs)
{ {
final Scene scene = client.getScene(); final Scene scene = client.getScene();
final Tile[][] tiles = scene.getTiles()[client.getPlane()]; final Tile[][] tiles = scene.getTiles()[client.getPlane()];