From 7c233a096c1a96f341c0145416799f60e7d59b79 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Wed, 28 Mar 2018 12:21:11 +0200 Subject: [PATCH] Add mappings and api for DMM player names - Add mappings for DMM player names and methods using them - Create class with DMM player name rendering masks - Create mapping for cleanName from player - Create mapping for setting name to player Signed-off-by: Tomas Slusny --- .../main/java/net/runelite/api/Client.java | 4 +++ .../main/java/net/runelite/api/Player.java | 4 +++ .../java/net/runelite/api/PlayerNameMask.java | 33 +++++++++++++++++++ .../net/runelite/mixins/RSPlayerMixin.java | 28 ++++++++++++++++ .../java/net/runelite/rs/api/RSClient.java | 8 +++++ .../main/java/net/runelite/rs/api/RSName.java | 6 ++++ 6 files changed, 83 insertions(+) create mode 100644 runelite-api/src/main/java/net/runelite/api/PlayerNameMask.java 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 aeed397d4d..c781270dc4 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -350,4 +350,8 @@ public interface Client extends GameEngine World createWorld(); SpritePixels drawInstanceMap(int z); + + void setPlayerNameMask(int mask); + + int getPlayerNameMask(); } diff --git a/runelite-api/src/main/java/net/runelite/api/Player.java b/runelite-api/src/main/java/net/runelite/api/Player.java index 6ea285b3d1..0f7ec9f041 100644 --- a/runelite-api/src/main/java/net/runelite/api/Player.java +++ b/runelite-api/src/main/java/net/runelite/api/Player.java @@ -31,6 +31,10 @@ public interface Player extends Actor @Override int getCombatLevel(); + String getCleanName(); + + void setName(String name); + PlayerComposition getPlayerComposition(); Polygon[] getPolygons(); diff --git a/runelite-api/src/main/java/net/runelite/api/PlayerNameMask.java b/runelite-api/src/main/java/net/runelite/api/PlayerNameMask.java new file mode 100644 index 0000000000..a50a0a3276 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/PlayerNameMask.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2018, Tomas Slusny + * 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.api; + +public class PlayerNameMask +{ + public static final int DRAW_FRIEND_NAME = 1; + public static final int DRAW_CLAN_NAME = 2; + public static final int DRAW_ALL_EXCEPT_OWN_NAME = 4; + public static final int DRAW_OWN_NAME = 8; +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java index 4981d760f5..8cf3cd6056 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java @@ -66,6 +66,34 @@ public abstract class RSPlayerMixin implements RSPlayer return name.replace('\u00A0', ' '); } + @Inject + @Override + public String getCleanName() + { + final RSName rsName = getRsName(); + + if (rsName == null) + { + return null; + } + + return rsName.getCleanName(); + } + + @Inject + @Override + public void setName(String name) + { + final RSName rsName = getRsName(); + + if (rsName == null) + { + return; + } + + rsName.setName(name); + } + @Inject @Override public Polygon[] getPolygons() 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 57a5a661c6..f6340c4c85 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 @@ -549,4 +549,12 @@ public interface RSClient extends RSGameEngine, Client @Import("drawObject") void drawObject(int z, int x, int y, int randomColor1, int randomColor2); + + @Import("playerNameMask") + @Override + void setPlayerNameMask(int mask); + + @Import("playerNameMask") + @Override + int getPlayerNameMask(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSName.java b/runescape-api/src/main/java/net/runelite/rs/api/RSName.java index bbd4f9abfd..768edaab81 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSName.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSName.java @@ -30,4 +30,10 @@ public interface RSName { @Import("name") String getName(); + + @Import("cleanName") + String getCleanName(); + + @Import("name") + void setName(String name); }