From 12104758ccdcc49aa5fbc748eba981609d7b6ea6 Mon Sep 17 00:00:00 2001 From: Morgan Lewis Date: Thu, 3 May 2018 20:53:10 -0400 Subject: [PATCH] Add world map api and mixin --- .../java/net/runelite/api/RenderOverview.java | 8 +++ .../net/runelite/mixins/WorldMapMixin.java | 53 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java diff --git a/runelite-api/src/main/java/net/runelite/api/RenderOverview.java b/runelite-api/src/main/java/net/runelite/api/RenderOverview.java index 1ea0205c15..42a54590db 100644 --- a/runelite-api/src/main/java/net/runelite/api/RenderOverview.java +++ b/runelite-api/src/main/java/net/runelite/api/RenderOverview.java @@ -24,8 +24,16 @@ */ package net.runelite.api; +import net.runelite.api.coords.WorldPoint; + public interface RenderOverview { + Point getWorldMapPosition(); + + float getWorldMapZoom(); + + void setWorldMapPositionTarget(WorldPoint worldPoint); + WorldMapManager getWorldMapManager(); void initializeWorldMap(WorldMapData var1); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java new file mode 100644 index 0000000000..bdd291b354 --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018, Morgan Lewis + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.mixins; + +import net.runelite.api.Point; +import net.runelite.api.coords.WorldPoint; +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.Mixin; +import net.runelite.rs.api.RSRenderOverview; +import net.runelite.rs.api.RSWorldMapManager; + +@Mixin(RSRenderOverview.class) +public abstract class WorldMapMixin implements RSRenderOverview +{ + @Override + @Inject + public Point getWorldMapPosition() + { + RSWorldMapManager worldMapManager = getWorldMapManager(); + int worldX = getWorldMapX() + worldMapManager.getSurfaceOffsetX(); + int worldY = getWorldMapY() + worldMapManager.getSurfaceOffsetY(); + return new Point(worldX, worldY); + } + + @Inject + public void setWorldMapPositionTarget(WorldPoint worldPoint) + { + setWorldMapPositionTarget(worldPoint.getX(), worldPoint.getY()); + } + +}