From 16aca14f7ff6fb1fbde1d19d5d192ace623b0a6a Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sat, 21 Apr 2018 08:54:58 -0600 Subject: [PATCH] Add WorldPoint::getRegionID --- .../src/main/java/net/runelite/api/coords/WorldPoint.java | 5 +++++ .../runelite/client/plugins/devtools/LocationOverlay.java | 4 +--- .../client/plugins/groundmarkers/GroundMarkerPlugin.java | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java index 56485d204c..73d2aa29f4 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java @@ -165,4 +165,9 @@ public class WorldPoint { return new Point(x, y); } + + public int getRegionID() + { + return ((x >> 6) << 8) | (y >> 6); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java index b6be559835..e49282d44f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java @@ -62,9 +62,7 @@ public class LocationOverlay extends Overlay WorldPoint localWorld = client.getLocalPlayer().getWorldLocation(); LocalPoint localPoint = client.getLocalPlayer().getLocalLocation(); - int regionX = localWorld.getX() >> 6; - int regionY = localWorld.getY() >> 6; - int regionID = regionX << 8 | regionY; + int regionID = localWorld.getRegionID(); if (client.isInInstancedRegion()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index 52027da29e..d6ca3ce744 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -342,9 +342,7 @@ public class GroundMarkerPlugin extends Plugin worldPoint = WorldPoint.fromLocal(client, localPoint); } - int regionX = worldPoint.getX() >> 6; - int regionY = worldPoint.getY() >> 6; - int regionId = regionX << 8 | regionY; + int regionId = worldPoint.getRegionID(); GroundMarkerPoint point = new GroundMarkerPoint(regionId, worldPoint.getX() & 0x3f, worldPoint.getY() & 0x3f, client.getPlane()); log.debug("Updating point: {} - {}", point, worldPoint);