diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index 45ce683b6e..d57b288af4 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -312,4 +312,11 @@ public final class AnimationID public static final int DAG_REX = 2853; public static final int DAG_PRIME = 2854; public static final int DAG_SUPREME = 2855; + + // Lizardman shaman + public static final int LIZARDMAN_SHAMAN_SPAWN = 2855; + + // Combat counter + public static final int BARRAGE_ANIMATION = 1979; + public static final int CHIN_ANIMATION = 7618; } \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index 0fdc3ad13b..156f9969f2 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -205,4 +205,9 @@ public final class ScriptID * Send a public message */ public static final int PUBLICMSG = 13337; + + /** + * TExt typed in the chatbox + */ + public static final int CHATBOX_TEXT = 96; } \ No newline at end of file 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 931004b869..c15e2c285e 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 @@ -151,6 +151,7 @@ public class WidgetID public static final int BEGINNER_CLUE_MAP_WIZARDS_TOWER = 356; public static final int SEED_BOX_GROUP_ID = 128; public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4; + public static final int TRADING_SCREEN = 335; static class WorldMap { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 4ea6de2dff..384da53621 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -26,11 +26,14 @@ */ package net.runelite.client.plugins.banlist; +import com.google.common.base.Splitter; import com.google.inject.Provides; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -43,6 +46,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; +import static net.runelite.api.widgets.WidgetID.TRADING_SCREEN; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatColorType; @@ -85,10 +89,10 @@ public class BanListPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - private final List wdrScamArrayList = new ArrayList<>(); - private final List wdrToxicArrayList = new ArrayList<>(); - private final List runeWatchArrayList = new ArrayList<>(); - private final List manualBans = new ArrayList<>(); + private final Set wdrScamSet = new HashSet<>(); + private final Set wdrToxicSet = new HashSet<>(); + private final Set runeWatchSet = new HashSet<>(); + private final Set manualBans = new HashSet<>(); @Provides BanListConfig getConfig(ConfigManager configManager) @@ -113,9 +117,9 @@ public class BanListPlugin extends Plugin @Override protected void shutDown() throws Exception { - wdrScamArrayList.clear(); - wdrToxicArrayList.clear(); - runeWatchArrayList.clear(); + wdrScamSet.clear(); + wdrToxicSet.clear(); + runeWatchSet.clear(); manualBans.clear(); } @@ -124,11 +128,17 @@ public class BanListPlugin extends Plugin { if (event.getGroup().equals("banlist") && event.getKey().equals("bannedPlayers")) { - for (String manual : Text.fromCSV(config.getBannedPlayers())) + List bannedPlayers = Splitter + .on(",") + .trimResults() + .omitEmptyStrings() + .splitToList(config.getBannedPlayers()); + + for (String bannedPlayer : bannedPlayers) { - if (!manualBans.contains(manual)) + if (!manualBans.contains(bannedPlayer)) { - manualBans.add(Text.standardize(manual)); + manualBans.add(Text.standardize(bannedPlayer)); } } } @@ -171,12 +181,14 @@ public class BanListPlugin extends Plugin public void onClanMemberJoined(ClanMemberJoined event) { ClanMember member = event.getMember(); - ListType scamList = checkScamList(Text.standardize(member.getUsername())); - ListType toxicList = checkToxicList(Text.standardize(member.getUsername())); + String memberUsername = Text.standardize(member.getUsername().toLowerCase()); + + ListType scamList = checkScamList(memberUsername); + ListType toxicList = checkToxicList(memberUsername); if (scamList != null) { - sendWarning(Text.standardize(member.getUsername()), scamList); + sendWarning(memberUsername, scamList); if (this.highlightInClan) { highlightRedInCC(); @@ -185,7 +197,7 @@ public class BanListPlugin extends Plugin if (toxicList != null) { - sendWarning(Text.standardize(member.getUsername()), toxicList); + sendWarning(memberUsername, toxicList); if (this.highlightInClan) { highlightRedInCC(); @@ -199,12 +211,12 @@ public class BanListPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded widgetLoaded) { - if (this.highlightInTrade && widgetLoaded.getGroupId() == 335) + if (this.highlightInTrade && widgetLoaded.getGroupId() == TRADING_SCREEN) { //if trading window was loaded clientThread.invokeLater(() -> { Widget tradingWith = client.getWidget(335, 31); - String name = tradingWith.getText().replaceAll("Trading With: ", ""); + String name = tradingWith.getText().replaceAll("Trading With: ", "").toLowerCase(); if (checkScamList(name) != null) { tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Scammer)" + "")); @@ -222,17 +234,17 @@ public class BanListPlugin extends Plugin */ private ListType checkScamList(String nameToBeChecked) { - if (wdrScamArrayList.size() > 0 && this.enableWDR && wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (wdrScamSet.size() > 0 && this.enableWDR && wdrScamSet.contains(nameToBeChecked)) { return ListType.WEDORAIDSSCAM_LIST; } - if (runeWatchArrayList.size() > 0 && this.enableRuneWatch && runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (runeWatchSet.size() > 0 && this.enableRuneWatch && runeWatchSet.contains(nameToBeChecked)) { return ListType.RUNEWATCH_LIST; } - if (manualBans.size() > 0 && manualBans.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (manualBans.size() > 0 && manualBans.contains(nameToBeChecked)) { return ListType.MANUAL_LIST; } @@ -243,7 +255,7 @@ public class BanListPlugin extends Plugin private ListType checkToxicList(String nameToBeChecked) { - if (wdrToxicArrayList.size() > 0 && this.enableWDR && wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (wdrToxicSet.size() > 0 && this.enableWDR && wdrToxicSet.contains(nameToBeChecked)) { return ListType.WEDORAIDSTOXIC_LIST; } @@ -337,9 +349,9 @@ public class BanListPlugin extends Plugin ArrayList wdrList = new ArrayList<>(Arrays.asList(text.split(","))); ArrayList wdrList2 = new ArrayList<>(); - wdrList.forEach((name) -> wdrList2.add(Text.standardize(name))); + wdrList.forEach((name) -> wdrList2.add(Text.standardize(name).toLowerCase())); - wdrScamArrayList.addAll(wdrList2); + wdrScamSet.addAll(wdrList2); } }); @@ -367,7 +379,7 @@ public class BanListPlugin extends Plugin { x = x.substring(x.indexOf("title"), x.indexOf('>')); x = x.substring(x.indexOf('=') + 2, x.length() - 1); - runeWatchArrayList.add(Text.standardize(x)); + runeWatchSet.add(Text.standardize(x).toLowerCase()); } } } @@ -394,9 +406,9 @@ public class BanListPlugin extends Plugin ArrayList wdrToxicList = new ArrayList<>(Arrays.asList(text.split(","))); ArrayList wdrToxicList2 = new ArrayList<>(); - wdrToxicList.forEach((name) -> wdrToxicList2.add(Text.standardize(name))); + wdrToxicList.forEach((name) -> wdrToxicList2.add(Text.standardize(name).toLowerCase())); - wdrToxicArrayList.addAll(wdrToxicList2); + wdrToxicSet.addAll(wdrToxicList2); } }); } @@ -411,8 +423,8 @@ public class BanListPlugin extends Plugin Widget widget = client.getWidget(WidgetInfo.CLAN_CHAT_LIST); for (Widget widgetChild : widget.getDynamicChildren()) { - ListType scamList = checkScamList(widgetChild.getText()); - ListType toxicList = checkToxicList(widgetChild.getText()); + ListType scamList = checkScamList(widgetChild.getText().toLowerCase()); + ListType toxicList = checkToxicList(widgetChild.getText().toLowerCase()); if (scamList != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index 673a5d77c1..12b3494af7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -97,7 +97,7 @@ class BarrowsOverlay extends Overlay final List players = client.getPlayers(); for (Player player : players) { - if (player.equals(local)) + if (player == local) { // Skip local player as we draw square for it later continue; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 30bcaeb72f..951547e777 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -818,7 +818,7 @@ public class ChatCommandsPlugin extends Plugin } catch (IOException e) { - log.error(e.toString()); + log.error("Error looking up prices", e); } int itemId = item.getId(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 9dcaae6540..4231bb6059 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -4,8 +4,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; import com.google.inject.Provides; import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; @@ -15,6 +15,7 @@ import net.runelite.api.GameState; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; import net.runelite.api.MessageNode; +import static net.runelite.api.ScriptID.CHATBOX_TEXT; import net.runelite.api.VarClientStr; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; @@ -50,7 +51,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Kick"); - private final List playerNames = new ArrayList<>(); + private final Set playerNames = new HashSet<>(); @Inject private Client client; @@ -258,7 +259,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } catch (Exception e) { - log.warn(e.toString()); + log.warn("Translation error", e); } return; } @@ -274,7 +275,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); clientThread.invoke(() -> - client.runScript(96, 0, translation)); + client.runScript(CHATBOX_TEXT, 0, translation)); } client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); } 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 ea6b78efeb..ecbb2e1d63 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 @@ -197,7 +197,7 @@ public class ClanChatPlugin extends Plugin for (final Player player : client.getPlayers()) { - if (player != null && !player.equals(local) && memberName.equals(Text.toJagexName(player.getName()))) + if (player != null && player != local && memberName.equals(Text.toJagexName(player.getName()))) { clanMembers.add(player); addClanCounter(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 4c12d83363..b1e618466f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -24,14 +24,26 @@ */ package net.runelite.client.plugins.combatcounter; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.inject.Provides; import java.awt.Color; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; +import static net.runelite.api.AnimationID.BARRAGE_ANIMATION; +import static net.runelite.api.AnimationID.BLOWPIPE_ATTACK; +import static net.runelite.api.AnimationID.CHIN_ANIMATION; import net.runelite.api.Client; import net.runelite.api.Hitsplat; import net.runelite.api.NPC; @@ -50,13 +62,6 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - @PluginDescriptor( name = "Tick Counter", description = "Count the amount of perfect combat ticks performed by each player.", @@ -116,130 +121,116 @@ public class CombatCounter extends Plugin return configManager.getConfig(CombatCounterConfig.class); } - private final Map VARIABLES = new HashMap() - { - { - this.put(422, 4); // Unarmed Punch, Block - this.put(423, 4); // Unarmed Kick + private static final Map VARIABLES = ImmutableMap.builder() + .put(422, 4) // Unarmed Punch, Block + .put(423, 4) // Unarmed Kick - this.put(8145, 4); // Rapier Stab, Lunge, Block - this.put(390, 4); // Rapier Slash + .put(8145, 4) // Rapier Stab, Lunge, Block + .put(390, 4) // Rapier Slash - this.put(7552, 5); // Armadyl Crossbow Accurate, Rapid, Longrange, Special + .put(7552, 5) // Armadyl Crossbow Accurate, Rapid, Longrange, Special - this.put(1167, 4); // Trident Accurate, Accurate, Longrange + .put(1167, 4) // Trident Accurate, Accurate, Longrange - this.put(401, 6); // Dragon Warhammer Pound, Pummel, Block - this.put(1378, 6); // Dragon Warhammer Special + .put(401, 6) // Dragon Warhammer Pound, Pummel, Block + .put(1378, 6) // Dragon Warhammer Special - this.put(393, 4); // Dragon Claws Chop, Slash, Block - this.put(1067, 4); // Dragon Claws Lunge - this.put(7514, 4); // Dragon Claws Special + .put(393, 4) // Dragon Claws Chop, Slash, Block + .put(1067, 4) // Dragon Claws Lunge + .put(7514, 4) // Dragon Claws Special - this.put(8288, 4); // Dragon Hunter Lance Lunge, Block - this.put(8289, 4); // Dragon Hunter Lance Swipe - this.put(8290, 4); // Dragon Hunter Lance Pound + .put(8288, 4) // Dragon Hunter Lance Lunge, Block + .put(8289, 4) // Dragon Hunter Lance Swipe + .put(8290, 4) // Dragon Hunter Lance Pound - this.put(7516, 6); // Elder maul Pound, Pummel, Block + .put(7516, 6) // Elder maul Pound, Pummel, Block - this.put(8056, 5); // Scythe of Vitur Reap, Chop, Jab, Block + .put(8056, 5) // Scythe of Vitur Reap, Chop, Jab, Block - this.put(7045, 6); // Bandos Godsword Chop, Slash - this.put(7054, 6); // Bandos Godsword Smash - this.put(7055, 6); // Bandos Godsword Block - this.put(7642, 6); // Bandos Godsword Special - this.put(7643, 6); // Bandos Godsword Special (Ornamate) + .put(7045, 6) // Bandos Godsword Chop, Slash + .put(7054, 6) // Bandos Godsword Smash + .put(7055, 6) // Bandos Godsword Block + .put(7642, 6) // Bandos Godsword Special + .put(7643, 6) // Bandos Godsword Special (Ornamate) - this.put(426, 5); // Twisted Bow Accurate, Rapid, Longrange + .put(426, 5) // Twisted Bow Accurate, Rapid, Longrange - this.put(414, 5); // Kodai Bash, Pound, Focus + .put(414, 5) // Kodai Bash, Pound, Focus - this.put(428, 4); // Staff of Light Jab - this.put(440, 4); // Staff of Light Swipe - this.put(419, 4); // Staff of Light Fend - this.put(7967, 4); // Staff of Light Special + .put(428, 4) // Staff of Light Jab + .put(440, 4) // Staff of Light Swipe + .put(419, 4) // Staff of Light Fend + .put(7967, 4) // Staff of Light Special - this.put(428, 7); // Crystal Halberd Jab, Fend - this.put(419, 7); // Crystal Halberd Swipe - this.put(1203, 7); // Crystal Halberd Special + .put(428, 7) // Crystal Halberd Jab, Fend + .put(419, 7) // Crystal Halberd Swipe + .put(1203, 7) // Crystal Halberd Special - this.put(5061, 2); // Toxic Blowpipe Accurate, Rapid, Longrange, Special + .put(5061, 2) // Toxic Blowpipe Accurate, Rapid, Longrange, Special - this.put(1979, 5); // Ancient Magicks Barrage - this.put(1978, 5); // Ancient Magicks Blitz + .put(1979, 5) // Ancient Magicks Barrage + .put(1978, 5) // Ancient Magicks Blitz - this.put(7618, 3); // Chinchompa Short, Medium, Long Fuse - this.put(1658, 4); // Whip Flick, Lash, Deflect + .put(7618, 3) // Chinchompa Short, Medium, Long Fuse + .put(1658, 4) // Whip Flick, Lash, Deflect - this.put(7555, 6); // Ballista Accurate, Rapid, Longrange - } - }; + .put(7555, 6) // Ballista Accurate, Rapid, Longrange + .build(); - private final List MELEE_ANIMATIONS = new ArrayList() - { - { - this.add(422); // Unarmed Punch, Block - this.add(423); // Unarmed Kick - this.add(8145); // Rapier Stab, Lunge, Block - this.add(390); // Rapier Slash + private static final Set MELEE_ANIMATIONS = ImmutableSet.builder() + .add(422) // Unarmed Punch, Block + .add(423) // Unarmed Kick - this.add(401); // Dragon Warhammer Pound, Pummel, Block - this.add(1378); // Dragon Warhammer Special + .add(8145) // Rapier Stab, Lunge, Block + .add(390) // Rapier Slash - this.add(393); // Dragon Claws Chop, Slash, Block - this.add(1067); // Dragon Claws Lunge - this.add(7514); // Dragon Claws Special + .add(401) // Dragon Warhammer Pound, Pummel, Block + .add(1378) // Dragon Warhammer Special - this.add(8288); // Dragon Hunter Lance Lunge, Block - this.add(8289); // Dragon Hunter Lance Swipe - this.add(8290); // Dragon Hunter Lance Pound + .add(393) // Dragon Claws Chop, Slash, Block + .add(1067) // Dragon Claws Lunge + .add(7514) // Dragon Claws Special - this.add(7516); // Elder maul Pound, Pummel, Block + .add(8288) // Dragon Hunter Lance Lunge, Block + .add(8289) // Dragon Hunter Lance Swipe + .add(8290) // Dragon Hunter Lance Pound - this.add(8056); // Scythe of Vitur Reap, Chop, Jab, Block + .add(7516) // Elder maul Pound, Pummel, Block - this.add(7045); // Bandos Godsword Chop, Slash - this.add(7054); // Bandos Godsword Smash - this.add(7055); // Bandos Godsword Block - this.add(7642); // Bandos Godsword Special - this.add(7643); // Bandos Godsword Special (Ornamate) + .add(8056) // Scythe of Vitur Reap, Chop, Jab, Block - this.add(414); // Kodai Bash, Pound, Focus + .add(7045) // Bandos Godsword Chop, Slash + .add(7054) // Bandos Godsword Smash + .add(7055) // Bandos Godsword Block + .add(7642) // Bandos Godsword Special + .add(7643) // Bandos Godsword Special (Ornamate) - this.add(428); // Staff of Light Jab - this.add(440); // Staff of Light Swipe - this.add(419); // Staff of Light Fend + .add(414) // Kodai Bash, Pound, Focus - this.add(428); // Crystal Halberd Jab, Fend - this.add(419); // Crystal Halberd Swipe - this.add(1203); // Crystal Halberd Special + .add(428) // Staff of Light Jab + .add(440) // Staff of Light Swipe + .add(419) // Staff of Light Fend - this.add(1658); // Whip Flick, Lash, Deflect - } - }; + .add(428) // Crystal Halberd Jab, Fend + .add(419) // Crystal Halberd Swipe + .add(1203) // Crystal Halberd Special - private final List RANGE_ANIMATIONS = new ArrayList() - { - { - this.add(7552); // Armadyl Crossbow Accurate, Rapid, Longrange, Special + .add(1658) // Whip Flick, Lash, Deflect + .build(); - this.add(426); // Twisted Bow Accurate, Rapid, Longrange + private static final Set RANGE_ANIMATIONS = ImmutableSet.of( + 7552, // Armadyl Crossbow Accurate, Rapid, Longrange, Special + 426, // Twisted Bow Accurate, Rapid, Longrange + 7618, // Chinchompa Short, Medium, Long Fuse + 7555 // Ballista Accurate, Rapid, Longrange + ); - this.add(7618); // Chinchompa Short, Medium, Long Fuse - - this.add(7555); // Ballista Accurate, Rapid, Longrange - } - }; - - private final List MAGE_ANIMATIONS = new ArrayList() - { - { - this.add(1167); // Trident Accurate, Accurate, Longrange - this.add(1978); // Ancient Magicks Blitz - this.add(1979); // Ancient Magicks Barrage - } - }; + private static final Set MAGE_ANIMATIONS = ImmutableSet.of( + 1167, // Trident Accurate, Accurate, Longrange + 1978, // Ancient Magicks Blitz + 1979 // Ancient Magicks Barrage + ); @Override protected void startUp() throws Exception @@ -298,8 +289,7 @@ public class CombatCounter extends Plugin counter.put(name, ticks); counter = sortByValue(counter); - long BLOWPIPE_ID = 5061; - if (animation == BLOWPIPE_ID) + if (animation == BLOWPIPE_ATTACK) { this.blowpipe.put(name, -4L); } @@ -315,12 +305,12 @@ public class CombatCounter extends Plugin List actives = new ArrayList<>(); actives.add(npc); - if (animation == 1979 || animation == 7618) + if (BARRAGE_ANIMATION == 1979 || CHIN_ANIMATION == 7618) { // Barrage or chin. for (NPC nearby : this.client.getNpcs()) { int distance = npc.getWorldLocation().distanceTo(nearby.getWorldLocation()); - if (distance <= 1 && npc.equals(nearby)) + if (distance <= 1 && npc != nearby) { actives.add(nearby); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index 20df61077a..06bbe2701c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -167,7 +167,7 @@ public class CorpPlugin extends Plugin { NPC npc = npcDespawned.getNpc(); - if (npc != null && npc.equals(corp)) + if (npc == corp) { log.debug("Corporeal beast despawn: {}", npc); corp = null; @@ -193,7 +193,7 @@ public class CorpPlugin extends Plugin .build()); } } - else if (npc != null && npc.equals(core)) + else if (npc == core) { core = null; } @@ -204,7 +204,7 @@ public class CorpPlugin extends Plugin { Actor actor = hitsplatApplied.getActor(); - if (actor != null && !actor.equals(corp)) + if (actor != corp) { return; } @@ -224,7 +224,7 @@ public class CorpPlugin extends Plugin Actor source = interactingChanged.getSource(); Actor target = interactingChanged.getTarget(); - if (target != null && !target.equals(corp)) + if (target != corp) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index 7ae5d58c2a..1b06ce6714 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -97,7 +97,7 @@ class ItemPricesOverlay extends Overlay switch (action) { case ITEM_USE_ON_WIDGET: - if (!menuEntry.getTarget().contains("High Level Alchemy") || !plugin.isShowAlchProfit()) + if (!client.getSelectedSpellName().equalsIgnoreCase("high level alchemy") || !plugin.isShowAlchProfit()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index 8a55f1fc21..0f6440b20f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -33,6 +33,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; +import static net.runelite.api.AnimationID.LIZARDMAN_SHAMAN_SPAWN; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; @@ -117,7 +118,7 @@ public class LizardmenShamanPlugin extends Plugin return; } - if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157 && this.showTimer) + if (actor.getName().equals(SHAMAN) && actor.getAnimation() == LIZARDMAN_SHAMAN_SPAWN && this.showTimer) { spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); }