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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
sdburns1998
2019-07-08 18:18:08 +02:00
parent 10d4a94f76 a32c667251
commit 78c5983809
5 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java Normal file
View File

@@ -0,0 +1,15 @@
package net.runelite.api.events;
import lombok.Value;
/**
* An event where a request to add a friend is sent to the server.
*/
@Value
public class FriendAdded
{
/**
* The name of the added friend.
*/
private final String name;
}

2
runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java → runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java
View File

@@ -30,7 +30,7 @@ import lombok.Value;
* An event where a request to remove a friend is sent to the server. * An event where a request to remove a friend is sent to the server.
*/ */
@Value @Value
public class RemovedFriend public class FriendRemoved
{ {
/** /**
* The name of the removed friend. * The name of the removed friend.

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

@@ -43,7 +43,7 @@ import net.runelite.api.Nameable;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.NameableNameChanged; import net.runelite.api.events.NameableNameChanged;
import net.runelite.api.events.RemovedFriend; import net.runelite.api.events.FriendRemoved;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
@@ -250,7 +250,7 @@ public class FriendNotesPlugin extends Plugin
} }
@Subscribe @Subscribe
public void onRemovedFriend(RemovedFriend event) public void onFriendRemoved(FriendRemoved event)
{ {
// Delete a friend's note if they are removed // Delete a friend's note if they are removed
final String displayName = Text.toJagexName(event.getName()); final String displayName = Text.toJagexName(event.getName());

4
runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java
View File

@@ -30,7 +30,7 @@ import net.runelite.api.Nameable;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.NameableNameChanged; import net.runelite.api.events.NameableNameChanged;
import net.runelite.api.events.RemovedFriend; import net.runelite.api.events.FriendRemoved;
import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.events.WidgetMenuOptionClicked;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
@@ -128,7 +128,7 @@ public class FriendTaggingPlugin extends Plugin
} }
@Subscribe @Subscribe
public void onRemovedFriend(RemovedFriend event) public void onFriendRemoved(FriendRemoved event)
{ {
final String displayName = event.getName().trim().toLowerCase(); final String displayName = event.getName().trim().toLowerCase();
deleteTag(displayName); deleteTag(displayName);

15
runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java
View File

@@ -1,6 +1,7 @@
package net.runelite.mixins; package net.runelite.mixins;
import net.runelite.api.events.RemovedFriend; import net.runelite.api.events.FriendAdded;
import net.runelite.api.events.FriendRemoved;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.MethodHook;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;
@@ -18,7 +19,15 @@ public abstract class RSFriendSystemMixin implements RSFriendSystem
@Inject @Inject
public void rl$removeFriend(String friendName) public void rl$removeFriend(String friendName)
{ {
RemovedFriend removedFriend = new RemovedFriend(friendName); FriendRemoved friendRemoved = new FriendRemoved(friendName);
client.getCallbacks().post(removedFriend); client.getCallbacks().post(friendRemoved);
}
@MethodHook("addFriend")
@Inject
public void rl$addFriend(String friendName)
{
FriendAdded friendAdded = new FriendAdded(friendName);
client.getCallbacks().post(friendAdded);
} }
} }