diff --git a/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java b/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java new file mode 100644 index 0000000000..76b60e3681 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java @@ -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; +} diff --git a/runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java b/runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java similarity index 98% rename from runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java rename to runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java index c60cd13c33..2b9c641b3c 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java +++ b/runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java @@ -30,7 +30,7 @@ import lombok.Value; * An event where a request to remove a friend is sent to the server. */ @Value -public class RemovedFriend +public class FriendRemoved { /** * The name of the removed friend. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java index 75561cb114..caefd58452 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java @@ -43,7 +43,7 @@ import net.runelite.api.Nameable; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; 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.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -250,7 +250,7 @@ public class FriendNotesPlugin extends Plugin } @Subscribe - public void onRemovedFriend(RemovedFriend event) + public void onFriendRemoved(FriendRemoved event) { // Delete a friend's note if they are removed final String displayName = Text.toJagexName(event.getName()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java index 5e550cdfb2..4a693a64a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java @@ -30,7 +30,7 @@ import net.runelite.api.Nameable; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; 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.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; @@ -128,7 +128,7 @@ public class FriendTaggingPlugin extends Plugin } @Subscribe - public void onRemovedFriend(RemovedFriend event) + public void onFriendRemoved(FriendRemoved event) { final String displayName = event.getName().trim().toLowerCase(); deleteTag(displayName); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java index 7497e7c2a5..d273a3bf33 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java @@ -1,6 +1,7 @@ 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.MethodHook; import net.runelite.api.mixins.Mixin; @@ -18,7 +19,15 @@ public abstract class RSFriendSystemMixin implements RSFriendSystem @Inject public void rl$removeFriend(String friendName) { - RemovedFriend removedFriend = new RemovedFriend(friendName); - client.getCallbacks().post(removedFriend); + FriendRemoved friendRemoved = new FriendRemoved(friendName); + client.getCallbacks().post(friendRemoved); + } + + @MethodHook("addFriend") + @Inject + public void rl$addFriend(String friendName) + { + FriendAdded friendAdded = new FriendAdded(friendName); + client.getCallbacks().post(friendAdded); } }