ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

friend notes: support notes on ignore list players

Browse Source
This commit is contained in:
Rami
2019-12-18 19:25:15 -05:00
committed by Adam
parent 608ec68ae6
commit 1d19c8cbf3
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -45,6 +45,7 @@ public enum WidgetInfo
INVENTORY(WidgetID.INVENTORY_GROUP_ID, 0), INVENTORY(WidgetID.INVENTORY_GROUP_ID, 0),
FRIENDS_LIST(WidgetID.FRIENDS_LIST_GROUP_ID, 0), FRIENDS_LIST(WidgetID.FRIENDS_LIST_GROUP_ID, 0),
IGNORE_LIST(WidgetID.IGNORE_LIST_GROUP_ID, 0),
CLAN_CHAT(WidgetID.CLAN_CHAT_GROUP_ID, 0), CLAN_CHAT(WidgetID.CLAN_CHAT_GROUP_ID, 0),
RAIDING_PARTY(WidgetID.RAIDING_PARTY_GROUP_ID, 0), RAIDING_PARTY(WidgetID.RAIDING_PARTY_GROUP_ID, 0),

15
runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
View File

@@ -36,6 +36,7 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Friend; import net.runelite.api.Friend;
import net.runelite.api.Ignore;
import net.runelite.api.MenuAction; import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.Nameable; import net.runelite.api.Nameable;
@@ -164,7 +165,8 @@ public class FriendNotesPlugin extends Plugin
final int groupId = WidgetInfo.TO_GROUP(event.getActionParam1()); final int groupId = WidgetInfo.TO_GROUP(event.getActionParam1());
// Look for "Message" on friends list // Look for "Message" on friends list
if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && event.getOption().equals("Message")) if ((groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && event.getOption().equals("Message")) ||
(groupId == WidgetInfo.IGNORE_LIST.getGroupId() && event.getOption().equals("Delete")))
{ {
// Friends have color tags // Friends have color tags
setHoveredFriend(Text.toJagexName(Text.removeTags(event.getTarget()))); setHoveredFriend(Text.toJagexName(Text.removeTags(event.getTarget())));
@@ -190,7 +192,9 @@ public class FriendNotesPlugin extends Plugin
@Subscribe @Subscribe
public void onMenuOptionClicked(MenuOptionClicked event) public void onMenuOptionClicked(MenuOptionClicked event)
{ {
if (WidgetInfo.TO_GROUP(event.getWidgetId()) == WidgetInfo.FRIENDS_LIST.getGroupId()) final int groupId = WidgetInfo.TO_GROUP(event.getWidgetId());
if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() || groupId == WidgetInfo.IGNORE_LIST.getGroupId())
{ {
if (Strings.isNullOrEmpty(event.getMenuTarget())) if (Strings.isNullOrEmpty(event.getMenuTarget()))
{ {
@@ -230,12 +234,11 @@ public class FriendNotesPlugin extends Plugin
{ {
final Nameable nameable = event.getNameable(); final Nameable nameable = event.getNameable();
if (nameable instanceof Friend) if (nameable instanceof Friend || nameable instanceof Ignore)
{ {
// Migrate a friend's note to their new display name // Migrate a friend's note to their new display name
final Friend friend = (Friend) nameable; String name = nameable.getName();
String name = friend.getName(); String prevName = nameable.getPrevName();
String prevName = friend.getPrevName();
if (prevName != null) if (prevName != null)
{ {