From c4a9a11655fe8bae95b1289525d49a8d407c31f6 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 25 Sep 2018 13:41:23 +0200 Subject: [PATCH 1/3] Revert "Add Hop-To option in chat" This reverts commit 7d89544290bb39ae531a4a0a8586d66cb3d57ae7. --- .../worldhopper/WorldHopperPlugin.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 19a5191cb8..68be5c6456 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -101,8 +101,6 @@ public class WorldHopperPlugin extends Plugin private static final ImmutableList BEFORE_OPTIONS = ImmutableList.of("Add friend", "Remove friend", KICK_OPTION); private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message"); - private static final ImmutableList BEFORE_OPTIONS_CHAT = ImmutableList.of("Report"); - @Inject private Client client; @@ -327,30 +325,6 @@ public class WorldHopperPlugin extends Plugin insertMenuEntry(hopTo, client.getMenuEntries(), after); } - else if (groupId == WidgetInfo.CHATBOX.getGroupId()) - { - if (!BEFORE_OPTIONS_CHAT.contains(option)) - { - return; - } - - // Don't add entry if user is offline - ChatPlayer player = getChatPlayerFromName(event.getTarget()); - - if (player == null || player.getWorld() == 0 || player.getWorld() == client.getWorld()) - { - return; - } - - final MenuEntry hopTo = new MenuEntry(); - hopTo.setOption(HOP_TO); - hopTo.setTarget(event.getTarget()); - hopTo.setType(MenuAction.RUNELITE.getId()); - hopTo.setParam0(event.getActionParam0()); - hopTo.setParam1(event.getActionParam1()); - - insertMenuEntry(hopTo, client.getMenuEntries(), false); - } } private void insertMenuEntry(MenuEntry newEntry, MenuEntry[] entries, boolean after) From f1d6142e734bc8be6bc8124654695a766d0032b8 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 25 Sep 2018 13:43:08 +0200 Subject: [PATCH 2/3] Remove Hop-To from private messages Signed-off-by: Tomas Slusny --- .../runelite/client/plugins/worldhopper/WorldHopperPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 68be5c6456..8971438989 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -290,8 +290,7 @@ public class WorldHopperPlugin extends Plugin int groupId = WidgetInfo.TO_GROUP(event.getActionParam1()); String option = event.getOption(); - if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() || groupId == WidgetInfo.CLAN_CHAT.getGroupId() || - groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId()) + if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() || groupId == WidgetInfo.CLAN_CHAT.getGroupId()) { boolean after; From 7e7f3053a1f74d14d3f71ae7480b8035aa321686 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 25 Sep 2018 13:55:44 +0200 Subject: [PATCH 3/3] Revert "world hopper: disable world hopper plugin" This reverts commit 8293819e47849e1321280aa6989c3f2c74277792. --- .../client/plugins/worldhopper/WorldHopperPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 8971438989..1d73a47bd3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -72,6 +72,7 @@ import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.ClientToolbar; import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.HotkeyListener; @@ -83,10 +84,10 @@ import net.runelite.http.api.worlds.WorldResult; import net.runelite.http.api.worlds.WorldType; import org.apache.commons.lang3.ArrayUtils; -//@PluginDescriptor( -// name = "World Hopper", -// description = "Allows you to quickly hop worlds" -//) +@PluginDescriptor( + name = "World Hopper", + description = "Allows you to quickly hop worlds" +) @Slf4j public class WorldHopperPlugin extends Plugin {