From bc2c959e7a2ea61f65ff7bf97e9b8fb285fe868f Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 12 May 2018 18:25:30 -0400 Subject: [PATCH] runelite-api: add getWorldType() --- .../src/main/java/net/runelite/api/Client.java | 3 +++ .../main/java/net/runelite/mixins/RSClientMixin.java | 10 ++++++++++ .../src/main/java/net/runelite/rs/api/RSClient.java | 3 +++ 3 files changed, 16 insertions(+) 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 681b167856..7bd2742df6 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -26,6 +26,7 @@ package net.runelite.api; import java.awt.Canvas; import java.awt.Dimension; +import java.util.EnumSet; import java.util.List; import java.util.Map; import javax.annotation.Nullable; @@ -416,4 +417,6 @@ public interface Client extends GameEngine void setTickCount(int tickCount); void setInventoryDragDelay(int delay); + + EnumSet getWorldType(); } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 806bb48d26..9ab7a5ebb4 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -25,6 +25,7 @@ package net.runelite.mixins; import java.util.ArrayList; +import java.util.EnumSet; import java.util.List; import javax.annotation.Nullable; import net.runelite.api.ChatMessageType; @@ -59,6 +60,7 @@ import net.runelite.api.Tile; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.WidgetNode; +import net.runelite.api.WorldType; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.BoostedLevelChanged; @@ -977,4 +979,12 @@ public abstract class RSClientMixin implements RSClient { tickCount = tick; } + + @Inject + @Override + public EnumSet getWorldType() + { + int flags = getFlags(); + return WorldType.fromMask(flags); + } } 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 a4604e2be5..be6811ded1 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 @@ -618,4 +618,7 @@ public interface RSClient extends RSGameEngine, Client @Import("itemPressedDuration") void setItemPressedDuration(int duration); + + @Import("flags") + int getFlags(); }