From 0f3d7e88770000fc2ccbd6ffde6a8168456e4b26 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sat, 20 Apr 2019 13:45:27 +0200 Subject: [PATCH 01/12] Do not count local player in nearby clan member counter Signed-off-by: Tomas Slusny --- .../plugins/clanchat/ClanChatPlugin.java | 631 ++++++++++++------ 1 file changed, 413 insertions(+), 218 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index f52ebd7260..3f46869425 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -1,30 +1,89 @@ +/* + * Copyright (c) 2017, Devin French + * Copyright (c) 2019, Adam + * Copyright (c) 2018, trimbe + * 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.client.plugins.clanchat; -import net.runelite.client.plugins.*; -import net.runelite.client.game.*; -import net.runelite.client.callback.*; - +import com.google.common.base.Strings; +import com.google.common.collect.Lists; +import com.google.inject.Provides; +import java.awt.Color; +import java.awt.image.BufferedImage; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; -import java.util.Objects; -import java.util.concurrent.*; -import net.runelite.client.config.*; -import com.google.inject.*; -import net.runelite.client.util.*; -import net.runelite.client.eventbus.*; -import com.google.common.base.*; -import net.runelite.api.widgets.*; -import net.runelite.client.ui.*; -import net.runelite.client.chat.*; -import java.awt.*; -import net.runelite.api.*; -import net.runelite.api.events.*; -import com.google.common.collect.*; -import java.util.*; -import java.util.function.*; -import net.runelite.client.ui.overlay.infobox.*; -import java.awt.image.*; +import java.util.Map; +import javax.inject.Inject; +import net.runelite.api.ChatLineBuffer; +import net.runelite.api.ChatMessageType; +import net.runelite.api.ClanMember; +import net.runelite.api.ClanMemberRank; +import net.runelite.api.Client; +import net.runelite.api.GameState; +import net.runelite.api.MessageNode; +import net.runelite.api.Player; +import net.runelite.api.ScriptID; +import net.runelite.api.SpriteID; +import net.runelite.api.VarClientStr; +import net.runelite.api.Varbits; +import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ClanChanged; +import net.runelite.api.events.ClanMemberJoined; +import net.runelite.api.events.ClanMemberLeft; +import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.GameTick; +import net.runelite.api.events.PlayerDespawned; +import net.runelite.api.events.PlayerSpawned; +import net.runelite.api.events.VarClientStrChanged; +import net.runelite.api.widgets.Widget; +import net.runelite.api.widgets.WidgetInfo; +import net.runelite.api.widgets.WidgetType; +import net.runelite.client.callback.ClientThread; +import net.runelite.client.chat.ChatMessageBuilder; +import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.game.ClanManager; +import net.runelite.client.game.SpriteManager; +import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; +import static net.runelite.client.ui.JagexColors.CHAT_CLAN_NAME_OPAQUE_BACKGROUND; +import static net.runelite.client.ui.JagexColors.CHAT_CLAN_NAME_TRANSPARENT_BACKGROUND; +import static net.runelite.client.ui.JagexColors.CHAT_CLAN_TEXT_OPAQUE_BACKGROUND; +import static net.runelite.client.ui.JagexColors.CHAT_CLAN_TEXT_TRANSPARENT_BACKGROUND; +import net.runelite.client.ui.overlay.infobox.InfoBoxManager; +import net.runelite.client.util.Text; -@PluginDescriptor(name = "Clan Chat", description = "Add rank icons to users talking in clan chat", tags = { "icons", "rank", "recent" }) +@PluginDescriptor( + name = "Clan Chat", + description = "Add rank icons to users talking in clan chat", + tags = {"icons", "rank", "recent"} +) public class ClanChatPlugin extends Plugin { private static final int MAX_CHATS = 10; @@ -32,376 +91,512 @@ public class ClanChatPlugin extends Plugin private static final String RECENT_TITLE = "Recent Clan Chats"; private static final int JOIN_LEAVE_DURATION = 20; private static final int MESSAGE_DELAY = 10; + @Inject private Client client; + @Inject private ClanManager clanManager; + @Inject private ClanChatConfig config; + @Inject private InfoBoxManager infoBoxManager; + @Inject private SpriteManager spriteManager; + @Inject private ClientThread clientThread; - private List chats; - private static CopyOnWriteArrayList clanMembers; + + private List chats = new ArrayList<>(); + private List clanMembers = new ArrayList<>(); private ClanChatIndicator clanMemberCounter; - private final Deque clanJoinMessages; - private Map activityBuffer; + /** + * queue of temporary messages added to the client + */ + private final Deque clanJoinMessages = new ArrayDeque<>(); + private Map activityBuffer = new HashMap<>(); private int clanJoinedTick; - public ClanChatPlugin() { - this.chats = new ArrayList(); - this.clanJoinMessages = new ArrayDeque(); - this.activityBuffer = new HashMap(); - } - - public static CopyOnWriteArrayList getClanMembers() { - return (CopyOnWriteArrayList)ClanChatPlugin.clanMembers.clone(); - } - @Provides - ClanChatConfig getConfig(final ConfigManager configManager) { + ClanChatConfig getConfig(ConfigManager configManager) + { return configManager.getConfig(ClanChatConfig.class); } - public void startUp() { - this.chats = new ArrayList(Text.fromCSV(this.config.chatsData())); + @Override + public void startUp() + { + chats = new ArrayList<>(Text.fromCSV(config.chatsData())); } - public void shutDown() { - ClanChatPlugin.clanMembers.clear(); - this.removeClanCounter(); - this.resetClanChats(); + @Override + public void shutDown() + { + clanMembers.clear(); + removeClanCounter(); + resetClanChats(); } @Subscribe - public void onConfigChanged(final ConfigChanged configChanged) { - if (configChanged.getGroup().equals("clanchat")) { - if (!this.config.recentChats()) { - this.resetClanChats(); + public void onConfigChanged(ConfigChanged configChanged) + { + if (configChanged.getGroup().equals("clanchat")) + { + if (!config.recentChats()) + { + resetClanChats(); } - if (this.config.showClanCounter()) { - this.clientThread.invoke(this::addClanCounter); + + if (config.showClanCounter()) + { + clientThread.invoke(this::addClanCounter); } - else { - this.removeClanCounter(); + else + { + removeClanCounter(); } } } @Subscribe - public void onClanMemberJoined(final ClanMemberJoined event) { + public void onClanMemberJoined(ClanMemberJoined event) + { final ClanMember member = event.getMember(); - if (member.getWorld() == this.client.getWorld()) { + + if (member.getWorld() == client.getWorld()) + { + final Player local = client.getLocalPlayer(); final String memberName = Text.toJagexName(member.getUsername()); - for (final Player player : this.client.getPlayers()) { - if (player != null && memberName.equals(Text.toJagexName(player.getName()))) { - ClanChatPlugin.clanMembers.add(player); - this.addClanCounter(); + + for (final Player player : client.getPlayers()) + { + if (player != null && player != local && memberName.equals(Text.toJagexName(player.getName()))) + { + clanMembers.add(player); + addClanCounter(); break; } } } - if (this.clanJoinedTick == this.client.getTickCount()) { + + // clan members getting initialized isn't relevant + if (clanJoinedTick == client.getTickCount()) + { return; } - if (!this.config.showJoinLeave() || member.getRank().getValue() < this.config.joinLeaveRank().getValue()) { + + if (!config.showJoinLeave() || + member.getRank().getValue() < config.joinLeaveRank().getValue()) + { return; } - if (!this.activityBuffer.containsKey(member.getUsername())) { - final ClanMemberActivity joinActivity = new ClanMemberActivity(ClanActivityType.JOINED, member, this.client.getTickCount()); - this.activityBuffer.put(member.getUsername(), joinActivity); + + // attempt to filter out world hopping joins + if (!activityBuffer.containsKey(member.getUsername())) + { + ClanMemberActivity joinActivity = new ClanMemberActivity(ClanActivityType.JOINED, + member, client.getTickCount()); + activityBuffer.put(member.getUsername(), joinActivity); } - else { - this.activityBuffer.remove(member.getUsername()); + else + { + activityBuffer.remove(member.getUsername()); } } @Subscribe - public void onClanMemberLeft(final ClanMemberLeft event) { + public void onClanMemberLeft(ClanMemberLeft event) + { final ClanMember member = event.getMember(); - if (member.getWorld() == this.client.getWorld()) { + + if (member.getWorld() == client.getWorld()) + { final String memberName = Text.toJagexName(member.getUsername()); - final Iterator each = ClanChatPlugin.clanMembers.iterator(); - while (each.hasNext()) { - if (memberName.equals(Text.toJagexName(each.next().getName()))) { + final Iterator each = clanMembers.iterator(); + + while (each.hasNext()) + { + if (memberName.equals(Text.toJagexName(each.next().getName()))) + { each.remove(); - if (ClanChatPlugin.clanMembers.isEmpty()) { - this.removeClanCounter(); - break; + + if (clanMembers.isEmpty()) + { + removeClanCounter(); } + break; } } } - if (!this.config.showJoinLeave() || member.getRank().getValue() < this.config.joinLeaveRank().getValue()) { + + if (!config.showJoinLeave() || + member.getRank().getValue() < config.joinLeaveRank().getValue()) + { return; } - if (!this.activityBuffer.containsKey(member.getUsername())) { - final ClanMemberActivity leaveActivity = new ClanMemberActivity(ClanActivityType.LEFT, member, this.client.getTickCount()); - this.activityBuffer.put(member.getUsername(), leaveActivity); + + if (!activityBuffer.containsKey(member.getUsername())) + { + ClanMemberActivity leaveActivity = new ClanMemberActivity(ClanActivityType.LEFT, + member, client.getTickCount()); + activityBuffer.put(member.getUsername(), leaveActivity); } - else { - this.activityBuffer.remove(member.getUsername()); + else + { + activityBuffer.remove(member.getUsername()); } } @Subscribe - public void onGameTick(final GameTick gameTick) { - if (this.client.getGameState() != GameState.LOGGED_IN) { + public void onGameTick(GameTick gameTick) + { + if (client.getGameState() != GameState.LOGGED_IN) + { return; } - final Widget clanChatTitleWidget = this.client.getWidget(WidgetInfo.CLAN_CHAT_TITLE); - if (clanChatTitleWidget != null) { - final Widget clanChatList = this.client.getWidget(WidgetInfo.CLAN_CHAT_LIST); - final Widget owner = this.client.getWidget(WidgetInfo.CLAN_CHAT_OWNER); - if (this.client.getClanChatCount() > 0) { - clanChatTitleWidget.setText("Clan Chat (" + this.client.getClanChatCount() + "/100)"); + + Widget clanChatTitleWidget = client.getWidget(WidgetInfo.CLAN_CHAT_TITLE); + if (clanChatTitleWidget != null) + { + Widget clanChatList = client.getWidget(WidgetInfo.CLAN_CHAT_LIST); + Widget owner = client.getWidget(WidgetInfo.CLAN_CHAT_OWNER); + if (client.getClanChatCount() > 0) + { + clanChatTitleWidget.setText(CLAN_CHAT_TITLE + " (" + client.getClanChatCount() + "/100)"); } - else if (this.config.recentChats() && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText())) { - clanChatTitleWidget.setText("Recent Clan Chats"); - this.loadClanChats(); + else if (config.recentChats() && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText())) + { + clanChatTitleWidget.setText(RECENT_TITLE); + + loadClanChats(); } } - if (!this.config.showJoinLeave()) { + + if (!config.showJoinLeave()) + { return; } - this.timeoutClanMessages(); - this.addClanActivityMessages(); + + timeoutClanMessages(); + + addClanActivityMessages(); } - private void timeoutClanMessages() { - if (this.clanJoinMessages.isEmpty()) { + private void timeoutClanMessages() + { + if (clanJoinMessages.isEmpty()) + { return; } + boolean removed = false; - final Iterator it = this.clanJoinMessages.iterator(); - while (it.hasNext()) { - final ClanJoinMessage clanJoinMessage = it.next(); - final MessageNode messageNode = clanJoinMessage.getMessageNode(); + + for (Iterator it = clanJoinMessages.iterator(); it.hasNext(); ) + { + ClanJoinMessage clanJoinMessage = it.next(); + MessageNode messageNode = clanJoinMessage.getMessageNode(); final int createdTick = clanJoinMessage.getTick(); - if (this.client.getTickCount() <= createdTick + 20) { + + if (client.getTickCount() > createdTick + JOIN_LEAVE_DURATION) + { + it.remove(); + + // If this message has been reused since, it will get a different id + if (clanJoinMessage.getGetMessageId() == messageNode.getId()) + { + ChatLineBuffer ccInfoBuffer = client.getChatLineMap().get(ChatMessageType.FRIENDSCHATNOTIFICATION.getType()); + if (ccInfoBuffer != null) + { + ccInfoBuffer.removeMessageNode(messageNode); + removed = true; + } + } + } + else + { + // Everything else in the deque is newer break; } - it.remove(); - if (clanJoinMessage.getGetMessageId() != messageNode.getId()) { - continue; - } - final ChatLineBuffer ccInfoBuffer = this.client.getChatLineMap().get(ChatMessageType.FRIENDSCHATNOTIFICATION.getType()); - if (ccInfoBuffer == null) { - continue; - } - ccInfoBuffer.removeMessageNode(messageNode); - removed = true; } - if (removed) { - this.clientThread.invoke(() -> this.client.runScript(216, new Object[0])); + + if (removed) + { + clientThread.invoke(() -> client.runScript(ScriptID.BUILD_CHATBOX)); } } - private void addClanActivityMessages() { - final Iterator activityIt = this.activityBuffer.values().iterator(); - while (activityIt.hasNext()) { - final ClanMemberActivity activity = activityIt.next(); - if (activity.getTick() < this.client.getTickCount() - 10) { + private void addClanActivityMessages() + { + Iterator activityIt = activityBuffer.values().iterator(); + + while (activityIt.hasNext()) + { + ClanMemberActivity activity = activityIt.next(); + + if (activity.getTick() < client.getTickCount() - MESSAGE_DELAY) + { activityIt.remove(); - this.addActivityMessage(activity.getMember(), activity.getActivityType()); + addActivityMessage(activity.getMember(), activity.getActivityType()); } } } - private void addActivityMessage(final ClanMember member, final ClanActivityType activityType) { - final String activityMessage = (activityType == ClanActivityType.JOINED) ? " has joined." : " has left."; + private void addActivityMessage(ClanMember member, ClanActivityType activityType) + { + final String activityMessage = activityType == ClanActivityType.JOINED ? " has joined." : " has left."; final ClanMemberRank rank = member.getRank(); - Color textColor = JagexColors.CHAT_CLAN_TEXT_OPAQUE_BACKGROUND; - Color channelColor = JagexColors.CHAT_CLAN_NAME_OPAQUE_BACKGROUND; + Color textColor = CHAT_CLAN_TEXT_OPAQUE_BACKGROUND; + Color channelColor = CHAT_CLAN_NAME_OPAQUE_BACKGROUND; int rankIcon = -1; - if (this.client.isResized() && this.client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1) { - textColor = JagexColors.CHAT_CLAN_TEXT_TRANSPARENT_BACKGROUND; - channelColor = JagexColors.CHAT_CLAN_NAME_TRANSPARENT_BACKGROUND; + + if (client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1) + { + textColor = CHAT_CLAN_TEXT_TRANSPARENT_BACKGROUND; + channelColor = CHAT_CLAN_NAME_TRANSPARENT_BACKGROUND; } - if (this.config.clanChatIcons() && rank != null && rank != ClanMemberRank.UNRANKED) { - rankIcon = this.clanManager.getIconNumber(rank); + + if (config.clanChatIcons() && rank != null && rank != ClanMemberRank.UNRANKED) + { + rankIcon = clanManager.getIconNumber(rank); } - final ChatMessageBuilder message = new ChatMessageBuilder().append("[").append(channelColor, this.client.getClanChatName()); - if (rankIcon > -1) { - message.append(" ").img(rankIcon); + + ChatMessageBuilder message = new ChatMessageBuilder() + .append("[") + .append(channelColor, client.getClanChatName()); + if (rankIcon > -1) + { + message + .append(" ") + .img(rankIcon); } - message.append("] ").append(textColor, member.getUsername() + activityMessage); + message + .append("] ") + .append(textColor, member.getUsername() + activityMessage); + final String messageString = message.build(); - this.client.addChatMessage(ChatMessageType.FRIENDSCHATNOTIFICATION, "", messageString, ""); - final ChatLineBuffer chatLineBuffer = this.client.getChatLineMap().get(ChatMessageType.FRIENDSCHATNOTIFICATION.getType()); + client.addChatMessage(ChatMessageType.FRIENDSCHATNOTIFICATION, "", messageString, ""); + + final ChatLineBuffer chatLineBuffer = client.getChatLineMap().get(ChatMessageType.FRIENDSCHATNOTIFICATION.getType()); final MessageNode[] lines = chatLineBuffer.getLines(); final MessageNode line = lines[0]; - final ClanJoinMessage clanJoinMessage = new ClanJoinMessage(line, line.getId(), this.client.getTickCount()); - this.clanJoinMessages.addLast(clanJoinMessage); + + ClanJoinMessage clanJoinMessage = new ClanJoinMessage(line, line.getId(), client.getTickCount()); + clanJoinMessages.addLast(clanJoinMessage); } @Subscribe - public void onVarClientStrChanged(final VarClientStrChanged strChanged) { - if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && this.config.recentChats()) { - this.updateRecentChat(this.client.getVar(VarClientStr.RECENT_CLAN_CHAT)); + public void onVarClientStrChanged(VarClientStrChanged strChanged) + { + if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && config.recentChats()) + { + updateRecentChat(client.getVar(VarClientStr.RECENT_CLAN_CHAT)); } } @Subscribe - public void onChatMessage(final ChatMessage chatMessage) { - if (this.client.getGameState() != GameState.LOADING && this.client.getGameState() != GameState.LOGGED_IN) { + public void onChatMessage(ChatMessage chatMessage) + { + if (client.getGameState() != GameState.LOADING && client.getGameState() != GameState.LOGGED_IN) + { return; } - if (this.client.getClanChatCount() <= 0) { + + if (client.getClanChatCount() <= 0) + { return; } - switch (chatMessage.getType()) { + + switch (chatMessage.getType()) + { case PRIVATECHAT: - case MODPRIVATECHAT: { - if (!this.config.privateMessageIcons()) { + case MODPRIVATECHAT: + if (!config.privateMessageIcons()) + { return; } break; - } case PUBLICCHAT: - case MODCHAT: { - if (!this.config.publicChatIcons()) { + case MODCHAT: + if (!config.publicChatIcons()) + { return; } break; - } - case FRIENDSCHAT: { - if (!this.config.clanChatIcons()) { + case FRIENDSCHAT: + if (!config.clanChatIcons()) + { return; } break; - } - default: { + default: return; - } } - this.insertClanRankIcon(chatMessage); + + insertClanRankIcon(chatMessage); } @Subscribe - public void onGameStateChanged(final GameStateChanged state) { - final GameState gameState = state.getGameState(); - if (gameState == GameState.LOGIN_SCREEN || gameState == GameState.CONNECTION_LOST || gameState == GameState.HOPPING) { - ClanChatPlugin.clanMembers.clear(); - this.removeClanCounter(); - this.clanJoinMessages.clear(); + public void onGameStateChanged(GameStateChanged state) + { + GameState gameState = state.getGameState(); + + if (gameState == GameState.LOGIN_SCREEN || gameState == GameState.CONNECTION_LOST || gameState == GameState.HOPPING) + { + clanMembers.clear(); + removeClanCounter(); + + clanJoinMessages.clear(); } } @Subscribe - public void onPlayerSpawned(final PlayerSpawned event) { - if (event.getPlayer().isClanMember()) { - ClanChatPlugin.clanMembers.add(event.getPlayer()); - this.addClanCounter(); + public void onPlayerSpawned(PlayerSpawned event) + { + final Player local = client.getLocalPlayer(); + final Player player = event.getPlayer(); + + if (player != local && player.isClanMember()) + { + clanMembers.add(player); + addClanCounter(); } } @Subscribe - public void onPlayerDespawned(final PlayerDespawned event) { - if (ClanChatPlugin.clanMembers.remove(event.getPlayer()) && ClanChatPlugin.clanMembers.isEmpty()) { - this.removeClanCounter(); + public void onPlayerDespawned(PlayerDespawned event) + { + if (clanMembers.remove(event.getPlayer()) && clanMembers.isEmpty()) + { + removeClanCounter(); } } @Subscribe - public void onClanChanged(final ClanChanged event) { - if (event.isJoined()) { - this.clanJoinedTick = this.client.getTickCount(); + public void onClanChanged(ClanChanged event) + { + if (event.isJoined()) + { + clanJoinedTick = client.getTickCount(); } - else { - ClanChatPlugin.clanMembers.clear(); - this.removeClanCounter(); + else + { + clanMembers.clear(); + removeClanCounter(); } - this.activityBuffer.clear(); + + activityBuffer.clear(); } - int getClanAmount() { - return ClanChatPlugin.clanMembers.size(); + int getClanAmount() + { + return clanMembers.size(); } - private void insertClanRankIcon(final ChatMessage message) { - final ClanMemberRank rank = this.clanManager.getRank(message.getName()); - if (rank != null && rank != ClanMemberRank.UNRANKED) { - final int iconNumber = this.clanManager.getIconNumber(rank); + private void insertClanRankIcon(final ChatMessage message) + { + final ClanMemberRank rank = clanManager.getRank(message.getName()); + + if (rank != null && rank != ClanMemberRank.UNRANKED) + { + int iconNumber = clanManager.getIconNumber(rank); final String img = ""; - if (message.getType() == ChatMessageType.FRIENDSCHAT) { - message.getMessageNode().setSender(message.getMessageNode().getSender() + " " + img); + if (message.getType() == ChatMessageType.FRIENDSCHAT) + { + message.getMessageNode() + .setSender(message.getMessageNode().getSender() + " " + img); } - else { - message.getMessageNode().setName(img + message.getMessageNode().getName()); + else + { + message.getMessageNode() + .setName(img + message.getMessageNode().getName()); } - this.client.refreshChat(); + client.refreshChat(); } } - private void resetClanChats() { - final Widget clanChatList = this.client.getWidget(WidgetInfo.CLAN_CHAT_LIST); - final Widget clanChatTitleWidget = this.client.getWidget(WidgetInfo.CLAN_CHAT_TITLE); - if (clanChatList == null) { + private void resetClanChats() + { + Widget clanChatList = client.getWidget(WidgetInfo.CLAN_CHAT_LIST); + Widget clanChatTitleWidget = client.getWidget(WidgetInfo.CLAN_CHAT_TITLE); + + if (clanChatList == null) + { return; } - if (this.client.getClanChatCount() == 0) { + + if (client.getClanChatCount() == 0) + { clanChatList.setChildren(null); } - clanChatTitleWidget.setText("Clan Chat"); + + clanChatTitleWidget.setText(CLAN_CHAT_TITLE); } - private void loadClanChats() { - final Widget clanChatList = this.client.getWidget(WidgetInfo.CLAN_CHAT_LIST); - if (clanChatList == null) { + private void loadClanChats() + { + Widget clanChatList = client.getWidget(WidgetInfo.CLAN_CHAT_LIST); + if (clanChatList == null) + { return; } + int y = 2; clanChatList.setChildren(null); - for (final String chat : Lists.reverse(this.chats)) { - final Widget widget = clanChatList.createChild(-1, 4); + for (String chat : Lists.reverse(chats)) + { + Widget widget = clanChatList.createChild(-1, WidgetType.TEXT); widget.setFontId(494); - widget.setTextColor(16777215); + widget.setTextColor(0xffffff); widget.setText(chat); widget.setOriginalHeight(14); widget.setOriginalWidth(142); widget.setOriginalY(y); widget.setOriginalX(20); widget.revalidate(); + y += 14; } } - private void updateRecentChat(String s) { - if (Strings.isNullOrEmpty(s)) { + private void updateRecentChat(String s) + { + if (Strings.isNullOrEmpty(s)) + { return; } + s = Text.toJagexName(s); - final List chats = this.chats; - final String s2 = s; - Objects.requireNonNull(s2); - chats.removeIf(s2::equalsIgnoreCase); - this.chats.add(s); - while (this.chats.size() > 10) { - this.chats.remove(0); + + chats.removeIf(s::equalsIgnoreCase); + chats.add(s); + + while (chats.size() > MAX_CHATS) + { + chats.remove(0); } - this.config.chatsData(Text.toCSV(this.chats)); + + config.chatsData(Text.toCSV(chats)); } - private void removeClanCounter() { - this.infoBoxManager.removeInfoBox(this.clanMemberCounter); - this.clanMemberCounter = null; + private void removeClanCounter() + { + infoBoxManager.removeInfoBox(clanMemberCounter); + clanMemberCounter = null; } - private void addClanCounter() { - if (!this.config.showClanCounter() || this.clanMemberCounter != null || ClanChatPlugin.clanMembers.isEmpty()) { + private void addClanCounter() + { + if (!config.showClanCounter() || clanMemberCounter != null || clanMembers.isEmpty()) + { return; } - final BufferedImage image = this.spriteManager.getSprite(904, 0); - this.clanMemberCounter = new ClanChatIndicator(image, this); - this.infoBoxManager.addInfoBox(this.clanMemberCounter); - } - static { - ClanChatPlugin.clanMembers = new CopyOnWriteArrayList(); + final BufferedImage image = spriteManager.getSprite(SpriteID.TAB_CLAN_CHAT, 0); + clanMemberCounter = new ClanChatIndicator(image, this); + infoBoxManager.addInfoBox(clanMemberCounter); } } From 4f1a8db3576c39ebaa53df33fe388d98f33304bc Mon Sep 17 00:00:00 2001 From: trimbe Date: Sat, 20 Apr 2019 22:49:19 -0400 Subject: [PATCH 02/12] scripts: add quest list progress script --- .../main/scripts/QuestListShowProgress.hash | 1 + .../main/scripts/QuestListShowProgress.rs2asm | 196 ++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 runelite-client/src/main/scripts/QuestListShowProgress.hash create mode 100644 runelite-client/src/main/scripts/QuestListShowProgress.rs2asm diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.hash b/runelite-client/src/main/scripts/QuestListShowProgress.hash new file mode 100644 index 0000000000..d3899f1431 --- /dev/null +++ b/runelite-client/src/main/scripts/QuestListShowProgress.hash @@ -0,0 +1 @@ +A6B3A7BFE7B688A08F69B91A7FD5C7184D71147D3DAF74B1262369D85DBB3A03 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm new file mode 100644 index 0000000000..0f19883b4f --- /dev/null +++ b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm @@ -0,0 +1,196 @@ +.id 1354 +.int_stack_count 3 +.string_stack_count 0 +.int_var_count 7 +.string_var_count 0 + iconst 0 + istore 3 + iconst 0 + istore 4 + iconst 0 + istore 5 + invoke 1340 + istore 6 +LABEL8: + iload 5 + iload 6 + if_icmplt LABEL12 + jump LABEL56 +LABEL12: + iload 0 + iload 5 + cc_find + iconst 1 + if_icmpeq LABEL18 + jump LABEL51 +LABEL18: + iload 5 + invoke 1357 + istore 3 + iload 3 + iconst 2 + if_icmpeq LABEL25 + jump LABEL28 +LABEL25: + iconst 901389 + istore 4 + jump LABEL37 +LABEL28: + iload 3 + iconst 0 + if_icmpeq LABEL32 + jump LABEL35 +LABEL32: + iconst 16776960 + istore 4 + jump LABEL37 +LABEL35: + iconst 16711680 + istore 4 +LABEL37: + iload 4 + cc_setcolour + iconst 85 + iconst -2147483645 + iconst -2147483643 + iconst 16777215 + sconst "Iii" + cc_setonmouseover + iconst 85 + iconst -2147483645 + iconst -2147483643 + iload 4 + sconst "Iii" + cc_setonmouseleave +LABEL51: + iload 5 + iconst 1 + add + istore 5 + jump LABEL8 +LABEL56: + iconst 0 + invoke 2245 + istore 6 + istore 5 +LABEL60: + iload 5 + iload 6 + if_icmplt LABEL64 + jump LABEL108 +LABEL64: + iload 1 + iload 5 + cc_find + iconst 1 + if_icmpeq LABEL70 + jump LABEL103 +LABEL70: + iload 5 + invoke 1358 + istore 3 + iload 3 + iconst 2 + if_icmpeq LABEL77 + jump LABEL80 +LABEL77: + iconst 901389 + istore 4 + jump LABEL89 +LABEL80: + iload 3 + iconst 0 + if_icmpeq LABEL84 + jump LABEL87 +LABEL84: + iconst 16776960 + istore 4 + jump LABEL89 +LABEL87: + iconst 16711680 + istore 4 +LABEL89: + iload 4 + cc_setcolour + iconst 85 + iconst -2147483645 + iconst -2147483643 + iconst 16777215 + sconst "Iii" + cc_setonmouseover + iconst 85 + iconst -2147483645 + iconst -2147483643 + iload 4 + sconst "Iii" + cc_setonmouseleave +LABEL103: + iload 5 + iconst 1 + add + istore 5 + jump LABEL60 +LABEL108: + iconst 0 + invoke 2265 + istore 6 + istore 5 +LABEL112: + iload 5 + iload 6 + if_icmplt LABEL116 + jump LABEL160 +LABEL116: + iload 2 + iload 5 + cc_find + iconst 1 + if_icmpeq LABEL122 + jump LABEL155 +LABEL122: + iload 5 + invoke 1359 + istore 3 + iload 3 + iconst 2 + if_icmpeq LABEL129 + jump LABEL132 +LABEL129: + iconst 901389 + istore 4 + jump LABEL141 +LABEL132: + iload 3 + iconst 0 + if_icmpeq LABEL136 + jump LABEL139 +LABEL136: + iconst 16776960 + istore 4 + jump LABEL141 +LABEL139: + iconst 16711680 + istore 4 +LABEL141: + iload 4 + cc_setcolour + iconst 85 + iconst -2147483645 + iconst -2147483643 + iconst 16777215 + sconst "Iii" + cc_setonmouseover + iconst 85 + iconst -2147483645 + iconst -2147483643 + iload 4 + sconst "Iii" + cc_setonmouseleave +LABEL155: + iload 5 + iconst 1 + add + istore 5 + jump LABEL112 +LABEL160: + return From 5807d383040fac67d9501688128b89f6a222efb4 Mon Sep 17 00:00:00 2001 From: trimbe Date: Sat, 20 Apr 2019 22:49:46 -0400 Subject: [PATCH 03/12] quest list plugin: use progress script to trigger hiding quests --- .../plugins/questlist/QuestListPlugin.java | 91 ++++++++++--------- .../main/scripts/QuestListShowProgress.rs2asm | 2 + 2 files changed, 49 insertions(+), 44 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java index fdc05403df..2ebf2a4318 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java @@ -36,12 +36,11 @@ import net.runelite.api.SpriteID; import net.runelite.api.VarClientInt; import net.runelite.api.Varbits; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.VarClientIntChanged; import net.runelite.api.events.VarbitChanged; -import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetPositionMode; import net.runelite.api.widgets.WidgetType; @@ -104,46 +103,45 @@ public class QuestListPlugin extends Plugin } @Subscribe - public void onWidgetLoaded(WidgetLoaded widgetLoaded) + public void onScriptCallbackEvent(ScriptCallbackEvent event) { - if (widgetLoaded.getGroupId() == WidgetID.QUESTLIST_GROUP_ID) + if (!event.getEventName().equals("questProgressUpdated")) { - Widget header = client.getWidget(WidgetInfo.QUESTLIST_BOX); - if (header != null) - { - questSearchButton = header.createChild(-1, WidgetType.GRAPHIC); - questSearchButton.setSpriteId(SpriteID.GE_SEARCH); - questSearchButton.setOriginalWidth(18); - questSearchButton.setOriginalHeight(17); - questSearchButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); - questSearchButton.setOriginalX(5); - questSearchButton.setOriginalY(0); - questSearchButton.setHasListener(true); - questSearchButton.setAction(1, MENU_OPEN); - questSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch()); - questSearchButton.setName(MENU_SEARCH); - questSearchButton.revalidate(); + return; + } - questHideButton = header.createChild(-1, WidgetType.GRAPHIC); - redrawHideButton(); + Widget header = client.getWidget(WidgetInfo.QUESTLIST_BOX); + if (header != null) + { + questSearchButton = header.createChild(-1, WidgetType.GRAPHIC); + questSearchButton.setSpriteId(SpriteID.GE_SEARCH); + questSearchButton.setOriginalWidth(18); + questSearchButton.setOriginalHeight(17); + questSearchButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); + questSearchButton.setOriginalX(5); + questSearchButton.setOriginalY(0); + questSearchButton.setHasListener(true); + questSearchButton.setAction(1, MENU_OPEN); + questSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch()); + questSearchButton.setName(MENU_SEARCH); + questSearchButton.revalidate(); - questHideButton.setOriginalWidth(13); - questHideButton.setOriginalHeight(13); - questHideButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); - questHideButton.setOriginalX(24); - questHideButton.setOriginalY(2); - questHideButton.setHasListener(true); - questHideButton.setOnOpListener((JavaScriptCallback) e -> toggleHidden()); - questHideButton.setAction(1, MENU_TOGGLE); - questHideButton.revalidate(); + questHideButton = header.createChild(-1, WidgetType.GRAPHIC); + redrawHideButton(); - questSet = new EnumMap<>(QuestContainer.class); + questHideButton.setOriginalWidth(13); + questHideButton.setOriginalHeight(13); + questHideButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); + questHideButton.setOriginalX(24); + questHideButton.setOriginalY(2); + questHideButton.setHasListener(true); + questHideButton.setOnOpListener((JavaScriptCallback) e -> toggleHidden()); + questHideButton.setAction(1, MENU_TOGGLE); + questHideButton.revalidate(); - if (!header.isHidden()) - { - updateFilter(); - } - } + questSet = new EnumMap<>(QuestContainer.class); + + updateFilter(); } } @@ -259,21 +257,26 @@ public class QuestListPlugin extends Plugin int y = miniList.getRelativeY() + miniList.getHeight() + 10; - int newHeight = 0; + int newHeight; if (container.getScrollHeight() > 0) { newHeight = (container.getScrollY() * y) / container.getScrollHeight(); } + else + { + newHeight = 0; + } container.setScrollHeight(y); container.revalidateScroll(); - client.runScript( - ScriptID.UPDATE_SCROLLBAR, - WidgetInfo.QUESTLIST_SCROLLBAR.getId(), - WidgetInfo.QUESTLIST_CONTAINER.getId(), - newHeight - ); + clientThread.invokeLater(() -> + client.runScript( + ScriptID.UPDATE_SCROLLBAR, + WidgetInfo.QUESTLIST_SCROLLBAR.getId(), + WidgetInfo.QUESTLIST_CONTAINER.getId(), + newHeight + )); } private void updateList(QuestContainer questContainer, String filter) @@ -309,7 +312,7 @@ public class QuestListPlugin extends Plugin // Find all of the widgets that we care about, sorting by their Y value quests = Arrays.stream(list.getDynamicChildren()) .sorted(Comparator.comparing(Widget::getRelativeY)) - .filter(w -> !w.isSelfHidden() && !QUEST_HEADERS.contains(w.getText())) + .filter(w -> !QUEST_HEADERS.contains(w.getText())) .map(w -> new QuestWidget(w, Text.removeTags(w.getText()).toLowerCase())) .collect(Collectors.toList()); questSet.put(questContainer, quests); diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm index 0f19883b4f..f7f91cd83e 100644 --- a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm +++ b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm @@ -193,4 +193,6 @@ LABEL155: istore 5 jump LABEL112 LABEL160: + sconst "questProgressUpdated" + runelite_callback return From dde0c0a235013e110b9258e3d7f9c2a88e263284 Mon Sep 17 00:00:00 2001 From: xDemoN Date: Sun, 21 Apr 2019 19:44:25 -0400 Subject: [PATCH 04/12] add lv32 wildy hot cold clue location --- .../plugins/cluescrolls/clues/hotcold/HotColdLocation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index bf9d40bac9..c145a7281c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -145,6 +145,7 @@ public enum HotColdLocation WILDERNESS_20(new WorldPoint(3225, 3676, 0), WILDERNESS, "East of the Corporeal Beast's lair, level 20 Wilderness."), WILDERNESS_27(new WorldPoint(3174, 3735, 0), WILDERNESS, "North-west of the Corporeal Beast cave, in the ruins at level 27 Wilderness."), WILDERNESS_28(new WorldPoint(3374, 3734, 0), WILDERNESS, "East of Venenatis' nest, level 28 Wilderness."), + WILDERNESS_32(new WorldPoint(3311, 3773, 0), WILDERNESS, "North of Venenatis' nest, level 32 Wilderness."), WILDERNESS_35(new WorldPoint(3153, 3795, 0), WILDERNESS, "East of the Wilderness canoe exit, level 35 Wilderness."), WILDERNESS_37(new WorldPoint(2975, 3811, 0), WILDERNESS, "South-east of the Chaos Temple, level 37 Wilderness."), WILDERNESS_38(new WorldPoint(3294, 3817, 0), WILDERNESS, "South of Callisto, level 38 Wilderness."), From 38bb5ca6099bf0e8cc418c770adbea9f712fd21a Mon Sep 17 00:00:00 2001 From: xDemoN Date: Sun, 21 Apr 2019 19:45:57 -0400 Subject: [PATCH 05/12] reword lv27 wildy hot cold clue location to match the description on osrs.wiki --- .../plugins/cluescrolls/clues/hotcold/HotColdLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index c145a7281c..b6c6fa2a43 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -143,7 +143,7 @@ public enum HotColdLocation WILDERNESS_5(new WorldPoint(3169, 3558, 0), WILDERNESS, "North of the Grand Exchange, level 5 Wilderness."), WILDERNESS_12(new WorldPoint(3038, 3612, 0), WILDERNESS, "South-east of the Dark Warriors' Fortress, level 12 Wilderness."), WILDERNESS_20(new WorldPoint(3225, 3676, 0), WILDERNESS, "East of the Corporeal Beast's lair, level 20 Wilderness."), - WILDERNESS_27(new WorldPoint(3174, 3735, 0), WILDERNESS, "North-west of the Corporeal Beast cave, in the ruins at level 27 Wilderness."), + WILDERNESS_27(new WorldPoint(3174, 3735, 0), WILDERNESS, "Inside the Ruins north of the Graveyard of Shadows, level 27 Wilderness."), WILDERNESS_28(new WorldPoint(3374, 3734, 0), WILDERNESS, "East of Venenatis' nest, level 28 Wilderness."), WILDERNESS_32(new WorldPoint(3311, 3773, 0), WILDERNESS, "North of Venenatis' nest, level 32 Wilderness."), WILDERNESS_35(new WorldPoint(3153, 3795, 0), WILDERNESS, "East of the Wilderness canoe exit, level 35 Wilderness."), From 1c5f64f336fe6c613f2444dced91fb6dfad018da Mon Sep 17 00:00:00 2001 From: JacobThompson Date: Mon, 22 Apr 2019 20:42:13 -0500 Subject: [PATCH 06/12] Update lap counter overlay strings for clarity. Removed slang "till'" from the lap counter overlay string and added colons to the end for cleanliness and aesthetic. --- .../runelite/client/plugins/agility/LapCounterOverlay.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java index c3da7a62f2..b6da44d76a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java @@ -81,14 +81,14 @@ class LapCounterOverlay extends Overlay panelComponent.getChildren().clear(); panelComponent.getChildren().add(LineComponent.builder() - .left("Total Laps") + .left("Total Laps:") .right(Integer.toString(session.getTotalLaps())) .build()); if (session.getLapsTillLevel() > 0) { panelComponent.getChildren().add(LineComponent.builder() - .left("Laps till level") + .left("Laps until level:") .right(Integer.toString(session.getLapsTillLevel())) .build()); } From 3be1c41cb9b2c06683efbe4e8e7a2297faaad1a9 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 23 Apr 2019 12:38:17 -0700 Subject: [PATCH 07/12] WorldType: Fix HIGH_RISK world type name This world type is not specifically a PVP world type; at the time of this commit, world 365 is a non-PVP high-risk world, where the world is the same as a regular members' world, except that the Protect Item prayer is disabled. --- .../main/java/net/runelite/http/api/worlds/WorldType.java | 2 +- .../net/runelite/http/service/worlds/ServiceWorldType.java | 2 +- runelite-api/src/main/java/net/runelite/api/WorldType.java | 6 +++--- .../net/runelite/client/plugins/discord/DiscordPlugin.java | 2 +- .../client/plugins/worldhopper/WorldHopperPlugin.java | 2 +- .../runelite/client/plugins/worldhopper/WorldTableRow.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java index 3bea0a4cbc..c94a7c70e6 100644 --- a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java +++ b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java @@ -30,7 +30,7 @@ public enum WorldType PVP, BOUNTY, SKILL_TOTAL, - PVP_HIGH_RISK, + HIGH_RISK, LAST_MAN_STANDING, TOURNAMENT, DEADMAN, diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java index 1a3c1271f9..c6aa598321 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java @@ -32,7 +32,7 @@ enum ServiceWorldType PVP(WorldType.PVP, 1 << 2), BOUNTY(WorldType.BOUNTY, 1 << 5), SKILL_TOTAL(WorldType.SKILL_TOTAL, 1 << 7), - PVP_HIGH_RISK(WorldType.PVP_HIGH_RISK, 1 << 10), + HIGH_RISK(WorldType.HIGH_RISK, 1 << 10), LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14), TOURNAMENT(WorldType.TOURNAMENT, 1 << 25), DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26), diff --git a/runelite-api/src/main/java/net/runelite/api/WorldType.java b/runelite-api/src/main/java/net/runelite/api/WorldType.java index b22bc17fb3..8929691be0 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -49,9 +49,9 @@ public enum WorldType */ SKILL_TOTAL(1 << 7), /** - * Pvp high risk world type. + * High risk world type. */ - PVP_HIGH_RISK(1 << 10), + HIGH_RISK(1 << 10), /** * Last man standing world type. */ @@ -84,7 +84,7 @@ public enum WorldType DEADMAN, DEADMAN_TOURNAMENT, PVP, - PVP_HIGH_RISK, + HIGH_RISK, SEASONAL_DEADMAN ); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index 9598b7eff5..c5a86c6df2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -409,7 +409,7 @@ public class DiscordPlugin extends Plugin if (worldType.contains(WorldType.SEASONAL_DEADMAN) || worldType.contains(WorldType.DEADMAN) || worldType.contains(WorldType.PVP) || - worldType.contains(WorldType.PVP_HIGH_RISK)) + worldType.contains(WorldType.HIGH_RISK)) { return false; } 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 f541ab2152..9a56f6eeab 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 @@ -554,7 +554,7 @@ public class WorldHopperPlugin extends Plugin if (config.quickhopOutOfDanger()) { currentWorldTypes.remove(WorldType.PVP); - currentWorldTypes.remove(WorldType.PVP_HIGH_RISK); + currentWorldTypes.remove(WorldType.HIGH_RISK); } // Don't regard these worlds as a type that must be hopped between currentWorldTypes.remove(WorldType.BOUNTY); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java index a497da60e7..a450c36b89 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java @@ -245,7 +245,7 @@ class WorldTableRow extends JPanel return; } else if (world.getTypes().contains(WorldType.PVP) - || world.getTypes().contains(WorldType.PVP_HIGH_RISK) + || world.getTypes().contains(WorldType.HIGH_RISK) || world.getTypes().contains(WorldType.DEADMAN) || world.getTypes().contains(WorldType.SEASONAL_DEADMAN)) { From 48d428edf541bdaf7b6cc437e62b24997006129c Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 23 Apr 2019 12:40:43 -0700 Subject: [PATCH 08/12] Remove PVP references to HIGH_RISK world type As described in 5bebd34bb, HIGH_RISK is not a PVP world type. Note: this will not affect the world hopper plugin, as it both explicitly references the high risk world type, and references the http-api WorldType implementation, not the runelite-api WorldType which is being modified in this commit. Fixes runelite/runelite#8605 Fixes runelite/runelite#8624 --- runelite-api/src/main/java/net/runelite/api/WorldType.java | 1 - .../net/runelite/client/plugins/discord/DiscordPlugin.java | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/WorldType.java b/runelite-api/src/main/java/net/runelite/api/WorldType.java index 8929691be0..0ecfd1ed94 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -84,7 +84,6 @@ public enum WorldType DEADMAN, DEADMAN_TOURNAMENT, PVP, - HIGH_RISK, SEASONAL_DEADMAN ); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index c5a86c6df2..443dd8ac12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -406,10 +406,7 @@ public class DiscordPlugin extends Plugin final EnumSet worldType = client.getWorldType(); // Do not show location in PVP activities - if (worldType.contains(WorldType.SEASONAL_DEADMAN) || - worldType.contains(WorldType.DEADMAN) || - worldType.contains(WorldType.PVP) || - worldType.contains(WorldType.HIGH_RISK)) + if (WorldType.isPvpWorld(worldType)) { return false; } From 62d99c1d3e37ae00eaa0065788e1dbf88d00aa2e Mon Sep 17 00:00:00 2001 From: Elliott Date: Tue, 23 Apr 2019 17:38:13 -0400 Subject: [PATCH 09/12] fishing plugin: add trawler timer Co-authored-by: Adam --- .../net/runelite/api/widgets/WidgetID.java | 1 + .../net/runelite/api/widgets/WidgetInfo.java | 2 + .../client/plugins/fishing/FishingConfig.java | 11 +++ .../client/plugins/fishing/FishingPlugin.java | 74 ++++++++++++++++++- 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index ffd20e7eb9..bb10df74ad 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -121,6 +121,7 @@ public class WidgetID public static final int MINIGAME_TAB_ID = 76; public static final int SPELLBOOK_GROUP_ID = 218; public static final int PVP_GROUP_ID = 90; + public static final int FISHING_TRAWLER_GROUP_ID = 366; public static final int ZEAH_MESS_HALL_GROUP_ID = 235; public static final int KOUREND_FAVOUR_GROUP_ID = 246; public static final int LOOTING_BAG_GROUP_ID = 81; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 579007c2f4..1bff89b327 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -420,6 +420,8 @@ public enum WidgetInfo EXPERIENCE_TRACKER_WIDGET(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.WIDGET), EXPERIENCE_TRACKER_BOTTOM_BAR(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.BOTTOM_BAR), + FISHING_TRAWLER_TIMER(WidgetID.FISHING_TRAWLER_GROUP_ID, 37), + TITHE_FARM(WidgetID.TITHE_FARM_GROUP_ID, 1), BARROWS_INFO(WidgetID.BARROWS_GROUP_ID, 0), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java index 17cb508a12..01d7454e4a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java @@ -118,4 +118,15 @@ public interface FishingConfig extends Config { return true; } + + @ConfigItem( + position = 8, + keyName = "trawlerTimer", + name = "Trawler timer in MM:SS", + description = "Trawler Timer will display a more accurate timer in MM:SS format." + ) + default boolean trawlerTimer() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index b9144a300f..d27886c1aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -57,6 +57,10 @@ import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.VarbitChanged; +import net.runelite.api.events.WidgetLoaded; +import net.runelite.api.widgets.Widget; +import net.runelite.api.widgets.WidgetID; +import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -78,9 +82,11 @@ public class FishingPlugin extends Plugin { private static final int TRAWLER_SHIP_REGION_NORMAL = 7499; private static final int TRAWLER_SHIP_REGION_SINKING = 8011; - + private static final int TRAWLER_TIME_LIMIT_IN_SECONDS = 614; private static final int TRAWLER_ACTIVITY_THRESHOLD = Math.round(0.15f * 255); + private Instant trawlerStartTime; + @Getter(AccessLevel.PACKAGE) private final FishingSession session = new FishingSession(); @@ -142,6 +148,7 @@ public class FishingPlugin extends Plugin minnowSpots.clear(); trawlerNotificationSent = false; currentSpot = null; + trawlerStartTime = null; } @Subscribe @@ -296,6 +303,11 @@ public class FishingPlugin extends Plugin } } } + + if (config.trawlerTimer()) + { + updateTrawlerTimer(); + } } @Subscribe @@ -351,6 +363,66 @@ public class FishingPlugin extends Plugin } } + @Subscribe + public void onWidgetLoaded(WidgetLoaded event) + { + if (event.getGroupId() == WidgetID.FISHING_TRAWLER_GROUP_ID) + { + trawlerStartTime = Instant.now(); + } + } + + /** + * Changes the Fishing Trawler timer widget from minutes to minutes and seconds + */ + private void updateTrawlerTimer() + { + if (trawlerStartTime == null) + { + return; + } + + int regionID = client.getLocalPlayer().getWorldLocation().getRegionID(); + if (regionID != TRAWLER_SHIP_REGION_NORMAL && regionID != TRAWLER_SHIP_REGION_SINKING) + { + log.debug("Trawler session ended"); + return; + } + + Widget trawlerTimerWidget = client.getWidget(WidgetInfo.FISHING_TRAWLER_TIMER); + if (trawlerTimerWidget == null) + { + return; + } + + long timeLeft = TRAWLER_TIME_LIMIT_IN_SECONDS - Duration.between(trawlerStartTime, Instant.now()).getSeconds(); + int minutes = (int) timeLeft / 60; + int seconds = (int) timeLeft % 60; + + final StringBuilder trawlerText = new StringBuilder(); + trawlerText.append("Time Left: "); + + if (minutes > 0) + { + trawlerText.append(minutes); + } + else + { + trawlerText.append("00"); + } + + trawlerText.append(':'); + + if (seconds < 10) + { + trawlerText.append("0"); + } + + trawlerText.append(seconds); + + trawlerTimerWidget.setText(trawlerText.toString()); + } + private void inverseSortSpotDistanceFromPlayer() { final LocalPoint cameraPoint = new LocalPoint(client.getCameraX(), client.getCameraY()); From b37539ad18856cee7afd5648b1e2baf23200fac7 Mon Sep 17 00:00:00 2001 From: BrianAllred Date: Wed, 24 Apr 2019 07:42:52 -0500 Subject: [PATCH 10/12] npc aggro timer: Add option to hide hint overlay (#8610) Closes #8589 --- .../plugins/npcunaggroarea/NpcAggroAreaConfig.java | 9 ++++----- .../npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java | 6 ++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java index 311e286b0b..99084a9172 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java @@ -37,7 +37,6 @@ public interface NpcAggroAreaConfig extends Config String CONFIG_CENTER2 = "center2"; String CONFIG_LOCATION = "location"; String CONFIG_DURATION = "duration"; - String CONFIG_NOT_WORKING_OVERLAY = "overlay"; @ConfigItem( keyName = "npcUnaggroAlwaysActive", @@ -96,12 +95,12 @@ public interface NpcAggroAreaConfig extends Config @ConfigItem( keyName = "npcUnaggroShowNotWorkingOverlay", - name = "Show not working hint", - description = "Show hint if plugin is enabled in unsupported area", + name = "Hide overlay hint", + description = "Hide overlay hint if plugin is enabled in unsupported area", position = 6 ) - default boolean showNotWorkingOverlay() + default boolean hideOverlayHint() { - return true; + return false; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java index 0a9dedb357..3d238cce85 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java @@ -36,12 +36,14 @@ import net.runelite.client.ui.overlay.components.PanelComponent; class NpcAggroAreaNotWorkingOverlay extends Overlay { private final NpcAggroAreaPlugin plugin; + private final NpcAggroAreaConfig config; private final PanelComponent panelComponent; @Inject - private NpcAggroAreaNotWorkingOverlay(NpcAggroAreaPlugin plugin) + private NpcAggroAreaNotWorkingOverlay(NpcAggroAreaPlugin plugin, NpcAggroAreaConfig config) { this.plugin = plugin; + this.config = config; panelComponent = new PanelComponent(); panelComponent.setPreferredSize(new Dimension(150, 0)); @@ -56,7 +58,7 @@ class NpcAggroAreaNotWorkingOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!plugin.isActive() || plugin.getSafeCenters()[1] != null) + if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || config.hideOverlayHint()) { return null; } From 01dfa4f97337c0a7ff4bb1f413fae270f6ca349c Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Wed, 24 Apr 2019 23:44:26 +0200 Subject: [PATCH 11/12] Add missing 'knows' to Hans beginner clue Signed-off-by: Tomas Slusny --- .../runelite/client/plugins/cluescrolls/clues/CrypticClue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java index 4fdc6efa09..9180d6f007 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java @@ -303,7 +303,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc new CrypticClue("Search the drawers, upstairs in the bank to the East of Varrock.", DRAWERS_7194, new WorldPoint(3250, 3420, 1), "Search the drawers upstairs in Varrock east bank."), new CrypticClue("Speak to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house to the north of fairy ring CLS. Answer: 6859"), new CrypticClue("The effects of this fire are magnified.", new WorldPoint(1179, 3626, 0), "Dig by the fire beside Ket'sal K'uk in the westernmost part of the Kebos Swamp. "), - new CrypticClue("Always walking around the castle grounds and somehow everyone's age.", "Hans", new WorldPoint(3221, 3218, 0), "Talk to Hans walking around Lumbridge Castle."), + new CrypticClue("Always walking around the castle grounds and somehow knows everyone's age.", "Hans", new WorldPoint(3221, 3218, 0), "Talk to Hans walking around Lumbridge Castle."), new CrypticClue("In the place Duke Horacio calls home, talk to a man with a hat dropped by goblins.", "Cook", new WorldPoint(3208, 3213, 0), "Talk to the Cook in Lumbridge Castle."), new CrypticClue("In a village of barbarians, I am the one who guards the village from up high.", "Hunding", new WorldPoint(3097, 3432, 2), "Talk to Hunding atop the tower on the east side of Barbarian Village."), new CrypticClue("Talk to Charlie the Tramp in Varrock.", "Charlie the Tramp", new WorldPoint(3209, 3390, 0), "Talk to Charlie the Tramp by the southern entrance to Varrock. He will give you a task."), From fba19cd0416d920ab75852ca70598e29cfb8e7a3 Mon Sep 17 00:00:00 2001 From: Ganom Date: Wed, 24 Apr 2019 20:14:07 -0400 Subject: [PATCH 12/12] Update npc aggro plugin --- .../plugins/npcunaggroarea/NpcAggroAreaPlugin.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index 10dd5752f9..75ebd40228 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -128,7 +128,6 @@ public class NpcAggroAreaPlugin extends Plugin private WorldPoint previousUnknownCenter; private boolean loggingIn; private List npcNamePatterns; - private boolean notWorkingOverlayShown = false; @Provides NpcAggroAreaConfig provideConfig(ConfigManager configManager) @@ -140,12 +139,7 @@ public class NpcAggroAreaPlugin extends Plugin protected void startUp() throws Exception { overlayManager.add(overlay); - if (config.showNotWorkingOverlay()) - { overlayManager.add(notWorkingOverlay); - notWorkingOverlayShown = true; - } - npcNamePatterns = NAME_SPLITTER.splitToList(config.npcNamePatterns()); recheckActive(); } @@ -155,11 +149,7 @@ public class NpcAggroAreaPlugin extends Plugin { removeTimer(); overlayManager.remove(overlay); - if (notWorkingOverlayShown) - { overlayManager.remove(notWorkingOverlay); - } - Arrays.fill(safeCenters, null); lastPlayerLocation = null; currentTimer = null; @@ -416,7 +406,6 @@ public class NpcAggroAreaPlugin extends Plugin configManager.unsetConfiguration(NpcAggroAreaConfig.CONFIG_GROUP, NpcAggroAreaConfig.CONFIG_CENTER2); configManager.unsetConfiguration(NpcAggroAreaConfig.CONFIG_GROUP, NpcAggroAreaConfig.CONFIG_LOCATION); configManager.unsetConfiguration(NpcAggroAreaConfig.CONFIG_GROUP, NpcAggroAreaConfig.CONFIG_DURATION); - configManager.unsetConfiguration(NpcAggroAreaConfig.CONFIG_GROUP, NpcAggroAreaConfig.CONFIG_NOT_WORKING_OVERLAY); } private void saveConfig()