From 11ab3dc2a2f10d10abcaf5ed0e861ae6c59a0229 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 22 Jan 2019 23:32:35 -0700 Subject: [PATCH] runelite-api, runescape-api: Rename Area to mapElement --- runelite-api/src/main/java/net/runelite/api/Client.java | 2 +- .../net/runelite/api/{Area.java => MapElementConfig.java} | 2 +- runescape-api/src/main/java/net/runelite/rs/api/RSClient.java | 4 ++-- .../runelite/rs/api/{RSArea.java => RSMapElementConfig.java} | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename runelite-api/src/main/java/net/runelite/api/{Area.java => MapElementConfig.java} (97%) rename runescape-api/src/main/java/net/runelite/rs/api/{RSArea.java => RSMapElementConfig.java} (92%) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 2b58fb180f..ca51dc74a9 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -848,7 +848,7 @@ public interface Client extends GameEngine * * @return the world areas */ - Area[] getMapAreas(); + MapElementConfig[] getMapElementConfigs(); /** * Gets a sprite of the map scene diff --git a/runelite-api/src/main/java/net/runelite/api/Area.java b/runelite-api/src/main/java/net/runelite/api/MapElementConfig.java similarity index 97% rename from runelite-api/src/main/java/net/runelite/api/Area.java rename to runelite-api/src/main/java/net/runelite/api/MapElementConfig.java index 2ae1134056..5ed46e25b9 100644 --- a/runelite-api/src/main/java/net/runelite/api/Area.java +++ b/runelite-api/src/main/java/net/runelite/api/MapElementConfig.java @@ -27,7 +27,7 @@ package net.runelite.api; /** * Represents an area in the world. */ -public interface Area +public interface MapElementConfig { /** * Gets the sprite icon to display on the world map. diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 79a4062927..2799198296 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -497,9 +497,9 @@ public interface RSClient extends RSGameEngine, Client @Import("widgetRoot") int getWidgetRoot(); - @Import("mapAreaType") + @Import("mapElementConfigs") @Override - RSArea[] getMapAreas(); + RSMapElementConfig[] getMapElementConfigs(); @Import("mapscene") @Override diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSArea.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java similarity index 92% rename from runescape-api/src/main/java/net/runelite/rs/api/RSArea.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java index 3496778672..028f5269a5 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSArea.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java @@ -24,10 +24,10 @@ */ package net.runelite.rs.api; -import net.runelite.api.Area; +import net.runelite.api.MapElementConfig; import net.runelite.mapping.Import; -public interface RSArea extends RSCacheableNode, Area +public interface RSMapElementConfig extends RSCacheableNode, MapElementConfig { @Import("getMapIcon") @Override