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 59d008ccbf..07a2f68ce6 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -313,4 +313,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/config/ConfigDescriptor.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java index 20013adc67..4ceb696339 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java @@ -53,10 +53,7 @@ public class ConfigDescriptor Collection allItems = new ArrayList<>(); for (ConfigItemsGroup g : itemGroups) { - for (ConfigItemDescriptor item : g.getItems()) - { - allItems.add(item); - } + allItems.addAll(g.getItems()); } return allItems; } diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index a9adb43b62..b22c8e67a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -81,7 +81,6 @@ public class ConfigManager @Inject EventBus eventBus; - private final ScheduledExecutorService executor; private final ConfigInvocationHandler handler = new ConfigInvocationHandler(this); private final Properties properties = new Properties(); private final Map configObjectCache = new HashMap<>(); @@ -90,9 +89,8 @@ public class ConfigManager @Inject public ConfigManager(ScheduledExecutorService scheduledExecutorService) { - this.executor = scheduledExecutorService; - executor.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS); + scheduledExecutorService.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS); } public final void switchSession() @@ -245,12 +243,10 @@ public class ConfigManager throw new RuntimeException("Non-public configuration classes can't have default methods invoked"); } - T t = (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] + return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] { clazz }, handler); - - return t; } public List getConfigurationKeys(String prefix) diff --git a/runelite-client/src/main/java/net/runelite/client/config/Keybind.java b/runelite-client/src/main/java/net/runelite/client/config/Keybind.java index b0fb4dffcf..8dac88a232 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/Keybind.java +++ b/runelite-client/src/main/java/net/runelite/client/config/Keybind.java @@ -60,7 +60,7 @@ public class Keybind private final int keyCode; private final int modifiers; - protected Keybind(int keyCode, int modifiers, boolean ignoreModifiers) + Keybind(int keyCode, int modifiers, boolean ignoreModifiers) { modifiers &= KEYBOARD_MODIFIER_MASK; @@ -108,7 +108,7 @@ public class Keybind return matches(e, false); } - protected boolean matches(KeyEvent e, boolean ignoreModifiers) + boolean matches(KeyEvent e, boolean ignoreModifiers) { if (NOT_SET.equals(this)) { @@ -177,7 +177,7 @@ public class Keybind return mod; } - public static String getModifiersExText(int modifiers) + private static String getModifiersExText(int modifiers) { StringBuilder buf = new StringBuilder(); if ((modifiers & InputEvent.META_DOWN_MASK) != 0) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java index bc67f82a8c..341e17a7aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java @@ -124,10 +124,6 @@ public class DiaryRequirementsPlugin extends Plugin } Map skillRequirements = buildRequirements(requirements.getRequirements()); - if (skillRequirements == null) - { - return; - } int offset = 0; String taskBuffer = ""; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java index 4350c80699..fe9729246c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java @@ -39,9 +39,9 @@ class AmmoCounter extends Counter { @Getter(AccessLevel.PACKAGE) private int itemID; - private String name; - private int total; - private Instant time; + private final String name; + private final int total; + private final Instant time; private BigDecimal ammoPerHour; AmmoCounter(Plugin plugin, int itemID, int count, String name, BufferedImage image) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java index 3a1eddfd4c..ed6d07b6af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java @@ -144,7 +144,7 @@ public class AntiDragPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.alwaysOn = config.alwaysOn(); this.keybind = config.keybind(); @@ -160,13 +160,10 @@ public class AntiDragPlugin extends Plugin @Subscribe public void onFocusChanged(FocusChanged focusChanged) { - if (!this.alwaysOn) + if (!this.alwaysOn && !focusChanged.isFocused() && this.reqfocus) { - if (!focusChanged.isFocused() && this.reqfocus) - { - client.setInventoryDragDelay(DEFAULT_DELAY); - overlayManager.remove(overlay); - } + client.setInventoryDragDelay(DEFAULT_DELAY); + overlayManager.remove(overlay); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java index d70d63c4be..0b82eafdb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java @@ -157,14 +157,12 @@ public class AoeWarningOverlay extends Overlay graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), outlineAlpha), true)); graphics.drawPolygon(tilePoly); } - if (plugin.isTickTimers()) + if (plugin.isTickTimers() && tickProgress >= 0) { - if (tickProgress >= 0) - { - OverlayUtil.renderTextLocation(graphics, Integer.toString(tickProgress), plugin.getTextSize(), - plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0); - } + OverlayUtil.renderTextLocation(graphics, Integer.toString(tickProgress), plugin.getTextSize(), + plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0); } + graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), fillAlpha), true)); graphics.fillPolygon(tilePoly); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index 730e36b204..95ea50287e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -450,7 +450,7 @@ public class AoeWarningPlugin extends Plugin return false; } - public void updateConfig() + private void updateConfig() { this.aoeNotifyAll = config.aoeNotifyAll(); this.overlayColor = config.overlayColor(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index 776cc3cd72..1a99f715af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -269,7 +269,7 @@ public class AttackStylesPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.alwaysShowStyle = config.alwaysShowStyle(); this.warnForDefence = config.warnForDefence(); @@ -320,10 +320,10 @@ public class AttackStylesPlugin extends Plugin { if (warnedSkills.contains(skill)) { - if (weaponSwitch) - { - // TODO : chat message to warn players that their weapon switch also caused an unwanted attack style change - } +// if (weaponSwitch) +// { +// // TODO : chat message to warn players that their weapon switch also caused an unwanted attack style change +// } warnedSkillSelected = true; break; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java index 2cf7e2b746..d5cebbd51d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java @@ -203,7 +203,7 @@ public class BankPlugin extends Plugin updateConfig(); } - public void updateConfig() + private void updateConfig() { this.showGE = config.showGE(); this.showHA = config.showHA(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java index 9b3d72fa53..11c64fd0e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java @@ -246,10 +246,8 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis intStack[intStackSize - 1] = 0; break; case "hideLine": - // hide the widget for the line separator - intStack[intStackSize - 1] = 1; - break; case "hideTabText": + // hide the widget for the line separator // hide the widget for the "Tab x" text intStack[intStackSize - 1] = 1; break; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java index c1d5ff8c11..d2ab9ead96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java @@ -66,7 +66,7 @@ public class TagManager this.clueScrollService = clueScrollService; } - String getTagString(int itemId, boolean variation) + private String getTagString(int itemId, boolean variation) { itemId = getItemId(itemId, variation); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index d2f7a4af52..1e26d51f87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -53,8 +53,8 @@ import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.InventoryID; import net.runelite.api.Item; -import net.runelite.api.ItemDefinition; import net.runelite.api.ItemContainer; +import net.runelite.api.ItemDefinition; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; import net.runelite.api.Point; @@ -579,11 +579,14 @@ public class TabInterface if (event.getOption().startsWith(CHANGE_ICON + " (")) { ItemDefinition item = getItem(event.getActionParam0()); - int itemId = itemManager.canonicalize(item.getId()); - iconToSet.setIconItemId(itemId); - iconToSet.getIcon().setItemId(itemId); - tabManager.setIcon(iconToSet.getTag(), itemId + ""); - event.consume(); + if (item != null) + { + int itemId = itemManager.canonicalize(item.getId()); + iconToSet.setIconItemId(itemId); + iconToSet.getIcon().setItemId(itemId); + tabManager.setIcon(iconToSet.getTag(), itemId + ""); + event.consume(); + } } // Reset icon selection even when we do not clicked item with icon @@ -613,9 +616,13 @@ public class TabInterface // Add "remove" menu entry to all items in bank while tab is selected event.consume(); final ItemDefinition item = getItem(event.getActionParam0()); - final int itemId = item.getId(); - tagManager.removeTag(itemId, activeTab.getTag()); - bankSearch.search(InputType.SEARCH, TAG_SEARCH + activeTab.getTag(), true); + final int itemId; + if (item != null) + { + itemId = item.getId(); + tagManager.removeTag(itemId, activeTab.getTag()); + bankSearch.search(InputType.SEARCH, TAG_SEARCH + activeTab.getTag(), true); + } } else if (event.getMenuAction() == MenuAction.RUNELITE && ((event.getActionParam1() == WidgetInfo.BANK_DEPOSIT_INVENTORY.getId() && event.getOption().equals(TAG_INVENTORY)) @@ -669,15 +676,11 @@ public class TabInterface updateTabIfActive(Lists.newArrayList(Text.standardize(draggedOn.getName()))); } } - else if (parent.getId() == draggedOn.getId() && parent.getId() == draggedWidget.getId()) + else if (parent.getId() == draggedOn.getId() && parent.getId() == draggedWidget.getId() && !Strings.isNullOrEmpty(draggedOn.getName())) { - // Reorder tag tabs - if (!Strings.isNullOrEmpty(draggedOn.getName())) - { - tabManager.move(draggedWidget.getName(), draggedOn.getName()); - tabManager.save(); - updateTabs(); - } + tabManager.move(draggedWidget.getName(), draggedOn.getName()); + tabManager.save(); + updateTabs(); } } else if (draggedWidget.getItemId() > 0) @@ -1010,8 +1013,17 @@ public class TabInterface private ItemDefinition getItem(int idx) { ItemContainer bankContainer = client.getItemContainer(InventoryID.BANK); - Item item = bankContainer.getItems()[idx]; - return itemManager.getItemDefinition(item.getId()); + Item item = null; + if (bankContainer != null) + { + item = bankContainer.getItems()[idx]; + } + if (item != null) + { + return itemManager.getItemDefinition(item.getId()); + } + + return null; } private void openTag(final String tag) 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 c382e703b7..564c7474fb 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,10 +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; @@ -42,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; @@ -84,10 +89,10 @@ public class BanListPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - private ArrayList wdrScamArrayList = new ArrayList<>(); - private ArrayList wdrToxicArrayList = new ArrayList<>(); - private ArrayList runeWatchArrayList = new ArrayList<>(); - private ArrayList 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) @@ -105,38 +110,46 @@ public class BanListPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - manualBans.addAll(Text.fromCSV(config.getBannedPlayers())); + List bannedPlayers = Splitter + .on(",") + .trimResults() + .omitEmptyStrings() + .splitToList(config.getBannedPlayers()); + manualBans.addAll(bannedPlayers); fetchFromWebsites(); } @Override protected void shutDown() throws Exception { - wdrScamArrayList.clear(); - wdrToxicArrayList.clear(); - runeWatchArrayList.clear(); + wdrScamSet.clear(); + wdrToxicSet.clear(); + runeWatchSet.clear(); manualBans.clear(); } @Subscribe public void onConfigChanged(ConfigChanged event) { - if (event.getGroup().equals("banlist")) + if (event.getGroup().equals("banlist") && event.getKey().equals("bannedPlayers")) { - if (event.getKey().equals("bannedPlayers")) + List bannedPlayers = Splitter + .on(",") + .trimResults() + .omitEmptyStrings() + .splitToList(config.getBannedPlayers()); + + for (String bannedPlayer : bannedPlayers) { - for (String manual : Text.fromCSV(config.getBannedPlayers())) + if (!manualBans.contains(bannedPlayer)) { - if (!manualBans.contains(manual)) - { - manualBans.add(Text.standardize(manual)); - } + manualBans.add(Text.standardize(bannedPlayer)); } } } } - public void updateConfig() + private void updateConfig() { this.enableWDR = config.enableWDR(); this.enableRuneWatch = config.enableRuneWatch(); @@ -173,12 +186,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(); @@ -187,7 +202,7 @@ public class BanListPlugin extends Plugin if (toxicList != null) { - sendWarning(Text.standardize(member.getUsername()), toxicList); + sendWarning(memberUsername, toxicList); if (this.highlightInClan) { highlightRedInCC(); @@ -201,24 +216,21 @@ public class BanListPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded widgetLoaded) { - if (this.highlightInTrade) - { - if (widgetLoaded.getGroupId() == 335) - { //if trading window was loaded - clientThread.invokeLater(() -> + 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: ", "").toLowerCase(); + if (checkScamList(name) != null) { - Widget tradingWith = client.getWidget(335, 31); - String name = tradingWith.getText().replaceAll("Trading With: ", ""); - if (checkScamList(name) != null) - { - tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Scammer)" + "")); - } - if (checkToxicList(name) != null) - { - tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Toxic)" + "")); - } - }); - } + tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Scammer)" + "")); + } + if (checkToxicList(name) != null) + { + tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Toxic)" + "")); + } + }); } } @@ -227,28 +239,19 @@ public class BanListPlugin extends Plugin */ private ListType checkScamList(String nameToBeChecked) { - if (wdrScamArrayList.size() > 0 && this.enableWDR) + if (wdrScamSet.size() > 0 && this.enableWDR && wdrScamSet.contains(nameToBeChecked)) { - if (wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.WEDORAIDSSCAM_LIST; - } + return ListType.WEDORAIDSSCAM_LIST; } - if (runeWatchArrayList.size() > 0 && this.enableRuneWatch) + if (runeWatchSet.size() > 0 && this.enableRuneWatch && runeWatchSet.contains(nameToBeChecked)) { - if (runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.RUNEWATCH_LIST; - } + return ListType.RUNEWATCH_LIST; } - if (manualBans.size() > 0) + if (manualBans.size() > 0 && manualBans.contains(nameToBeChecked)) { - if (manualBans.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.MANUAL_LIST; - } + return ListType.MANUAL_LIST; } return null; @@ -257,12 +260,9 @@ public class BanListPlugin extends Plugin private ListType checkToxicList(String nameToBeChecked) { - if (wdrToxicArrayList.size() > 0 && this.enableWDR) + if (wdrToxicSet.size() > 0 && this.enableWDR && wdrToxicSet.contains(nameToBeChecked)) { - if (wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.WEDORAIDSTOXIC_LIST; - } + return ListType.WEDORAIDSTOXIC_LIST; } return null; @@ -354,9 +354,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); } }); @@ -382,9 +382,9 @@ public class BanListPlugin extends Plugin { if (x.contains("title")) { - x = x.substring(x.indexOf("title"), x.indexOf(">")); - x = x.substring(x.indexOf("=") + 2, x.length() - 1); - runeWatchArrayList.add(Text.standardize(x)); + x = x.substring(x.indexOf("title"), x.indexOf('>')); + x = x.substring(x.indexOf('=') + 2, x.length() - 1); + runeWatchSet.add(Text.standardize(x).toLowerCase()); } } } @@ -411,9 +411,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); } }); } @@ -428,8 +428,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/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java index 10e56c8ac8..733f89c249 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.Sets; +import java.util.List; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -41,7 +42,7 @@ class BarbarianAssaultMenu { private final MenuManager menuManager; private final BarbarianAssaultPlugin game; - private final ArrayList tracker = new ArrayList<>(); + private final List tracker = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private boolean hornUpdated = false; @@ -58,7 +59,7 @@ class BarbarianAssaultMenu private boolean isHornOptionHidden(String option) { - if (game.isInGame() && game.getRole() != null && game.getRole().getTell(game.getLastCallText()).toLowerCase().equals(option)) + if (game.isInGame() && game.getRole() != null && game.getRole().getTell(game.getLastCallText()).equalsIgnoreCase(option)) { // This will force the menu to be rebuilt after the correct tell is found // medic will be added to the menu if it wasn't there before diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index 241ea3bb0b..0c39075df7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -29,7 +29,6 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableList; import com.google.inject.Provides; - import java.awt.Color; import java.awt.Font; import java.awt.event.KeyEvent; @@ -42,12 +41,10 @@ import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Inject; - import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; - import net.runelite.api.Actor; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -186,16 +183,16 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private Font font = null; @Getter - private final HashMap redEggs = new HashMap<>(); + private final Map redEggs = new HashMap<>(); @Getter - private final HashMap greenEggs = new HashMap<>(); + private final Map greenEggs = new HashMap<>(); @Getter - private final HashMap blueEggs = new HashMap<>(); + private final Map blueEggs = new HashMap<>(); @Getter - private final HashMap yellowEggs = new HashMap<>(); + private final Map yellowEggs = new HashMap<>(); @Getter private final Map healers = new HashMap<>(); @@ -206,7 +203,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener @Getter private String lastListenText = null; - private String lastClickedTell = null; + // private String lastClickedTell = null; private int lastCallColor = -1; @@ -216,7 +213,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private int tickNum = 0; - private int gameTick = -1; + // private int gameTick = -1; private int inGameBit = 0; @@ -237,9 +234,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private BufferedImage torsoImage, fighterImage, healerImage, rangerImage, runnerImage; - private ArrayList deathTimes = new ArrayList<>(); + private final List deathTimes = new ArrayList<>(); - private HashMap projectiles = new HashMap<>(); + private final Map projectiles = new HashMap<>(); private TimerBox tickCounter; @@ -341,7 +338,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener controlDown = false; resetWave(); wave = null; - gameTick = client.getTickCount(); + // gameTick = client.getTickCount(); menu.disableSwaps(true); menu.clearHiddenMenus(); } @@ -452,7 +449,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } - public void updateConfig() + private void updateConfig() { this.swapLadder = config.swapLadder(); this.showTimer = config.showTimer(); @@ -648,7 +645,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener return; } - HashMap eggMap = getEggMap(itemSpawned.getItem().getId()); + Map eggMap = getEggMap(itemSpawned.getItem().getId()); if (eggMap != null) { WorldPoint worldPoint = itemSpawned.getTile().getWorldLocation(); @@ -677,7 +674,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener // If an egg despawns due to time and the collector is standing over it, // a point will added as if the player picked it up - HashMap eggMap = getEggMap(itemId); + Map eggMap = getEggMap(itemId); if (eggMap != null) { WorldPoint worldPoint = itemDespawned.getTile().getWorldLocation(); @@ -760,12 +757,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener String name = event.getNpc().getName(); - if (name.equals("Penance Healer")) + if (name.equals("Penance Healer") && !healers.containsKey(npc.getIndex())) { - if (!healers.containsKey(npc.getIndex())) - { - healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage)); - } + healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage)); } } @@ -1160,16 +1154,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener String target = Text.removeTags(event.getTarget()).toLowerCase(); - if (getRole() == Role.HEALER) + if (getRole() == Role.HEALER && (target.startsWith("poisoned meat -> penance healer") + || target.startsWith("poisoned tofu -> penance healer") + || target.startsWith("poisoned worms -> penance healer"))) { - if (target.startsWith("poisoned meat -> penance healer") - || target.startsWith("poisoned tofu -> penance healer") - || target.startsWith("poisoned worms -> penance healer")) - { - lastHealerPoisoned = event.getIdentifier(); - poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->"); - return; - } + lastHealerPoisoned = event.getIdentifier(); + poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->"); } // INW @@ -1206,14 +1196,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener if (opponent == null) { - if (lastInteracted != -1) + if (lastInteracted != -1 && StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted)) { - if (StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted)) - { - Healer healer = healers.get(lastInteracted); - healer.setFoodRemaining(healer.getFoodRemaining() - 1); - healer.setTimeLastPoisoned(Instant.now()); - } + Healer healer = healers.get(lastInteracted); + healer.setFoodRemaining(healer.getFoodRemaining() - 1); + healer.setTimeLastPoisoned(Instant.now()); } lastInteracted = -1; @@ -1263,7 +1250,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener lastListenText = null; lastCallText = null; lastCallColor = -1; - lastClickedTell = null; + // lastClickedTell = null; } else { @@ -1385,12 +1372,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener if (newCallColor == COLOR_CALL_CALLED) { lastCallColor = COLOR_CALL_CALLED; - lastClickedTell = lastCallText; + // lastClickedTell = lastCallText; } else if (callTimer == null) { lastCallColor = COLOR_CALL_UPDATED; - lastClickedTell = null; + // lastClickedTell = null; } if (callWidget != null) @@ -1603,7 +1590,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener yellowEggs.clear(); } - private HashMap getEggMap(int itemID) + private Map getEggMap(int itemID) { switch (itemID) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java index 2e2f6635e1..df5b7423b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.barbarianassault; import java.awt.Color; import java.util.ArrayList; +import java.util.List; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.events.ChatMessage; @@ -41,7 +42,7 @@ public class Scorecard private BarbarianAssaultPlugin game; @Getter(AccessLevel.NONE) - private ArrayList waves = new ArrayList<>(); + private List waves = new ArrayList<>(); private String[] totalDescriptions = { "A: ", "; D: ", @@ -67,13 +68,10 @@ public class Scorecard @Subscribe public void onChatMessage(ChatMessage chatMessage) { - if (chatMessage.getMessage().startsWith("---- Points:")) + if (chatMessage.getMessage().startsWith("---- Points:") && game.getStage() == 1) { - if (game.getStage() == 1) - { - totalPoints = new int[6]; - totalAmounts = new int[6]; - } + totalPoints = new int[6]; + totalAmounts = new int[6]; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index a3bbf6461f..beeb0ba8cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -207,7 +207,7 @@ public class BarrowsPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.showMinimap = config.showMinimap(); this.showBrotherLoc = config.showBrotherLoc(); @@ -289,19 +289,16 @@ public class BarrowsPlugin extends Plugin ladders.clear(); puzzleAnswer = null; } - else if (event.getGameState() == GameState.LOGGED_IN) + else if (event.getGameState() == GameState.LOGGED_IN && client.getLocalPlayer() != null) { - if (client.getLocalPlayer() != null) + boolean isInCrypt = isInCrypt(); + if (wasInCrypt && !isInCrypt) { - boolean isInCrypt = isInCrypt(); - if (wasInCrypt && !isInCrypt) - { - stopPrayerDrainTimer(); - } - else if (!wasInCrypt && isInCrypt) - { - startPrayerDrainTimer(); - } + stopPrayerDrainTimer(); + } + else if (!wasInCrypt && isInCrypt) + { + startPrayerDrainTimer(); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java index d23a8c238c..f31100e59e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java @@ -117,12 +117,9 @@ public class BlackjackPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() == ChatMessageType.SPAM) + if (event.getType() == ChatMessageType.SPAM && event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && this.pickpocketOnAggro)) { - if (event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && this.pickpocketOnAggro)) - { - nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4); - } + nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java index 7c50696f55..c1afdb3bee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java @@ -210,7 +210,7 @@ public class BlastFurnacePlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.showBarDispenser = config.showBarDispenser(); this.showConveyorBelt = config.showConveyorBelt(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index 9bbee9f251..4140df8426 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -106,7 +106,7 @@ public class BoostsPlugin extends Plugin private int lastChangeUp = -1; private boolean preserveBeenActive = false; private long lastTickMillis; - private List boostedSkillsChanged = new ArrayList<>(); + private final List boostedSkillsChanged = new ArrayList<>(); private boolean enableSkill; @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java index 5c9ef73762..946d6a6517 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java @@ -29,7 +29,7 @@ import java.awt.image.BufferedImage; import net.runelite.client.ui.overlay.infobox.InfoBox; import net.runelite.client.ui.overlay.infobox.InfoBoxPriority; -public class StatChangeIndicator extends InfoBox +class StatChangeIndicator extends InfoBox { private final boolean up; private final BoostsPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java index bd13e194be..a4b8028e47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java @@ -28,7 +28,7 @@ import java.awt.Color; import java.awt.image.BufferedImage; import net.runelite.client.ui.overlay.infobox.InfoBox; -public class CannonCounter extends InfoBox +class CannonCounter extends InfoBox { private final CannonPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index dd229ef8c6..2c6c68ecb3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -229,14 +229,12 @@ public class CannonPlugin extends Plugin GameObject gameObject = event.getGameObject(); Player localPlayer = client.getLocalPlayer(); - if (gameObject.getId() == CANNON_BASE && !cannonPlaced) + if (gameObject.getId() == CANNON_BASE && !cannonPlaced && + localPlayer.getWorldLocation().distanceTo(gameObject.getWorldLocation()) <= 2 && + localPlayer.getAnimation() == AnimationID.BURYING_BONES) { - if (localPlayer.getWorldLocation().distanceTo(gameObject.getWorldLocation()) <= 2 - && localPlayer.getAnimation() == AnimationID.BURYING_BONES) - { - cannonPosition = gameObject.getWorldLocation(); - cannon = gameObject; - } + cannonPosition = gameObject.getWorldLocation(); + cannon = gameObject; } } @@ -250,17 +248,15 @@ public class CannonPlugin extends Plugin WorldPoint projectileLoc = WorldPoint.fromLocal(client, projectile.getX1(), projectile.getY1(), client.getPlane()); //Check to see if projectile x,y is 0 else it will continuously decrease while ball is flying. - if (projectileLoc.equals(cannonPosition) && projectile.getX() == 0 && projectile.getY() == 0) - { + if (projectileLoc.equals(cannonPosition) && projectile.getX() == 0 && projectile.getY() == 0 && // When there's a chat message about cannon reloaded/unloaded/out of ammo, // the message event runs before the projectile event. However they run // in the opposite order on the server. So if both fires in the same tick, // we don't want to update the cannonball counter if it was set to a specific // amount. - if (!skipProjectileCheckThisTick) - { - cballsLeft--; - } + !skipProjectileCheckThisTick) + { + cballsLeft--; } } } @@ -366,13 +362,10 @@ public class CannonPlugin extends Plugin { return Color.orange; } - else if (cballsLeft <= this.ammoAmount) + else if (cballsLeft <= this.ammoAmount && this.notifyAmmoLeft && !lock) { - if (this.notifyAmmoLeft && !lock) - { - notifier.notify("Your cannon has " + this.ammoAmount + " balls left!"); - lock = true; - } + notifier.notify("Your cannon has " + this.ammoAmount + " balls left!"); + lock = true; } return Color.red; 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 fcac5d54b1..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) { - e.printStackTrace(); + log.error("Error looking up prices", e); } int itemId = item.getId(); @@ -1166,7 +1166,7 @@ public class ChatCommandsPlugin extends Plugin ItemPrice shortest = null; for (ItemPrice item : items) { - if (item.getName().toLowerCase().equals(originalInput.toLowerCase())) + if (item.getName().equalsIgnoreCase(originalInput.toLowerCase())) { return item; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java index dc9c1fffe1..d32dab3fc1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java @@ -34,7 +34,7 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.input.KeyListener; @Singleton -public class ChatKeyboardListener implements KeyListener +class ChatKeyboardListener implements KeyListener { @Inject private ChatCommandsConfig chatCommandsConfig; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 86586dedf5..6b63e2c1d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -143,13 +143,11 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener case MODPRIVATECHAT: final String name = Text.removeTags(chatMessage.getName()); // Remove to ensure uniqueness & its place in history - if (!friends.remove(name)) - { + if (!friends.remove(name) && // If the friend didn't previously exist ensure deque capacity doesn't increase by adding them - if (friends.size() >= FRIENDS_MAX_SIZE) - { - friends.remove(); - } + friends.size() >= FRIENDS_MAX_SIZE) + { + friends.remove(); } friends.add(name); // intentional fall-through diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 0f8c5f1847..00b7cc80d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -82,7 +82,7 @@ public class ChatNotificationsPlugin extends Plugin private Pattern highlightMatcher = null; // Private message cache used to avoid duplicate notifications from ChatHistory. - private Set privateMessageHashes = new HashSet<>(); + private final Set privateMessageHashes = new HashSet<>(); private boolean highlightOwnName; private String highlightWordsString; 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 3760f5b036..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 @@ -3,8 +3,20 @@ package net.runelite.client.plugins.chattranslation; 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.HashSet; +import java.util.Set; +import javax.inject.Inject; +import javax.inject.Provider; import javax.inject.Singleton; -import net.runelite.api.*; +import lombok.extern.slf4j.Slf4j; +import net.runelite.api.Client; +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; import net.runelite.api.events.MenuEntryAdded; @@ -24,11 +36,6 @@ import net.runelite.client.plugins.PluginType; import net.runelite.client.util.Text; import org.apache.commons.lang3.ArrayUtils; -import javax.inject.Inject; -import javax.inject.Provider; -import java.awt.event.KeyEvent; -import java.util.ArrayList; - @PluginDescriptor( name = "Chat Translator", description = "Translates messages from one Language to another.", @@ -36,6 +43,7 @@ import java.util.ArrayList; type = PluginType.UTILITY ) @Singleton +@Slf4j public class ChatTranslationPlugin extends Plugin implements KeyListener { @@ -43,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 ArrayList playerNames = new ArrayList<>(); + private final Set playerNames = new HashSet<>(); @Inject private Client client; @@ -84,12 +92,9 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { updateConfig(); - if (client != null) + if (client != null && this.translateOptionVisable) { - if (this.translateOptionVisable) - { - menuManager.get().addPlayerMenuItem(TRANSLATE); - } + menuManager.get().addPlayerMenuItem(TRANSLATE); } keyManager.registerKeyListener(this); @@ -99,12 +104,9 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener @Override protected void shutDown() throws Exception { - if (client != null) + if (client != null && this.translateOptionVisable) { - if (this.translateOptionVisable) - { - menuManager.get().removePlayerMenuItem(TRANSLATE); - } + menuManager.get().removePlayerMenuItem(TRANSLATE); } keyManager.unregisterKeyListener(this); @@ -143,8 +145,6 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener if (groupId == WidgetInfo.CHATBOX.getGroupId()) { - boolean after; - if (!AFTER_OPTIONS.contains(option)) { return; @@ -223,7 +223,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } catch (Exception e) { - e.printStackTrace(); + log.warn(e.toString()); } client.refreshChat(); @@ -246,47 +246,42 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener Widget chatboxParent = client.getWidget(WidgetInfo.CHATBOX_PARENT); - if (chatboxParent != null && chatboxParent.getOnKeyListener() != null) + if (chatboxParent != null && chatboxParent.getOnKeyListener() != null && event.getKeyCode() == 0xA) { - if (event.getKeyCode() == 0xA) + Translator translator = new Translator(); + String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); + + if (message.startsWith("/")) { - Translator translator = new Translator(); - String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); - - if (message.startsWith("/")) - { - try - { - client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translator.translate("auto", config.playerTargetLanguage().toString(), message)); - } - catch (Exception e) - { - e.printStackTrace(); - } - return; - } - - event.consume(); - try { - //Automatically check language of message and translate to selected language. - String translation = translator.translate("auto", this.playerTargetLanguage.toString(), message); - if (translation != null) - { - client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); - - clientThread.invoke(() -> - { - client.runScript(96, 0, translation); - }); - } - client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); + client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translator.translate("auto", config.playerTargetLanguage().toString(), message)); } catch (Exception e) { - e.printStackTrace(); + log.warn("Translation error", e); } + return; + } + + event.consume(); + + try + { + //Automatically check language of message and translate to selected language. + String translation = translator.translate("auto", this.playerTargetLanguage.toString(), message); + if (translation != null) + { + client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); + + clientThread.invoke(() -> + client.runScript(CHATBOX_TEXT, 0, translation)); + } + client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); + } + catch (Exception e) + { + log.warn(e.toString()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java index 71e34d16d9..8ab04b3281 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java @@ -9,7 +9,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; -public class Translator +class Translator { public String translate(String source, String target, String message) throws Exception @@ -23,7 +23,7 @@ public class Translator BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); String inputLine; - StringBuffer response = new StringBuffer(); + StringBuilder response = new StringBuilder(); while ((inputLine = in.readLine()) != null) { 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 cab4bb4b45..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 @@ -121,13 +121,13 @@ public class ClanChatPlugin extends Plugin return (CopyOnWriteArrayList) clanMembers.clone(); } - private static CopyOnWriteArrayList clanMembers = new CopyOnWriteArrayList<>(); + private static final CopyOnWriteArrayList clanMembers = new CopyOnWriteArrayList<>(); private ClanChatIndicator clanMemberCounter; /** * queue of temporary messages added to the client */ private final Deque clanJoinMessages = new ArrayDeque<>(); - private Map activityBuffer = new HashMap<>(); + private final Map activityBuffer = new HashMap<>(); private int clanJoinedTick; private boolean clanChatIcons; @@ -151,7 +151,7 @@ public class ClanChatPlugin extends Plugin public void startUp() { updateConfig(); - chats = new ArrayList<>(Text.fromCSV(config.chatsData())); + chats = new ArrayList<>(Text.fromCSV(this.chatsData)); } @Override @@ -485,7 +485,7 @@ public class ClanChatPlugin extends Plugin final Player local = client.getLocalPlayer(); final Player player = event.getPlayer(); - if (player != local && player.isClanMember()) + if (player != null && !player.equals(local) && player.isClanMember()) { clanMembers.add(player); addClanCounter(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java index d0b8e79c9c..8f4a61c2b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java @@ -16,12 +16,12 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class ClanManModeMinimapOverlay extends Overlay { private final ClanManModeService ClanManModeService; - private final ClanManModeConfig config; + private final ClanManModePlugin plugin; @Inject - private ClanManModeMinimapOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService) + private ClanManModeMinimapOverlay(final ClanManModePlugin plugin, final ClanManModeService ClanManModeService) { - this.config = config; + this.plugin = plugin; this.ClanManModeService = ClanManModeService; setLayer(OverlayLayer.ABOVE_WIDGETS); setPosition(OverlayPosition.DYNAMIC); @@ -39,7 +39,7 @@ public class ClanManModeMinimapOverlay extends Overlay { final String name = actor.getName().replace('\u00A0', ' '); - if (config.drawMinimapNames()) + if (plugin.isDrawMinimapNames()) { final net.runelite.api.Point minimapLocation = actor.getMinimapLocation(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java index e616ad7486..cd98f5fd46 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java @@ -17,12 +17,12 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class ClanManModeOverlay extends Overlay { private final ClanManModeService ClanManModeService; - private final ClanManModeConfig config; + private final ClanManModePlugin plugin; @Inject - private ClanManModeOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService) + private ClanManModeOverlay(final ClanManModePlugin plugin, final ClanManModeService ClanManModeService) { - this.config = config; + this.plugin = plugin; this.ClanManModeService = ClanManModeService; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.MED); @@ -37,7 +37,7 @@ public class ClanManModeOverlay extends Overlay private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color) { - if (!config.drawOverheadPlayerNames()) + if (!plugin.isDrawOverheadPlayerNames()) { return; } @@ -48,7 +48,7 @@ public class ClanManModeOverlay extends Overlay if (textLocation != null) { - if (config.getClanAttackableColor().equals(color) && config.ShowBold()) + if (plugin.getGetClanAttackableColor().equals(color) && plugin.isShowBold()) { graphics.setFont(FontManager.getRunescapeBoldFont()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java index 9a7d13f310..5313fec5f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java @@ -1,11 +1,14 @@ package net.runelite.client.plugins.clanmanmode; import com.google.inject.Provides; +import java.awt.Color; import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; @@ -49,6 +52,37 @@ public class ClanManModePlugin extends Plugin @Inject private Client client; + @Getter(AccessLevel.PACKAGE) + private boolean highlightAttackable; + @Getter(AccessLevel.PACKAGE) + private Color getAttackableColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightAttacked; + @Getter(AccessLevel.PACKAGE) + private Color getClanAttackableColor; + @Getter(AccessLevel.PACKAGE) + private boolean drawTiles; + @Getter(AccessLevel.PACKAGE) + private boolean drawOverheadPlayerNames; + @Getter(AccessLevel.PACKAGE) + private boolean drawMinimapNames; + @Getter(AccessLevel.PACKAGE) + private boolean showAttackers; + @Getter(AccessLevel.PACKAGE) + private Color getAttackerColor; + @Getter(AccessLevel.PACKAGE) + private boolean ShowBold; + @Getter(AccessLevel.PACKAGE) + private boolean hideAttackable; + @Getter(AccessLevel.PACKAGE) + private int hideTime; + @Getter(AccessLevel.PACKAGE) + private boolean CalcSelfCB; + @Getter(AccessLevel.PACKAGE) + private boolean PersistentClan; + @Getter(AccessLevel.PACKAGE) + private Color getClanMemberColor; + @Provides ClanManModeConfig provideConfig(ConfigManager configManager) { @@ -60,11 +94,13 @@ public class ClanManModePlugin extends Plugin int clanmax; int inwildy; int ticks; - Map clan = new HashMap<>(); + final Map clan = new HashMap<>(); @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(ClanManModeOverlay); overlayManager.add(ClanManModeTileOverlay); overlayManager.add(ClanManModeMinimapOverlay); @@ -91,6 +127,8 @@ public class ClanManModePlugin extends Plugin { return; } + + updateConfig(); } @Subscribe @@ -122,4 +160,23 @@ public class ClanManModePlugin extends Plugin clanmax = Collections.max(clan.values()); } } + + private void updateConfig() + { + this.highlightAttackable = config.highlightAttackable(); + this.getAttackableColor = config.getAttackableColor(); + this.highlightAttacked = config.highlightAttacked(); + this.getClanAttackableColor = config.getClanAttackableColor(); + this.drawTiles = config.drawTiles(); + this.drawOverheadPlayerNames = config.drawOverheadPlayerNames(); + this.drawMinimapNames = config.drawMinimapNames(); + this.showAttackers = config.showAttackers(); + this.getAttackerColor = config.getAttackerColor(); + this.ShowBold = config.ShowBold(); + this.hideAttackable = config.hideAttackable(); + this.hideTime = config.hideTime(); + this.CalcSelfCB = config.CalcSelfCB(); + this.PersistentClan = config.PersistentClan(); + this.getClanMemberColor = config.getClanMemberColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java index ca32c5892d..02ccf87b7c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java @@ -16,18 +16,16 @@ import net.runelite.api.coords.WorldPoint; public class ClanManModeService { private final Client client; - private final ClanManModeConfig config; private final ClanManModePlugin plugin; @Inject - private ClanManModeService(final Client client, final ClanManModeConfig config, final ClanManModePlugin plugin) + private ClanManModeService(final Client client, final ClanManModePlugin plugin) { - this.config = config; this.client = client; this.plugin = plugin; } - private Map interactors = new HashMap<>(); + private final Map interactors = new HashMap<>(); public void forEachPlayer(final BiConsumer consumer) { @@ -39,12 +37,7 @@ public class ClanManModeService int selfmax = localPlayer.getCombatLevel() + plugin.wildernessLevel; for (Player player : client.getPlayers()) { - if (player == null || player.getName() == null) - { - continue; - } - - if (player == localPlayer) + if (player == null || player.getName() == null || player.equals(localPlayer)) { continue; } @@ -57,15 +50,9 @@ public class ClanManModeService interactor = ((Player) interacting); } - if (config.showAttackers()) + if (plugin.isShowAttackers() && interactor != null && interactor.getName().equals(localName)) { - if (interactor != null) - { - if (interactor.getName().equals(localName)) - { - consumer.accept(player, config.getAttackerColor()); - } - } + consumer.accept(player, plugin.getGetAttackerColor()); } if (plugin.inwildy == 1) @@ -76,94 +63,82 @@ public class ClanManModeService { plugin.clan.put(player.getName(), player.getCombatLevel()); } - if (config.highlightAttacked()) + if (plugin.isHighlightAttacked() && interactor != null && !interactors.containsKey(interactor.getName())) { - if (interactor != null) + WorldPoint a = interactor.getWorldLocation(); + int underLevel = ((a.getY() - 9920) / 8) + 1; + int upperLevel = ((a.getY() - 3520) / 8) + 1; + int wildernessLevel = a.getY() > 6400 ? underLevel : upperLevel; + int wildydiff = plugin.wildernessLevel - wildernessLevel; + if (wildydiff < 0) { - if (!interactors.containsKey(interactor.getName())) + wildydiff = 0; + } + if (plugin.isCalcSelfCB()) + { + if (interacting.getCombatLevel() <= selfmax && interacting.getCombatLevel() - wildydiff >= selfmin && !interactor.isClanMember()) { - WorldPoint a = interactor.getWorldLocation(); - int underLevel = ((a.getY() - 9920) / 8) + 1; - int upperLevel = ((a.getY() - 3520) / 8) + 1; - int wildernessLevel = a.getY() > 6400 ? underLevel : upperLevel; - int wildydiff = plugin.wildernessLevel - wildernessLevel; - if (wildydiff < 0) - { - wildydiff = 0; - } - if (config.CalcSelfCB()) - { - if (interacting.getCombatLevel() <= selfmax && interacting.getCombatLevel() - wildydiff >= selfmin && !interactor.isClanMember()) - { - interactors.put(interactor.getName(), player.getName()); - consumer.accept(interactor, config.getClanAttackableColor()); - } - } - else - { - if (interacting.getCombatLevel() <= maxatk && interacting.getCombatLevel() - wildydiff >= minatk && !interactor.isClanMember()) - { - interactors.put(interactor.getName(), player.getName()); - consumer.accept(interactor, config.getClanAttackableColor()); - } - } + interactors.put(interactor.getName(), player.getName()); + consumer.accept(interactor, plugin.getGetClanAttackableColor()); + } + } + else + { + if (interacting.getCombatLevel() <= maxatk && interacting.getCombatLevel() - wildydiff >= minatk && !interactor.isClanMember()) + { + interactors.put(interactor.getName(), player.getName()); + consumer.accept(interactor, plugin.getGetClanAttackableColor()); } } } } else { - if (config.PersistentClan()) + if (plugin.isPersistentClan() && plugin.clan.containsKey(player.getName())) { - if (plugin.clan.containsKey(player.getName())) - { - consumer.accept(player, config.getClanMemberColor()); - } + consumer.accept(player, plugin.getGetClanMemberColor()); } - if (config.highlightAttacked()) - { - if (interactors.containsKey(player.getName())) + if (plugin.isHighlightAttacked() && interactors.containsKey(player.getName())) { - String attackername = interactors.get(player.getName()); - boolean found = false; - for (Player attacker : client.getPlayers()) + String attackername = interactors.get(player.getName()); + boolean found = false; + for (Player attacker : client.getPlayers()) + { + if (attacker == null || attacker.getName() == null) { - if (attacker == null || attacker.getName() == null) + continue; + } + if (attacker.getName().equals(attackername)) + { + found = true; + Actor ainteract = attacker.getInteracting(); + if (ainteract != null) { - continue; - } - if (attacker.getName().equals(attackername)) - { - found = true; - Actor ainteract = attacker.getInteracting(); - if (ainteract != null) + if (ainteract.getName().equals(player.getName())) { - if (ainteract.getName().equals(player.getName())) - { - consumer.accept(player, config.getClanAttackableColor()); - } - else - { - interactors.remove(player.getName()); - } + consumer.accept(player, plugin.getGetClanAttackableColor()); } else { interactors.remove(player.getName()); } - break; } + else + { + interactors.remove(player.getName()); + } + break; } - if (!found) - { - interactors.remove(player.getName()); - } - continue; } + if (!found) + { + interactors.remove(player.getName()); + } + continue; } - if (config.highlightAttackable()) + if (plugin.isHighlightAttackable()) { - if ((config.hideAttackable() && plugin.ticks >= config.hideTime()) || plugin.clan.containsKey(player.getName())) + if ((plugin.isHideAttackable() && plugin.ticks >= plugin.getHideTime()) || plugin.clan.containsKey(player.getName())) { continue; } @@ -176,18 +151,18 @@ public class ClanManModeService { wildydiff = 0; } - if (config.CalcSelfCB()) + if (plugin.isCalcSelfCB()) { if (player.getCombatLevel() <= selfmax && player.getCombatLevel() - wildydiff >= selfmin) { - consumer.accept(player, config.getAttackableColor()); + consumer.accept(player, plugin.getGetAttackableColor()); } } else { if (player.getCombatLevel() <= maxatk && player.getCombatLevel() - wildydiff >= minatk) { - consumer.accept(player, config.getAttackableColor()); + consumer.accept(player, plugin.getGetAttackableColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java index 9347f28de5..4482996a64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java @@ -78,13 +78,10 @@ public class ClueScrollOverlay extends Overlay clue.makeOverlayHint(panelComponent, plugin); - if (clue.isRequiresSpade() && plugin.getInventoryItems() != null) + if (clue.isRequiresSpade() && plugin.getInventoryItems() != null && !HAS_SPADE.fulfilledBy(plugin.getInventoryItems())) { - if (!HAS_SPADE.fulfilledBy(plugin.getInventoryItems())) - { - panelComponent.getChildren().add(LineComponent.builder().left("").build()); - panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build()); - } + panelComponent.getChildren().add(LineComponent.builder().left("").build()); + panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build()); } return panelComponent.render(graphics); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 98498a40fb..bc0c3d6526 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -36,10 +36,8 @@ import java.awt.Rectangle; import java.awt.geom.Area; import java.awt.image.BufferedImage; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Stream; import javax.inject.Inject; import javax.inject.Singleton; import lombok.Getter; @@ -101,6 +99,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.ui.overlay.worldmap.WorldMapPointManager; import net.runelite.client.util.ImageUtil; +import net.runelite.client.util.ItemUtil; import net.runelite.client.util.Text; @PluginDescriptor( @@ -211,12 +210,9 @@ public class ClueScrollPlugin extends Plugin return; } - if (clue instanceof HotColdClue) + if (clue instanceof HotColdClue && ((HotColdClue) clue).update(event.getMessage(), this)) { - if (((HotColdClue) clue).update(event.getMessage(), this)) - { - worldMapPointsSet = false; - } + worldMapPointsSet = false; } if (!event.getMessage().equals("The strange device cools as you find your treasure.") @@ -231,9 +227,9 @@ public class ClueScrollPlugin extends Plugin @Subscribe public void onMenuOptionClicked(final MenuOptionClicked event) { - if (event.getMenuAction() != null && event.getMenuAction().equals("Read")) + if ("read".equalsIgnoreCase(event.getOption())) { - final ItemDefinition itemComposition = itemManager.getItemDefinition(event.hashCode()); + final ItemDefinition itemComposition = itemManager.getItemDefinition(event.getIdentifier()); if (itemComposition != null && itemComposition.getName().startsWith("Clue scroll")) { @@ -262,30 +258,25 @@ public class ClueScrollPlugin extends Plugin // Check if item was removed from inventory if (clue != null && clueItemId != null) { - final Stream items = Arrays.stream(event.getItemContainer().getItems()); - // Check if clue was removed from inventory - if (items.noneMatch(item -> itemManager.getItemDefinition(item.getId()).getId() == clueItemId)) + if (!ItemUtil.containsItemId(event.getItemContainer().getItems(), clueItemId)) { resetClue(true); } } // if three step clue check for clue scroll pieces - if (clue instanceof ThreeStepCrypticClue) + if (clue instanceof ThreeStepCrypticClue && ((ThreeStepCrypticClue) clue).update(client, event, itemManager)) { - if (((ThreeStepCrypticClue) clue).update(client, event, itemManager)) + worldMapPointsSet = false; + npcsToMark.clear(); + + if (this.displayHintArrows) { - worldMapPointsSet = false; - npcsToMark.clear(); - - if (this.displayHintArrows) - { - client.clearHintArrow(); - } - - checkClueNPCs(clue, client.getCachedNPCs()); + client.clearHintArrow(); } + + checkClueNPCs(clue, client.getCachedNPCs()); } } @@ -483,12 +474,9 @@ public class ClueScrollPlugin extends Plugin final String text = Text.sanitizeMultilineText(clueScrollText.getText()).toLowerCase(); // Early return if this is same clue as already existing one - if (clue instanceof TextClueScroll) + if (clue instanceof TextClueScroll && ((TextClueScroll) clue).getText().equalsIgnoreCase(text)) { - if (((TextClueScroll) clue).getText().equalsIgnoreCase(text)) - { - return clue; - } + return clue; } // (This|The) anagram reveals who to speak to next: @@ -773,7 +761,7 @@ public class ClueScrollPlugin extends Plugin textComponent.render(graphics); } - void scrollToWidget(WidgetInfo list, WidgetInfo scrollbar, Widget ... toHighlight) + void scrollToWidget(WidgetInfo list, WidgetInfo scrollbar, Widget... toHighlight) { final Widget parent = client.getWidget(list); int averageCentralY = 0; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 219916d240..ae18259fb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -171,11 +171,11 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat if (digLocations.size() > 10) { - for (HotColdArea area : locationCounts.keySet()) + for (Map.Entry locationCount : locationCounts.entrySet()) { panelComponent.getChildren().add(LineComponent.builder() - .left(area.getName()) - .right(Integer.toString(locationCounts.get(area))) + .left(locationCount.getKey().getName()) + .right(Integer.toString(locationCount.getValue())) .build()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java index 2efe470b84..aa8fde3a15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java @@ -29,7 +29,7 @@ import net.runelite.api.Item; public class AllRequirementsCollection implements ItemRequirement { - private ItemRequirement[] requirements; + private final ItemRequirement[] requirements; public AllRequirementsCollection(ItemRequirement... requirements) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java index 02a713f7b0..45f1086267 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java @@ -29,8 +29,8 @@ import net.runelite.api.Item; public class AnyRequirementCollection implements ItemRequirement { - private String name; - private ItemRequirement[] requirements; + private final String name; + private final ItemRequirement[] requirements; public AnyRequirementCollection(String name, ItemRequirement... requirements) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java index 92d1f14de8..ae716a54b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java @@ -29,9 +29,9 @@ import net.runelite.api.Item; public class RangeItemRequirement implements ItemRequirement { - private String name; - private int startItemId; - private int endItemId; + private final String name; + private final int startItemId; + private final int endItemId; public RangeItemRequirement(String name, int startItemId, int endItemId) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java index 834fbe7739..333da4c47b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java @@ -30,7 +30,7 @@ import net.runelite.api.ItemDefinition; public class SingleItemRequirement implements ItemRequirement { - private int itemId; + private final int itemId; public SingleItemRequirement(int itemId) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java index 1fae03dde5..697f6a59e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java @@ -30,8 +30,8 @@ import net.runelite.api.Item; public class SlotLimitationRequirement implements ItemRequirement { - private String description; - private EquipmentInventorySlot[] slots; + private final String description; + private final EquipmentInventorySlot[] slots; public SlotLimitationRequirement(String description, EquipmentInventorySlot... slots) { 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 162aeca40a..1e0079ebd6 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,13 +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; @@ -49,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.", @@ -64,6 +70,7 @@ import java.util.Map; enabledByDefault = false ) @Singleton +@Slf4j public class CombatCounter extends Plugin { @@ -87,9 +94,9 @@ public class CombatCounter extends Plugin @Getter(AccessLevel.PACKAGE) private Map counter = new HashMap<>(); - private Map blowpipe = new HashMap<>(); + private final Map blowpipe = new HashMap<>(); - private Map npcDamageMap = new HashMap<>(); + private final Map npcDamageMap = new HashMap<>(); Map playerDamage = new HashMap<>(); @Getter(AccessLevel.PACKAGE) @@ -114,130 +121,116 @@ public class CombatCounter extends Plugin return configManager.getConfig(CombatCounterConfig.class); } - private 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 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 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 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 @@ -279,23 +272,24 @@ public class CombatCounter extends Plugin int animation = p.getAnimation(); if (animation != -1) { - if (variables.containsKey(animation)) + if (VARIABLES.containsKey(animation)) { /* * This part handles the Tick Counter. */ - long ticks = variables.get(animation); + long ticks = VARIABLES.get(animation); if (((Player) actor).getPlayerAppearance().getEquipmentId(KitType.WEAPON) == 23360) { ticks = 3; } if (counter.containsKey(name)) + { ticks += counter.get(name); + } counter.put(name, ticks); counter = sortByValue(counter); - long BLOWPIPE_ID = 5061; - if (animation == BLOWPIPE_ID) + if (animation == BLOWPIPE_ATTACK) { this.blowpipe.put(name, -4L); } @@ -311,7 +305,7 @@ 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()) { @@ -354,7 +348,7 @@ public class CombatCounter extends Plugin } else { - System.out.println("Unclassified Animation: " + animation); + log.debug("Unclassified Animation: {}", animation); } if (delay != -1) @@ -379,13 +373,17 @@ public class CombatCounter extends Plugin { NPCDamageCounter dc = new NPCDamageCounter(); if (this.npcDamageMap.containsKey(target)) + { dc = this.npcDamageMap.get(target); + } for (Integer tick : ticksToAdd) { List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) + { attackers = dc.attackers.get(tick); + } attackers.add(name); dc.attackers.put(tick, attackers); @@ -425,7 +423,9 @@ public class CombatCounter extends Plugin for (Player p : this.client.getPlayers()) { if (p.getName() != null) + { visible.put(p.getName(), p); + } } for (NPC npc : new ArrayList<>(this.npcDamageMap.keySet())) @@ -442,7 +442,9 @@ public class CombatCounter extends Plugin double totalDamage = 0d; for (Integer damage : counter.damage) + { totalDamage += damage; + } if (attackers.containsKey(-1)) { @@ -454,7 +456,9 @@ public class CombatCounter extends Plugin { double count = 0d; if (this.playerDamage.containsKey(name)) + { count = this.playerDamage.get(name); + } count += damagePerPlayer; this.playerDamage.put(name, count); @@ -475,11 +479,17 @@ public class CombatCounter extends Plugin // } for (Integer i : new ArrayList<>(attackers.keySet())) + { if (i <= -1) + { attackers.remove(i); + } + } if (attackers.isEmpty()) + { this.npcDamageMap.remove(npc); + } } this.playerDamage = sortByValue(this.playerDamage); @@ -508,20 +518,26 @@ public class CombatCounter extends Plugin NPCDamageCounter dc = new NPCDamageCounter(); if (this.npcDamageMap.containsKey(npc)) + { dc = this.npcDamageMap.get(npc); + } int delay = this.calculateBPDelay(distance); List counts = new ArrayList<>(); counts.add(delay); if (delay > 2) + { counts.add(delay - 1); + } for (int tick : counts) { List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) + { attackers = dc.attackers.get(tick); + } attackers.add(user); dc.attackers.put(tick, attackers); @@ -545,12 +561,16 @@ public class CombatCounter extends Plugin Actor actor = event.getActor(); if (!(actor instanceof NPC)) + { return; + } NPC npc = (NPC) actor; if (!this.npcDamageMap.containsKey(npc)) + { return; + } Hitsplat splat = event.getHitsplat(); NPCDamageCounter dc = this.npcDamageMap.get(npc); @@ -586,6 +606,7 @@ public class CombatCounter extends Plugin int distance = wpNPC.distanceTo(wpPlayer); if (size > 1) + { for (int x = 0; x < size; x++) { for (int y = 0; y < size; y++) @@ -598,6 +619,8 @@ public class CombatCounter extends Plugin } } } + } + return distance; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java index dd0a2cc25c..de414bc3b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java @@ -96,17 +96,18 @@ class CombatOverlay extends Overlay return null; } - for (String name : map.keySet()) + for (Map.Entry counter : map.entrySet()) { + String name = counter.getKey(); if (client.getLocalPlayer().getName().contains(name)) { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getSelfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getOtherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getOtherColor())); } - total += map.get(name); + total += counter.getValue(); } if (!map.containsKey(local.getName())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java index 0e2cd5109e..8a27e6f96b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java @@ -97,16 +97,16 @@ class DamageOverlay extends Overlay return null; } - for (String name : map.keySet()) + for (Map.Entry damage : map.entrySet()) { - String val = String.format("%.1f", map.get(name)); - if (client.getLocalPlayer().getName().contains(name)) + String val = String.format("%.1f", damage.getValue()); + if (client.getLocalPlayer().getName().contains(damage.getKey())) { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor())); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java index 2c5a848c89..8e9d96e24e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java @@ -10,9 +10,9 @@ import javax.inject.Singleton; class NPCDamageCounter { - Map> attackers; + final Map> attackers; - List damage; + final List damage; NPCDamageCounter() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java index a2db038077..575f59af6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java @@ -119,7 +119,7 @@ public class CombatLevelPlugin extends Plugin if (widgetText.contains(".")) { - combatLevelWidget.setText(widgetText.substring(0, widgetText.indexOf("."))); + combatLevelWidget.setText(widgetText.substring(0, widgetText.indexOf('.'))); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index b328842794..8a8692b947 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -48,6 +48,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Objects; import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; import javax.inject.Singleton; @@ -992,7 +993,7 @@ public class ConfigPanel extends PluginPanel if (e.getStateChange() == ItemEvent.SELECTED) { changeConfiguration(listItem, config, box, cd, cid); - box.setToolTipText(box.getSelectedItem().toString()); + box.setToolTipText(Objects.requireNonNull(box.getSelectedItem()).toString()); } }); item.add(box, BorderLayout.EAST); @@ -1175,7 +1176,7 @@ public class ConfigPanel extends PluginPanel else if (component instanceof JComboBox) { JComboBox jComboBox = (JComboBox) component; - configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) jComboBox.getSelectedItem()).name()); + configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) Objects.requireNonNull(jComboBox.getSelectedItem())).name()); for (ConfigItemDescriptor cid2 : cd.getItems()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java index c8ce0b37dc..7dbd7d73b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java @@ -10,8 +10,8 @@ import javax.swing.event.DocumentListener; class DeferredDocumentChangedListener implements DocumentListener { - private Timer timer; - private List listeners; + private final Timer timer; + private final List listeners; DeferredDocumentChangedListener() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java index 98fc840a7c..2146c9f9fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java @@ -34,7 +34,7 @@ import net.runelite.client.config.Keybind; import net.runelite.client.config.ModifierlessKeybind; @Singleton -public class HotkeyButton extends JButton +class HotkeyButton extends JButton { @Getter(AccessLevel.PACKAGE) private Keybind value; @@ -43,9 +43,7 @@ public class HotkeyButton extends JButton { setValue(value); addActionListener(e -> - { - setValue(Keybind.NOT_SET); - }); + setValue(Keybind.NOT_SET)); addKeyListener(new KeyAdapter() { @Override @@ -63,7 +61,7 @@ public class HotkeyButton extends JButton }); } - public void setValue(Keybind value) + private void setValue(Keybind value) { if (value == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 22065fc7df..0a226cb72b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -62,7 +62,6 @@ public class PluginListItem extends JPanel private static final ImageIcon OFF_STAR; private final ConfigPanel configPanel; - public final ConfigManager configManager; @Getter @Nullable @@ -144,7 +143,6 @@ public class PluginListItem extends JPanel @Nullable ConfigDescriptor configDescriptor, String name, String description, String... tags) { this.configPanel = configPanel; - this.configManager = configManager; this.plugin = plugin; this.config = config; this.configDescriptor = configDescriptor; @@ -186,7 +184,7 @@ public class PluginListItem extends JPanel buttonPanel.add(configButton); // add a listener to configButton only if there are config items to show - if (config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden())) + if (configDescriptor != null && config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden())) { configButton.addActionListener(e -> { 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 d4c815f7eb..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 @@ -224,7 +224,7 @@ public class CorpPlugin extends Plugin Actor source = interactingChanged.getSource(); Actor target = interactingChanged.getTarget(); - if (corp == null || target != corp) + if (target != corp) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java index 049e6192b9..16d755049b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java @@ -112,12 +112,9 @@ public class DeathIndicatorPlugin extends Plugin return; } - if (config.showDeathHintArrow()) + if (config.showDeathHintArrow() && !client.hasHintArrow()) { - if (!client.hasHintArrow()) - { - client.setHintArrow(new WorldPoint(config.deathLocationX(), config.deathLocationY(), config.deathLocationPlane())); - } + client.setHintArrow(new WorldPoint(config.deathLocationX(), config.deathLocationY(), config.deathLocationPlane())); } if (config.showDeathOnWorldMap()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java index eaaf010435..53b64457eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java @@ -53,8 +53,8 @@ public class DemonicGorillaOverlay extends Overlay private static final int OVERLAY_ICON_DISTANCE = 50; private static final int OVERLAY_ICON_MARGIN = 8; - private Client client; - private DemonicGorillaPlugin plugin; + private final Client client; + private final DemonicGorillaPlugin plugin; @Inject private SkillIconManager iconManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java index d031b501b5..9b4d7f8a21 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java @@ -206,7 +206,8 @@ public class DemonicGorillaPlugin extends Plugin } boolean correctPrayer = target == null || // If player is out of memory, assume prayer was correct - attackStyle == protectedStyle; + (attackStyle != null && + attackStyle.equals(protectedStyle)); if (attackStyle == DemonicGorilla.AttackStyle.BOULDER) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java index 08e9df8e5b..42e0a731cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java @@ -160,7 +160,7 @@ class DevToolsOverlay extends Overlay for (Player p : players) { - if (p != local) + if (!p.equals(local)) { String text = p.getName() + " (A: " + p.getAnimation() + ") (G: " + p.getSpotAnimation() + ")"; OverlayUtil.renderActorOverlay(graphics, p, text, BLUE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java index 74e75d23df..bea864d8bc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java @@ -86,7 +86,6 @@ class VarInspector extends JFrame private final static int MAX_LOG_ENTRIES = 10_000; private final Client client; - private final DevToolsPlugin plugin; private final EventBus eventBus; private final JPanel tracker = new JPanel(); @@ -104,7 +103,6 @@ class VarInspector extends JFrame { this.eventBus = eventBus; this.client = client; - this.plugin = plugin; setTitle("RuneLite Var Inspector"); setIconImage(ClientUI.ICON); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java index cea9a2b9c1..f622b59677 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java @@ -63,7 +63,6 @@ class WidgetInspector extends JFrame private final ClientThread clientThread; private final DevToolsConfig config; private final DevToolsOverlay overlay; - private final DevToolsPlugin plugin; private final JTree widgetTree; private final WidgetInfoTableModel infoTableModel; @@ -86,7 +85,6 @@ class WidgetInspector extends JFrame this.infoTableModel = infoTableModel; this.config = config; this.overlay = overlay; - this.plugin = plugin; eventBus.register(this); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index ac5487f6a8..ea63fe7136 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -301,7 +301,6 @@ enum DiscordGameEventType this.details = training(skill); this.priority = priority; this.imageKey = imageKeyOf(skill); - this.priority = priority; this.shouldTimeout = true; } 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 68a10c2567..cfeff83a8d 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 @@ -86,8 +86,6 @@ import okhttp3.Response; @Singleton public class DiscordPlugin extends Plugin { - private static boolean discordEnabled = false; - @Inject private Client client; @@ -112,7 +110,7 @@ public class DiscordPlugin extends Plugin @Inject private WSClient wsClient; - private Map skillExp = new HashMap<>(); + private final Map skillExp = new HashMap<>(); private NavigationButton discordButton; private boolean loginFlag; @@ -159,7 +157,6 @@ public class DiscordPlugin extends Plugin } wsClient.registerMessage(DiscordUserInfo.class); - discordEnabled = true; } @Override @@ -169,7 +166,6 @@ public class DiscordPlugin extends Plugin discordState.reset(); partyService.changeParty(null); wsClient.unregisterMessage(DiscordUserInfo.class); - discordEnabled = false; } @Subscribe @@ -342,17 +338,14 @@ public class DiscordPlugin extends Plugin { final PartyMember localMember = partyService.getLocalMember(); - if (localMember != null) + if (localMember != null && discordService.getCurrentUser() != null) { - if (discordService.getCurrentUser() != null) - { - final DiscordUserInfo userInfo = new DiscordUserInfo( - discordService.getCurrentUser().userId, - discordService.getCurrentUser().avatar); + final DiscordUserInfo userInfo = new DiscordUserInfo( + discordService.getCurrentUser().userId, + discordService.getCurrentUser().avatar); - userInfo.setMemberId(localMember.getMemberId()); - wsClient.send(userInfo); - } + userInfo.setMemberId(localMember.getMemberId()); + wsClient.send(userInfo); } } @@ -452,7 +445,7 @@ public class DiscordPlugin extends Plugin return false; } - public void updateConfig() + private void updateConfig() { this.actionTimeout = config.actionTimeout(); this.hideElapsedTime = config.hideElapsedTime(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java index ddb554fd75..93c3c1b28c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java @@ -46,7 +46,7 @@ import static net.runelite.client.ws.PartyService.PARTY_MAX; class DiscordState { @Data - private class EventWithTime + private static class EventWithTime { private final DiscordGameEventType type; private final Instant start; @@ -57,7 +57,7 @@ class DiscordState private final List events = new ArrayList<>(); private final DiscordService discordService; private final DiscordPlugin plugin; - private PartyService party; + private final PartyService party; private final RuneLiteProperties properties; private DiscordPresence lastPresence; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java index b48a58e153..967d0fb730 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java @@ -49,14 +49,14 @@ import net.runelite.client.ui.PluginPanel; @Slf4j @Singleton -public class EquipmentInspectorPanel extends PluginPanel +class EquipmentInspectorPanel extends PluginPanel { private final static String NO_PLAYER_SELECTED = "No player selected"; - private GridBagConstraints c; - private JPanel equipmentPanels; - private JPanel header; - private JLabel nameLabel; + private final GridBagConstraints c; + private final JPanel equipmentPanels; + private final JPanel header; + private final JLabel nameLabel; @Inject private ItemManager itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index 10680e620b..84e784ba48 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -306,7 +306,7 @@ public class EquipmentInspectorPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.ShowValue = config.ShowValue(); this.protecteditems = config.protecteditems(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index 414c75a4c7..26e77760a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -354,7 +354,7 @@ public class ExaminePlugin extends Plugin } catch (IOException e) { - e.printStackTrace(); + log.error(e.toString()); } message .append(ChatColorType.NORMAL) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index a94da44953..ce76c45f00 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -103,7 +103,7 @@ public class XpDropPlugin extends Plugin private boolean hasDropped = false; private boolean correctPrayer; private Skill lastSkill = null; - private Map previousSkillExpTable = new EnumMap<>(Skill.class); + private final Map previousSkillExpTable = new EnumMap<>(Skill.class); private PrayerType currentTickPrayer; private XpDropConfig.DamageMode damageMode; @@ -401,12 +401,10 @@ public class XpDropPlugin extends Plugin final String[] stringStack = client.getStringStack(); final int stringStackSize = client.getStringStackSize(); - StringBuilder builder = new StringBuilder() - .append(stringStack[stringStackSize - 1]) - .append(ColorUtil.colorTag(this.damageColor)) - .append(" (").append(damage).append(")"); - - stringStack[stringStackSize - 1] = builder.toString(); + String builder = stringStack[stringStackSize - 1] + + ColorUtil.colorTag(this.damageColor) + + " (" + damage + ")"; + stringStack[stringStackSize - 1] = builder; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java index 53f6b3d575..ee66d4271f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java @@ -252,11 +252,10 @@ public class FairyRingPlugin extends Plugin return; } - if (codes != null) - { + if (codes != null && // Check to make sure the list hasn't been rebuild since we were last her // Do this by making sure the list's dynamic children are the same as when we last saw them - if (codes.stream().noneMatch(w -> + codes.stream().noneMatch(w -> { Widget codeWidget = w.getCode(); if (codeWidget == null) @@ -265,9 +264,8 @@ public class FairyRingPlugin extends Plugin } return list.getChild(codeWidget.getIndex()) == codeWidget; })) - { - codes = null; - } + { + codes = null; } if (codes == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java index 0366361345..59de3a4465 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java @@ -69,8 +69,8 @@ public class FeedPlugin extends Plugin private FeedPanel feedPanel; private NavigationButton navButton; - private FeedClient feedClient = new FeedClient(); - private Supplier feedSupplier = Suppliers.memoizeWithExpiration(() -> + private final FeedClient feedClient = new FeedClient(); + private final Supplier feedSupplier = Suppliers.memoizeWithExpiration(() -> { try { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java index 3bc482bf51..7b32f5c087 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java @@ -97,7 +97,7 @@ class FightCaveContainer TZTOKJAD1(NpcID.TZTOKJAD, AttackStyle.UNKNOWN, ImmutableSet.of(AnimationID.TZTOK_JAD_MAGIC_ATTACK, AnimationID.TZTOK_JAD_RANGE_ATTACK, AnimationID.TZTOK_JAD_MELEE_ATTACK), 0), TZTOKJAD2(NpcID.TZTOKJAD_6506, AttackStyle.UNKNOWN, ImmutableSet.of(AnimationID.TZTOK_JAD_MAGIC_ATTACK, AnimationID.TZTOK_JAD_RANGE_ATTACK, AnimationID.TZTOK_JAD_MELEE_ATTACK), 0); - private static ImmutableMap idMap; + private static final ImmutableMap idMap; static { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java index 4f9c675825..8cf64da3f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java @@ -48,9 +48,9 @@ import net.runelite.client.util.ImageUtil; @Singleton public class FightCaveOverlay extends Overlay { - private FightCavePlugin plugin; - private Client client; - private SpriteManager spriteManager; + private final FightCavePlugin plugin; + private final Client client; + private final SpriteManager spriteManager; @Inject FightCaveOverlay(final Client client, final FightCavePlugin plugin, final SpriteManager spriteManager) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java index a31197e700..2376f09fb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java @@ -171,14 +171,11 @@ public class FightCavePlugin extends Plugin { updateConfig(); - if (client.getGameState() == GameState.LOGGED_IN) + if (client.getGameState() == GameState.LOGGED_IN && regionCheck()) { - if (regionCheck()) - { - validRegion = true; - overlayManager.add(waveOverlay); - overlayManager.add(fightCaveOverlay); - } + validRegion = true; + overlayManager.add(waveOverlay); + overlayManager.add(fightCaveOverlay); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java index 811eca25bb..3ead0d19d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java @@ -33,7 +33,7 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.awt.geom.Line2D; -import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; @@ -65,7 +65,7 @@ public class FlexoOverlay extends Overlay if (plugin.isDebugNPCs() || plugin.isDebugGroundItems() || plugin.isDebugPlayers()) { - ArrayList clickAreas = plugin.getClickAreas(); + List clickAreas = plugin.getClickAreas(); if (clickAreas != null) { for (Rectangle clickArea : clickAreas) @@ -77,7 +77,7 @@ public class FlexoOverlay extends Overlay } } - ArrayList clickPoints = plugin.getClickPoints(); + List clickPoints = plugin.getClickPoints(); if (clickPoints != null) { for (Point p : clickPoints) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java index 1cca96d9c6..e0e1b57b20 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java @@ -134,9 +134,9 @@ public class FlexoPlugin extends Plugin private int scalingFactor; @Getter(AccessLevel.PACKAGE) - private ArrayList clickAreas = new ArrayList<>(); + private List clickAreas = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private ArrayList clickPoints = new ArrayList<>(); + private List clickPoints = new ArrayList<>(); @Subscribe private void onConfigChanged(ConfigChanged event) @@ -172,15 +172,12 @@ public class FlexoPlugin extends Plugin { for (NPC npc : client.getNpcs()) { - if (npc != null) + if (npc != null && npc.getConvexHull() != null) { - if (npc.getConvexHull() != null) - { - Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds()); - this.clickAreas.add(r); - java.awt.Point p = FlexoMouse.getClickPoint(r); - this.clickPoints.add(p); - } + Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds()); + this.clickAreas.add(r); + java.awt.Point p = FlexoMouse.getClickPoint(r); + this.clickPoints.add(p); } } } @@ -194,15 +191,12 @@ public class FlexoPlugin extends Plugin { for (Player player : client.getPlayers()) { - if (player != null) + if (player != null && player.getConvexHull() != null) { - if (player.getConvexHull() != null) - { - Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds()); - this.clickAreas.add(r); - java.awt.Point p = FlexoMouse.getClickPoint(r); - this.clickPoints.add(p); - } + Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds()); + this.clickAreas.add(r); + java.awt.Point p = FlexoMouse.getClickPoint(r); + this.clickPoints.add(p); } } } @@ -214,27 +208,21 @@ public class FlexoPlugin extends Plugin Flexo.isStretched = client.isStretchedEnabled(); Flexo.scale = this.scalingFactor; - if (flexo != null) + if (flexo != null && GroundItemsPlugin.getCollectedGroundItems() != null) { - if (GroundItemsPlugin.getCollectedGroundItems() != null) + for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values()) { - for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values()) + if (gi != null) { - if (gi != null) + LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation()); + if (lp != null && Perspective.getCanvasTilePoly(client, lp) != null) { - LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation()); - if (lp != null) - { - if (Perspective.getCanvasTilePoly(client, lp) != null) - { - Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds()); - Rectangle r2 = FlexoMouse.getClickArea(r1); - Rectangle r3 = FlexoMouse.getClickArea(r2); - this.clickAreas.add(r3); - java.awt.Point p = FlexoMouse.getClickPoint(r3); - this.clickPoints.add(p); - } - } + Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds()); + Rectangle r2 = FlexoMouse.getClickArea(r1); + Rectangle r3 = FlexoMouse.getClickArea(r2); + this.clickAreas.add(r3); + java.awt.Point p = FlexoMouse.getClickPoint(r3); + this.clickPoints.add(p); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java index 3fdd3f6925..b729a4ad9f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java @@ -54,7 +54,7 @@ public class FpsDrawListener implements Runnable // Working set private long lastMillis = 0; - private long[] lastDelays = new long[SAMPLE_SIZE]; + private final long[] lastDelays = new long[SAMPLE_SIZE]; private int lastDelayIndex = 0; private long sleepDelay = 0; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index fe43baae47..b17e2b871e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -55,7 +55,7 @@ public class FreezeTimersOverlay extends Overlay private final BufferedImage FREEZE_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "freeze.png"); private final BufferedImage TB_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "teleblock.png"); private final BufferedImage VENG_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "veng.png"); - private Timers timers; + private final Timers timers; @Inject @@ -257,7 +257,7 @@ public class FreezeTimersOverlay extends Overlay xOffset); } - public void renderImageLocation(Graphics2D graphics, Point imgLoc, BufferedImage image) + private void renderImageLocation(Graphics2D graphics, Point imgLoc, BufferedImage image) { int x = imgLoc.getX(); int y = imgLoc.getY(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index 5769c33df1..3a19f7be49 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -162,7 +162,7 @@ public class FreezeTimersPlugin extends Plugin this.remove(player); } - public void remove(Actor actor) + private void remove(Actor actor) { freezes.remove(actor.getName()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java index 05806a1c24..38f236567c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java @@ -24,6 +24,7 @@ package net.runelite.client.plugins.freezetimers; import java.util.HashMap; +import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -34,14 +35,14 @@ import net.runelite.api.Player; @Slf4j @Singleton -public class PrayerTracker +class PrayerTracker { @Inject private Client client; - private HashMap> lastTick = new HashMap<>(); - private HashMap> newTick = new HashMap<>(); + private final Map> lastTick = new HashMap<>(); + private final Map> newTick = new HashMap<>(); public void gameTick() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index 0d58af3127..3a61e5ed2d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -24,15 +24,16 @@ package net.runelite.client.plugins.freezetimers; import java.util.HashMap; +import java.util.Map; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; @Slf4j @Singleton -public class Timers +class Timers { - private HashMap> timerMap = new HashMap<>(); + private final Map> timerMap = new HashMap<>(); void gameTick() { 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 c4c088aab3..5e550cdfb2 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 @@ -63,13 +63,13 @@ public class FriendTaggingPlugin extends Plugin private static final String KEY_PREFIX = "tag_"; private static final String ADD_TAG = "Add Tag"; private static final String DELETE_TAG = "Delete Tag"; - private WidgetMenuOption friendsTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption friendsTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_FRIENDS_TAB); - private WidgetMenuOption ignoreTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption ignoreTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_IGNORES_TAB); - private WidgetMenuOption friendTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption friendTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_FRIENDS_TAB); - private WidgetMenuOption ignoreTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption ignoreTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_IGNORES_TAB); @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index 272ff27c39..e8cbcb9977 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -841,7 +841,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks // Re-create fbo if (lastStretchedCanvasWidth != stretchedCanvasWidth || lastStretchedCanvasHeight != stretchedCanvasHeight - || lastAntiAliasingMode != antiAliasingMode) + || (lastAntiAliasingMode != null + && !lastAntiAliasingMode.equals(antiAliasingMode))) { shutdownSceneFbo(); @@ -1012,7 +1013,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks final AnisotropicFilteringMode anisotropicFilteringMode = this.anisotropicFilteringMode; final boolean afEnabled = anisotropicFilteringMode != AnisotropicFilteringMode.DISABLED; - if (lastAnisotropicFilteringMode != anisotropicFilteringMode) + if (lastAnisotropicFilteringMode != null && !lastAnisotropicFilteringMode.equals(anisotropicFilteringMode)) { if (afEnabled) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java index 056e32cc39..44dfa51dfa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java @@ -126,21 +126,15 @@ class SceneUploader } GroundObject groundObject = tile.getGroundObject(); - if (groundObject != null) + if (groundObject != null && groundObject.getRenderable() instanceof Model) { - if (groundObject.getRenderable() instanceof Model) - { - ((Model) groundObject.getRenderable()).setBufferOffset(-1); - } + ((Model) groundObject.getRenderable()).setBufferOffset(-1); } DecorativeObject decorativeObject = tile.getDecorativeObject(); - if (decorativeObject != null) + if (decorativeObject != null && decorativeObject.getRenderable() instanceof Model) { - if (decorativeObject.getRenderable() instanceof Model) - { - ((Model) decorativeObject.getRenderable()).setBufferOffset(-1); - } + ((Model) decorativeObject.getRenderable()).setBufferOffset(-1); } GameObject[] gameObjects = tile.getGameObjects(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java index ed8602718b..0a83e9c904 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -73,7 +74,7 @@ class GrotesqueGuardiansOverlay extends Overlay // TODO: Awaiting GraphicsObjectDespawn event to be tracked to make this more efficient. for (GraphicsObject graphicsObject : client.getGraphicsObjects()) { - Color color = null; + Color color; if (graphicsObject.getId() >= GROTESQUE_GUARDIANS_LIGHTNING_START && graphicsObject.getId() <= GROTESQUE_GUARDIANS_LIGHTNING_END) { @@ -99,22 +100,19 @@ class GrotesqueGuardiansOverlay extends Overlay { OverlayUtil.renderPolygon(graphics, poly, color); } - if ((plugin.isInGargs()) && (plugin.isNeedingToRun())) + if (plugin.isInGargs() && plugin.isNeedingToRun() && plugin.getDusk() != null && plugin.getDusk().getLocalLocation() != null) { - if ((plugin.getDusk() != null) && (plugin.getDusk().getLocalLocation() != null)) - { - TextComponent textComponent = new TextComponent(); - LocalPoint duskPoint; + TextComponent textComponent = new TextComponent(); + LocalPoint duskPoint; - duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2); - net.runelite.api.Point duskLoc = Perspective.getCanvasTextLocation(client, graphics, duskPoint, "RUN AWAY", 500); - if (duskLoc != null) - { - textComponent.setText("RUN AWAY"); - textComponent.setPosition(new java.awt.Point(duskLoc.getX(), duskLoc.getY())); - textComponent.setColor(Color.red); - textComponent.render(graphics); - } + duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (Objects.requireNonNull(plugin.getDusk().getTransformedDefinition()).getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2); + net.runelite.api.Point duskLoc = Perspective.getCanvasTextLocation(client, graphics, duskPoint, "RUN AWAY", 500); + if (duskLoc != null) + { + textComponent.setText("RUN AWAY"); + textComponent.setPosition(new java.awt.Point(duskLoc.getX(), duskLoc.getY())); + textComponent.setColor(Color.red); + textComponent.render(graphics); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java index 1de4b29640..bc3c398cb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -70,7 +71,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay if ((plugin.isInGargs()) && (plugin.getPrayAgainst() != null) && (plugin.getDusk() != null)) { DuskAttack attack = plugin.getPrayAgainst(); - BufferedImage prayerImage = null; + BufferedImage prayerImage; prayerImage = getPrayerImage(attack); imagePanelComponent.setBackgroundColor(client .isPrayerActive(attack.getPrayer()) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); @@ -79,7 +80,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay imagePanelComponent.getChildren().add(new ImageComponent(prayerImage)); - LocalPoint duskPoint = new LocalPoint(dusk.getLocalLocation().getX() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2, dusk.getLocalLocation().getY() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2); + LocalPoint duskPoint = new LocalPoint(dusk.getLocalLocation().getX() + 128 * (Objects.requireNonNull(dusk.getTransformedDefinition()).getSize() - 1) / 2, dusk.getLocalLocation().getY() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2); net.runelite.api.Point duskLoc = Perspective.getCanvasImageLocation(client, duskPoint, prayerImage, 400); if (duskLoc != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java index 4badf41ef4..8a53d9c2dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java @@ -36,7 +36,7 @@ import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseAdapter; @Singleton -public class GroundItemInputListener extends MouseAdapter implements KeyListener +class GroundItemInputListener extends MouseAdapter implements KeyListener { private static final int HOTKEY = KeyEvent.VK_ALT; @@ -119,14 +119,11 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener return e; } } - else if (SwingUtilities.isRightMouseButton(e)) + else if (SwingUtilities.isRightMouseButton(e) && plugin.getTextBoxBounds() != null && plugin.getTextBoxBounds().getKey().contains(mousePos)) { - if (plugin.getTextBoxBounds() != null && plugin.getTextBoxBounds().getKey().contains(mousePos)) - { - plugin.updateList(plugin.getTextBoxBounds().getValue().getName(), true); - e.consume(); - return e; - } + plugin.updateList(plugin.getTextBoxBounds().getValue().getName(), true); + e.consume(); + return e; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 14ff283672..40b8a7f97c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -352,7 +352,11 @@ public class GroundItemsOverlay extends Overlay plugin.setHighlightBoxBounds(new SimpleEntry<>(itemHighlightBox, item)); } - boolean topItem = topGroundItem == item; + boolean topItem = false; + if (topGroundItem != null) + { + topItem = topGroundItem.equals(item); + } // Draw background if hovering if (topItem && (mouseInBox || mouseInHiddenBox || mouseInHighlightBox)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index f2e70b9fdc..ca28c8f797 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -273,7 +273,10 @@ public class GroundItemsPlugin extends Plugin { for (GroundItem item : collectedGroundItems.values()) { - if (item.getTicks() == -1) continue; + if (item.getTicks() == -1) + { + continue; + } item.setTicks(item.getTicks() - 1); } } @@ -488,21 +491,31 @@ public class GroundItemsPlugin extends Plugin if (this.rightClickHidden) { if (aHidden && bMenuType == WALK) + { return -1; + } if (bHidden && aMenuType == WALK) + { return 1; + } } // sort hidden items below non-hidden items if (aHidden && !bHidden && bMenuType != WALK) + { return -1; + } if (bHidden && !aHidden && aMenuType != WALK) + { return 1; + } // RS sorts by alch price by private, so no need to sort if config not set if (this.sortByGEPrice) + { return (getGePriceFromItemId(aId) * aQuantity) - (getGePriceFromItemId(bId) * bQuantity); + } } } @@ -738,11 +751,11 @@ public class GroundItemsPlugin extends Plugin if (entries.length > 1) { MenuEntry[] newEntries = new MenuEntry[entries.length - 1]; - for (int i = 0; i < entries.length; ++i) + for (MenuEntry entry : entries) { - if (!(entries[i].getOption().equals(option) && entries[i].getTarget().equals(target))) + if (!(entry.getOption().equals(option) && entry.getTarget().equals(target))) { - newEntries[j++] = entries[i]; + newEntries[j++] = entry; } } @@ -867,7 +880,9 @@ public class GroundItemsPlugin extends Plugin { // so that "Prayer Potion (4)" returns 1 instead of 4 and "Coins (25)" returns 25 instead of 1 if (!itemNameIncludesQuantity || matches >= 1) + { lastMatch = matcher.group(1); + } matches++; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index ec184a1a87..f0c7df167c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -129,15 +129,11 @@ public class HiscorePanel extends PluginPanel private final List skillLabels = new ArrayList<>(); - private final JPanel statsPanel = new JPanel(); - /* Container of all the selectable endpoints (ironman, deadman, etc) */ private final MaterialTabGroup tabGroup; private final HiscoreClient hiscoreClient = new HiscoreClient(); - private HiscoreResult result; - /* The currently selected endpoint */ private HiscoreEndpoint selectedEndPoint; @@ -247,6 +243,7 @@ public class HiscorePanel extends PluginPanel // Panel that holds skill icons GridLayout stats = new GridLayout(8, 3); + JPanel statsPanel = new JPanel(); statsPanel.setLayout(stats); statsPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR); statsPanel.setBorder(new EmptyBorder(5, 0, 5, 0)); @@ -371,6 +368,7 @@ public class HiscorePanel extends PluginPanel selectedEndPoint = HiscoreEndpoint.NORMAL; } + HiscoreResult result; try { log.debug("Hiscore endpoint " + selectedEndPoint.name() + " selected"); @@ -607,7 +605,11 @@ public class HiscorePanel extends PluginPanel */ if (SKILLS.contains(skill)) { - long experience = result.getSkill(skill).getExperience(); + long experience = 0; + if (skill != null) + { + experience = result.getSkill(skill).getExperience(); + } if (experience >= 0) { int currentXp = (int) experience; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java index c287fc1160..8601a91289 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java @@ -134,14 +134,6 @@ public class HunterPlugin extends Plugin * ------------------------------------------------------------------------------ */ case ObjectID.DEADFALL: // Deadfall trap placed - if (localPlayer.getWorldLocation().distanceTo(trapLocation) <= 2) - { - log.debug("Trap placed by \"{}\" on {}", localPlayer.getName(), trapLocation); - traps.put(trapLocation, new HunterTrap(gameObject)); - lastActionTime = Instant.now(); - } - break; - case ObjectID.MONKEY_TRAP: // Maniacal monkey trap placed // If player is right next to "object" trap assume that player placed the trap if (localPlayer.getWorldLocation().distanceTo(trapLocation) <= 2) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java index 610352bd86..751db82ee1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java @@ -53,17 +53,14 @@ public class BabyHydraIndicatorOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.getHydra() != null) + if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex())) { - if (plugin.getHydras().containsKey(plugin.getHydra().getIndex())) + int val = plugin.getHydras().get(plugin.getHydra().getIndex()); + if (val != 0) { - int val = plugin.getHydras().get(plugin.getHydra().getIndex()); - if (val != 0) - { - panelComponent.getChildren().clear(); - panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build()); - return panelComponent.render(graphics); - } + panelComponent.getChildren().clear(); + panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build()); + return panelComponent.render(graphics); } } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java index 58456a4ef3..3e392cd878 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java @@ -65,52 +65,49 @@ public class BabyHydraOverlay extends Overlay { continue; } - if (hydra.getName().equalsIgnoreCase("Hydra")) + if (hydra.getName().equalsIgnoreCase("Hydra") && plugin.getHydras().containsKey(hydra.getIndex())) { - if (plugin.getHydras().containsKey(hydra.getIndex())) + int val = plugin.getHydras().get(hydra.getIndex()); + if (val != 0) { - int val = plugin.getHydras().get(hydra.getIndex()); - if (val != 0) + if (plugin.isBoldText()) { - if (plugin.isBoldText()) - { - graphics.setFont(FontManager.getRunescapeBoldFont()); - } - if (plugin.getHydraattacks().containsKey(hydra.getIndex())) - { - int attack = plugin.getHydraattacks().get(hydra.getIndex()); + graphics.setFont(FontManager.getRunescapeBoldFont()); + } + if (plugin.getHydraattacks().containsKey(hydra.getIndex())) + { + int attack = plugin.getHydraattacks().get(hydra.getIndex()); - Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100); + Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100); - if (textLocation != null && attack == 8261) + if (textLocation != null && attack == 8261) + { + if (val == 3) { - if (val == 3) - { - OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); - } - else - { - OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); - } + OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); } - else if (textLocation != null && attack == 8262) + else { - if (val == 3) - { - OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); - } - else - { - OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); - } + OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); } } - Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40); - if (hydraPoint != null) + else if (textLocation != null && attack == 8262) { - OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE); + if (val == 3) + { + OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); + } + else + { + OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); + } } } + Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40); + if (hydraPoint != null) + { + OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java index c0c6e28536..8c2f0fff42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java @@ -159,15 +159,9 @@ public class BabyHydraPlugin extends Plugin public void onNpcSpawned(NpcSpawned event) { NPC hydra = event.getNpc(); - if (hydra.getCombatLevel() != 0 && hydra.getName() != null) + if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra") && !hydras.containsKey(hydra.getIndex())) { - if (hydra.getName().equalsIgnoreCase("Hydra")) - { - if (!hydras.containsKey(hydra.getIndex())) - { - hydras.put(hydra.getIndex(), 3); - } - } + hydras.put(hydra.getIndex(), 3); } } @@ -175,13 +169,10 @@ public class BabyHydraPlugin extends Plugin public void onNpcDespawned(NpcDespawned event) { NPC hydra = event.getNpc(); - if (hydra.getCombatLevel() != 0 && hydra.getName() != null) + if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra")) { - if (hydra.getName().equalsIgnoreCase("Hydra")) - { - hydras.remove(hydra.getIndex()); - hydraattacks.remove(hydra.getIndex()); - } + hydras.remove(hydra.getIndex()); + hydraattacks.remove(hydra.getIndex()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java index cf56196e21..977bb80afc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java @@ -47,8 +47,8 @@ public class BabyHydraPrayOverlay extends Overlay private final BabyHydraPlugin plugin; private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150); - private BufferedImage PRAY_MAGE; - private BufferedImage PRAY_RANGED; + private BufferedImage prayMage; + private BufferedImage prayRanged; private final PanelComponent imagePanelComponent = new PanelComponent(); @Inject @@ -69,71 +69,65 @@ public class BabyHydraPrayOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (PRAY_MAGE == null) + if (prayMage == null) { - PRAY_MAGE = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0); + prayMage = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0); } - if (PRAY_RANGED == null) + if (prayRanged == null) { - PRAY_RANGED = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0); + prayRanged = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0); } - if (plugin.getHydra() != null) + if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex())) { - if (plugin.getHydras().containsKey(plugin.getHydra().getIndex())) + int val = plugin.getHydras().get(plugin.getHydra().getIndex()); + if (val != 0 && plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex())) { - int val = plugin.getHydras().get(plugin.getHydra().getIndex()); - if (val != 0) + int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex()); + if (attack == 8261) { - if (plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex())) + if (val == 3) { - int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex()); - if (attack == 8261) - { - if (val == 3) - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(prayMage)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - else - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + else + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(prayRanged)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - } - else if (attack == 8262) - { - if (val == 3) - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + } + else if (attack == 8262) + { + if (val == 3) + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(prayRanged)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - else - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + else + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(prayMage)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - } + return imagePanelComponent.render(graphics); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 66310c8d41..10a72b7667 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -27,100 +27,18 @@ package net.runelite.client.plugins.idlenotifier; import com.google.inject.Provides; import java.awt.TrayIcon; -//import java.io.IOException; import java.time.Duration; import java.time.Instant; import java.util.Arrays; import java.util.EnumSet; import java.util.List; import javax.inject.Inject; -//import javax.sound.sampled.LineUnavailableException; -//import javax.sound.sampled.UnsupportedAudioFileException; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Setter; -import net.runelite.api.events.ConfigChanged; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.runelite.api.Actor; import net.runelite.api.AnimationID; -import static net.runelite.api.AnimationID.COOKING_FIRE; -import static net.runelite.api.AnimationID.COOKING_RANGE; -import static net.runelite.api.AnimationID.COOKING_WINE; -import static net.runelite.api.AnimationID.CRAFTING_BATTLESTAVES; -import static net.runelite.api.AnimationID.CRAFTING_GLASSBLOWING; -import static net.runelite.api.AnimationID.CRAFTING_LEATHER; -import static net.runelite.api.AnimationID.CRAFTING_POTTERS_WHEEL; -import static net.runelite.api.AnimationID.CRAFTING_POTTERY_OVEN; -import static net.runelite.api.AnimationID.CRAFTING_SPINNING; -import static net.runelite.api.AnimationID.DENSE_ESSENCE_CHIPPING; -import static net.runelite.api.AnimationID.DENSE_ESSENCE_CHISELING; -import static net.runelite.api.AnimationID.FARMING_MIX_ULTRACOMPOST; -import static net.runelite.api.AnimationID.FISHING_CRUSHING_INFERNAL_EELS; -import static net.runelite.api.AnimationID.FISHING_CUTTING_SACRED_EELS; -import static net.runelite.api.AnimationID.FLETCHING_BOW_CUTTING; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAGIC_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAGIC_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAPLE_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAPLE_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_NORMAL_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_NORMAL_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_OAK_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_OAK_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_WILLOW_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_WILLOW_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_YEW_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_YEW_SHORTBOW; -import static net.runelite.api.AnimationID.GEM_CUTTING_AMETHYST; -import static net.runelite.api.AnimationID.GEM_CUTTING_DIAMOND; -import static net.runelite.api.AnimationID.GEM_CUTTING_EMERALD; -import static net.runelite.api.AnimationID.GEM_CUTTING_JADE; -import static net.runelite.api.AnimationID.GEM_CUTTING_OPAL; -import static net.runelite.api.AnimationID.GEM_CUTTING_REDTOPAZ; -import static net.runelite.api.AnimationID.GEM_CUTTING_RUBY; -import static net.runelite.api.AnimationID.GEM_CUTTING_SAPPHIRE; -import static net.runelite.api.AnimationID.HERBLORE_MAKE_TAR; -import static net.runelite.api.AnimationID.HERBLORE_PESTLE_AND_MORTAR; -import static net.runelite.api.AnimationID.HERBLORE_POTIONMAKING; -import static net.runelite.api.AnimationID.HOME_MAKE_TABLET; -import static net.runelite.api.AnimationID.IDLE; -import static net.runelite.api.AnimationID.MAGIC_CHARGING_ORBS; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_1; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_2; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_3; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_JEWELRY; -import static net.runelite.api.AnimationID.MAGIC_LUNAR_PLANK_MAKE; -import static net.runelite.api.AnimationID.MAGIC_LUNAR_SHARED; -import static net.runelite.api.AnimationID.MAGIC_LUNAR_STRING_JEWELRY; -import static net.runelite.api.AnimationID.MAGIC_MAKE_TABLET; -import static net.runelite.api.AnimationID.MINING_3A_PICKAXE; -import static net.runelite.api.AnimationID.MINING_ADAMANT_PICKAXE; -import static net.runelite.api.AnimationID.MINING_BLACK_PICKAXE; -import static net.runelite.api.AnimationID.MINING_BRONZE_PICKAXE; -import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE; -import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE_ORN; -import static net.runelite.api.AnimationID.MINING_INFERNAL_PICKAXE; -import static net.runelite.api.AnimationID.MINING_IRON_PICKAXE; -import static net.runelite.api.AnimationID.MINING_MITHRIL_PICKAXE; -import static net.runelite.api.AnimationID.MINING_RUNE_PICKAXE; -import static net.runelite.api.AnimationID.MINING_STEEL_PICKAXE; -import static net.runelite.api.AnimationID.PISCARILIUS_CRANE_REPAIR; -import static net.runelite.api.AnimationID.SAND_COLLECTION; -import static net.runelite.api.AnimationID.SMITHING_ANVIL; -import static net.runelite.api.AnimationID.SMITHING_CANNONBALL; -import static net.runelite.api.AnimationID.SMITHING_SMELTING; -import static net.runelite.api.AnimationID.USING_GILDED_ALTAR; -import static net.runelite.api.AnimationID.WOODCUTTING_3A_AXE; -import static net.runelite.api.AnimationID.WOODCUTTING_ADAMANT; -import static net.runelite.api.AnimationID.WOODCUTTING_BLACK; -import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE; -import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON; -import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL; -import static net.runelite.api.AnimationID.WOODCUTTING_IRON; -import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; -import static net.runelite.api.AnimationID.WOODCUTTING_RUNE; -import static net.runelite.api.AnimationID.WOODCUTTING_STEEL; +import static net.runelite.api.AnimationID.*; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.GameState; @@ -135,12 +53,13 @@ import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.WorldType; import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.PlayerSpawned; +import net.runelite.api.events.SpotAnimationChanged; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -150,6 +69,10 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.util.PvPUtil; +//import java.io.IOException; +//import javax.sound.sampled.LineUnavailableException; +//import javax.sound.sampled.UnsupportedAudioFileException; + @PluginDescriptor( name = "Idle Notifier", description = "Send a notification when going idle, or when HP/Prayer reaches a threshold", @@ -158,8 +81,6 @@ import net.runelite.client.util.PvPUtil; @Singleton public class IdleNotifierPlugin extends Plugin { - private static final Logger logger = LoggerFactory.getLogger(IdleNotifierPlugin.class); - // This must be more than 500 client ticks (10 seconds) before you get AFK kicked private static final int LOGOUT_WARNING_MILLIS = (4 * 60 + 40) * 1000; // 4 minutes and 40 seconds private static final int COMBAT_WARNING_MILLIS = 19 * 60 * 1000; // 19 minutes @@ -362,22 +283,14 @@ public class IdleNotifierPlugin extends Plugin private void onPlayerSpawned(PlayerSpawned event) { final Player p = event.getPlayer(); - if (this.notifyPkers) + if (this.notifyPkers && p != null && p != client.getLocalPlayer() + && PvPUtil.isAttackable(client, p) && !client.isFriended(p.getName(), false) + && !client.isClanMember(p.getName())) { - if (p != null) - { - if (p != client.getLocalPlayer()) - { - if (PvPUtil.isAttackable(client, p) && !client.isFriended(p.getName(), false) - && !client.isClanMember(p.getName())) - { - String playerName = p.getName(); - int combat = p.getCombatLevel(); - notifier.notify("PK'er warning! A level " + combat + " player named " + playerName + - " appeared!", TrayIcon.MessageType.WARNING); - } - } - } + String playerName = p.getName(); + int combat = p.getCombatLevel(); + notifier.notify("PK'er warning! A level " + combat + " player named " + playerName + + " appeared!", TrayIcon.MessageType.WARNING); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java index a66ee4e270..6b429da714 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java @@ -29,7 +29,9 @@ public class ImplingCounterOverlay extends Overlay public Dimension render(Graphics2D graphics) { if (!plugin.isShowSpawn() || plugin.getImplings().isEmpty()) + { return null; + } panelComponent.getChildren().clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java index 3208dba7df..1bcd8702f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java @@ -41,7 +41,7 @@ public class InfernoNPC RANDOM("Random", Color.ORANGE); @Getter(AccessLevel.PACKAGE) - private String name = ""; + private String name; @Getter(AccessLevel.PACKAGE) private Color color; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java index 0d374137f7..75f6587bc5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java @@ -88,7 +88,7 @@ public class InfernoOverlay extends Overlay } // renders text location - public static void renderTextLocation(Graphics2D graphics, InfernoNPC actor, String text, Color color) + private static void renderTextLocation(Graphics2D graphics, InfernoNPC actor, String text, Color color) { graphics.setFont(new Font("Arial", Font.BOLD, 15)); Point textLocation = actor.getNpc().getCanvasTextLocation(graphics, text, actor.textLocHeight + 40); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 4b0112a94f..9230985b1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -118,7 +118,7 @@ public class InfernoPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private int currentWaveNumber; - private List waveMonsters; + private final List waveMonsters; public InfernoPlugin() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java index 6b71f552a6..9227aba3af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java @@ -147,12 +147,9 @@ public class InfoPanel extends PluginPanel emailLabel.enableAutoLinkHandler(false); emailLabel.addHyperlinkListener(e -> { - if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null) + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && e.getURL().toString().equals(RUNELITE_LOGIN)) { - if (e.getURL().toString().equals(RUNELITE_LOGIN)) - { - executor.execute(sessionManager::login); - } + executor.execute(sessionManager::login); } }); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java index b3e88b6a60..e86007d0b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java @@ -68,18 +68,15 @@ public class JRichTextPane extends JEditorPane { linkHandler = e -> { - if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null) + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && Desktop.isDesktopSupported()) { - if (Desktop.isDesktopSupported()) + try { - try - { - Desktop.getDesktop().browse(e.getURL().toURI()); - } - catch (URISyntaxException | IOException ex) - { - log.warn("Error opening link", ex); - } + Desktop.getDesktop().browse(e.getURL().toURI()); + } + catch (URISyntaxException | IOException ex) + { + log.warn("Error opening link", ex); } } }; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java index ae75a638ac..6e6cbd9732 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java @@ -34,7 +34,7 @@ import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseAdapter; import net.runelite.client.input.MouseWheelListener; -public class InstanceMapInputListener extends MouseAdapter implements KeyListener, MouseWheelListener +class InstanceMapInputListener extends MouseAdapter implements KeyListener, MouseWheelListener { @Inject private InstanceMapPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java index 4e86d634ff..9309861a98 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java @@ -69,7 +69,7 @@ class InventoryGridOverlay extends Overlay final Widget if1DraggingWidget = client.getIf1DraggedWidget(); final Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY); - if (if1DraggingWidget == null || if1DraggingWidget != inventoryWidget + if (if1DraggingWidget == null || if1DraggingWidget.equals(inventoryWidget) || client.getItemPressedDuration() < plugin.getDragDelay() / Constants.CLIENT_TICK_LENGTH) { return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java index e49e8b1512..8e8761e1f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java @@ -25,7 +25,7 @@ */ package net.runelite.client.plugins.inventorysetups; -import java.util.ArrayList; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; @@ -33,7 +33,7 @@ import lombok.Getter; public class InventorySetup { @Getter - private ArrayList inventory; + private List inventory; @Getter - private ArrayList equipment; + private List equipment; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index a9c0b01929..f7d8cba390 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -33,6 +33,7 @@ import java.awt.image.BufferedImage; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Inject; @@ -108,7 +109,7 @@ public class InventorySetupPlugin extends Plugin private InventorySetupPluginPanel panel; - private Map inventorySetups = new HashMap<>(); + private final Map inventorySetups = new HashMap<>(); private NavigationButton navButton; @@ -205,8 +206,8 @@ public class InventorySetupPlugin extends Plugin clientThread.invoke(() -> { - ArrayList inv = getNormalizedContainer(InventoryID.INVENTORY); - ArrayList eqp = getNormalizedContainer(InventoryID.EQUIPMENT); + List inv = getNormalizedContainer(InventoryID.INVENTORY); + List eqp = getNormalizedContainer(InventoryID.EQUIPMENT); final InventorySetup invSetup = new InventorySetup(inv, eqp); SwingUtilities.invokeLater(() -> @@ -333,13 +334,13 @@ public class InventorySetupPlugin extends Plugin if (container == client.getItemContainer(InventoryID.INVENTORY)) { - ArrayList normContainer = getNormalizedContainer(InventoryID.INVENTORY); + List normContainer = getNormalizedContainer(InventoryID.INVENTORY); final InventorySetup setup = inventorySetups.get(selectedInventorySetup); panel.highlightDifferences(normContainer, setup, InventoryID.INVENTORY); } else if (container == client.getItemContainer(InventoryID.EQUIPMENT)) { - ArrayList normContainer = getNormalizedContainer(InventoryID.EQUIPMENT); + List normContainer = getNormalizedContainer(InventoryID.EQUIPMENT); final InventorySetup setup = inventorySetups.get(selectedInventorySetup); panel.highlightDifferences(normContainer, setup, InventoryID.EQUIPMENT); } @@ -371,13 +372,13 @@ public class InventorySetupPlugin extends Plugin } } - public ArrayList getNormalizedContainer(final InventoryID id) + public List getNormalizedContainer(final InventoryID id) { assert id == InventoryID.INVENTORY || id == InventoryID.EQUIPMENT : "invalid inventory ID"; final ItemContainer container = client.getItemContainer(id); - ArrayList newContainer = new ArrayList<>(); + List newContainer = new ArrayList<>(); Item[] items = null; if (container != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 6e0b8b99ba..794f7217b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -27,7 +27,7 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.BorderLayout; import java.awt.Color; -import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; @@ -39,9 +39,9 @@ import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin; import net.runelite.client.ui.ColorScheme; @Singleton -public abstract class InventorySetupContainerPanel extends JPanel +abstract class InventorySetupContainerPanel extends JPanel { - protected ItemManager itemManager; + private final ItemManager itemManager; private final InventorySetupPlugin plugin; @@ -73,7 +73,7 @@ public abstract class InventorySetupContainerPanel extends JPanel void setContainerSlot(int index, final InventorySetupSlot containerSlot, - final ArrayList items) + final List items) { if (index >= items.size() || items.get(index).getId() == -1) { @@ -127,5 +127,5 @@ public abstract class InventorySetupContainerPanel extends JPanel containerSlot.setBackground(ColorScheme.DARKER_GRAY_COLOR); } - abstract public void setupContainerPanel(final JPanel containerSlotsPanel); + protected abstract void setupContainerPanel(final JPanel containerSlotsPanel); } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java index 2ca6687660..6802ecee8a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java @@ -26,8 +26,9 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; -import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.api.EquipmentInventorySlot; @@ -40,7 +41,7 @@ import net.runelite.client.ui.ColorScheme; @Singleton public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel { - private HashMap equipmentSlots; + private Map equipmentSlots; InventorySetupEquipmentPanel(final ItemManager itemManager, final InventorySetupPlugin plugin) { @@ -80,7 +81,7 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel void setEquipmentSetupSlots(final InventorySetup setup) { - final ArrayList equipment = setup.getEquipment(); + final List equipment = setup.getEquipment(); for (final EquipmentInventorySlot slot : EquipmentInventorySlot.values()) { @@ -93,9 +94,9 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel } - void highlightDifferences(final ArrayList currEquipment, final InventorySetup inventorySetup) + void highlightDifferences(final List currEquipment, final InventorySetup inventorySetup) { - final ArrayList equipToCheck = inventorySetup.getEquipment(); + final List equipToCheck = inventorySetup.getEquipment(); assert currEquipment.size() == equipToCheck.size() : "size mismatch"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java index 3310b2f25c..fecaf28ce5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.client.game.ItemManager; @@ -40,7 +41,7 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel private static final int ITEMS_PER_ROW = 4; private static final int NUM_INVENTORY_ITEMS = 28; - private ArrayList inventorySlots; + private List inventorySlots; InventorySetupInventoryPanel(final ItemManager itemManager, final InventorySetupPlugin plugin) { @@ -67,7 +68,7 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel void setInventorySetupSlots(final InventorySetup setup) { - ArrayList inventory = setup.getInventory(); + List inventory = setup.getInventory(); for (int i = 0; i < NUM_INVENTORY_ITEMS; i++) { @@ -79,10 +80,10 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel } - void highlightDifferentSlots(final ArrayList currInventory, final InventorySetup inventorySetup) + void highlightDifferentSlots(final List currInventory, final InventorySetup inventorySetup) { - final ArrayList inventoryToCheck = inventorySetup.getInventory(); + final List inventoryToCheck = inventorySetup.getInventory(); assert currInventory.size() == inventoryToCheck.size() : "size mismatch"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java index 339ba435a3..77d99029ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java @@ -33,7 +33,7 @@ import java.awt.event.ItemEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; -import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.Box; import javax.swing.BoxLayout; @@ -55,10 +55,10 @@ import net.runelite.client.util.ImageUtil; @Singleton public class InventorySetupPluginPanel extends PluginPanel { - private static ImageIcon ADD_ICON; - private static ImageIcon ADD_HOVER_ICON; - private static ImageIcon REMOVE_ICON; - private static ImageIcon REMOVE_HOVER_ICON; + private static final ImageIcon ADD_ICON; + private static final ImageIcon ADD_HOVER_ICON; + private static final ImageIcon REMOVE_ICON; + private static final ImageIcon REMOVE_HOVER_ICON; private final JPanel noSetupsPanel; private final JPanel invEqPanel; @@ -254,8 +254,8 @@ public class InventorySetupPluginPanel extends PluginPanel if (plugin.getHighlightDifference()) { - final ArrayList normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY); - final ArrayList normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT); + final List normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY); + final List normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT); highlightDifferences(normInv, inventorySetup, InventoryID.INVENTORY); highlightDifferences(normEqp, inventorySetup, InventoryID.EQUIPMENT); @@ -287,7 +287,7 @@ public class InventorySetupPluginPanel extends PluginPanel repaint(); } - public void highlightDifferences(final ArrayList container, + public void highlightDifferences(final List container, final InventorySetup setupToCheck, final InventoryID type) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 16f7184da9..0cf44d6f25 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -88,7 +88,7 @@ public class ItemChargePlugin extends Plugin private static final Pattern DODGY_BREAK_PATTERN = Pattern.compile( "Your dodgy necklace protects you\\..*It then crumbles to dust\\."); private static final String RING_OF_RECOIL_BREAK_MESSAGE = "Your Ring of Recoil has shattered."; - private static Pattern BINDING_CHECK_PATTERN = Pattern.compile( + private static final Pattern BINDING_CHECK_PATTERN = Pattern.compile( "You have ([0-9]+|one) charges? left before your Binding necklace disintegrates."); private static final Pattern BINDING_USED_PATTERN = Pattern.compile( "You bind the temple's power into (mud|lava|steam|dust|smoke|mist) runes\\."); @@ -567,13 +567,10 @@ public class ItemChargePlugin extends Plugin @Subscribe public void onSpotAnimationChanged(SpotAnimationChanged event) { - if (event.getActor() == client.getLocalPlayer()) + if (event.getActor() == client.getLocalPlayer() && client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) { - if (client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) - { - final int xericCharges = Math.max(this.xericTalisman - 1, 0); - updateXericCharges(xericCharges); - } + final int xericCharges = Math.max(this.xericTalisman - 1, 0); + updateXericCharges(xericCharges); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java index 57e00c2f64..bc37d03b27 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java @@ -60,19 +60,17 @@ class ItemRecoilOverlay extends Overlay tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); this.imagePanelComponent.getChildren().clear(); - if (plugin.isShowrecoil()) + if (plugin.isShowrecoil() && plugin.isRingOfRecoilAvailable()) { - if (plugin.isRingOfRecoilAvailable()) - { - BufferedImage recoilImage = plugin.getRecoilRingImage(); - imagePanelComponent.setBackgroundColor(plugin - .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); - imagePanelComponent.getChildren().add(new ImageComponent(recoilImage)); + BufferedImage recoilImage = plugin.getRecoilRingImage(); + imagePanelComponent.setBackgroundColor(plugin + .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); + imagePanelComponent.getChildren().add(new ImageComponent(recoilImage)); - imagePanelComponent.getChildren().add(tableComponent); - return imagePanelComponent.render(graphics); - } + imagePanelComponent.getChildren().add(tableComponent); + return imagePanelComponent.render(graphics); } + return null; } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java index d2e9913bbf..c1ccaada8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java @@ -90,7 +90,7 @@ enum ItemIdentification final Type type; final String medName; final String shortName; - final int[] itemIDs; + private final int[] itemIDs; ItemIdentification(Type type, String medName, String shortName, int... ids) { 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 cd28fbfda6..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,10 @@ class ItemPricesOverlay extends Overlay switch (action) { case ITEM_USE_ON_WIDGET: - if (!menuEntry.getTarget().contains("High Level Alchemy") || !plugin.isShowAlchProfit()) return null; + if (!client.getSelectedSpellName().equalsIgnoreCase("high level alchemy") || !plugin.isShowAlchProfit()) + { + return null; + } case WIDGET_DEFAULT: case ITEM_USE: case ITEM_FIRST_OPTION: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java index 83409af0ce..b8aaf11616 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java @@ -28,7 +28,7 @@ import net.runelite.client.plugins.itemstats.stats.Stats; public abstract class FoodBase extends StatBoost { - public FoodBase() + protected FoodBase() { super(Stats.HITPOINTS, false); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java index 28b3e555a2..a9a3c766ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java @@ -53,11 +53,11 @@ public class ItemStatOverlay extends Overlay .aspeed(6) .build()); - private Client client; - private ItemManager itemManager; - private TooltipManager tooltipManager; - private ItemStatChanges statChanges; - private ItemStatPlugin plugin; + private final Client client; + private final ItemManager itemManager; + private final TooltipManager tooltipManager; + private final ItemStatChanges statChanges; + private final ItemStatPlugin plugin; @Inject ItemStatOverlay(Client client, ItemStatPlugin plugin, ItemManager itemManager, TooltipManager tooltipManager, ItemStatChanges itemStatChanges) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java index ad40c469a4..5d55a70694 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java @@ -38,13 +38,13 @@ public abstract class StatBoost extends SingleEffect @Setter private boolean boost; - public StatBoost(Stat stat, boolean boost) + protected StatBoost(Stat stat, boolean boost) { this.stat = stat; this.boost = boost; } - public abstract int heals(Client client); + protected abstract int heals(Client client); @Override public StatChange effect(Client client) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java index bd2fbfa4b6..47198e4a29 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java @@ -63,7 +63,7 @@ public class PrayerPotion extends StatBoost final int ring = ItemUtil.safeGetItemIdAtIndex(equip, EquipmentInventorySlot.RING.getSlotIdx()); final int cape = ItemUtil.safeGetItemIdAtIndex(equip, EquipmentInventorySlot.CAPE.getSlotIdx()); - hasHolyWrench |= ring == ItemID.RING_OF_THE_GODS_I; + hasHolyWrench = ring == ItemID.RING_OF_THE_GODS_I; hasHolyWrench |= HOLY_WRENCH_IDS.contains(cape); } if (!hasHolyWrench) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java index d4ee16fa1a..ae816900cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java @@ -77,7 +77,7 @@ public class SaradominBrew implements Effect ) ).toArray(StatChange[]::new)); changes.setPositivity(Stream.of(changes.getStatChanges()) - .map(sc -> sc.getPositivity()) + .map(StatChange::getPositivity) .max(Comparator.comparing(Enum::ordinal)).get()); return changes; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java index d8180ae9e0..3ddcf0b137 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java @@ -87,7 +87,7 @@ public class SuperRestore implements Effect return calc.effect(client); }) ).toArray(StatChange[]::new)); - changes.setPositivity(Stream.of(changes.getStatChanges()).map(sc -> sc.getPositivity()).max(Comparator.comparing(Enum::ordinal)).get()); + changes.setPositivity(Stream.of(changes.getStatChanges()).map(StatChange::getPositivity).max(Comparator.comparing(Enum::ordinal)).get()); return changes; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java index 25b7f019f8..a2baa6a09e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java @@ -103,7 +103,7 @@ public class SpicyStew implements Effect } StatsChanges changesReturn = new StatsChanges(4); - changesReturn.setStatChanges(changes.toArray(new StatChange[changes.size()])); + changesReturn.setStatChanges(changes.toArray(new StatChange[0])); return changesReturn; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 2d94b6e4d1..a269a80c8f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -197,12 +197,9 @@ public class KeyRemappingPlugin extends Plugin { case SCRIPT_EVENT_SET_CHATBOX_INPUT: Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); - if (chatboxInput != null) + if (chatboxInput != null && chatboxFocused() && !typing) { - if (chatboxFocused() && !typing) - { - chatboxInput.setText(getWaitingText()); - } + chatboxInput.setText(getWaitingText()); } break; case SCRIPT_EVENT_BLOCK_CHAT_INPUT: @@ -230,14 +227,11 @@ public class KeyRemappingPlugin extends Plugin void unlockChat() { Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); - if (chatboxInput != null) + if (chatboxInput != null && client.getGameState() == GameState.LOGGED_IN) { - if (client.getGameState() == GameState.LOGGED_IN) - { - final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; - final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND; - chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor)); - } + final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; + final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND; + chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java index 7c3dc3b56a..b48a0af346 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java @@ -30,7 +30,7 @@ import net.runelite.client.ui.overlay.infobox.Counter; import net.runelite.client.util.StackFormatter; @Singleton -public class KingdomCounter extends Counter +class KingdomCounter extends Counter { private final KingdomPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java index fe11faac3b..857c50cef3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java @@ -36,7 +36,7 @@ import net.runelite.client.ui.FontManager; @Singleton class BookPanel extends JPanel { - private JLabel location = new JLabel(); + private final JLabel location = new JLabel(); BookPanel(final Book b) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java index 9af693fed2..fb60cb0262 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java @@ -138,7 +138,7 @@ class KourendLibraryOverlay extends Overlay Color color = bookIsKnown ? Color.ORANGE : Color.WHITE; // Render the poly on the floor - if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || !possible.isEmpty()) && !shouldHideOverlayIfDuplicateBook(book)) + if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || !possible.isEmpty()) && shouldShowOverlayIfDuplicateBook(book)) { Polygon poly = getCanvasTilePoly(client, localBookcase); if (poly != null) @@ -151,7 +151,7 @@ class KourendLibraryOverlay extends Overlay // If the book is singled out, render the text and the book's icon if (bookIsKnown) { - if (book != null && !shouldHideOverlayIfDuplicateBook(book)) + if (book != null && shouldShowOverlayIfDuplicateBook(book)) { FontMetrics fm = g.getFontMetrics(); Rectangle2D bounds = fm.getStringBounds(book.getShortName(), g); @@ -228,7 +228,10 @@ class KourendLibraryOverlay extends Overlay Point screen = Perspective.localToCanvas(client, local, client.getPlane(), n.getLogicalHeight()); if (screen != null) { - g.drawImage(b.getIcon(), screen.getX() - (b.getIcon().getWidth() / 2), screen.getY() - b.getIcon().getHeight(), null); + if (b != null) + { + g.drawImage(b.getIcon(), screen.getX() - (b.getIcon().getWidth() / 2), screen.getY() - b.getIcon().getHeight(), null); + } } }); } @@ -236,11 +239,11 @@ class KourendLibraryOverlay extends Overlay return null; } - private boolean shouldHideOverlayIfDuplicateBook(@Nullable Book book) + private boolean shouldShowOverlayIfDuplicateBook(@Nullable Book book) { - return plugin.isHideDuplicateBook() - && book != null - && !book.isDarkManuscript() - && plugin.doesPlayerContainBook(book); + return !plugin.isHideDuplicateBook() + || book == null + || book.isDarkManuscript() + || !plugin.doesPlayerContainBook(book); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java index 90900667f1..aba91b0911 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java @@ -36,7 +36,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Singleton; import javax.swing.ImageIcon; @@ -151,7 +150,7 @@ class KourendLibraryPanel extends PluginPanel } else { - e.getValue().setLocation("" + locs.stream().collect(Collectors.joining("
")) + ""); + e.getValue().setLocation("" + String.join("
", locs) + ""); } } }); 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 e850169cbf..7e76be3560 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,8 @@ 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.ChatMessageType; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; @@ -102,12 +104,9 @@ public class LizardmenShamanPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (this.notifyOnSpawn) + if (this.notifyOnSpawn && event.getType() == ChatMessageType.GAMEMESSAGE && event.getMessage().contains(MESSAGE)) { - if (event.getMessage().contains(MESSAGE)) - { - notifier.notify(MESSAGE); - } + notifier.notify(MESSAGE); } } @@ -120,12 +119,9 @@ public class LizardmenShamanPlugin extends Plugin return; } - if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157) + if (actor.getName().equals(SHAMAN) && actor.getAnimation() == LIZARDMAN_SHAMAN_SPAWN && this.showTimer) { - if (this.showTimer) - { - spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); - } + spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java index 9d60355d6d..2ccc721ddf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java @@ -63,12 +63,9 @@ class ShamanSpawnOverlay extends Overlay final long startCountdown = Duration.between(spawn.getStart(), now).getSeconds(); final double certainSec = spawn.getCountdownTimer() - startCountdown; - if (certainSec <= 0) + if (certainSec <= 0 && spawn.getEnd() == null) { - if (spawn.getEnd() == null) - { - spawn.setEnd(Instant.now()); - } + spawn.setEnd(Instant.now()); } final ProgressPieComponent pieComponent = new ProgressPieComponent(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java index 8041ef36b0..2aa5705337 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java @@ -22,8 +22,8 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class LootAssistOverlay extends Overlay { - private Client client; - private DecimalFormat d = new DecimalFormat("##.#"); + private final Client client; + private final DecimalFormat d = new DecimalFormat("##.#"); @Inject public LootAssistOverlay(final Client client) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java index 35e02cff98..b896912eec 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java @@ -31,7 +31,7 @@ public class LootAssistPlugin extends Plugin @Inject LootAssistOverlay lootAssistOverlay; - static ConcurrentHashMap lootPiles = new ConcurrentHashMap<>(); + static final ConcurrentHashMap lootPiles = new ConcurrentHashMap<>(); @Override protected void startUp() throws Exception diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java index 4098bed359..8dbdb20123 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java @@ -67,8 +67,8 @@ class LootTrackerBox extends JPanel private final List records = new ArrayList<>(); private long totalPrice; - private boolean hideIgnoredItems; - private BiConsumer onItemToggle; + private final boolean hideIgnoredItems; + private final BiConsumer onItemToggle; LootTrackerBox( final ItemManager itemManager, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 2f863394fe..de5a6cab2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -33,11 +33,9 @@ import com.google.common.collect.Multiset; import com.google.common.collect.Multisets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonStreamParser; import com.google.gson.reflect.TypeToken; import com.google.inject.Provides; import java.awt.image.BufferedImage; -import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; @@ -51,6 +49,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.regex.Matcher; @@ -145,12 +144,10 @@ public class LootTrackerPlugin extends Plugin 12342, // Edgeville 11062 // Camelot ); - // Player deaths - public static HashSet usernameSet = new HashSet(Arrays.stream(new String[]{"All Records"}).collect(Collectors.toList())); @Inject public Client client; @VisibleForTesting - public Collection lootRecords = new ArrayList<>(); + private Collection lootRecords = new ArrayList<>(); private boolean pvpDeath = false; @Inject private ClientToolbar clientToolbar; @@ -175,8 +172,6 @@ public class LootTrackerPlugin extends Plugin private Multiset inventorySnapshot; @Getter(AccessLevel.PACKAGE) private LootTrackerClient lootTrackerClient; - private BufferedReader bufferedReader; - private JsonStreamParser jsonStreamParser; private static Collection stack(Collection items) { @@ -305,7 +300,7 @@ public class LootTrackerPlugin extends Plugin AccountSession accountSession = sessionManager.getAccountSession(); LOOT_RECORDS_FILE.createNewFile(); - bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath()); + // BufferedReader bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath()); if (accountSession != null || this.localPersistence) { @@ -323,7 +318,10 @@ public class LootTrackerPlugin extends Plugin if (this.syncPanel && lootTrackerClient != null) { - lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); + if (accountSession != null) + { + lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); + } try { lootRecords = lootTrackerClient.get(); @@ -372,7 +370,7 @@ public class LootTrackerPlugin extends Plugin { clientToolbar.removeNavigation(navButton); lootTrackerClient = null; - lootRecords = new ArrayList(); + lootRecords = new ArrayList<>(); } @Subscribe @@ -613,11 +611,9 @@ public class LootTrackerPlugin extends Plugin @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { - final ItemContainer itemContainer = event.getItemContainer(); - if (pvpDeath && RESPAWN_REGIONS.contains(client.getLocalPlayer().getWorldLocation().getRegionID())) { - Multiset snapshot = HashMultiset.create(); + Multiset snapshot; snapshot = inventorySnapshot; deathInventorySnapshot(); if (inventorySnapshot != snapshot) @@ -629,7 +625,7 @@ public class LootTrackerPlugin extends Plugin Multiset currentInventory = HashMultiset.create(); if (inventory != null) { - Arrays.stream(client.getItemContainer(InventoryID.INVENTORY).getItems()) + Arrays.stream(Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) .forEach(item -> currentInventory.add(item.getId(), item.getQuantity())); } @@ -818,7 +814,7 @@ public class LootTrackerPlugin extends Plugin .toArray(LootTrackerItem[]::new); } - public Collection convertToLootTrackerRecord(final Collection records) + private Collection convertToLootTrackerRecord(final Collection records) { Collection trackerRecords = new ArrayList<>(); for (LootRecord record : records) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java index ac85314026..b711aa37a5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java @@ -108,7 +108,7 @@ public class MaxHitPlugin extends Plugin equipYourCharacter.setText(maxHitText); } - private class MaxHit + private static class MaxHit { private final double maxMeleeHit; private final double maxRangeHit; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java index c868d3b25a..ce0e468770 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.maxhit.calculators; import java.util.ArrayList; +import java.util.List; import java.util.function.BiFunction; import net.runelite.api.Client; import net.runelite.api.Item; @@ -97,9 +98,9 @@ public abstract class MaxHitCalculator double applyEquipmentBonus(double maxhit, EquipmentBonusConfig.BonusType bonusType) { double bonus = 1; - ArrayList addList = new ArrayList<>(); + List addList = new ArrayList<>(); - ArrayList equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType); + List equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType); for (EquipmentBonusConfig equipmentBonus : equipmentBonuses) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java index 51ec9c6234..3e51821336 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.maxhit.config; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.function.BiFunction; import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; @@ -205,10 +206,10 @@ public enum CustomFormulaConfig ); private final MaxHitCalculator.CombatMethod requiredCombatMethod; - private final ArrayList requirements; + private final List requirements; private final BiFunction customFormula; - CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, ArrayList requirements, BiFunction customFormula) + CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, List requirements, BiFunction customFormula) { this.requiredCombatMethod = requiredCombatMethod; this.requirements = requirements; @@ -225,7 +226,7 @@ public enum CustomFormulaConfig return customFormula; } - public ArrayList getRequirements() + public List getRequirements() { return this.requirements; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java index 86915c66a8..015566d5e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java @@ -376,7 +376,7 @@ public enum EquipmentBonusConfig this.operation = operation; } - public static ArrayList getBonusByType(BonusType bonusType) + public static List getBonusByType(BonusType bonusType) { if (!bonusTypes.containsKey(bonusType)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java index 5e440d5064..1bd3d6c861 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java @@ -24,21 +24,21 @@ */ package net.runelite.client.plugins.maxhit.equipment; -import java.util.ArrayList; +import java.util.List; import net.runelite.api.EquipmentInventorySlot; public class EquipmentSlotItem { private final EquipmentInventorySlot equipmentSlot; - private final ArrayList itemIds; + private final List itemIds; - public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, ArrayList itemIds) + public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, List itemIds) { this.equipmentSlot = equipmentSlot; this.itemIds = itemIds; } - public ArrayList getItems() + public List getItems() { return this.itemIds; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java index e6e771281e..5e933a3e61 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.maxhit.requirements; -import java.util.ArrayList; +import java.util.List; import net.runelite.api.Client; import net.runelite.api.Varbits; import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig; @@ -32,9 +32,9 @@ import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig; public class AutocastSpellRequirement implements Requirement { - private final ArrayList autocastSpells; + private final List autocastSpells; - public AutocastSpellRequirement(ArrayList autocastSpells) + public AutocastSpellRequirement(List autocastSpells) { this.autocastSpells = autocastSpells; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index a4414ca6dc..06dee1c828 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -221,9 +221,7 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean swapBones; private boolean swapChase; private boolean swapHarpoon; - private boolean swapOccult; private OccultAltarMode swapOccultMode; - private boolean swapHomePortal; private HouseMode swapHomePortalMode; private boolean swapPrivate; private boolean swapPick; @@ -275,9 +273,7 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean swapPlank; private boolean swapMetamorphosis; private boolean swapEnchant; - private boolean swapFairyRing; private FairyRingMode swapFairyRingMode; - private boolean swapObelisk; private ObeliskMode swapObeliskMode; private boolean swapTeleportItem; private boolean swapWildernessLever; @@ -1730,9 +1726,7 @@ public class MenuEntrySwapperPlugin extends Plugin this.swapBones = config.swapBones(); this.swapChase = config.swapChase(); this.swapHarpoon = config.swapHarpoon(); - this.swapOccult = config.swapOccult(); this.swapOccultMode = config.swapOccultMode(); - this.swapHomePortal = config.swapHomePortal(); this.swapHomePortalMode = config.swapHomePortalMode(); this.swapPrivate = config.swapPrivate(); this.swapPick = config.swapPick(); @@ -1784,9 +1778,7 @@ public class MenuEntrySwapperPlugin extends Plugin this.swapPlank = config.swapPlank(); this.swapMetamorphosis = config.swapMetamorphosis(); this.swapEnchant = config.swapEnchant(); - this.swapFairyRing = config.swapFairyRing(); this.swapFairyRingMode = config.swapFairyRingMode(); - this.swapObelisk = config.swapObelisk(); this.swapObeliskMode = config.swapObeliskMode(); this.swapTeleportItem = config.swapTeleportItem(); this.swapWildernessLever = config.swapWildernessLever(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java index d4e9785f5f..e063efa2a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java @@ -38,7 +38,7 @@ public class Parse { if (!str.startsWith("//")) { - sb.append(str + "\n"); + sb.append(str).append("\n"); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java index c258bfb30a..6a44185c4f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java @@ -30,7 +30,7 @@ import javax.inject.Singleton; import net.runelite.client.input.KeyListener; @Singleton -public class ShiftClickInputListener implements KeyListener +class ShiftClickInputListener implements KeyListener { @Inject private MenuEntrySwapperPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 766b80c434..b0d9e42f3f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -26,14 +26,16 @@ package net.runelite.client.plugins.metronome; import com.google.inject.Provides; +import java.io.IOException; import javax.inject.Inject; import javax.inject.Singleton; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.UnsupportedAudioFileException; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.SoundEffectVolume; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.Clip; -import javax.sound.sampled.DataLine; -import javax.sound.sampled.AudioFormat; import javax.sound.sampled.FloatControl; import java.io.File; import net.runelite.api.Client; @@ -51,6 +53,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"skilling", "tick", "timers"}, enabledByDefault = false ) +@Slf4j @Singleton public class MetronomePlugin extends Plugin { @@ -82,34 +85,26 @@ public class MetronomePlugin extends Plugin private Clip GetAudioClip(String path) { File audioFile = new File(path); - if (audioFile.exists()) + if (!audioFile.exists()) { - AudioInputStream audioStream = null; - try - { - audioStream = AudioSystem.getAudioInputStream(audioFile); - } - catch (Exception e) - { - return null; - } - AudioFormat audioFormat = audioStream.getFormat(); - DataLine.Info audioInfo = new DataLine.Info(Clip.class, audioFormat); - try - { - Clip audioClip = AudioSystem.getClip(); - audioClip.open(audioStream); - FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN); - float gainValue = (((float) this.volume) * 40f / 100f) - 35f; - gainControl.setValue(gainValue); - return audioClip; - } - catch (Exception e) - { - return null; - } + return null; + } + + try (AudioInputStream audioStream = AudioSystem.getAudioInputStream(audioFile)) + { + Clip audioClip = AudioSystem.getClip(); + audioClip.open(audioStream); + FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN); + float gainValue = (((float) this.volume) * 40f / 100f) - 35f; + gainControl.setValue(gainValue); + + return audioClip; + } + catch (IOException | LineUnavailableException | UnsupportedAudioFileException e) + { + log.warn("Error opening audiostream from " + audioFile, e); + return null; } - return null; } @Override @@ -149,6 +144,7 @@ public class MetronomePlugin extends Plugin float gainValue = (((float) this.volume) * 40f / 100f) - 35f; FloatControl gainControlTick = (FloatControl) tickClip.getControl(FloatControl.Type.MASTER_GAIN); gainControlTick.setValue(gainValue); + FloatControl gainControlTock = (FloatControl) tockClip.getControl(FloatControl.Type.MASTER_GAIN); gainControlTock.setValue(gainValue); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java index 33e15bb3bd..6de0afb579 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java @@ -28,7 +28,7 @@ import java.awt.Color; import net.runelite.api.Client; import net.runelite.api.Sprite; -public class MinimapDot +class MinimapDot { private static final int MAP_DOT_WIDTH = 4; private static final int MAP_DOT_HEIGHT = 5; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index 29f5df03e0..f114f276ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -76,7 +76,7 @@ import net.runelite.client.ui.overlay.OverlayManager; @Singleton public class MiningPlugin extends Plugin { - private static final int ROCK_DISTANCE = 14; + // private static final int ROCK_DISTANCE = 14; private static final int MINING_GUILD_REGION = 12183; private static final Pattern COAL_BAG_EMPTY_MESSAGE = Pattern.compile("^The coal bag is (now )?empty\\.$"); @@ -285,7 +285,7 @@ public class MiningPlugin extends Plugin * @param delta How much to add/subtract from the amount. * Supply a negative number to subtract, or positive number to add. */ - protected void updateAmountOfCoalInBag(int delta) + private void updateAmountOfCoalInBag(int delta) { // check for upper/lower bounds of amount of coal in a bag // 0 <= X <= 27 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java index 3fa2aba3dd..6b672967dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java @@ -97,21 +97,17 @@ class MotherlodeRocksOverlay extends Overlay for (WallObject vein : plugin.getVeins()) { LocalPoint location = vein.getLocalLocation(); - if (localLocation.distanceTo(location) <= MAX_DISTANCE) + if (localLocation.distanceTo(location) <= MAX_DISTANCE && plugin.isUpstairs(localLocation) == plugin.isUpstairs(vein.getLocalLocation())) { - // Only draw veins on the same level - if (plugin.isUpstairs(localLocation) == plugin.isUpstairs(vein.getLocalLocation())) + if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation()) + && plugin.isMining() + && plugin.isShowTargetVein()) { - if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation()) - && plugin.isMining() - && plugin.isShowTargetVein()) - { - renderVein(graphics, vein, true); - } - else - { - renderVein(graphics, vein, false); - } + renderVein(graphics, vein, true); + } + else + { + renderVein(graphics, vein, false); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index b8bd37fa9c..186497182f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -37,22 +37,7 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; -import static net.runelite.api.ObjectID.CUPBOARD_23678; -import static net.runelite.api.ObjectID.CUPBOARD_23679; -import static net.runelite.api.ObjectID.CUPBOARD_23680; -import static net.runelite.api.ObjectID.CUPBOARD_23681; -import static net.runelite.api.ObjectID.CUPBOARD_23682; -import static net.runelite.api.ObjectID.CUPBOARD_23683; -import static net.runelite.api.ObjectID.CUPBOARD_23684; -import static net.runelite.api.ObjectID.CUPBOARD_23685; -import static net.runelite.api.ObjectID.CUPBOARD_23686; -import static net.runelite.api.ObjectID.CUPBOARD_23687; -import static net.runelite.api.ObjectID.CUPBOARD_23688; -import static net.runelite.api.ObjectID.CUPBOARD_23689; -import static net.runelite.api.ObjectID.CUPBOARD_23690; -import static net.runelite.api.ObjectID.CUPBOARD_23691; -import static net.runelite.api.ObjectID.CUPBOARD_23692; -import static net.runelite.api.ObjectID.CUPBOARD_23693; +import static net.runelite.api.ObjectID.*; import net.runelite.api.Perspective; import net.runelite.api.Player; import net.runelite.api.Point; @@ -121,7 +106,7 @@ public class AlchemyRoom extends MTARoom } AlchemyItem bestItem = getBest(); - if (best == null || best != bestItem) + if (best == null || !best.equals(bestItem)) { if (best != null) { @@ -240,40 +225,37 @@ public class AlchemyRoom extends MTARoom String message = wrapper.getMessage(); - if (wrapper.getType() == ChatMessageType.GAMEMESSAGE) + if (wrapper.getType() == ChatMessageType.GAMEMESSAGE && message.contains(YOU_FOUND)) { - if (message.contains(YOU_FOUND)) + String item = message.replace(YOU_FOUND, "").trim(); + AlchemyItem alchemyItem = AlchemyItem.find(item); + Cupboard clicked = getClicked(); + if (clicked.alchemyItem != alchemyItem && alchemyItem != null) { - String item = message.replace(YOU_FOUND, "").trim(); - AlchemyItem alchemyItem = AlchemyItem.find(item); - Cupboard clicked = getClicked(); - if (clicked.alchemyItem != alchemyItem) - { - fill(clicked, alchemyItem); - } + fill(clicked, alchemyItem); } - else if (message.equals(EMPTY)) + } + else if (message.equals(EMPTY)) + { + Cupboard clicked = getClicked(); + + int idx = Arrays.asList(cupboards).indexOf(clicked); + for (int i = -2; i <= 2; ++i) { - Cupboard clicked = getClicked(); - - int idx = Arrays.asList(cupboards).indexOf(clicked); - for (int i = -2; i <= 2; ++i) + int j = (idx + i) % 8; + if (j < 0) { - int j = (idx + i) % 8; - if (j < 0) - { - j = 8 + j; - } - - Cupboard cupboard = cupboards[j]; - if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN) - { - cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY; - } + j = 8 + j; } - clicked.alchemyItem = AlchemyItem.EMPTY; + Cupboard cupboard = cupboards[j]; + if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN) + { + cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY; + } } + + clicked.alchemyItem = AlchemyItem.EMPTY; } } @@ -393,7 +375,7 @@ public class AlchemyRoom extends MTARoom continue; } - if (alchemyItem == best) + if (alchemyItem.equals(best)) { client.setHintArrow(object.getWorldLocation()); found = true; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java index 8db687282f..c3be2bc51f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java @@ -29,7 +29,7 @@ import java.awt.image.BufferedImage; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.Counter; -public class GraveyardCounter extends Counter +class GraveyardCounter extends Counter { GraveyardCounter(final BufferedImage image, final Plugin plugin) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java index 2c683989c6..5cfe0f16fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java @@ -83,13 +83,10 @@ public class GraveyardRoom extends MTARoom @Subscribe public void onGameTick(GameTick tick) { - if (!inside() || !this.graveyard) + if ((!inside() || !this.graveyard) && this.counter != null) { - if (this.counter != null) - { - infoBoxManager.removeIf(e -> e instanceof GraveyardCounter); - this.counter = null; - } + infoBoxManager.removeIf(e -> e instanceof GraveyardCounter); + this.counter = null; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index 557792c398..2023ff3166 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -219,7 +219,7 @@ public class TelekineticRoom extends MTARoom { NPC npc = event.getNpc(); - if (npc == guardian) + if (npc.equals(guardian)) { guardian = null; } @@ -286,7 +286,11 @@ public class TelekineticRoom extends MTARoom Direction next = moves.pop(); WorldArea areaNext = getIndicatorLine(next); - WorldPoint nearestNext = nearest(areaNext, current); + WorldPoint nearestNext = null; + if (areaNext != null) + { + nearestNext = nearest(areaNext, current); + } if (moves.isEmpty()) { @@ -298,9 +302,20 @@ public class TelekineticRoom extends MTARoom Direction after = moves.peek(); moves.push(next); WorldArea areaAfter = getIndicatorLine(after); - WorldPoint nearestAfter = nearest(areaAfter, nearestNext); + WorldPoint nearestAfter = null; + if (areaAfter != null) + { + nearestAfter = nearest(areaAfter, nearestNext); + } - return nearest(areaNext, nearestAfter); + if (areaNext != null) + { + return nearest(areaNext, nearestAfter); + } + else + { + return nearestAfter; + } } private static int manhattan(WorldPoint point1, WorldPoint point2) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java index cf7a0ef3da..7bf5da3df2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.List; import net.runelite.api.Constants; -public class MapLocations +class MapLocations { private static final List[] MULTICOMBAT = new List[Constants.MAX_Z]; private static final List[] NOT_MULTICOMBAT = new List[Constants.MAX_Z]; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java index dd134690ed..74573f97a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java @@ -86,8 +86,11 @@ public class MultiIndicatorsOverlay extends Overlay path = Geometry.transformPath(path, coords -> { Point point = Perspective.localToCanvas(client, new LocalPoint((int) coords[0], (int) coords[1]), client.getPlane()); - coords[0] = point.getX(); - coords[1] = point.getY(); + if (point != null) + { + coords[0] = point.getX(); + coords[1] = point.getY(); + } }); graphics.draw(path); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 122599d15c..a65fbf0b4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -562,13 +562,10 @@ public class NpcIndicatorsPlugin extends Plugin { for (NPC npc : despawnedNpcsThisTick) { - if (!teleportGraphicsObjectSpawnedThisTick.isEmpty()) + if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() && teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation())) { - if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation())) - { - // NPC teleported away, so we don't want to add the respawn timer - continue; - } + // NPC teleported away, so we don't want to add the respawn timer + continue; } if (isInViewRange(client.getLocalPlayer().getWorldLocation(), npc.getWorldLocation())) @@ -590,14 +587,12 @@ public class NpcIndicatorsPlugin extends Plugin for (NPC npc : spawnedNpcsThisTick) { - if (!teleportGraphicsObjectSpawnedThisTick.isEmpty()) + if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() && + (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) || + teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc)))) { - if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) || - teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc))) - { - // NPC teleported here, so we don't want to update the respawn timer - continue; - } + // NPC teleported here, so we don't want to update the respawn timer + continue; } if (lastPlayerLocation != null && isInViewRange(lastPlayerLocation, npc.getWorldLocation())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java index 900072d4e3..5f0d3100a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java @@ -153,7 +153,11 @@ public class NpcSceneOverlay extends Overlay { case SOUTH_WEST_TILE: LocalPoint lp1 = LocalPoint.fromWorld(client, actor.getWorldLocation()); - Polygon tilePoly1 = Perspective.getCanvasTilePoly(client, lp1); + Polygon tilePoly1 = null; + if (lp1 != null) + { + tilePoly1 = Perspective.getCanvasTilePoly(client, lp1); + } renderPoly(graphics, color, tilePoly1); break; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 61f438f638..2c7b4e438f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -148,21 +148,19 @@ public class NpcStatusPlugin extends Plugin return; } final Hitsplat hitsplat = event.getHitsplat(); - if (hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK) + if ((hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK) && event.getActor() instanceof NPC) { - if (event.getActor() instanceof NPC) + for (MemorizedNPC mn : memorizedNPCs) { - for (MemorizedNPC mn : memorizedNPCs) + if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null) { - if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null) - { - mn.setStatus(MemorizedNPC.Status.FLINCHING); - mn.setCombatTimerEnd(-1); - mn.setFlinchTimerEnd(client.getTickCount() + mn.getAttackSpeed() / 2 + 1); - } + mn.setStatus(MemorizedNPC.Status.FLINCHING); + mn.setCombatTimerEnd(-1); + mn.setFlinchTimerEnd(client.getTickCount() + mn.getAttackSpeed() / 2 + 1); } } } + } private void checkStatus() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java index c9c1c4fae2..916b74450a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java @@ -114,8 +114,11 @@ class NpcAggroAreaOverlay extends Overlay path = Geometry.transformPath(path, coords -> { Point point = Perspective.localToCanvas(client, new LocalPoint((int) coords[0], (int) coords[1]), client.getPlane()); - coords[0] = point.getX(); - coords[1] = point.getY(); + if (point != null) + { + coords[0] = point.getX(); + coords[1] = point.getY(); + } }); graphics.draw(path); 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 f9053cc2dd..75335426cb 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 @@ -24,14 +24,10 @@ */ package net.runelite.client.plugins.npcunaggroarea; -import java.awt.Color; -import javax.inject.Singleton; -import lombok.AccessLevel; -import net.runelite.api.Player; -import net.runelite.api.geometry.Geometry; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.inject.Provides; +import java.awt.Color; import java.awt.Polygon; import java.awt.Rectangle; import java.awt.geom.Area; @@ -42,6 +38,8 @@ import java.time.Instant; import java.util.Arrays; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -50,6 +48,7 @@ import net.runelite.api.ItemID; import net.runelite.api.NPC; import net.runelite.api.NPCDefinition; import net.runelite.api.Perspective; +import net.runelite.api.Player; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; @@ -57,6 +56,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcSpawned; +import net.runelite.api.geometry.Geometry; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -354,20 +354,17 @@ public class NpcAggroAreaPlugin extends Plugin public void onGameTick(GameTick event) { WorldPoint newLocation = client.getLocalPlayer().getWorldLocation(); - if (lastPlayerLocation != null) + if (lastPlayerLocation != null && safeCenters[1] == null && newLocation.distanceTo2D(lastPlayerLocation) > SAFE_AREA_RADIUS * 4) { - if (safeCenters[1] == null && newLocation.distanceTo2D(lastPlayerLocation) > SAFE_AREA_RADIUS * 4) - { - safeCenters[0] = null; - safeCenters[1] = newLocation; - resetTimer(); - calculateLinesToDisplay(); + safeCenters[0] = null; + safeCenters[1] = newLocation; + resetTimer(); + calculateLinesToDisplay(); - // We don't know where the previous area was, so if the player e.g. - // entered a dungeon and then goes back out, he/she may enter the previous - // area which is unknown and would make the plugin inaccurate - previousUnknownCenter = lastPlayerLocation; - } + // We don't know where the previous area was, so if the player e.g. + // entered a dungeon and then goes back out, he/she may enter the previous + // area which is unknown and would make the plugin inaccurate + previousUnknownCenter = lastPlayerLocation; } if (safeCenters[0] == null && previousUnknownCenter != null && @@ -380,17 +377,14 @@ public class NpcAggroAreaPlugin extends Plugin calculateLinesToDisplay(); } - if (safeCenters[1] != null) + if (safeCenters[1] != null && Arrays.stream(safeCenters).noneMatch( + x -> x != null && x.distanceTo2D(newLocation) <= SAFE_AREA_RADIUS)) { - if (Arrays.stream(safeCenters).noneMatch( - x -> x != null && x.distanceTo2D(newLocation) <= SAFE_AREA_RADIUS)) - { - safeCenters[0] = safeCenters[1]; - safeCenters[1] = newLocation; - resetTimer(); - calculateLinesToDisplay(); - previousUnknownCenter = null; - } + safeCenters[0] = safeCenters[1]; + safeCenters[1] = newLocation; + resetTimer(); + calculateLinesToDisplay(); + previousUnknownCenter = null; } lastPlayerLocation = newLocation; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index f21d7ef067..0f20e4c8df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -332,13 +332,11 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener for (ObjectPoint objectPoint : objectPoints) { if ((worldPoint.getX() & (REGION_SIZE - 1)) == objectPoint.getRegionX() - && (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY()) + && (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY() + && objectPoint.getName().equals(client.getObjectDefinition(object.getId()).getName())) { - if (objectPoint.getName().equals(client.getObjectDefinition(object.getId()).getName())) - { - objects.add(object); - break; - } + objects.add(object); + break; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index 979633bdf7..e65b070674 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -163,13 +163,12 @@ public class OpponentInfoPlugin extends Plugin { if (lastOpponent != null && lastTime != null - && client.getLocalPlayer().getInteracting() == null) + && client.getLocalPlayer().getInteracting() == null + && Duration.between(lastTime, Instant.now()).compareTo(WAIT) > 0) { - if (Duration.between(lastTime, Instant.now()).compareTo(WAIT) > 0) - { - lastOpponent = null; - } + lastOpponent = null; } + } @Subscribe diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java index c0548dadbf..bc9b22b1eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java @@ -28,7 +28,7 @@ import java.util.UUID; import javax.annotation.Nullable; import net.runelite.client.plugins.party.data.PartyData; -public interface PartyPluginService +interface PartyPluginService { /** * Get the party data for a party member diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java index 8a51f5fa0c..a81979c779 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java @@ -37,7 +37,7 @@ class PartyWorldMapPoint extends WorldMapPoint private static final BufferedImage ARROW = ImageUtil.getResourceStreamFromClass(PartyWorldMapPoint.class, "/util/clue_arrow.png"); private BufferedImage partyImage; - private PartyMember member; + private final PartyMember member; PartyWorldMapPoint(final WorldPoint worldPoint, final PartyMember member) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java index ede483cfa1..d4a6c6634b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java @@ -113,8 +113,8 @@ public class PerformanceStatsOverlay extends Overlay return new String[] { performance.getUsername(), - (int) Math.round(performance.getDamageDealt()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitDealt())), - (int) Math.round(performance.getDamageTaken()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitTaken())), + (int) Math.round(performance.getDamageDealt()) + " | " + (int) Math.round(performance.getHighestHitDealt()), + (int) Math.round(performance.getDamageTaken()) + " | " + (int) Math.round(performance.getHighestHitTaken()), String.valueOf(performance.getDPS()), performance.getHumanReadableSecondsSpent() }; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java index 5ed0b19202..64deb7876d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java @@ -41,9 +41,9 @@ import net.runelite.api.events.GameTick; @Slf4j public class Game { - private Client client; + private final Client client; - private PestControlPlugin plugin; + private final PestControlPlugin plugin; @Getter(AccessLevel.PACKAGE) private Portal bluePortal = new Portal(PortalColor.BLUE, WidgetPortal.BLUE); @@ -66,7 +66,7 @@ public class Game private boolean portalLocationsSet = false; - private Instant startTime = Instant.now(); + private final Instant startTime = Instant.now(); public Game(Client client, PestControlPlugin plugin) { @@ -147,7 +147,7 @@ public class Game } } - possibleRotations = rotations.toArray(new PortalRotation[rotations.size()]); + possibleRotations = rotations.toArray(new PortalRotation[0]); } private void killPortal(Portal portal) @@ -162,7 +162,7 @@ public class Game portal.setPortalState(PortalState.DEAD); } - private boolean loadPortalLocations() + private void loadPortalLocations() { NPC squire = null; @@ -180,10 +180,8 @@ public class Game log.debug("In-game Squire found: {}", squire); setPortalLocations(squire.getWorldLocation()); - return true; } - return false; } private void setPortalLocations(WorldPoint squireLocation) @@ -201,7 +199,7 @@ public class Game List getPortals() { - List portalList = new ArrayList(); + List portalList = new ArrayList<>(); portalList.add(getPurplePortal()); portalList.add(getBluePortal()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java index 3dfaee777b..049f649de0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java @@ -38,5 +38,5 @@ class NpcHighlightContext { private NpcHighlightStyle npcRenderStyle; private Color color; - private boolean showNpcName = false; + private boolean showNpcName; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java index 7f8d94148b..941f851b6c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java @@ -53,11 +53,11 @@ public class PortalWeaknessOverlay extends Overlay private final PestControlPlugin plugin; private final Client client; - private BufferedImage magicImage; - private BufferedImage rangedImage; - private BufferedImage stabImage; - private BufferedImage slashImage; - private BufferedImage crushImage; + private final BufferedImage magicImage; + private final BufferedImage rangedImage; + private final BufferedImage stabImage; + private final BufferedImage slashImage; + private final BufferedImage crushImage; @Inject PortalWeaknessOverlay( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java index a1d69ccff2..1fe970e620 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java @@ -27,7 +27,7 @@ package net.runelite.client.plugins.pileindicators; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Actor; @@ -56,11 +56,11 @@ public class PileIndicatorsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - ArrayList> stackList = plugin.getStacks(); + List> stackList = plugin.getStacks(); if (stackList != null) { - for (ArrayList actorArrayList : stackList) + for (List actorArrayList : stackList) { PileType pileType = plugin.getPileType(actorArrayList); Color pileColor = plugin.getColorByPileType(pileType); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java index 32e04d6612..50e04c26ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.pileindicators; import com.google.inject.Provides; import java.awt.Color; import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -103,11 +104,11 @@ public class PileIndicatorsPlugin extends Plugin overlayManager.remove(overlay); } - ArrayList> getStacks() + List> getStacks() { - ArrayList> outerArrayList = new ArrayList<>(); + List> outerArrayList = new ArrayList<>(); - ArrayList pileList = new ArrayList<>(); + List pileList = new ArrayList<>(); if (this.enableNPCS) { @@ -120,16 +121,13 @@ public class PileIndicatorsPlugin extends Plugin } } - if (this.enablePlayers) + if (this.enablePlayers && (client.getVar(Varbits.IN_WILDERNESS) > 0 && this.wildyOnlyPlayer) ^ (!this.wildyOnlyPlayer)) { - if ((client.getVar(Varbits.IN_WILDERNESS) > 0 && this.wildyOnlyPlayer) ^ (!this.wildyOnlyPlayer)) + for (Player player : client.getPlayers()) { - for (Player player : client.getPlayers()) + if (player != null) { - if (player != null) - { - pileList.add(player); - } + pileList.add(player); } } } @@ -144,12 +142,9 @@ public class PileIndicatorsPlugin extends Plugin ArrayList potentialStackArrayList = new ArrayList<>(); for (Actor actorToCompareTo : pileList) { - if (!potentialStackArrayList.contains(actorToCompareTo)) + if (!potentialStackArrayList.contains(actorToCompareTo) && actor.getWorldLocation().distanceTo(actorToCompareTo.getWorldLocation()) == 0) { - if (actor.getWorldLocation().distanceTo(actorToCompareTo.getWorldLocation()) == 0) - { - potentialStackArrayList.add(actorToCompareTo); - } + potentialStackArrayList.add(actorToCompareTo); } } if (potentialStackArrayList.size() >= this.minimumPileSize) @@ -175,7 +170,7 @@ public class PileIndicatorsPlugin extends Plugin return null; } - PileType getPileType(ArrayList pile) + PileType getPileType(List pile) { PileType pileType = null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index 90ee0fb013..8bbdf54fa8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -28,6 +28,7 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -172,7 +173,7 @@ public class PlayerIndicatorsPlugin extends Plugin overlayManager.remove(playerIndicatorsMinimapOverlay); } - private ArrayList callers = new ArrayList<>(); + private List callers = new ArrayList<>(); @Subscribe public void onConfigChanged(ConfigChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index 90e224a044..54a2589782 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -64,7 +64,7 @@ public class PlayerIndicatorsService boolean isClanMember = player.isClanMember(); - if (player == localPlayer) + if (player.equals(localPlayer)) { if (plugin.isHighlightOwnPlayer()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 3ad3f06a4e..c2f09c8371 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -51,7 +51,7 @@ import net.runelite.client.plugins.config.PluginListItem; public class PluginSorterPlugin extends Plugin { //Cache the hidden plugins - private static List removedPlugins = new ArrayList<>(); + private static final List removedPlugins = new ArrayList<>(); @Inject private PluginSorterConfig config; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java index abf1f4c56e..ef0a03b5e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java @@ -488,7 +488,7 @@ public class PoisonPlugin extends Plugin } // Only update sprites when the heart icon actually changes - if (newHeart != heart) + if (newHeart != null && !newHeart.equals(heart)) { heart = newHeart; client.getWidgetSpriteCache().reset(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java index 4ff815d6cd..338fcd4357 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java @@ -34,9 +34,9 @@ import net.runelite.api.Player; public class PlayerContainer { - private Player player; - private long whenTheyAttackedMe; - private int millisToExpireHighlight; + private final Player player; + private final long whenTheyAttackedMe; + private final int millisToExpireHighlight; PlayerContainer(final Player player, final long whenTheyAttackedMe, final int millisToExpireHighlight) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java index 0af7b52e28..c4380983f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java @@ -73,13 +73,10 @@ class PrayAgainstPlayerOverlayPrayerTab extends Overlay { for (PlayerContainer container : plugin.getPlayersAttackingMe()) { - if (plugin.getPlayersAttackingMe() != null && plugin.getPlayersAttackingMe().size() > 0) + if (plugin.getPlayersAttackingMe() != null && plugin.getPlayersAttackingMe().size() == 1 && + plugin.isDrawTargetPrayAgainstPrayerTab()) { - // no reason to show you what prayers to pray in your prayer tab if multiple people are attacking you - if ((plugin.getPlayersAttackingMe().size() == 1) && (plugin.isDrawTargetPrayAgainstPrayerTab())) - { - renderPrayerToClick(graphics, container.getPlayer()); - } + renderPrayerToClick(graphics, container.getPlayer()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java index db42cc14fa..6e40c5ebe9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java @@ -32,6 +32,7 @@ import java.awt.image.ColorModel; import java.awt.image.IndexColorModel; import java.awt.image.WritableRaster; import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -81,8 +82,8 @@ public class PrayAgainstPlayerPlugin extends Plugin private static final Color PROTECTION_ICON_OUTLINE_COLOR = new Color(33, 33, 33); private final BufferedImage[] ProtectionIcons = new BufferedImage[PROTECTION_ICONS.length]; - private ArrayList potentialPlayersAttackingMe; - private ArrayList playersAttackingMe; + private List potentialPlayersAttackingMe; + private List playersAttackingMe; @Inject private Client client; @@ -347,12 +348,12 @@ public class PrayAgainstPlayerPlugin extends Plugin } } - ArrayList getPotentialPlayersAttackingMe() + List getPotentialPlayersAttackingMe() { return potentialPlayersAttackingMe; } - ArrayList getPlayersAttackingMe() + List getPlayersAttackingMe() { return playersAttackingMe; } @@ -360,9 +361,7 @@ public class PrayAgainstPlayerPlugin extends Plugin //All of the methods below are from the Zulrah plugin!!! Credits to it's respective owner private void loadProtectionIcons() { - int curPosition = 0; - - for (int i = 0; i < PROTECTION_ICONS.length; i++, curPosition++) + for (int i = 0; i < PROTECTION_ICONS.length; i++) { final int resource = PROTECTION_ICONS[i]; ProtectionIcons[i] = rgbaToIndexedBufferedImage(ProtectionIconFromSprite(spriteManager.getSprite(resource, 0))); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java index d312a0ee8c..d6078e556e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java @@ -54,7 +54,7 @@ enum WeaponType { return WEAPON_MELEE; } - if (weaponNameGivenLowerCase == null || weaponNameGivenLowerCase.toLowerCase().contains("null")) + if (weaponNameGivenLowerCase.toLowerCase().contains("null")) { return WEAPON_MELEE; } @@ -87,7 +87,7 @@ enum WeaponType } - private static String[] meleeWeaponNames = { + private static final String[] meleeWeaponNames = { "sword", "scimitar", "dagger", @@ -119,7 +119,7 @@ enum WeaponType "bulwark" }; - private static String[] rangedWeaponNames = { + private static final String[] rangedWeaponNames = { "bow", "blowpipe", "xil-ul", @@ -130,7 +130,7 @@ enum WeaponType "ballista" }; - private static String[] magicWeaponNames = { + private static final String[] magicWeaponNames = { "staff", "trident", "wand", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java index 144f443dd1..56e4dc1660 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java @@ -77,14 +77,13 @@ class PrayerFlickOverlay extends Overlay //Purposefully using height twice here as the bounds of the prayer orb includes the number sticking out the side int orbInnerHeight = (int) bounds.getHeight(); - int orbInnerWidth = orbInnerHeight; int orbInnerX = (int) (bounds.getX() + 24);//x pos of the inside of the prayer orb int orbInnerY = (int) (bounds.getY() - 1);//y pos of the inside of the prayer orb double t = plugin.getTickProgress(); - int xOffset = (int) (-Math.cos(t) * orbInnerWidth / 2) + orbInnerWidth / 2; + int xOffset = (int) (-Math.cos(t) * orbInnerHeight / 2) + orbInnerHeight / 2; int indicatorHeight = (int) (Math.sin(t) * orbInnerHeight); int yOffset = (orbInnerHeight / 2) - (indicatorHeight / 2); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java index 85d8111a94..1dae89f203 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java @@ -153,7 +153,7 @@ public class PrayerPlugin extends Plugin final ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY); final ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT); - if (container == inventory || container == equipment) + if (container != null && (container.equals(inventory) || container.equals(equipment))) { doseOverlay.setHasHolyWrench(false); doseOverlay.setHasPrayerRestore(false); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java index 878ed2b220..352ee7677f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java @@ -103,7 +103,7 @@ class ProfilePanel extends JPanel } catch (InvalidKeySpecException | NoSuchAlgorithmException ex) { - ex.printStackTrace(); + log.error(e.toString()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index bf0283a4a3..60835272a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -92,7 +92,7 @@ class ProfilesPanel extends PluginPanel private final JPasswordField txtAccountLogin = new JPasswordField(ACCOUNT_USERNAME); private final JPasswordField txtPasswordLogin = new JPasswordField(PASSWORD_LABEL); private final JPanel profilesPanel = new JPanel(); - private GridBagConstraints c; + private final GridBagConstraints c; @Inject public ProfilesPanel(final Client client, final ProfilesConfig config) @@ -346,7 +346,7 @@ class ProfilesPanel extends PluginPanel } catch (InvalidKeySpecException | NoSuchAlgorithmException ex) { - ex.printStackTrace(); + log.error(e.toString()); } this.addAccount(data); @@ -552,7 +552,7 @@ class ProfilesPanel extends PluginPanel } catch (NoSuchAlgorithmException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchPaddingException e) { - e.printStackTrace(); + log.error(e.toString()); } return new byte[0]; } @@ -568,7 +568,7 @@ class ProfilesPanel extends PluginPanel } catch (NoSuchAlgorithmException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchPaddingException e) { - e.printStackTrace(); + log.error(e.toString()); } return ""; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java index 488a511a5f..b79187fa6a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java @@ -87,14 +87,11 @@ public class ProfilesPlugin extends Plugin @Subscribe private void onConfigChanged(ConfigChanged event) throws Exception { - if (event.getGroup().equals("profiles")) + if (event.getGroup().equals("profiles") && event.getKey().equals("rememberPassword")) { - if (event.getKey().equals("rememberPassword")) - { - panel = injector.getInstance(ProfilesPanel.class); - this.shutDown(); - this.startUp(); - } + panel = injector.getInstance(ProfilesPanel.class); + this.shutDown(); + this.startUp(); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java index 378217d02e..331a7a6205 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java @@ -87,7 +87,7 @@ public class PuzzleSolverPlugin extends Plugin private PuzzleSolverConfig config; private LightboxState lightbox; - private LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER]; + private final LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER]; private Combination lastClick; private boolean lastClickInvalid; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java index e7aae71dcc..9dcf6b4a7a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java @@ -29,7 +29,7 @@ public class LightboxSolver private LightboxState initial; private final LightboxState[] switches = new LightboxState[LightBox.COMBINATIONS_POWER]; - static boolean isBitSet(int num, int bit) + private static boolean isBitSet(int num, int bit) { return ((num >>> bit) & 1) != 0; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java index 6e156a62ce..5270bcd452 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java @@ -37,8 +37,8 @@ public class PuzzleSolver implements Runnable private static final Duration MAX_WAIT_DURATION = Duration.ofMillis(1500); - private Pathfinder pathfinder; - private PuzzleState startState; + private final Pathfinder pathfinder; + private final PuzzleState startState; private List solution; private int position; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java index 74d346cd29..0946c504ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java @@ -84,67 +84,55 @@ public class PuzzleState int emptyPieceY = emptyPiece / DIMENSION; // Move left if there is space to the left - if (emptyPieceX > 0) + if (emptyPieceX > 0 && (parent == null || parent.emptyPiece != emptyPiece - 1)) { - if (parent == null || parent.emptyPiece != emptyPiece - 1) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece - 1] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece - 1]; - state.emptyPiece--; + state.pieces[emptyPiece - 1] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece - 1]; + state.emptyPiece--; - moves.add(state); - } + moves.add(state); } // Move right if there is space to the right - if (emptyPieceX < DIMENSION - 1) + if (emptyPieceX < DIMENSION - 1 && (parent == null || parent.emptyPiece != emptyPiece + 1)) { - if (parent == null || parent.emptyPiece != emptyPiece + 1) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece + 1] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece + 1]; - state.emptyPiece++; + state.pieces[emptyPiece + 1] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece + 1]; + state.emptyPiece++; - moves.add(state); - } + moves.add(state); } // Move up if there is space upwards - if (emptyPieceY > 0) + if (emptyPieceY > 0 && (parent == null || parent.emptyPiece != emptyPiece - DIMENSION)) { - if (parent == null || parent.emptyPiece != emptyPiece - DIMENSION) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece - DIMENSION] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece - DIMENSION]; - state.emptyPiece -= DIMENSION; + state.pieces[emptyPiece - DIMENSION] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece - DIMENSION]; + state.emptyPiece -= DIMENSION; - moves.add(state); - } + moves.add(state); } // Move down if there is space downwards - if (emptyPieceY < DIMENSION - 1) + if (emptyPieceY < DIMENSION - 1 && (parent == null || parent.emptyPiece != emptyPiece + DIMENSION)) { - if (parent == null || parent.emptyPiece != emptyPiece + DIMENSION) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece + DIMENSION] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece + DIMENSION]; - state.emptyPiece += DIMENSION; + state.pieces[emptyPiece + DIMENSION] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece + DIMENSION]; + state.emptyPiece += DIMENSION; - moves.add(state); - } + moves.add(state); } return moves; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java index 331c883a18..86877c2327 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java @@ -51,9 +51,9 @@ import net.runelite.client.plugins.puzzlesolver.solver.heuristics.Heuristic; public class IDAStarMM extends IDAStar { private PuzzleState currentState; - private List stateList = new ArrayList<>(); - private List> validRowNumbers = new ArrayList<>(); - private List> validColumnNumbers = new ArrayList<>(); + private final List stateList = new ArrayList<>(); + private final List> validRowNumbers = new ArrayList<>(); + private final List> validColumnNumbers = new ArrayList<>(); public IDAStarMM(Heuristic heuristic) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java index c8715253f9..d742f327cb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java @@ -31,7 +31,7 @@ import net.runelite.client.plugins.puzzlesolver.solver.heuristics.Heuristic; public abstract class Pathfinder { - private Heuristic heuristic; + private final Heuristic heuristic; Pathfinder(Heuristic heuristic) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java index a620a6d8aa..8924e5e9df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.ArrayUtils; @Singleton public class PlayerCountOverlay extends Overlay { - private static int[] CLAN_WARS_REGIONS = {9520, 13135, 13134, 13133, 13131, 13130, 13387, 13386}; + private static final int[] CLAN_WARS_REGIONS = {9520, 13135, 13134, 13133, 13131, 13130, 13387, 13386}; private final PvpToolsPlugin pvpToolsPlugin; private final Client client; @@ -52,25 +52,23 @@ public class PlayerCountOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (pvpToolsPlugin.isCountPlayers()) - { - if ((client.getVar(Varbits.IN_WILDERNESS) == 1) || WorldType.isPvpWorld(client.getWorldType()) + if (pvpToolsPlugin.isCountPlayers() && + (client.getVar(Varbits.IN_WILDERNESS) == 1 || WorldType.isPvpWorld(client.getWorldType()) || ArrayUtils.contains(CLAN_WARS_REGIONS, client.getMapRegions()[0]) || - WorldType.isDeadmanWorld(client.getWorldType())) - { - // Make this stop showing up when its not relevant - TableComponent tableComponent = new TableComponent(); - TableElement[] firstRowElements = { - TableElement.builder().content("Friendly").color(Color.GREEN).build(), - TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()}; - TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build(); - TableElement[] secondRowElements = { - TableElement.builder().content("Enemy").color(Color.RED).build(), - TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()}; - TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build(); - tableComponent.addRows(firstRow, secondRow); - return tableComponent.render(graphics); - } + WorldType.isDeadmanWorld(client.getWorldType()))) + { + // Make this stop showing up when its not relevant + TableComponent tableComponent = new TableComponent(); + TableElement[] firstRowElements = { + TableElement.builder().content("Friendly").color(Color.GREEN).build(), + TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()}; + TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build(); + TableElement[] secondRowElements = { + TableElement.builder().content("Enemy").color(Color.RED).build(), + TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()}; + TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build(); + tableComponent.addRows(firstRow, secondRow); + return tableComponent.render(graphics); } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java index 09e0cccdf1..5aceb68fa7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java @@ -25,7 +25,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class PvpToolsOverlay extends Overlay { - private PvpToolsPlugin pvpToolsPlugin; + private final PvpToolsPlugin pvpToolsPlugin; @Inject private PvpToolsOverlay(final PvpToolsPlugin pvpToolsPlugin) @@ -40,13 +40,10 @@ public class PvpToolsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (pvpToolsPlugin.isFallInHelper()) + if (pvpToolsPlugin.isFallInHelper() && pvpToolsPlugin.fallinHelperEnabled) { - if (pvpToolsPlugin.fallinHelperEnabled) - { - graphics.setFont(FontManager.getRunescapeFont().deriveFont(28)); - OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW); - } + graphics.setFont(FontManager.getRunescapeFont().deriveFont(28)); + OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW); } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java index 1686cd2353..c64dacff12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java @@ -29,23 +29,23 @@ import net.runelite.client.ui.PluginPanel; @Slf4j @Singleton -public class PvpToolsPanel extends PluginPanel +class PvpToolsPanel extends PluginPanel { private final JLabel loggedLabel = new JLabel(); private final JRichTextPane emailLabel = new JRichTextPane(); - JLabel numCC = new JLabel(); - JLabel numOther = new JLabel(); - JLabel numMageJLabel = new JLabel(" "); - JLabel numRangeJLabel = new JLabel(" "); - JLabel numMeleeJLabel = new JLabel(" "); - JLabel totalRiskLabel = new JLabel(" "); - JLabel riskProtectingItem = new JLabel(" "); - JLabel biggestItemLabel = new JLabel("Protected Item: "); - JButton missingPlayers = new JButton("Show missing CC members"); - JButton currentPlayers = new JButton("Show current CC members"); - private JLabel numBrews = new JLabel(); - private JPanel missingPlayersPanel = new JPanel(); + final JLabel numCC = new JLabel(); + final JLabel numOther = new JLabel(); + final JLabel numMageJLabel = new JLabel(" "); + final JLabel numRangeJLabel = new JLabel(" "); + final JLabel numMeleeJLabel = new JLabel(" "); + final JLabel totalRiskLabel = new JLabel(" "); + final JLabel riskProtectingItem = new JLabel(" "); + final JLabel biggestItemLabel = new JLabel("Protected Item: "); + final JButton missingPlayers = new JButton("Show missing CC members"); + final JButton currentPlayers = new JButton("Show current CC members"); + private final JLabel numBrews = new JLabel(); + private final JPanel missingPlayersPanel = new JPanel(); public static String htmlLabel(String key, String value) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index ad858dccf8..b0b7d100f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -97,7 +97,7 @@ public class PvpToolsPlugin extends Plugin @Inject private ItemManager itemManager; - private PvpToolsPlugin uhPvpToolsPlugin = this; + private final PvpToolsPlugin uhPvpToolsPlugin = this; /** * ActionListener for the missing cc members and refresh buttons @@ -195,12 +195,9 @@ public class PvpToolsPlugin extends Plugin if (!Objects.isNull(clanMember)) { List arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList()); - if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername())))) + if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !missingMembers.contains(clanMember.getUsername())) { - if (!missingMembers.contains(clanMember.getUsername())) - { - missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername()); - } + missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername()); } } } @@ -217,12 +214,9 @@ public class PvpToolsPlugin extends Plugin if (!Objects.isNull(clanMember)) { List arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList()); - if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername())))) + if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !currentMembers.contains(clanMember.getUsername())) { - if (!currentMembers.contains(clanMember.getUsername())) - { - currentMembers.add(clanMember.getUsername()); - } + currentMembers.add(clanMember.getUsername()); } } } @@ -370,12 +364,9 @@ public class PvpToolsPlugin extends Plugin { getCarriedWealth(); } - if (event.getGameState().equals(GameState.LOGGED_IN)) + if (event.getGameState().equals(GameState.LOGGED_IN) && this.countPlayers) { - if (this.countPlayers) - { - updatePlayers(); - } + updatePlayers(); } } @@ -478,25 +469,20 @@ public class PvpToolsPlugin extends Plugin overheadCount = new int[]{0, 0, 0}; for (Player p : client.getPlayers()) { - if (Objects.nonNull(p)) + if (Objects.nonNull(p) && PvPUtil.isAttackable(client, p) && + !p.isClanMember() && !(p.getOverheadIcon() == null)) { - if (PvPUtil.isAttackable(client, p)) + switch (p.getOverheadIcon()) { - if (!p.isClanMember() && !(p.getOverheadIcon() == null)) - { - switch (p.getOverheadIcon()) - { - case MAGIC: - overheadCount[0]++; - break; - case RANGED: - overheadCount[1]++; - break; - case MELEE: - overheadCount[2]++; - break; - } - } + case MAGIC: + overheadCount[0]++; + break; + case RANGED: + overheadCount[1]++; + break; + case MELEE: + overheadCount[2]++; + break; } } } @@ -548,12 +534,9 @@ public class PvpToolsPlugin extends Plugin panel.totalRiskLabel.repaint(); int itemLimit = 0; - if (client.getLocalPlayer().getSkullIcon() != null) + if (client.getLocalPlayer().getSkullIcon() != null && client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL) { - if (client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL) - { - itemLimit = 1; - } + itemLimit = 1; } if (client.getLocalPlayer().getSkullIcon() == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index 7c75d11ff7..f12911344c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -38,19 +38,9 @@ import lombok.Getter; import net.runelite.api.Client; import static net.runelite.api.Constants.GAME_TICK_LENGTH; import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE; -import static net.runelite.api.ObjectID.GRAND_GOLD_CHEST; -import static net.runelite.api.ObjectID.OPENED_GOLD_CHEST; -import static net.runelite.api.ObjectID.SARCOPHAGUS_21255; -import static net.runelite.api.ObjectID.SARCOPHAGUS_21256; import static net.runelite.api.ObjectID.SPEARTRAP_21280; import static net.runelite.api.ObjectID.TOMB_DOOR_20948; import static net.runelite.api.ObjectID.TOMB_DOOR_20949; -import static net.runelite.api.ObjectID.URN_21261; -import static net.runelite.api.ObjectID.URN_21262; -import static net.runelite.api.ObjectID.URN_21263; -import static net.runelite.api.ObjectID.URN_21265; -import static net.runelite.api.ObjectID.URN_21266; -import static net.runelite.api.ObjectID.URN_21267; import net.runelite.api.Player; import net.runelite.api.Tile; import net.runelite.api.TileObject; @@ -90,21 +80,21 @@ public class PyramidPlunderPlugin extends Plugin static final int CLOSED_DOOR = TOMB_DOOR_20948; static final int OPENED_DOOR = TOMB_DOOR_20949; - // Next 2 are in here for anyone who wants to spend more time on this - private static final Set LOOTABLE = ImmutableSet.of( - GRAND_GOLD_CHEST, - SARCOPHAGUS_21255, - URN_21261, - URN_21262, - URN_21263 - ); - private static final Set LOOTED = ImmutableSet.of( - OPENED_GOLD_CHEST, - SARCOPHAGUS_21256, - URN_21265, - URN_21266, - URN_21267 - ); +// // Next 2 are in here for anyone who wants to spend more time on this +// private static final Set LOOTABLE = ImmutableSet.of( +// GRAND_GOLD_CHEST, +// SARCOPHAGUS_21255, +// URN_21261, +// URN_21262, +// URN_21263 +// ); +// private static final Set LOOTED = ImmutableSet.of( +// OPENED_GOLD_CHEST, +// SARCOPHAGUS_21256, +// URN_21265, +// URN_21266, +// URN_21267 +// ); private static final Set DOOR_WALL_IDS = ImmutableSet.of( 26618, 26619, 26620, 26621 ); 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 3d9bd03579..2f0fb9b415 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 @@ -182,12 +182,9 @@ public class QuestListPlugin extends Plugin @Subscribe public void onVarClientIntChanged(VarClientIntChanged varClientIntChanged) { - if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex()) + if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex() && isChatboxOpen() && isNotOnQuestTab()) { - if (isChatboxOpen() && isNotOnQuestTab()) - { - chatboxPanelManager.close(); - } + chatboxPanelManager.close(); } } @@ -314,11 +311,10 @@ public class QuestListPlugin extends Plugin Collection quests = questSet.get(questContainer); - if (quests != null) - { + if (quests != null && // Check to make sure the list hasn't been rebuild since we were last her // Do this by making sure the list's dynamic children are the same as when we last saw them - if (quests.stream().noneMatch(w -> + quests.stream().noneMatch(w -> { Widget codeWidget = w.getQuest(); if (codeWidget == null) @@ -327,9 +323,8 @@ public class QuestListPlugin extends Plugin } return list.getChild(codeWidget.getIndex()) == codeWidget; })) - { - quests = null; - } + { + quests = null; } if (quests == null) @@ -359,7 +354,7 @@ public class QuestListPlugin extends Plugin else { // Otherwise hide if it doesn't match the filter state - hidden = currentFilterState != QuestState.ALL && questState != currentFilterState; + hidden = currentFilterState != QuestState.ALL && questState != null && !questState.equals(currentFilterState); } quest.setHidden(hidden); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java index dfc56c30c4..33e4ebbd24 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java @@ -109,7 +109,7 @@ public class Raid } } - return combatRooms.toArray(new RaidRoom[combatRooms.size()]); + return combatRooms.toArray(new RaidRoom[0]); } String getRotationString() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 4c4afc9bec..4ccbc18ee8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -33,6 +33,7 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; @@ -75,8 +76,8 @@ public class RaidsOverlay extends Overlay private final ItemManager itemManager; private final SpriteManager spriteManager; private final PanelComponent panelImages = new PanelComponent(); - private Client client; - private RaidsPlugin plugin; + private final Client client; + private final RaidsPlugin plugin; @Setter(AccessLevel.PACKAGE) private boolean sharable = false; @Getter(AccessLevel.PACKAGE) @@ -161,7 +162,7 @@ public class RaidsOverlay extends Overlay boolean vanguards = false; boolean unknownCombat = false; String puzzles = ""; - String roomName = ""; + String roomName; for (Room layoutRoom : plugin.getRaid().getLayout().getRooms()) { int position = layoutRoom.getPosition(); @@ -177,7 +178,7 @@ public class RaidsOverlay extends Overlay case COMBAT: combatCount++; roomName = room.getBoss().getName(); - switch (RaidRoom.Boss.fromString(roomName)) + switch (Objects.requireNonNull(RaidRoom.Boss.fromString(roomName))) { case VANGUARDS: vanguards = true; @@ -189,7 +190,7 @@ public class RaidsOverlay extends Overlay break; case PUZZLE: roomName = room.getPuzzle().getName(); - switch (RaidRoom.Puzzle.fromString(roomName)) + switch (Objects.requireNonNull(RaidRoom.Puzzle.fromString(roomName))) { case CRABS: crabs = true; @@ -324,12 +325,9 @@ public class RaidsOverlay extends Overlay String bossName = room.getBoss().getName(); String bossNameLC = bossName.toLowerCase(); - if (plugin.isShowRecommendedItems()) + if (plugin.isShowRecommendedItems() && plugin.getRecommendedItemsList().get(bossNameLC) != null) { - if (plugin.getRecommendedItemsList().get(bossNameLC) != null) - { - imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC)); - } + imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC)); } tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(bossName, color)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java index 2c16219f06..a053396af6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java @@ -46,9 +46,9 @@ class RaidsPanel extends PluginPanel @Inject private RaidsPlugin raidsPlugin; - private JButton reloadButton = new JButton("Reload Instance"); - private JButton reloadScouter = new JButton("Reload Raid Overlay"); - private JLabel reloadMessage = new JLabel("

Instance Reload Helper

Reloading an instance will cause your client to disconnect temporarily.
"); + private final JButton reloadButton = new JButton("Reload Instance"); + private final JButton reloadScouter = new JButton("Reload Raid Overlay"); + private final JLabel reloadMessage = new JLabel("

Instance Reload Helper

Reloading an instance will cause your client to disconnect temporarily.
"); void init() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index fd465aa6bd..6794ebe2cb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -96,6 +96,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.Text; import org.apache.commons.lang3.StringUtils; +import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; @PluginDescriptor( name = "CoX Scouter", @@ -148,13 +149,13 @@ public class RaidsPlugin extends Plugin private static final String TRIPLE_PUZZLE = "SFCCPC.PCSCPF - #WSEENES#WWWNEEE"; //good crabs first rare crabs second rare crabs third private static final Pattern PUZZLES = Pattern.compile("Puzzle - (\\w+)"); @Getter(AccessLevel.PACKAGE) - private final ArrayList roomWhitelist = new ArrayList<>(); + private final List roomWhitelist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private final ArrayList roomBlacklist = new ArrayList<>(); + private final List roomBlacklist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private final ArrayList rotationWhitelist = new ArrayList<>(); + private final List rotationWhitelist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private final ArrayList layoutWhitelist = new ArrayList<>(); + private final List layoutWhitelist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) private final Map> recommendedItemsList = new HashMap<>(); @Inject @@ -814,11 +815,11 @@ public class RaidsPlugin extends Plugin } } - private void updateList(ArrayList list, String input) + private void updateList(List list, String input) { list.clear(); - if (list == rotationWhitelist) + if (list.equals(rotationWhitelist)) { Matcher m = ROTATION_REGEX.matcher(input); while (m.find()) @@ -1103,10 +1104,10 @@ public class RaidsPlugin extends Plugin StringBuilder builder = new StringBuilder(); if (seconds >= 3600) { - builder.append((int) Math.floor(seconds / 3600) + ";"); + builder.append((int) Math.floor(seconds / 3600)).append(";"); } seconds %= 3600; - if (builder.toString().equals("")) + if (builder.length() == 0) { builder.append((int) Math.floor(seconds / 60)); } @@ -1216,14 +1217,12 @@ public class RaidsPlugin extends Plugin String recordRaid() { - if (raid.getRotationString().toLowerCase().equals("vasa,tekton,vespula") - && raid.getFullRotationString().toLowerCase().contains("crabs") - && raid.getFullRotationString().toLowerCase().contains("tightrope")) + if (raid.getRotationString().equalsIgnoreCase("vasa,tekton,vespula") + && containsIgnoreCase(raid.getFullRotationString(), "crabs") + && containsIgnoreCase(raid.getFullRotationString(), "tightrope") + && goodCrabs != null) { - if (goodCrabs != null) - { - return goodCrabs; - } + return goodCrabs; } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java index fe32ceaf76..e53a7326c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java @@ -97,7 +97,7 @@ public class RotationSolver } } - if (match != null && match != rotation) + if (match != null && match.equals(rotation)) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java index 4f59a5c241..efef1cb773 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeSet; import static net.runelite.client.plugins.raidsthieving.BatSolver.SolutionSet.SOLUTION_SETS; @@ -37,7 +38,7 @@ public class BatSolver private Map numberOfSolutionsWithPoison; private final SolutionSet solution; - private final HashSet grubsChests; + private final Set grubsChests; public BatSolver(final ThievingRoomType roomType) { @@ -59,9 +60,9 @@ public class BatSolver calculateChanceOfPoison(); } - public TreeSet matchSolutions() + public Set matchSolutions() { - TreeSet possibleEmptyChests = new TreeSet<>(); + Set possibleEmptyChests = new TreeSet<>(); for (SolutionSet knownSolution : SolutionSet.SOLUTION_SETS) { if (knownSolution.getType() == solution.getType() && matchSolution(knownSolution)) @@ -100,7 +101,7 @@ public class BatSolver return matchesAll && everMatched; } - public ThievingRoomType getType() + private ThievingRoomType getType() { return solution.getType(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java index 8cf12f817a..9e25a8b5d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java @@ -256,5 +256,5 @@ public class ChestIdentifier chest.setChestId(id); } - private Map chestIds; + private final Map chestIds; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java index 03c34ce7c0..4ac35ebf47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java @@ -28,7 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Map; -import java.util.TreeSet; +import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -94,13 +94,10 @@ public class ChestOverlay extends Overlay if (chest != null) { - if (!plugin.isBatsFound() && !chest.isEverOpened()) + if (!plugin.isBatsFound() && !chest.isEverOpened() && shouldDrawChest(pos)) { - if (shouldDrawChest(pos)) - { - Color drawColor = new Color(setAlphaComponent(plugin.getGetPotentialBatColor().getRGB(), getChestOpacity(pos))); - drawCircleOnTrap(graphics, chest, drawColor); - } + Color drawColor = new Color(setAlphaComponent(plugin.getGetPotentialBatColor().getRGB(), getChestOpacity(pos))); + drawCircleOnTrap(graphics, chest, drawColor); } if (chest.isPoison()) { @@ -120,7 +117,7 @@ public class ChestOverlay extends Overlay BatSolver solver = plugin.getSolver(); if (solver != null && chestId != -1) { - TreeSet matches = solver.matchSolutions(); + Set matches = solver.matchSolutions(); return matches.contains(chestId) || matches.size() == 0; } return true; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java index 8ab527ebe8..a898ef4df0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.raidsthieving; -public class RaidsThievingConstants +class RaidsThievingConstants { static final int CLOSED_CHEST_ID = 29742; static final int OPEN_EMPTY_CHEST = 29743; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java index c96e12c0cf..f95edccb1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java @@ -53,7 +53,7 @@ public class RegenMeterOverlay extends Overlay private static final Stroke STROKE = new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER); private final Client client; - private RegenMeterPlugin plugin; + private final RegenMeterPlugin plugin; private Rectangle getBounds(WidgetInfo widgetInfo) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java index e518f4814b..59c2c9428e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java @@ -42,7 +42,7 @@ import static net.runelite.api.ObjectID.WALL_7249; class Obstacles { - public static final Set OBSTACLE_IDS_HULL = Sets.newHashSet( + static final Set OBSTACLE_IDS_HULL = Sets.newHashSet( SPINNING_BLADES_7224, CONTORTION_BARS, PENDULUM, @@ -52,7 +52,7 @@ class Obstacles NULL_7235 /*Wall safe*/ ); - public static final Set OBSTACLE_IDS_TILE = Sets.newHashSet( + static final Set OBSTACLE_IDS_TILE = Sets.newHashSet( FLOOR, /*Floor spikes*/ WALL_7228, /*Wall spikes*/ WALL_7229, /*Wall spears*/ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java index 0d7583ea7e..163682223b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.roguesden; import java.util.HashMap; +import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -58,10 +59,10 @@ import net.runelite.client.ui.overlay.OverlayManager; public class RoguesDenPlugin extends Plugin { @Getter(AccessLevel.PACKAGE) - private final HashMap obstaclesHull = new HashMap<>(); + private final Map obstaclesHull = new HashMap<>(); @Getter(AccessLevel.PACKAGE) - private final HashMap obstaclesTile = new HashMap<>(); + private final Map obstaclesTile = new HashMap<>(); @Getter(AccessLevel.PACKAGE) private boolean hasGem; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java index 29ea78ad00..aafce938f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java @@ -163,7 +163,7 @@ class AbyssOverlay extends Overlay } } - public BufferedImage getImage(AbyssRifts rift) + private BufferedImage getImage(AbyssRifts rift) { BufferedImage image = abyssIcons.get(rift); if (image != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index f42c10102b..29f3ae2523 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -206,12 +206,9 @@ public class RunecraftPlugin extends Plugin return; } - if (this.degradingNotification) + if (this.degradingNotification && event.getMessage().contains(POUCH_DECAYED_MESSAGE)) { - if (event.getMessage().contains(POUCH_DECAYED_MESSAGE)) - { - notifier.notify(POUCH_DECAYED_NOTIFICATION_MESSAGE); - } + notifier.notify(POUCH_DECAYED_NOTIFICATION_MESSAGE); } } @@ -356,7 +353,7 @@ public class RunecraftPlugin extends Plugin public void onNpcDespawned(NpcDespawned event) { final NPC npc = event.getNpc(); - if (npc == darkMage) + if (npc != null && npc.equals(darkMage)) { darkMage = null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java index 0756a6d4b6..593151484a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java @@ -28,7 +28,7 @@ import java.awt.Color; import static java.awt.Color.RED; import java.awt.Dimension; import java.awt.Graphics2D; -import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -70,17 +70,13 @@ class RunedokuOverlay extends Overlay final Widget sudokuScreen = client.getWidget(288, 131); - if (sudokuScreen != null) + if (sudokuScreen != null && !sudokuScreen.isHidden()) { - if (!sudokuScreen.isHidden()) - { - Sudoku sudoku = new Sudoku(util.createTable(client)); - boolean solved = sudoku.solve(); - - renderReferenceRunes(graphics, solved); - renderSolvedPuzzle(graphics, sudoku, solved); - } + Sudoku sudoku = new Sudoku(util.createTable(client)); + boolean solved = sudoku.solve(); + renderReferenceRunes(graphics, solved); + renderSolvedPuzzle(graphics, sudoku, solved); } return null; @@ -126,7 +122,7 @@ class RunedokuOverlay extends Overlay */ private void renderSolvedPuzzle(Graphics2D graphics, Sudoku sudoku, boolean solved) { - ArrayList simpleArr = util.makeSimple(sudoku.getBoard()); + List simpleArr = util.makeSimple(sudoku.getBoard()); //highlight each cell to tell you which piece to place int iteration = 0; for (int i = 10; i < 91; i++) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java index d8e75ca1dd..d19b5845b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java @@ -57,7 +57,7 @@ public enum RunedokuPiece this.pieceForSudoku = pieceForSudoku; } - int getId() + private int getId() { return pieceID; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java index 3c7b51564d..1687eb5a05 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Polygon; import java.awt.Rectangle; import java.util.ArrayList; +import java.util.List; import java.util.Objects; import javax.inject.Inject; import net.runelite.api.Client; @@ -105,9 +106,9 @@ class RunedokuUtil * @param board * @return */ - ArrayList makeSimple(int[][] board) + List makeSimple(int[][] board) { - ArrayList list = new ArrayList<>(); + List list = new ArrayList<>(); for (int i = 0; i < 9; i++) { for (int ii = 0; ii < 9; ii++) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java index e763013b3e..53711c8dc4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java @@ -5,11 +5,11 @@ package net.runelite.client.plugins.runedoku; * * @author ? */ -public class Sudoku +class Sudoku { - private int[][] board; - public static final int EMPTY = 0; + private final int[][] board; + private static final int EMPTY = 0; private static final int SIZE = 9; Sudoku(final int[][] board) @@ -102,17 +102,6 @@ public class Sudoku return true; } - public void display() - { - for (int i = 0; i < SIZE; i++) - { - for (int j = 0; j < SIZE; j++) - { - System.out.print(" " + board[i][j]); - } - } - } - int[][] getBoard() { return board; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index 769266f69c..cf011407f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -36,7 +36,6 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.RuneLiteProperties; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.discord.DiscordService; @@ -91,9 +90,6 @@ public class RuneLitePlusPlugin extends Plugin } } - @Inject - private RuneLiteProperties runeLiteProperties; - @Inject private RuneLitePlusConfig config; @@ -109,7 +105,7 @@ public class RuneLitePlusPlugin extends Plugin @Inject private ClientThread clientThread; - private RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener(); + private final RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener(); private int entered = -1; private int enterIdx; private boolean expectInput; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java index 81ab24eb1d..8ef9debda1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java @@ -335,7 +335,6 @@ public class RunEnergyPlugin extends Plugin } // Calculate the number of seconds left - final double secondsLeft = (100 - client.getEnergy()) / recoverRate; - return (int) secondsLeft; + return (int) ((100 - client.getEnergy()) / recoverRate); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java index bb12d9b191..2eedef5440 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java @@ -42,25 +42,19 @@ public class SafeSpotOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (safeSpotPlugin.isSafeSpotsRenderable()) + if (safeSpotPlugin.isSafeSpotsRenderable() && safeSpotPlugin.getSafeSpotList() != null && safeSpotPlugin.getSafeSpotList().size() > 0) { - if (safeSpotPlugin.getSafeSpotList() != null) + safeSpotPlugin.getSafeSpotList().forEach(tile -> { - if (safeSpotPlugin.getSafeSpotList().size() > 0) + if (tile != null && tile.getLocalLocation() != null) { - safeSpotPlugin.getSafeSpotList().forEach(tile -> + final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation()); + if (poly != null) { - if (tile != null && tile.getLocalLocation() != null) - { - final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation()); - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor()); - } - } - }); + OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor()); + } } - } + }); } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java index e95934a145..bc2ea6d984 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java @@ -56,7 +56,7 @@ public class SafeSpotPlugin extends Plugin private SafeSpotConfig config; @Getter(AccessLevel.PACKAGE) - private ArrayList safeSpotList; + private List safeSpotList; @Getter(AccessLevel.PACKAGE) private boolean safeSpotsRenderable = false; @@ -151,9 +151,9 @@ public class SafeSpotPlugin extends Plugin * @param worldPoints - Worldpoints in the current scene * @return an ArrayList of Tiles where current player can attack actor but actor cannot attack local player */ - private ArrayList getSafeSpotList(Actor actor, List worldPoints) + private List getSafeSpotList(Actor actor, List worldPoints) { - ArrayList safeSpotList = new ArrayList<>(); + List safeSpotList = new ArrayList<>(); Tile[][][] tiles = client.getScene().getTiles(); for (WorldPoint w : worldPoints) { @@ -172,16 +172,14 @@ public class SafeSpotPlugin extends Plugin { bit = Objects.requireNonNull(client.getCollisionMaps())[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()]; } - if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile)) - { - if (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT || + if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile) && + (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT || (bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION) == CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION || (bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR) == CollisionDataFlag.BLOCK_MOVEMENT_FLOOR || - (bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL)) - { - safeSpotList.add(toTile); - } + (bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL))) + { + safeSpotList.add(toTile); } } return safeSpotList; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java index 15d7d735e7..4bb242a575 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java @@ -38,7 +38,7 @@ import net.runelite.client.ui.overlay.OverlayPriority; @Singleton public class ScreenMarkerCreationOverlay extends Overlay { - private ScreenMarkerPlugin plugin; + private final ScreenMarkerPlugin plugin; @Inject private ScreenMarkerCreationOverlay(final ScreenMarkerPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java index 93b1350999..3bb1d8e28e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java @@ -30,7 +30,7 @@ import javax.swing.SwingUtilities; import net.runelite.client.input.MouseAdapter; @Singleton -public class ScreenMarkerMouseListener extends MouseAdapter +class ScreenMarkerMouseListener extends MouseAdapter { private final ScreenMarkerPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java index 8f3fe97d3b..5be2693d28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java @@ -86,7 +86,7 @@ public class ScreenMarkerPluginPanel extends PluginPanel ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f)); } - public void init() + private void init() { setLayout(new BorderLayout()); setBorder(new EmptyBorder(10, 10, 10, 10)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index e1aeb37d68..453c7f4597 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -199,7 +199,7 @@ public class ScreenshotPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private BufferedImage reportButton; - private Map dying = new HashMap<>(); + private final Map dying = new HashMap<>(); private NavigationButton titleBarButton; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java deleted file mode 100644 index c417f413b8..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.runelite.client.plugins.shiftwalker; - -// import java.util.HashSet; - -public final class ShiftWalkerGroups -{ - /*//Specific Targets to limit the walking to - private static final String BOX_TRAP = "BOX TRAP"; - private static final String BOX_TRAP_SHAKING = "SHAKING BOX"; - - //Specific menu options to replace - private static final String BOX_TRAP_DISMANTLE = "DISMANTLE"; - private static final String BOX_TRAP_CHECK = "CHECK"; - - private static final String ATTACK_OPTIONS_ATTACK = "ATTACK"; - - public static final HashSet BOX_TRAP_TARGETS = new HashSet<>(); - public static final HashSet BOX_TRAP_KEYWORDS = new HashSet<>(); - public static final HashSet ATTACK_OPTIONS_KEYWORDS = new HashSet<>(); - - static - { - BOX_TRAP_TARGETS.add(BOX_TRAP); - BOX_TRAP_TARGETS.add(BOX_TRAP_SHAKING); - - BOX_TRAP_KEYWORDS.add(BOX_TRAP_DISMANTLE); - BOX_TRAP_KEYWORDS.add(BOX_TRAP_CHECK); - - ATTACK_OPTIONS_KEYWORDS.add(ATTACK_OPTIONS_ATTACK); - }*/ - -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java index 6b6560ca61..b48841dc16 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java @@ -30,7 +30,7 @@ import javax.inject.Singleton; import net.runelite.client.input.KeyListener; @Singleton -public class ShiftWalkerInputListener implements KeyListener +class ShiftWalkerInputListener implements KeyListener { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index 5216d24ace..ac7d985013 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -77,17 +77,17 @@ public class BankedCalculator extends JPanel private Skill currentSkill; private double totalBankedXp = 0.0f; - private JLabel totalLabel = new JLabel(); - private JPanel detailConfigContainer; - private JPanel detailContainer; + private final JLabel totalLabel = new JLabel(); + private final JPanel detailConfigContainer; + private final JPanel detailContainer; // Banked Experience magic private Map bankMap = new HashMap<>(); - private Map categoryMap = new HashMap<>(); // Check if CriticalItem Category is enabled - private Map panelMap = new HashMap<>(); - private Map criticalMap = new HashMap<>(); // Quantity of CriticalItem inside bankMap - private Map activityMap = new HashMap<>(); // Selected Activity used for calculating xp - private Map linkedMap = new HashMap<>(); // ItemID of item that links to the CriticalItem + private final Map categoryMap = new HashMap<>(); // Check if CriticalItem Category is enabled + private final Map panelMap = new HashMap<>(); + private final Map criticalMap = new HashMap<>(); // Quantity of CriticalItem inside bankMap + private final Map activityMap = new HashMap<>(); // Selected Activity used for calculating xp + private final Map linkedMap = new HashMap<>(); // ItemID of item that links to the CriticalItem BankedCalculator( final SkillCalculatorPanel parent, @@ -256,7 +256,7 @@ public class BankedCalculator extends JPanel private void calculatedBankedMaps() { // Grab all CriticalItems for this skill - ArrayList items = CriticalItem.getBySkillName(currentSkill); + List items = CriticalItem.getBySkillName(currentSkill); // Loop over all Critical Items for this skill and determine how many are in the bank for (CriticalItem item : items) @@ -331,12 +331,9 @@ public class BankedCalculator extends JPanel } // One activity and rewards no xp ignore. - if (activities.size() == 1) + if (activities.size() == 1 && activities.get(0).getXp() <= 0) { - if (activities.get(0).getXp() <= 0) - { - return; - } + return; } } @@ -414,7 +411,7 @@ public class BankedCalculator extends JPanel for (String category : CriticalItem.getSkillCategories(currentSkill)) { - ArrayList items = CriticalItem.getItemsForSkillCategories(currentSkill, category); + List items = CriticalItem.getItemsForSkillCategories(currentSkill, category); for (CriticalItem item : items) { Integer amount = bankMap.get(item.getItemID()); @@ -438,7 +435,7 @@ public class BankedCalculator extends JPanel { // This is triggered on every click so don't update if activity didn't actually change Activity cur = activityMap.get(i); - if (cur == a) + if (cur != null && cur.equals(a)) { return; } @@ -448,19 +445,16 @@ public class BankedCalculator extends JPanel // If had a previous selection and this item links to another check for item prevention change. // If there are changes adjust the Linked panel quantity as well - if (cur != null && i.getLinkedItemId() != -1) + if (cur != null && i.getLinkedItemId() != -1 && cur.isPreventLinked() != a.isPreventLinked()) { - if (cur.isPreventLinked() != a.isPreventLinked()) + CriticalItem linked = CriticalItem.getByItemId(i.getLinkedItemId()); + CriticalItemPanel l = panelMap.get(linked); + if (l != null) { - CriticalItem linked = CriticalItem.getByItemId(i.getLinkedItemId()); - CriticalItemPanel l = panelMap.get(linked); - if (l != null) - { - l.updateLinkedMap(getLinkedTotalMap(linked)); - int amount = config.limitedBankedSecondaries() ? limitToActivitySecondaries(a, l.getAmount()) : l.getAmount(); - l.updateAmount(amount, false); - l.recalculate(); - } + l.updateLinkedMap(getLinkedTotalMap(linked)); + int amount = config.limitedBankedSecondaries() ? limitToActivitySecondaries(a, l.getAmount()) : l.getAmount(); + l.updateAmount(amount, false); + l.recalculate(); } } @@ -500,13 +494,11 @@ public class BankedCalculator extends JPanel // This item has an activity selected and its preventing linked functionality? Activity selected = activityMap.get(i); - if (selected != null && selected.isPreventLinked()) - { + if (selected != null && selected.isPreventLinked() // If initial request is for this item - if (!first) - { - return map; - } + && !first) + { + return map; } // Add self to map @@ -547,7 +539,13 @@ public class BankedCalculator extends JPanel if (oldMapFlag) { CalculatorType calc = CalculatorType.getBySkill(currentSkill); - SwingUtilities.invokeLater(() -> openBanked(calc)); + SwingUtilities.invokeLater(() -> + { + if (calc != null) + { + openBanked(calc); + } + }); return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index ca0c650c0f..e0b614a95a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -74,7 +74,7 @@ class SkillCalculator extends JPanel @Getter(AccessLevel.PACKAGE) private final UICombinedActionSlot combinedActionSlot; @Getter(AccessLevel.PACKAGE) - private final ArrayList combinedActionSlots = new ArrayList<>(); + private final List combinedActionSlots = new ArrayList<>(); private final List bonusCheckBoxes = new ArrayList<>(); private final IconTextField searchBar = new IconTextField(); @@ -270,7 +270,7 @@ class SkillCalculator extends JPanel for (JCheckBox checkBox : uiCheckBoxList) { - if (checkBox != uiCheckBox) + if (checkBox != null && !checkBox.equals(uiCheckBox)) { checkBox.setSelected(false); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java index c337470c32..79684db069 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java @@ -32,6 +32,7 @@ import java.awt.GridBagLayout; import java.awt.GridLayout; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Singleton; @@ -64,10 +65,10 @@ class SkillCalculatorPanel extends PluginPanel private final MaterialTabGroup skillGroup; private final MaterialTabGroup tabGroup; private String currentTab; - private ArrayList tabs = new ArrayList<>(); + private final List tabs = new ArrayList<>(); @Getter private Map bankMap = new HashMap<>(); - private GridBagConstraints c; + private final GridBagConstraints c; SkillCalculatorPanel(final SkillIconManager iconManager, final Client client, final SkillCalculatorConfig config, final SpriteManager spriteManager, final ItemManager itemManager) { @@ -123,7 +124,7 @@ class SkillCalculatorPanel extends PluginPanel MaterialTab tab = new MaterialTab(icon, skillGroup, null); tab.setOnSelectEvent(() -> { - if (currentCalc == calculatorType) + if (currentCalc != null && currentCalc.equals(calculatorType)) { return true; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java index 688a00d3c6..983526c59a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator.banked; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import lombok.Getter; @@ -320,9 +321,9 @@ public enum CriticalItem } // Builds a Map to reduce looping frequency - private static Map> buildSkillItemMap() + private static Map> buildSkillItemMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (CriticalItem item : values()) { map.computeIfAbsent(item.getSkill(), e -> new ArrayList<>()).add(item); @@ -331,9 +332,9 @@ public enum CriticalItem return map; } - private static final Map> bySkillName = buildSkillItemMap(); + private static final Map> bySkillName = buildSkillItemMap(); - public static ArrayList getBySkillName(Skill skill) + public static List getBySkillName(Skill skill) { return bySkillName.get(skill); } @@ -358,9 +359,9 @@ public enum CriticalItem } // Builds a Map to reduce looping frequency - private static Map> buildItemSkillCategoryMap() + private static Map> buildItemSkillCategoryMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (CriticalItem item : values()) { String key = item.getCategory() + item.skill.getName(); @@ -370,9 +371,9 @@ public enum CriticalItem return map; } - private static final Map> itemsBySkillCategory = buildItemSkillCategoryMap(); + private static final Map> itemsBySkillCategory = buildItemSkillCategoryMap(); - public static ArrayList getItemsForSkillCategories(Skill skill, String category) + public static List getItemsForSkillCategories(Skill skill, String category) { return itemsBySkillCategory.get(category + skill.getName()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java index 8d2b122119..080dad9cb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.skillcalculator.banked.beans; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import lombok.AccessLevel; import lombok.Getter; @@ -377,7 +378,7 @@ public enum Activity private static final Map> byCriticalItem = buildItemMap(); - public static ArrayList getByCriticalItem(CriticalItem item) + public static List getByCriticalItem(CriticalItem item) { return byCriticalItem.getOrDefault(item, new ArrayList<>()); @@ -390,10 +391,10 @@ public enum Activity * @param limitLevel Level to check Activitiy requirements against. -1 or 0 value disables limits * @return an empty list if no activities */ - public static ArrayList getByCriticalItem(CriticalItem item, int limitLevel) + public static List getByCriticalItem(CriticalItem item, int limitLevel) { - ArrayList activities = getByCriticalItem(item); - ArrayList l = new ArrayList<>(); + List activities = getByCriticalItem(item); + List l = new ArrayList<>(); if (limitLevel <= 0) { return l; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java index a6af1138ef..1b12419ec0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java @@ -36,7 +36,6 @@ import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; @@ -298,7 +297,7 @@ public class CriticalItemPanel extends JPanel private JPanel createActivitiesPanel() { - ArrayList activities = Activity.getByCriticalItem(item); + List activities = Activity.getByCriticalItem(item); if (activities == null || activities.size() == 1) { return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index be720fa9e3..2c9e181905 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -142,7 +142,7 @@ public class SlayerPlugin extends Plugin // Superiors @VisibleForTesting - static List SUPERIOR_SLAYER_MONSTERS = Arrays.asList( + static final List SUPERIOR_SLAYER_MONSTERS = Arrays.asList( "crushing hand", "chasm crawler", "screaming banshee", @@ -239,10 +239,10 @@ public class SlayerPlugin extends Plugin private int cachedPoints; private Instant infoTimer; private List targetNames = new ArrayList<>(); - private List targetIds = new ArrayList<>(); + private final List targetIds = new ArrayList<>(); private boolean checkAsTokens = true; - private List lingeringPresences = new ArrayList<>(); + private final List lingeringPresences = new ArrayList<>(); private SlayerXpDropLookup slayerXpDropLookup = null; private SlayerTaskPanel panel; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java index 2f8776b200..75e7c8327a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java @@ -277,8 +277,8 @@ class TaskBox extends JPanel return Long.MAX_VALUE; } double timePerKill = ((double) taskData.getElapsedTime()) / ((double) killsInElapsedTime); - double remainingTime = timePerKill * taskData.getAmount(); - return (long) remainingTime; + + return (long) timePerKill * taskData.getAmount(); } private static String htmlLabel(long timeMillis) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java index 59b1b31e8c..e14b883286 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java @@ -159,8 +159,8 @@ class QuestGuideLinks private static class Link { - private String questName; - private String url; + private final String questName; + private final String url; Link(String questName, String url) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java index 45095c18f7..f90e7b271e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java @@ -2,7 +2,7 @@ package net.runelite.client.plugins.spawntimer; import net.runelite.api.NPC; -public class thing +class thing { private NPC npc; private int tick; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java index fef53c1ea8..3f164f87b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java @@ -159,20 +159,17 @@ public class SpecialCounterPlugin extends Plugin int deltaExperience = hpXp - specialHitpointsExperience; specialHitpointsExperience = -1; - if (deltaExperience > 0) + if (deltaExperience > 0 && specialWeapon != null) { - if (specialWeapon != null) + int hit = getHit(specialWeapon, deltaExperience); + + updateCounter(specialWeapon, null, hit); + + if (!party.getMembers().isEmpty()) { - int hit = getHit(specialWeapon, deltaExperience); - - updateCounter(specialWeapon, null, hit); - - if (!party.getMembers().isEmpty()) - { - final SpecialCounterUpdate specialCounterUpdate = new SpecialCounterUpdate(interactingId, specialWeapon, hit); - specialCounterUpdate.setMemberId(party.getLocalMember().getMemberId()); - wsClient.send(specialCounterUpdate); - } + final SpecialCounterUpdate specialCounterUpdate = new SpecialCounterUpdate(interactingId, specialWeapon, hit); + specialCounterUpdate.setMemberId(party.getLocalMember().getMemberId()); + wsClient.send(specialCounterUpdate); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java index 5ac75aae56..4bb3a8cacc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java @@ -41,9 +41,9 @@ import net.runelite.client.ui.overlay.OverlayPriority; @Singleton public class SpellbookDragOverlay extends Overlay { - private SpellbookPlugin plugin; - private Client client; - private SpriteManager spriteManager; + private final SpellbookPlugin plugin; + private final Client client; + private final SpriteManager spriteManager; @Inject private SpellbookDragOverlay(final SpellbookPlugin plugin, final Client client, final SpriteManager spriteManager) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java index 01db4f79e5..562bf74679 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java @@ -32,7 +32,7 @@ import net.runelite.client.input.MouseAdapter; import net.runelite.client.input.MouseWheelListener; @Singleton -public class SpellbookMouseListener extends MouseAdapter implements MouseWheelListener +class SpellbookMouseListener extends MouseAdapter implements MouseWheelListener { private final SpellbookPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index fc5d766385..0502330b79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -129,7 +129,7 @@ public class SpellbookPlugin extends Plugin @Getter private Point draggingLocation; - private Map spells = new HashMap<>(); + private final Map spells = new HashMap<>(); private Map tmp = null; private ImmutableSet notFilteredSpells; private Spellbook spellbook; @@ -586,11 +586,11 @@ public class SpellbookPlugin extends Plugin { ImmutableSet tmp = ImmutableSet.copyOf(notFilteredSpells); - for (int id : spells.keySet()) + for (Map.Entry spell : spells.entrySet()) { - Widget w = client.getWidget(WidgetInfo.TO_GROUP(id), WidgetInfo.TO_CHILD(id)); // y tho let me just plop in id + Widget w = client.getWidget(WidgetInfo.TO_GROUP(spell.getKey()), WidgetInfo.TO_CHILD(spell.getKey())); // y tho let me just plop in id - if (w == null || !w.getBounds().contains(point) || !isUnfiltered(spells.get(id).getName(), tmp)) + if (w == null || !w.getBounds().contains(point) || !isUnfiltered(spell.getValue().getName(), tmp)) { continue; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java index d4d64dec42..014a1a1fdb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java @@ -90,10 +90,14 @@ public class StatusBarsOverlay extends Overlay } } - if (curViewport == null || curWidget.isHidden()) + if (curViewport == null) { return null; } + else + { + curWidget.isHidden(); + } final Point offsetLeft = curViewport.getOffsetLeft(); final Point offsetRight = curViewport.getOffsetRight(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java index b2310a1acc..1936f87664 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java @@ -158,12 +158,9 @@ public class StatusBarsPlugin extends Plugin overlayManager.add(overlay); } } - else if (lastCombatAction != null) + else if (lastCombatAction != null && Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > combatTimeout) { - if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > combatTimeout) - { - overlayManager.remove(overlay); - } + overlayManager.remove(overlay); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java index f721611b47..7dc607c57b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java @@ -58,10 +58,10 @@ public abstract class BarRenderer protected final StatusBarsPlugin plugin; int maximumValue; int currentValue; - protected int restore; + int restore; Color standardColor; Color restoreColor; - protected Image icon; + Image icon; protected abstract void update(Client client, StatusBarsOverlay overlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java index 3141db78e6..6ba61372c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java @@ -41,6 +41,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -161,9 +162,9 @@ public class StonedLootTrackerPlugin extends Plugin private NavigationButton navButton; private String eventType; - private Multimap lootRecordMultimap = ArrayListMultimap.create(); - private Multimap uniques = ArrayListMultimap.create(); - private Map killCountMap = new HashMap<>(); + private final Multimap lootRecordMultimap = ArrayListMultimap.create(); + private final Multimap uniques = ArrayListMultimap.create(); + private final Map killCountMap = new HashMap<>(); // key = name, value=current killCount private boolean loaded = false; @@ -572,7 +573,7 @@ public class StonedLootTrackerPlugin extends Plugin writer.deleteLootTrackerRecords(name); } - public TreeSet getNames() + public Set getNames() { return new TreeSet<>(lootRecordMultimap.keySet()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java index f40ca6cb94..12179a35de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.stonedloottracker.data; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -120,14 +121,14 @@ public enum BossTab } // By Category Name - private static final Map> byCategoryName = buildCategoryMap(); - public static ArrayList getByCategoryName(String name) + private static final Map> byCategoryName = buildCategoryMap(); + public static List getByCategoryName(String name) { return byCategoryName.get(name.toUpperCase()); } - private static Map> buildCategoryMap() + private static Map> buildCategoryMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (BossTab tab : values()) { map.computeIfAbsent(tab.getCategory().toUpperCase(), e -> new ArrayList<>()).add(tab); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java index 3a03546606..13b001151c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java @@ -124,7 +124,7 @@ public class LootRecordWriter return data; } - public synchronized boolean addLootTrackerRecord(LootRecordCustom rec) + public synchronized void addLootTrackerRecord(LootRecordCustom rec) { // Grab file String fileName = npcNameToFileName(rec.getName()); @@ -141,17 +141,15 @@ public class LootRecordWriter file.newLine(); file.close(); bus.post(new LootTrackerRecordStored(rec)); - return true; } catch (IOException ioe) { log.warn("Error writing loot data to file {}: {}", fileName, ioe.getMessage()); - return false; } } // Mostly used to adjust previous loot entries such as adding pet drops/abyssal sire drops - public synchronized boolean writeLootTrackerFile(String npcName, Collection loots) + public synchronized void writeLootTrackerFile(String npcName, Collection loots) { String fileName = npcNameToFileName(npcName); File lootFile = new File(playerFolder, fileName); @@ -168,16 +166,14 @@ public class LootRecordWriter } file.close(); - return true; } catch (IOException ioe) { log.warn("Error rewriting loot data to file {}: {}", fileName, ioe.getMessage()); - return false; } } - public synchronized boolean deleteLootTrackerRecords(String npcName) + public synchronized void deleteLootTrackerRecords(String npcName) { String fileName = npcNameToFileName(npcName); @@ -186,12 +182,10 @@ public class LootRecordWriter if (lootFile.delete()) { log.debug("Deleted loot file: {}", fileName); - return true; } else { log.debug("Couldn't delete file: {}", fileName); - return false; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java index d15a980420..7af2acf699 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.stream.Collectors; import lombok.AccessLevel; @@ -874,14 +875,14 @@ public enum UniqueItem } // Returns an array of UniqueItems by an individual `activities` name - private static final Map> byActivityName = buildActivityMap(); - public static ArrayList getByActivityName(String name) + private static final Map> byActivityName = buildActivityMap(); + public static List getByActivityName(String name) { return byActivityName.get(name.toUpperCase()); } - private static Map> buildActivityMap() + private static Map> buildActivityMap() { - Map> byName = new HashMap<>(); + Map> byName = new HashMap<>(); for (UniqueItem item : values()) { String[] activities = item.getActivities(); @@ -897,14 +898,14 @@ public enum UniqueItem // Return an array of UniqueItems by `setName` // Unused ATM - private static final Map> bySetName = buildSetMap(); - public static ArrayList getBySetName(String name) + private static final Map> bySetName = buildSetMap(); + public static List getBySetName(String name) { return bySetName.get(name.toUpperCase()); } - private static Map> buildSetMap() + private static Map> buildSetMap() { - Map> byName = new HashMap<>(); + Map> byName = new HashMap<>(); for (UniqueItem item : values()) { byName.computeIfAbsent(item.getSetName().toUpperCase(), e -> new ArrayList<>()).add(item); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java index 0af19c077c..33927c6ffe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java @@ -26,8 +26,8 @@ package net.runelite.client.plugins.stonedloottracker.ui; import java.awt.Dimension; import java.awt.GridLayout; -import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; @@ -44,7 +44,7 @@ class LootGrid extends JPanel private static final int ITEMS_PER_ROW = 5; private static final Dimension ITEM_SIZE = new Dimension(40, 40); private final LootTrackerItemEntry[] itemsToDisplay; - private ItemManager itemManager; + private final ItemManager itemManager; LootGrid(final LootTrackerItemEntry[] itemsToDisplay, final ItemManager itemManager) { @@ -62,7 +62,7 @@ class LootGrid extends JPanel */ private void buildItems() { - ArrayList items = LootTrackerBox.dedupeClues(Arrays.asList(itemsToDisplay)); + List items = LootTrackerBox.dedupeClues(Arrays.asList(itemsToDisplay)); // Calculates how many rows need to be display to fit all items final int rowSize = LootTrackerBox.rowSize(items.size()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java index 089eda28d0..5abe89d05c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java @@ -32,6 +32,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -52,12 +53,12 @@ import net.runelite.client.ui.ColorScheme; @Singleton class LootPanel extends JPanel { - private Collection records; - private Map> uniqueMap; - private boolean hideUniques; - private ItemSortTypes sortType; - private boolean itemBreakdown; - private ItemManager itemManager; + private final Collection records; + private final Map> uniqueMap; + private final boolean hideUniques; + private final ItemSortTypes sortType; + private final boolean itemBreakdown; + private final ItemManager itemManager; // Consolidate LTItemEntries stored by ItemID private Map consolidated; @@ -187,7 +188,7 @@ class LootPanel extends JPanel Collection itemsToDisplay = new ArrayList<>(); - ArrayList items = LootTrackerBox.dedupeClues(new ArrayList<>(consolidated.values())); + List items = LootTrackerBox.dedupeClues(new ArrayList<>(consolidated.values())); for (LootTrackerItemEntry item : items) { totalValue += item.getTotal(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java index da69419947..9618536cc0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java @@ -184,9 +184,9 @@ class LootTrackerBox extends JPanel repaint(); } - static ArrayList dedupeClues(List items) + static List dedupeClues(List items) { - final ArrayList newItems = new ArrayList<>(); + final List newItems = new ArrayList<>(); int eliteClues = 0; int hardClues = 0; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java index f6e9141a3b..510fa4491b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java @@ -33,7 +33,7 @@ import java.awt.Image; import java.awt.Insets; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.ArrayList; +import java.util.List; import java.util.Set; import java.util.TreeSet; import javax.inject.Singleton; @@ -53,17 +53,17 @@ import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; @Singleton class SelectionPanel extends JPanel { - private TreeSet names; - private LootTrackerPanel parent; - private ItemManager itemManager; + private final Set names; + private final LootTrackerPanel parent; + private final ItemManager itemManager; private final static Color BACKGROUND_COLOR = ColorScheme.DARK_GRAY_COLOR; private final static Color BUTTON_COLOR = ColorScheme.DARKER_GRAY_COLOR; private final static Color BUTTON_HOVER_COLOR = ColorScheme.DARKER_GRAY_HOVER_COLOR; - private boolean configToggle; + private final boolean configToggle; - SelectionPanel(final boolean configToggle, final TreeSet names, final LootTrackerPanel parent, final ItemManager itemManager) + SelectionPanel(final boolean configToggle, final Set names, final LootTrackerPanel parent, final ItemManager itemManager) { this.names = names == null ? new TreeSet<>() : names; this.parent = parent; @@ -168,7 +168,7 @@ class SelectionPanel extends JPanel name.setForeground(Color.WHITE); name.setVerticalAlignment(SwingConstants.CENTER); - ArrayList categoryTabs = BossTab.getByCategoryName(categoryName); + List categoryTabs = BossTab.getByCategoryName(categoryName); for (BossTab tab : categoryTabs) { // Create tab (with hover effects/text) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java index 0bb4824668..e4aa3be03b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java @@ -54,8 +54,8 @@ class UniqueItemPanel extends JPanel { private ItemManager itemManager; - private final float alphaMissing = 0.35f; - private final float alphaHas = 1.0f; + private final static float alphaMissing = 0.35f; + private final static float alphaHas = 1.0f; private static final Dimension panelSize = new Dimension(215, 50); private static final Border panelBorder = new EmptyBorder(3, 0, 3, 0); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index af1a6685a9..6b0d864198 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -35,6 +35,7 @@ import java.util.ArrayDeque; import java.util.Deque; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Random; import java.util.regex.Pattern; import javax.inject.Inject; @@ -48,113 +49,10 @@ import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.InventoryID; import net.runelite.api.Item; -import net.runelite.api.ItemDefinition; import net.runelite.api.ItemContainer; +import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; -import static net.runelite.api.ItemID.ACCUMULATOR_MAX_CAPE; -import static net.runelite.api.ItemID.ADAMANT_DART; -import static net.runelite.api.ItemID.ADAMANT_KNIFE; -import static net.runelite.api.ItemID.ADAMANT_THROWNAXE; -import static net.runelite.api.ItemID.ADMIRAL_PIE; -import static net.runelite.api.ItemID.AIR_RUNE; -import static net.runelite.api.ItemID.ANCHOVY_PIZZA; -import static net.runelite.api.ItemID.APPLE_PIE; -import static net.runelite.api.ItemID.ASSEMBLER_MAX_CAPE; -import static net.runelite.api.ItemID.ASTRAL_RUNE; -import static net.runelite.api.ItemID.AVAS_ACCUMULATOR; -import static net.runelite.api.ItemID.AVAS_ASSEMBLER; -import static net.runelite.api.ItemID.AVAS_ATTRACTOR; -import static net.runelite.api.ItemID.BLACK_CHINCHOMPA; -import static net.runelite.api.ItemID.BLACK_DART; -import static net.runelite.api.ItemID.BLACK_KNIFE; -import static net.runelite.api.ItemID.BLOOD_RUNE; -import static net.runelite.api.ItemID.BODY_RUNE; -import static net.runelite.api.ItemID.BOTANICAL_PIE; -import static net.runelite.api.ItemID.BRONZE_DART; -import static net.runelite.api.ItemID.BRONZE_KNIFE; -import static net.runelite.api.ItemID.BRONZE_THROWNAXE; -import static net.runelite.api.ItemID.CAKE; -import static net.runelite.api.ItemID.CANNONBALL; -import static net.runelite.api.ItemID.CHAOS_RUNE; -import static net.runelite.api.ItemID.CHINCHOMPA_10033; -import static net.runelite.api.ItemID.CHOCOLATE_CAKE; -import static net.runelite.api.ItemID.CHOCOLATE_SLICE; -import static net.runelite.api.ItemID.COINS_995; -import static net.runelite.api.ItemID.COSMIC_RUNE; -import static net.runelite.api.ItemID.DEATH_RUNE; -import static net.runelite.api.ItemID.DRAGON_DART; -import static net.runelite.api.ItemID.DRAGON_KNIFE; -import static net.runelite.api.ItemID.DRAGON_KNIFEP; -import static net.runelite.api.ItemID.DRAGON_KNIFEP_22808; -import static net.runelite.api.ItemID.DRAGON_KNIFEP_22810; -import static net.runelite.api.ItemID.DRAGON_KNIFE_22812; -import static net.runelite.api.ItemID.DRAGON_KNIFE_22814; -import static net.runelite.api.ItemID.DRAGON_THROWNAXE; -import static net.runelite.api.ItemID.DUST_RUNE; -import static net.runelite.api.ItemID.EARTH_RUNE; -import static net.runelite.api.ItemID.FIRE_RUNE; -import static net.runelite.api.ItemID.FISH_PIE; -import static net.runelite.api.ItemID.GARDEN_PIE; -import static net.runelite.api.ItemID.HALF_AN_ADMIRAL_PIE; -import static net.runelite.api.ItemID.HALF_AN_APPLE_PIE; -import static net.runelite.api.ItemID.HALF_A_BOTANICAL_PIE; -import static net.runelite.api.ItemID.HALF_A_FISH_PIE; -import static net.runelite.api.ItemID.HALF_A_GARDEN_PIE; -import static net.runelite.api.ItemID.HALF_A_MEAT_PIE; -import static net.runelite.api.ItemID.HALF_A_MUSHROOM_PIE; -import static net.runelite.api.ItemID.HALF_A_REDBERRY_PIE; -import static net.runelite.api.ItemID.HALF_A_SUMMER_PIE; -import static net.runelite.api.ItemID.HALF_A_WILD_PIE; -import static net.runelite.api.ItemID.IRON_DART; -import static net.runelite.api.ItemID.IRON_KNIFE; -import static net.runelite.api.ItemID.IRON_THROWNAXE; -import static net.runelite.api.ItemID.LAVA_RUNE; -import static net.runelite.api.ItemID.LAW_RUNE; -import static net.runelite.api.ItemID.MEAT_PIE; -import static net.runelite.api.ItemID.MEAT_PIZZA; -import static net.runelite.api.ItemID.MIND_RUNE; -import static net.runelite.api.ItemID.MIST_RUNE; -import static net.runelite.api.ItemID.MITHRIL_DART; -import static net.runelite.api.ItemID.MITHRIL_KNIFE; -import static net.runelite.api.ItemID.MITHRIL_THROWNAXE; -import static net.runelite.api.ItemID.MUD_RUNE; -import static net.runelite.api.ItemID.MUSHROOM_PIE; -import static net.runelite.api.ItemID.NATURE_RUNE; -import static net.runelite.api.ItemID.PINEAPPLE_PIZZA; -import static net.runelite.api.ItemID.PLAIN_PIZZA; -import static net.runelite.api.ItemID.RANGING_CAPE; -import static net.runelite.api.ItemID.REDBERRY_PIE; -import static net.runelite.api.ItemID.RED_CHINCHOMPA_10034; -import static net.runelite.api.ItemID.RUNE_DART; -import static net.runelite.api.ItemID.RUNE_KNIFE; -import static net.runelite.api.ItemID.RUNE_THROWNAXE; -import static net.runelite.api.ItemID.SANGUINESTI_STAFF; -import static net.runelite.api.ItemID.SANGUINESTI_STAFF_UNCHARGED; -import static net.runelite.api.ItemID.SLICE_OF_CAKE; -import static net.runelite.api.ItemID.SMOKE_RUNE; -import static net.runelite.api.ItemID.SOUL_RUNE; -import static net.runelite.api.ItemID.STEAM_RUNE; -import static net.runelite.api.ItemID.STEEL_DART; -import static net.runelite.api.ItemID.STEEL_KNIFE; -import static net.runelite.api.ItemID.STEEL_THROWNAXE; -import static net.runelite.api.ItemID.SUMMER_PIE; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS_E; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS_FULL; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SWAMP; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SWAMP_E; -import static net.runelite.api.ItemID.UNCHARGED_TOXIC_TRIDENT; -import static net.runelite.api.ItemID.UNCHARGED_TOXIC_TRIDENT_E; -import static net.runelite.api.ItemID.WATER_RUNE; -import static net.runelite.api.ItemID.WILD_PIE; -import static net.runelite.api.ItemID.WRATH_RUNE; -import static net.runelite.api.ItemID.ZULRAHS_SCALES; -import static net.runelite.api.ItemID._12_ANCHOVY_PIZZA; -import static net.runelite.api.ItemID._12_MEAT_PIZZA; -import static net.runelite.api.ItemID._12_PINEAPPLE_PIZZA; -import static net.runelite.api.ItemID._12_PLAIN_PIZZA; -import static net.runelite.api.ItemID._23_CAKE; -import static net.runelite.api.ItemID._23_CHOCOLATE_CAKE; +import static net.runelite.api.ItemID.*; import net.runelite.api.Player; import net.runelite.api.VarPlayer; import net.runelite.api.events.AnimationChanged; @@ -221,9 +119,9 @@ public class SuppliesTrackerPlugin extends Plugin private static final int[] RUNE_IDS = new int[]{AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE}; //Hold Supply Data - private static HashMap suppliesEntry = new HashMap<>(); + private static final Map suppliesEntry = new HashMap<>(); private ItemContainer old; - private Deque actionStack = new ArrayDeque<>(); + private final Deque actionStack = new ArrayDeque<>(); private int ammoId = 0; private int ammoAmount = 0; private int thrownId = 0; @@ -234,7 +132,7 @@ public class SuppliesTrackerPlugin extends Plugin private int mainHand = 0; private SuppliesTrackerPanel panel; private NavigationButton navButton; - private String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; + private final String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; private int attackStyleVarbit = -1; private int ticks = 0; @@ -610,9 +508,8 @@ public class SuppliesTrackerPlugin extends Plugin // Create pattern to find eat/drink at beginning Pattern eatPattern = Pattern.compile(EAT_PATTERN); Pattern drinkPattern = Pattern.compile(DRINK_PATTERN); - if (eatPattern.matcher(event.getTarget().toLowerCase()).find() || drinkPattern.matcher(event.getTarget().toLowerCase()).find()) - { - if (actionStack.stream().noneMatch(a -> + if ((eatPattern.matcher(event.getTarget().toLowerCase()).find() || drinkPattern.matcher(event.getTarget().toLowerCase()).find()) && + actionStack.stream().noneMatch(a -> { if (a instanceof MenuAction.ItemAction) { @@ -621,15 +518,14 @@ public class SuppliesTrackerPlugin extends Plugin } return false; })) + { + old = client.getItemContainer(InventoryID.INVENTORY); + int slot = event.getActionParam0(); + if (old.getItems() != null) { - old = client.getItemContainer(InventoryID.INVENTORY); - int slot = event.getActionParam0(); - if (old.getItems() != null) - { - int pushItem = old.getItems()[event.getActionParam0()].getId(); - MenuAction newAction = new MenuAction.ItemAction(CONSUMABLE, old.getItems(), pushItem, slot); - actionStack.push(newAction); - } + int pushItem = old.getItems()[event.getActionParam0()].getId(); + MenuAction newAction = new MenuAction.ItemAction(CONSUMABLE, old.getItems(), pushItem, slot); + actionStack.push(newAction); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java index afe425a8d9..fc2bbff2f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.tarnslair; import java.util.HashMap; +import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -63,13 +64,13 @@ public class TarnsLairPlugin extends Plugin private static final int TARNS_LAIR_SOUTH_REGION = 12615; @Getter(AccessLevel.PACKAGE) - private final HashMap staircases = new HashMap<>(); + private final Map staircases = new HashMap<>(); @Getter(AccessLevel.PACKAGE) - private final HashMap wallTraps = new HashMap<>(); + private final Map wallTraps = new HashMap<>(); @Getter(AccessLevel.PACKAGE) - private final HashMap floorTraps = new HashMap<>(); + private final Map floorTraps = new HashMap<>(); @Getter(AccessLevel.PACKAGE) private boolean inLair; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java index 69c55e9f2f..56740fdd0a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java @@ -125,13 +125,11 @@ public class TearsOfGuthixPlugin extends Plugin { DecorativeObject object = event.getDecorativeObject(); - if (object.getId() == ObjectID.BLUE_TEARS || - object.getId() == ObjectID.BLUE_TEARS_6665) + if ((object.getId() == ObjectID.BLUE_TEARS || + object.getId() == ObjectID.BLUE_TEARS_6665) && + client.getLocalPlayer().getWorldLocation().getRegionID() == TOG_REGION) { - if (client.getLocalPlayer().getWorldLocation().getRegionID() == TOG_REGION) - { - streams.put(event.getDecorativeObject(), Instant.now()); - } + streams.put(event.getDecorativeObject(), Instant.now()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java index 0112708098..5d007a342c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java @@ -22,7 +22,7 @@ public abstract class RoomHandler protected final Client client; protected final TheatrePlugin plugin; - public RoomHandler(final Client client, final TheatrePlugin plugin) + protected RoomHandler(final Client client, final TheatrePlugin plugin) { this.client = client; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java index 9bf1aaca87..f7c262c853 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java @@ -48,7 +48,6 @@ public class BloatHandler extends RoomHandler this.reset(); this.plugin.setRoom(TheatreRoom.BLOAT); - System.out.println("Starting Bloat Room"); } @Override @@ -56,10 +55,9 @@ public class BloatHandler extends RoomHandler { this.reset(); this.plugin.setRoom(TheatreRoom.UNKNOWN); - System.out.println("Stopping Bloat Room"); } - public void reset() + private void reset() { bloat = null; bloatFlag = false; @@ -134,13 +132,10 @@ public class BloatHandler extends RoomHandler @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (client.getVar(Varbits.BLOAT_DOOR) == 1) + if (client.getVar(Varbits.BLOAT_DOOR) == 1 && !bloatFlag) { - if (!bloatFlag) - { - bloatTimer = 0; - bloatFlag = true; - } + bloatTimer = 0; + bloatFlag = true; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java index d62bf8c8ea..af76b8c921 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java @@ -54,18 +54,18 @@ public class MaidenHandler extends RoomHandler ); private static final Color TRANSPARENT = new Color(0, 0, 0, 0); private static final Color FREEZE = new Color(0, 226, 255, 255); - private List bloodThrows = new ArrayList<>(); - private List bloodSpawns = new ArrayList<>(); + private final List bloodThrows = new ArrayList<>(); + private final List bloodSpawns = new ArrayList<>(); private List bloodSpawnLocation = new ArrayList<>(); - private List bloodSpawnTarget = new ArrayList<>(); + private final List bloodSpawnTarget = new ArrayList<>(); private NPC maiden; private String nyloCall; - private Set nylos = new HashSet<>(); - private List healers = new ArrayList<>(); + private final Set nylos = new HashSet<>(); + private final List healers = new ArrayList<>(); private int healerCount = 0; private int wave = 1; private long startTime = 0; - private ModelOutlineRenderer modelOutline; + private final ModelOutlineRenderer modelOutline; public MaidenHandler(final Client client, final TheatrePlugin plugin, final ModelOutlineRenderer modelOutline) { @@ -94,7 +94,7 @@ public class MaidenHandler extends RoomHandler log.debug("Stopping Maiden Room"); } - public void reset() + private void reset() { this.bloodThrows.clear(); this.bloodSpawns.clear(); @@ -240,12 +240,9 @@ public class MaidenHandler extends RoomHandler { NPC npc = event.getNpc(); - if (npc.getName() != null && npc.getName().equals("Nylocas Matomenos")) + if (npc.getName() != null && npc.getName().equals("Nylocas Matomenos") && npc.getId() == -1) { - if (npc.getId() == -1) - { - nylos.removeIf(c -> c.getNpc() == npc); - } + nylos.removeIf(c -> c.getNpc() == npc); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java index 6d0ccd8c03..ae6aabfcf3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java @@ -39,11 +39,11 @@ public class SotetsegHandler extends RoomHandler private int playerY; @Getter(AccessLevel.PUBLIC) private List redOverworld = new ArrayList<>(); - private List blackOverworld = new ArrayList<>(); - private List blackUnderworld = new ArrayList<>(); - private List redUnderworld = new ArrayList<>(); - private List gridPath = new ArrayList<>(); - private Map soteyProjectiles = new HashMap<>(); + private final List blackOverworld = new ArrayList<>(); + private final List blackUnderworld = new ArrayList<>(); + private final List redUnderworld = new ArrayList<>(); + private final List gridPath = new ArrayList<>(); + private final Map soteyProjectiles = new HashMap<>(); private NPC npc; public SotetsegHandler(final Client client, final TheatrePlugin plugin) @@ -61,7 +61,6 @@ public class SotetsegHandler extends RoomHandler this.reset(); this.plugin.setRoom(TheatreRoom.SOTETSEG); - System.out.println("Starting Sotetseg Room"); } @Override @@ -69,10 +68,9 @@ public class SotetsegHandler extends RoomHandler { this.reset(); this.plugin.setRoom(TheatreRoom.UNKNOWN); - System.out.println("Stopping Sotetseg Room"); } - public void reset() + private void reset() { npc = null; soteyProjectiles.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java index 9c311a236c..65cb217054 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java @@ -13,7 +13,6 @@ import net.runelite.api.Actor; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GraphicsObject; -import net.runelite.api.Model; import net.runelite.api.NPC; import net.runelite.api.Perspective; import net.runelite.api.Player; @@ -61,7 +60,6 @@ public class VerzikHandler extends RoomHandler this.reset(); this.plugin.setRoom(TheatreRoom.VERSIK); - System.out.println("Starting Verzik Room"); } @Override @@ -69,10 +67,9 @@ public class VerzikHandler extends RoomHandler { this.reset(); this.plugin.setRoom(TheatreRoom.UNKNOWN); - System.out.println("Stopping Verzik Room"); } - public void reset() + private void reset() { this.redCrabsTimer = 13; this.Verzik_RangeProjectiles.clear(); @@ -105,79 +102,60 @@ public class VerzikHandler extends RoomHandler if (id == TheatreConstant.VERZIK_ID_P1) { - if (plugin.isP1attacks()) + if (plugin.isP1attacks() && this.versikCounter >= 0) { - if (this.versikCounter >= 0) - { - String str = Integer.toString(versikCounter); + String str = Integer.toString(versikCounter); - LocalPoint lp = npc.getLocalLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); + LocalPoint lp = npc.getLocalLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); - renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); - } + renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); } } else if (id == TheatreConstant.VERZIK_ID_P2) { - if (plugin.isP2attacks()) + if (plugin.isP2attacks() && this.versikCounter >= 0) { - if (this.versikCounter >= 0) - { - String str = Integer.toString(versikCounter); + String str = Integer.toString(versikCounter); - LocalPoint lp = npc.getLocalLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); + LocalPoint lp = npc.getLocalLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); - renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); - } + renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); } } - else if (id == TheatreConstant.VERZIK_ID_P3) + else if (id == TheatreConstant.VERZIK_ID_P3 && plugin.isP3attacks() && versikCounter > 0 && versikCounter < 8) { - if (plugin.isP3attacks()) - { - Model model = npc.getModel(); - if (versikCounter > 0 && versikCounter < 8) - { - String str = Math.max(versikCounter, 0) + "";// + " | " + model.getModelHeight();// + " | " + model.getRadius(); + String str = Math.max(versikCounter, 0) + "";// + " | " + model.getModelHeight();// + " | " + model.getRadius(); - LocalPoint lp = npc.getLocalLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); + LocalPoint lp = npc.getLocalLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); - renderTextLocation(graphics, str, 15, Font.BOLD, Color.WHITE, point); - } - } + renderTextLocation(graphics, str, 15, Font.BOLD, Color.WHITE, point); } } - if (plugin.isVerzikTankTile()) + if (plugin.isVerzikTankTile() && id == TheatreConstant.VERZIK_ID_P3) { - if (id == TheatreConstant.VERZIK_ID_P3) - { - WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane()); - drawTile2(graphics, wp, new Color(75, 0, 130), 2, 255, 0); - //renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0); - } - + WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane()); + drawTile2(graphics, wp, new Color(75, 0, 130), 2, 255, 0); + //renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0); } - if (plugin.isShowVerzikYellows()) - { - if (this.yellows > 0) - { - String text = Integer.toString(this.yellows); - for (GraphicsObject object : client.getGraphicsObjects()) + if (plugin.isShowVerzikYellows() && this.yellows > 0) + { + String text = Integer.toString(this.yellows); + + for (GraphicsObject object : client.getGraphicsObjects()) + { + if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS) { - if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS) - { - drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW, 3, 255, 0); - LocalPoint lp = object.getLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0); - renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point); - } + drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW, 3, 255, 0); + LocalPoint lp = object.getLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0); + renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point); } } } @@ -326,7 +304,6 @@ public class VerzikHandler extends RoomHandler { this.yellows = 14; // this.versikCounter = 22; - System.out.println("Yellows have spawned."); break; } } @@ -337,12 +314,9 @@ public class VerzikHandler extends RoomHandler this.yellows--; } - if (npc != null) + if (npc != null && npc.getAnimation() == 8117) { - if (npc.getAnimation() == 8117) - { - redCrabsTimer = redCrabsTimer - 1; - } + redCrabsTimer = redCrabsTimer - 1; } @@ -408,7 +382,6 @@ public class VerzikHandler extends RoomHandler long minutes = seconds / 60L; seconds = seconds % 60; - int attackTick = this.client.getTickCount() - 4; this.versikCounter = -1; this.attacksLeft = 9; if (plugin.isExtraTimers()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 46dc3bf122..e16ba749e9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -8,6 +8,7 @@ import java.awt.Polygon; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.regex.Matcher; @@ -34,8 +35,8 @@ public class NyloHandler extends RoomHandler public long startTime = 0L; int startTick = 0; - ArrayList waveSpawns = new ArrayList(); - ArrayList waveAgros = new ArrayList(); + final List waveSpawns = new ArrayList<>(); + final List waveAgros = new ArrayList<>(); @Getter(AccessLevel.PUBLIC) private Map pillars = new HashMap<>(); @Getter(AccessLevel.PUBLIC) @@ -45,9 +46,6 @@ public class NyloHandler extends RoomHandler private int wave = 0; private NyloOverlay overlay = null; private NyloPredictor predictor = null; - private Point south = new Point(64, 41); - private Point west = new Point(49, 56); - private Point east = new Point(78, 56); public NyloHandler(final Client client, final TheatrePlugin plugin) { @@ -71,7 +69,6 @@ public class NyloHandler extends RoomHandler plugin.getOverlayManager().add(overlay); } - System.out.println("Starting Nylocas Room"); this.startTime = System.currentTimeMillis(); this.startTick = this.client.getTickCount(); } @@ -97,17 +94,13 @@ public class NyloHandler extends RoomHandler long minutes = seconds / 60L; seconds = seconds % 60; - if (this.startTime != 0) + if (this.startTime != 0 && plugin.isExtraTimers()) { - if (plugin.isExtraTimers()) - { - this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); - } + this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } - System.out.println("Stopping Nylocas Room"); } - public void reset() + private void reset() { this.pillars.clear(); this.spiders.clear(); @@ -155,15 +148,19 @@ public class NyloHandler extends RoomHandler { if (plugin.isShowNyloPillarHealth()) { - for (NPC npc : pillars.keySet()) + for (Map.Entry pillars : pillars.entrySet()) { - final int health = pillars.get(npc); + final int health = pillars.getValue(); final String healthStr = health + "%"; - WorldPoint p = npc.getWorldLocation(); + WorldPoint p = pillars.getKey().getWorldLocation(); LocalPoint lp = LocalPoint.fromWorld(client, p.getX() + 1, p.getY() + 1); Color c = this.healthColorCode(health); - Point canvasPoint = Perspective.localToCanvas(client, lp, client.getPlane(), 65); + Point canvasPoint = null; + if (lp != null) + { + canvasPoint = Perspective.localToCanvas(client, lp, client.getPlane(), 65); + } renderTextLocation(graphics, healthStr, 13, Font.BOLD, c, canvasPoint); } } @@ -171,15 +168,15 @@ public class NyloHandler extends RoomHandler switch (plugin.getShowNylocasExplosions()) { case TILE: - for (NPC npc : spiders.keySet()) + for (Map.Entry spiders : spiders.entrySet()) { - int ticksLeft = spiders.get(npc); + int ticksLeft = spiders.getValue(); if (ticksLeft > -1 && ticksLeft < 6) { Color color = new Color(255, 255, 0, 180); int outlineWidth = 2; int outlineAlpha = 150; - renderNpcOverlay(graphics, npc, color, outlineWidth, outlineAlpha, 15); + renderNpcOverlay(graphics, spiders.getKey(), color, outlineWidth, outlineAlpha, 15); } } break; @@ -265,26 +262,23 @@ public class NyloHandler extends RoomHandler this.pillars.put(npc, 100); this.recalculateLocal(); } - else if (npc.getName() != null) + else if (npc.getName() != null && this.plugin.getRoom() == TheatreRoom.NYLOCAS) { - if (this.plugin.getRoom() == TheatreRoom.NYLOCAS) + Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)"); + Matcher m = p.matcher(npc.getName()); + if (m.matches()) { - Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)"); - Matcher m = p.matcher(npc.getName()); - if (m.matches()) - { - this.spiders.put(npc, 52); + this.spiders.put(npc, 52); - if (this.predictor != null) - { - this.predictor.onNpcSpawned(event); - } - } - else if (npc.getName().equals("Nylocas Vasilias")) + if (this.predictor != null) { - this.onStop(); + this.predictor.onNpcSpawned(event); } } + else if (npc.getName().equals("Nylocas Vasilias")) + { + this.onStop(); + } } } @@ -397,10 +391,6 @@ public class NyloHandler extends RoomHandler int centerX = minX + 5; int centerY = minY + 5; - south = new Point(centerX + 1, centerY - 14); - east = new Point(centerX + 15, centerY); - west = new Point(centerX - 14, centerY); - if (this.predictor != null) { this.predictor.southBound = centerY - 12; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java index e6cc1324eb..d7e2703b93 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java @@ -50,7 +50,7 @@ class NyloOverlay extends Overlay private final TheatrePlugin plugin; private final PanelComponent panelComponent = new PanelComponent(); - private NyloHandler nylohandler; + private final NyloHandler nylohandler; NyloOverlay(final Client client, final TheatrePlugin plugin, final NyloHandler nylohandler) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index b0a9720e96..40226ac167 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -46,12 +46,12 @@ public class NyloPredictor new Wave(new Nylocas(NylocasType.RANGE_260, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.MAGE_260, Spawn.EAST)), new Wave(new Nylocas(NylocasType.MELEE_162, Spawn.WEST), new Nylocas(NylocasType.RANGE_162, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.RANGE_162, Spawn.EAST), new Nylocas(NylocasType.MAGE_162, Spawn.EAST)) }; - public Client client; + private final Client client; int westBound = 50; int eastBound = 77; int southBound = 42; - private NyloHandler handler; - private Map currentSpawns = new HashMap(); + private final NyloHandler handler; + private final Map currentSpawns = new HashMap<>(); private int currentIndex = -1; NyloPredictor(Client client, NyloHandler handler) @@ -108,8 +108,6 @@ public class NyloPredictor type = NylocasType.valueOf("MELEE_" + level); } - System.out.println(npc.getName() + " | " + npc.getCombatLevel() + " | (" + lp.getSceneX() + ", " + lp.getSceneY() + ") | (" + westBound + ", " + eastBound + ", " + southBound + ") | " + type + " | " + spawn); - if (spawn == null || type == null) { return; @@ -126,7 +124,7 @@ public class NyloPredictor Wave checkWave = NYLOCAS_WAVES[i]; List queue = new ArrayList<>(currentSpawns.keySet()); - HashMap npcs = new HashMap(); + HashMap npcs = new HashMap<>(); boolean found = true; for (Nylocas nylocas : checkWave.getSpawns()) @@ -150,20 +148,19 @@ public class NyloPredictor currentSpawns.clear(); handler.setWave(currentIndex); - System.out.println("Nylocas Wave #" + currentIndex + " has spawned @ " + (this.client.getTickCount() - this.handler.startTick) + " | " + npcs.size() + " size."); - for (NPC npc : npcs.keySet()) + for (Map.Entry nylocas : npcs.entrySet()) { - Nylocas nylo = npcs.get(npc); + Nylocas nylo = nylocas.getValue(); - if (!this.handler.waveSpawns.contains(npc)) + if (!this.handler.waveSpawns.contains(nylocas.getKey())) { - this.handler.waveSpawns.add(npc); + this.handler.waveSpawns.add(nylocas.getKey()); } - if (this.isAgressive(nylo.getType(), nylo.getSpawn(), currentIndex) && !this.handler.waveAgros.contains(npc)) + if (this.isAgressive(nylo.getType(), nylo.getSpawn(), currentIndex) && !this.handler.waveAgros.contains(nylocas.getKey())) { - this.handler.waveAgros.add(npc); + this.handler.waveAgros.add(nylocas.getKey()); } } @@ -220,7 +217,6 @@ public class NyloPredictor } } - System.out.printf("%d\t%d\t%d\t%d\t%d\t%d\t%d\n", elapsedTicks, mage_count, mage_level, range_count, range_level, melee_count, melee_level); } } } @@ -451,21 +447,21 @@ public class NyloPredictor public static class Nylocas { - private NylocasType type; - private Spawn spawn; + private final NylocasType type; + private final Spawn spawn; - public Nylocas(NylocasType type, Spawn spawn) + Nylocas(NylocasType type, Spawn spawn) { this.type = type; this.spawn = spawn; } - public NylocasType getType() + NylocasType getType() { return this.type; } - public Spawn getSpawn() + Spawn getSpawn() { return this.spawn; } @@ -486,14 +482,14 @@ public class NyloPredictor public static class Wave { - private Nylocas[] spawns; + private final Nylocas[] spawns; - public Wave(Nylocas... nylocas) + Wave(Nylocas... nylocas) { this.spawns = nylocas; } - public Nylocas[] getSpawns() + Nylocas[] getSpawns() { return this.spawns; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java index 73772c40e6..f6ee089e31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java @@ -14,10 +14,10 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; -public class XarpusCounter extends Overlay +class XarpusCounter extends Overlay { - private PanelComponent panelComponent = new PanelComponent(); - private XarpusHandler xarpusHandler; + private final PanelComponent panelComponent = new PanelComponent(); + private final XarpusHandler xarpusHandler; XarpusCounter(final TheatrePlugin plugin, final XarpusHandler xarpushandler) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java index 94467d34f8..36c7cf918e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java @@ -69,8 +69,6 @@ public class XarpusHandler extends RoomHandler overlay = new XarpusCounter(plugin, this); plugin.getOverlayManager().add(overlay); } - - System.out.println("Starting Xarpus Room"); } @Override @@ -84,11 +82,9 @@ public class XarpusHandler extends RoomHandler plugin.getOverlayManager().remove(overlay); overlay = null; } - - System.out.println("Stopping Xarpus Room"); } - public void reset() + private void reset() { exhumesCount = 0; xarpusFlag = false; @@ -134,9 +130,9 @@ public class XarpusHandler extends RoomHandler if (npc.getId() == NpcID.XARPUS_8339 && plugin.isShowXarpusHeals()) { - for (GroundObject o : exhumes.keySet()) + for (Map.Entry exhum : exhumes.entrySet()) { - Polygon poly = o.getCanvasTilePoly(); + Polygon poly = exhum.getKey().getCanvasTilePoly(); if (poly != null) { Color c = new Color(0, 255, 0, 130); @@ -144,8 +140,8 @@ public class XarpusHandler extends RoomHandler graphics.setStroke(new BasicStroke(1)); graphics.draw(poly); - String count = Integer.toString(exhumes.get(o) + 1); - LocalPoint lp = o.getLocalLocation(); + String count = Integer.toString(exhum.getValue() + 1); + LocalPoint lp = exhum.getKey().getLocalLocation(); Point point = Perspective.getCanvasTextLocation(client, graphics, lp, count, 0); if (point != null) { @@ -158,35 +154,34 @@ public class XarpusHandler extends RoomHandler public void onVarbitChanged(VarbitChanged event) { - if (client.getVar(Varbits.MULTICOMBAT_AREA) == 1 || client.getVarbitValue(client.getVarps(), TheatreConstant.DOOR_VARP) == 2) + if ((client.getVar(Varbits.MULTICOMBAT_AREA) == 1 || + client.getVarbitValue(client.getVarps(), TheatreConstant.DOOR_VARP) == 2) && + !xarpusFlag) { - if (!xarpusFlag) + int players = client.getPlayers().size(); + + if (players == 5) { - int players = client.getPlayers().size(); - - if (players == 5) - { - exhumesCount = 18; - } - else if (players == 4) - { - exhumesCount = 15; - } - else if (players == 3) - { - exhumesCount = 12; - } - else if (players == 2) - { - exhumesCount = 9; - } - else - { - exhumesCount = 7; - } - - xarpusFlag = true; + exhumesCount = 18; } + else if (players == 4) + { + exhumesCount = 15; + } + else if (players == 3) + { + exhumesCount = 12; + } + else if (players == 2) + { + exhumesCount = 9; + } + else + { + exhumesCount = 7; + } + + xarpusFlag = true; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java index 04c5a1a6c5..250fdca506 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java @@ -1,8 +1,8 @@ package net.runelite.client.plugins.theatre.timers; -import java.util.HashMap; +import java.util.Map; public interface Timeable { - HashMap getTimes(); + Map getTimes(); } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java index f7a5b6ae42..d0a1328c88 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java @@ -110,7 +110,7 @@ class NPCContainer DAGANNOTH_SUPREME(NpcID.DAGANNOTH_SUPREME, AttackStyle.RANGE, ImmutableSet.of(AnimationID.DAG_SUPREME)), DAGANNOTH_PRIME(NpcID.DAGANNOTH_PRIME, AttackStyle.MAGE, ImmutableSet.of(AnimationID.DAG_PRIME)); - private static ImmutableMap idMap; + private static final ImmutableMap idMap; static { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java index 25e09e077c..b801e83a40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java @@ -239,12 +239,9 @@ public class TickTimersPlugin extends Plugin for (int anims : npcs.getAnimations()) { - if (anims == npcs.getNpc().getAnimation()) + if (anims == npcs.getNpc().getAnimation() && npcs.getTicksUntilAttack() < 1) { - if (npcs.getTicksUntilAttack() < 1) - { - npcs.setTicksUntilAttack(npcs.getAttackSpeed()); - } + npcs.setTicksUntilAttack(npcs.getAttackSpeed()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java index 1b07158e7d..2063625a2c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java @@ -45,8 +45,8 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class TimersOverlay extends Overlay { - private TickTimersPlugin plugin; - private Client client; + private final TickTimersPlugin plugin; + private final Client client; @Inject TimersOverlay(final TickTimersPlugin plugin, final Client client) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java index b7df67dd1a..e701b46390 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java @@ -59,13 +59,11 @@ public class TileIndicatorsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.isHighlightHoveredTile()) - { + if (plugin.isHighlightHoveredTile() && // If we have tile "selected" render it - if (client.getSelectedSceneTile() != null) - { - renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), plugin.getHighlightHoveredColor()); - } + client.getSelectedSceneTile() != null) + { + renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), plugin.getHighlightHoveredColor()); } if (plugin.isHighlightDestinationTile()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 43701cbb34..36ac85610f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -60,11 +60,11 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.LocalPlayerDeath; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; @@ -79,7 +79,6 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import static net.runelite.client.plugins.timers.GameIndicator.VENGEANCE_ACTIVE; import static net.runelite.client.plugins.timers.GameTimer.*; - import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @PluginDescriptor( @@ -644,15 +643,13 @@ public class TimersPlugin extends Plugin } } - if (freezeTimer != null) - { + if (freezeTimer != null && // assume movement means unfrozen - if (freezeTime != client.getTickCount() - && !currentWorldPoint.equals(lastPoint)) - { - removeGameTimer(freezeTimer.getTimer()); - freezeTimer = null; - } + freezeTime != client.getTickCount() + && !currentWorldPoint.equals(lastPoint)) + { + removeGameTimer(freezeTimer.getTimer()); + freezeTimer = null; } lastPoint = currentWorldPoint; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java index 98db274ee2..9b0e2c24cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java @@ -242,7 +242,7 @@ abstract class ClockPanel extends JPanel } } - void updateActivityStatus() + private void updateActivityStatus() { boolean isActive = clock.isActive(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java index bfb71e3287..1c30f2da58 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java @@ -50,7 +50,7 @@ public class BirdHouseTracker // average time taken to harvest 10 birds, in seconds static final int BIRD_HOUSE_DURATION = (int) Duration.ofMinutes(50).getSeconds(); - private static ImmutableSet FOSSIL_ISLAND_REGIONS = ImmutableSet.of(14650, 14651, 14652, 14906, 14907, 15162, 15163); + private static final ImmutableSet FOSSIL_ISLAND_REGIONS = ImmutableSet.of(14650, 14651, 14652, 14906, 14907, 15162, 15163); private final Client client; private final ItemManager itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index 1202e4466b..842e1cc887 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -93,7 +93,7 @@ public class DamageCounterPlugin extends Plugin private static final int[] ToB_Region = {MAIDEN_REGION, MAIDEN_REGION_1, BLOAT_REGION, NYLOCAS_REGION, SOTETSEG_REGION, SOTETSEG_REGION2, XARPUS_REGION, VERZIK_REGION}; //setting up the array for a check list - private static int[] NPCARRAY = {NpcID.THE_MAIDEN_OF_SUGADINTI, NpcID.THE_MAIDEN_OF_SUGADINTI_8361, + private static final int[] NPCARRAY = {NpcID.THE_MAIDEN_OF_SUGADINTI, NpcID.THE_MAIDEN_OF_SUGADINTI_8361, NpcID.THE_MAIDEN_OF_SUGADINTI_8362, NpcID.THE_MAIDEN_OF_SUGADINTI_8363, NpcID.THE_MAIDEN_OF_SUGADINTI_8364, NpcID.THE_MAIDEN_OF_SUGADINTI_8365, NpcID.PESTILENT_BLOAT, NpcID.NYLOCAS_VASILIAS, NpcID.NYLOCAS_VASILIAS_8355, NpcID.NYLOCAS_VASILIAS_8356, NpcID.NYLOCAS_VASILIAS_8357, NpcID.SOTETSEG, @@ -101,8 +101,6 @@ public class DamageCounterPlugin extends Plugin NpcID.VERZIK_VITUR, NpcID.VERZIK_VITUR_8369, NpcID.VERZIK_VITUR_8370, NpcID.VERZIK_VITUR_8371, NpcID.VERZIK_VITUR_8372, NpcID.VERZIK_VITUR_8373, NpcID.VERZIK_VITUR_8374, NpcID.VERZIK_VITUR_8375}; - private int[] HEALTHARRAY = {MAIDENHP, NYLOHP, VERZIKHP}; - @Inject private Client client; @Inject @@ -128,21 +126,15 @@ public class DamageCounterPlugin extends Plugin { Player localPlayer = client.getLocalPlayer(); Actor interacting = localPlayer.getInteracting(); - if (client.getGameState() == GameState.LOGGED_IN) + if (client.getGameState() == GameState.LOGGED_IN && BossName == null && interacting instanceof NPC) { - if (BossName == null) + int interactingId = ((NPC) interacting).getId(); + String interactingName = interacting.getName(); + for (int aNPCARRAY : NPCARRAY) { - if (interacting instanceof NPC) + if (aNPCARRAY == interactingId) { - int interactingId = ((NPC) interacting).getId(); - String interactingName = interacting.getName(); - for (int aNPCARRAY : NPCARRAY) - { - if (aNPCARRAY == interactingId) - { - BossName = interactingName; - } - } + BossName = interactingName; } } } @@ -188,17 +180,13 @@ public class DamageCounterPlugin extends Plugin { Player localPlayer = client.getLocalPlayer(); Actor interacting = localPlayer.getInteracting(); - if (client.getGameState() == GameState.LOGGED_IN) + if (client.getGameState() == GameState.LOGGED_IN && interacting instanceof NPC) { - if (interacting instanceof NPC) + String interactingName = interacting.getName(); + if (interactingName.equals(BossName)) { - String interactingName = interacting.getName(); - int NPC = ((NPC) interacting).getId(); - if (interactingName.equals(BossName)) - { - DamageCount += (XPtoDamage() * BOSS_MODIFIER); + DamageCount += (XPtoDamage() * BOSS_MODIFIER); - } } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java index 6dccc6abc3..0a42864ffe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java @@ -45,7 +45,7 @@ public class VetionOverlay extends Overlay private static final Color RED_ALPHA = new Color(Color.RED.getRed(), Color.RED.getGreen(), Color.RED.getBlue(), 100); private static final Duration MAX_TIME = Duration.ofSeconds(9); private final VetionPlugin plugin; - private Client client; + private final Client client; @Inject private VetionOverlay(Client client, VetionPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java index af8635f8af..d55484adb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java @@ -51,8 +51,8 @@ public class VorkathOverlay extends Overlay private static final int OVERLAY_ICON_DISTANCE = 30; private static final int OVERLAY_ICON_MARGIN = 1; - private Client client; - private VorkathPlugin plugin; + private final Client client; + private final VorkathPlugin plugin; @Inject public VorkathOverlay(final Client client, final VorkathPlugin plugin) @@ -80,7 +80,11 @@ public class VorkathOverlay extends Overlay BufferedImage currentPhaseIcon = getIcon(vorkath); - int totalWidth = currentPhaseIcon.getWidth() * OVERLAY_ICON_MARGIN; + int totalWidth = 0; + if (currentPhaseIcon != null) + { + totalWidth = currentPhaseIcon.getWidth() * OVERLAY_ICON_MARGIN; + } int bgPadding = 8; int currentPosX = 0; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java index 145eb2602d..a0cbc0451a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java @@ -37,7 +37,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class ZombifiedSpawnOverlay extends Overlay { - private VorkathPlugin plugin; + private final VorkathPlugin plugin; @Inject public ZombifiedSpawnOverlay(final VorkathPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java index 3e278405e5..5e3e253797 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java @@ -68,12 +68,9 @@ public class WarIndicatorMiniMapOverlay extends Overlay String[] callers = plugin.getGetActiveCallers().split(", "); String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName()) && minimapLocation != null) { - if (minimapLocation != null) - { - OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); - } + OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); } if (plugin.isSnipeMinimap() && ArrayUtils.contains(targets, actor.getName())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java index 4d24401d7d..c430a3ba28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java @@ -73,20 +73,14 @@ public class WarIndicatorOverlay extends Overlay String[] callers = plugin.getGetActiveCallers().split(", "); String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName()) && poly != null) { - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, color); - } + OverlayUtil.renderPolygon(graphics, poly, color); } - if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName())) + if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName()) && poly != null) { - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, color); - } + OverlayUtil.renderPolygon(graphics, poly, color); } String name = actor.getName().replace('\u00A0', ' '); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java index d5b9d32afa..3423fa083d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java @@ -28,8 +28,8 @@ import net.runelite.client.ui.overlay.components.TitleComponent; @Singleton public class WhaleWatchersGloryOverlay extends Overlay { - private WhaleWatchersPlugin plugin; - private PanelComponent panelComponent; + private final WhaleWatchersPlugin plugin; + private final PanelComponent panelComponent; @Inject private ItemManager itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java index a915399cab..2ee2ed02e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java @@ -31,9 +31,9 @@ import net.runelite.client.ui.overlay.components.TitleComponent; @Singleton public class WhaleWatchersOverlay extends Overlay { - private Client client; - private WhaleWatchersPlugin plugin; - private PanelComponent panelComponent; + private final Client client; + private final WhaleWatchersPlugin plugin; + private final PanelComponent panelComponent; private String lastOpponent = "-"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index a35c9fe846..31878c18ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -98,12 +98,9 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onOverlayMenuClicked(OverlayMenuClicked event) { - if (event.getOverlay().equals(overlay)) + if (event.getOverlay().equals(overlay) && event.getEntry().getOption().equals("Reset")) { - if (event.getEntry().getOption().equals("Reset")) - { - resetDamageCounter(); - } + resetDamageCounter(); } } @@ -207,16 +204,10 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (this.showDamageCounter) - { - if (client.getVar(VarPlayer.ATTACKING_PLAYER) == -1) + if (this.showDamageCounter && client.getVar(VarPlayer.ATTACKING_PLAYER) == -1 && inCombat) { - if (inCombat) - { - tickCountdown = 10; - } + tickCountdown = 10; } - } if (this.protectItemWarning) { @@ -254,17 +245,14 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (this.showDamageCounter) + if (this.showDamageCounter && tickCountdown > 0 && tickCountdown < 11) { - if (tickCountdown > 0 && tickCountdown < 11) + tickCountdown--; + if (tickCountdown == 1) { - tickCountdown--; - if (tickCountdown == 1) - { - inCombat = false; - resetDamageCounter(); - return; - } + inCombat = false; + resetDamageCounter(); + return; } } if (this.smiteableWarning && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType()))) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java index 17de8ac9b8..f93a397d2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java @@ -34,8 +34,8 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class WhaleWatchersProtOverlay extends Overlay { - private Client client; - private WhaleWatchersPlugin plugin; + private final Client client; + private final WhaleWatchersPlugin plugin; @Inject public WhaleWatchersProtOverlay(final Client client, final WhaleWatchersPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java index 0d2cd567e9..4a5b434900 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java @@ -28,8 +28,8 @@ import net.runelite.client.ui.overlay.components.TitleComponent; @Singleton public class WhaleWatchersSmiteableOverlay extends Overlay { - private WhaleWatchersPlugin plugin; - private PanelComponent panelComponent; + private final WhaleWatchersPlugin plugin; + private final PanelComponent panelComponent; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java index 921ed916b6..3a87600da7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java @@ -23,7 +23,7 @@ import net.runelite.client.ui.overlay.components.TextComponent; public class WildernessLocationsOverlay extends Overlay { private final WildernessLocationsPlugin plugin; - private TextComponent textComponent; + private final TextComponent textComponent; @Inject public WildernessLocationsOverlay(final WildernessLocationsPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index b051211fc6..07e7442638 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -81,7 +81,7 @@ public class WildernessLocationsPlugin extends Plugin private String oldChat = ""; private int currentCooldown = 0; private WorldPoint worldPoint = null; - private final HashMap wildLocs = getLocationMap(); + private final Map wildLocs = getLocationMap(); private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind) { @@ -202,9 +202,9 @@ public class WildernessLocationsPlugin extends Plugin return s; } - private static HashMap getLocationMap() + private static Map getLocationMap() { - HashMap hashMap = new HashMap<>(); + Map hashMap = new HashMap<>(); Arrays.stream(WildernessLocation.values()).forEach(wildernessLocation -> hashMap.put(wildernessLocation.getWorldArea(), wildernessLocation.getName())); return hashMap; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index c8551b1d0f..82deb0d766 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -212,26 +212,20 @@ public class ZulrahPlugin extends Plugin } Actor actor = event.getActor(); - if (config.sounds()) + if (config.sounds() && zulrah != null && zulrah.equals(actor) && zulrah.getAnimation() == AnimationID.ZULRAH_PHASE) { - if (zulrah == actor) - { - if (zulrah.getAnimation() == AnimationID.ZULRAH_PHASE) - { - Prayer prayer = instance.getNextPhase().getPrayer(); + Prayer prayer = instance.getNextPhase().getPrayer(); - if (prayer != null) - { - switch (prayer) - { - case PROTECT_FROM_MAGIC: - soundManager.playSound(Sound.PRAY_MAGIC); - break; - case PROTECT_FROM_MISSILES: - soundManager.playSound(Sound.PRAY_RANGED); - break; - } - } + if (prayer != null) + { + switch (prayer) + { + case PROTECT_FROM_MAGIC: + soundManager.playSound(Sound.PRAY_MAGIC); + break; + case PROTECT_FROM_MISSILES: + soundManager.playSound(Sound.PRAY_RANGED); + break; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java index db8136ac24..3d9e5eac0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java @@ -188,15 +188,24 @@ public class ZulrahOverlay extends Overlay Point zulrahMinimapPoint = Perspective.localToMinimap(client, zulrahLocalTile); Color color = phase.getColor(); graphics.setColor(color); - graphics.fillOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + if (zulrahMinimapPoint != null) + { + graphics.fillOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + } graphics.setColor(TILE_BORDER_COLOR); graphics.setStroke(new BasicStroke(1)); - graphics.drawOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + if (zulrahMinimapPoint != null) + { + graphics.drawOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + } if (next) { graphics.setColor(NEXT_TEXT_COLOR); FontMetrics fm = graphics.getFontMetrics(); - graphics.drawString("Next", zulrahMinimapPoint.getX() - fm.stringWidth("Next") / 2, zulrahMinimapPoint.getY() - 2); + if (zulrahMinimapPoint != null) + { + graphics.drawString("Next", zulrahMinimapPoint.getX() - fm.stringWidth("Next") / 2, zulrahMinimapPoint.getY() - 2); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java index caf6bcf575..74f89b05d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java @@ -39,7 +39,7 @@ public abstract class ZulrahPattern { private final List pattern = new ArrayList<>(); - protected final void add(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer) + final void add(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer) { add(loc, type, standLocation, false, prayer); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java index 91a1a658ab..1205c6b3a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java @@ -34,6 +34,7 @@ import java.awt.Font; import java.awt.FontFormatException; import java.awt.GraphicsEnvironment; import java.io.IOException; +import java.util.Map; import lombok.Getter; import net.runelite.client.config.FontType; @@ -59,7 +60,7 @@ public class FontManager } private static final ImmutableBiMap fontMap; - private static final HashMap derivedFontMap = new HashMap<>(); + private static final Map derivedFontMap = new HashMap<>(); static { @@ -108,7 +109,7 @@ public class FontManager } } - public static Font getFontOffCorrectSize(Font f) + private static Font getFontOffCorrectSize(Font f) { // Size of the font is already set if (f.getSize2D() > 1) @@ -214,7 +215,7 @@ public class FontManager public static String[] getAvailableFontNames() { - return fontMap.keySet().toArray(new String[fontMap.keySet().size()]); + return fontMap.keySet().toArray(new String[0]); } public static boolean isAvailable(Font font) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java index 895df62c0e..7974c121bd 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java @@ -52,13 +52,13 @@ import org.pushingpixels.substance.internal.SubstanceSynapse; @Singleton public class RuneLiteSplashScreen { - private RuneLiteProperties runeLiteProperties = new RuneLiteProperties(); + private final RuneLiteProperties runeLiteProperties = new RuneLiteProperties(); - public JFrame frame; - public JPanel panel = new JPanel(); + private JFrame frame; + private final JPanel panel = new JPanel(); private JLabel messageLabel; private JLabel subMessageLabel; - private JProgressBar progressBar = new JProgressBar(); + private final JProgressBar progressBar = new JProgressBar(); /** * This is not done in the constructor in order to avoid processing in case the user chooses to not load diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java b/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java index 128c88197a..29125a9ee3 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java @@ -76,7 +76,7 @@ public class CustomScrollBarUI extends BasicScrollBarUI /** * Creates an empty JButton to be used as the scroll bar's arrows (to disable the arrows). */ - protected JButton createEmptyButton() + private JButton createEmptyButton() { JButton button = new JButton(); Dimension zeroDim = new Dimension(0, 0); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java index dc340613d6..ac5ba1cd79 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java @@ -159,7 +159,7 @@ public class ProgressBar extends DimmableJPanel centerLabel.setText(isDimmed() ? txt : centerLabelText); } - public int getPercentage() + private int getPercentage() { if (value == 0) { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java index dab064566c..036de05ae2 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java @@ -46,7 +46,7 @@ public class ColorPanel extends JPanel private final int size; - private BufferedImage image; + private final BufferedImage image; private Point targetPosition; private int selectedY; private boolean forceRedraw; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java index 08110b01b6..43f549143b 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java @@ -43,12 +43,12 @@ import javax.swing.text.DocumentFilter; import net.runelite.client.ui.ColorScheme; import net.runelite.client.util.ColorUtil; -public class ColorValuePanel extends JPanel +class ColorValuePanel extends JPanel { private static final int DEFAULT_VALUE = ColorUtil.MAX_RGB_VALUE; - private ColorValueSlider slider = new ColorValueSlider(); - private JTextField input = new JTextField(); + private final ColorValueSlider slider = new ColorValueSlider(); + private final JTextField input = new JTextField(); private Consumer onValueChanged; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java index 365206340c..f4e7e835fc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java @@ -57,9 +57,6 @@ public class MaterialTab extends JLabel private static final Border UNSELECTED_BORDER = BorderFactory .createEmptyBorder(5, 10, 5, 10); - /* The tab's containing group */ - private final MaterialTabGroup group; - /* The tab's associated content display */ @Getter private final JComponent content; @@ -75,7 +72,7 @@ public class MaterialTab extends JLabel { super(string); - this.group = group; + /* The tab's containing group */ this.content = content; if (selected) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java index a25019ad8f..d6ef646b50 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java @@ -75,7 +75,7 @@ public class MaterialTabGroup extends JPanel public MaterialTab getTab(int index) { - if (tabs == null || tabs.isEmpty()) + if (tabs.isEmpty()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index d68a7acbc1..40d82c357d 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -138,10 +138,7 @@ public class OverlayManager Optional optionalOverlayMenuEntry = menuEntries.stream() .filter(me -> me.getOption().equals(event.getOption())) .findAny(); - if (optionalOverlayMenuEntry.isPresent()) - { - eventBus.post(new OverlayMenuClicked(optionalOverlayMenuEntry.get(), overlay)); - } + optionalOverlayMenuEntry.ifPresent(overlayMenuEntry -> eventBus.post(new OverlayMenuClicked(overlayMenuEntry, overlay))); } } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 41a3b9329a..76d5a21386 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -91,8 +91,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener private boolean isResizeable; private OverlayBounds snapCorners; - // Overlay Fonts - private Font clientFont; private Font standardFont; private Font tooltipFont; private Font interfaceFont; @@ -115,10 +113,11 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener private void updateConfig() { - this.clientFont = runeLiteConfig.clientFont(); - this.standardFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.fontType()); - this.tooltipFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.tooltipFontType()); - this.interfaceFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.interfaceFontType()); + // Overlay Fonts + Font clientFont = runeLiteConfig.clientFont(); + this.standardFont = FontManager.getFontFromType(clientFont, runeLiteConfig.fontType()); + this.tooltipFont = FontManager.getFontFromType(clientFont, runeLiteConfig.tooltipFontType()); + this.interfaceFont = FontManager.getFontFromType(clientFont, runeLiteConfig.interfaceFontType()); } @Subscribe diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java index 904eac78ce..91be8caeca 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java @@ -28,8 +28,8 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; -import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -106,7 +106,7 @@ public class ArrowMinimapOverlay extends Overlay else if (arrowPoint.types.contains(ArrowType.OBJECT)) { - ArrayList objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); + List objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); if (objects.isEmpty() && fallBackPoint != null) { renderMinimapArrow(graphics, arrowPoint, null, localPlayerPos, worldPlayerPos); @@ -163,7 +163,10 @@ public class ArrowMinimapOverlay extends Overlay AffineTransform at = new AffineTransform(); if (arrowPoint.isMinimapImagePointToTarget()) { - at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + if (minimapPlayerPos != null) + { + at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + } at.rotate(cameraAngle - theta); at.translate(0, 66); at.translate(minimapImageOffset.getX() - minimapImage.getWidth() / 2, minimapImageOffset.getY() - minimapImage.getHeight() / 2); @@ -177,7 +180,10 @@ public class ArrowMinimapOverlay extends Overlay double dY = at.getTranslateY(); //Then apply that position to an un-rotated transform at = new AffineTransform(); - at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + if (minimapPlayerPos != null) + { + at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + } at.translate(dX, dY); at.translate(minimapImageOffset.getX() - minimapImage.getWidth() / 2, minimapImageOffset.getY() - minimapImage.getHeight() / 2); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java index 9969869356..2b381ca9cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java @@ -27,7 +27,7 @@ package net.runelite.client.ui.overlay.arrow; import java.awt.Color; import java.awt.image.BufferedImage; import java.util.EnumSet; -import java.util.HashSet; +import java.util.Set; import lombok.Builder; import lombok.Data; import lombok.NonNull; @@ -44,15 +44,15 @@ public class ArrowPoint @NonNull private WorldPoint worldPoint; - private HashSet npcIDs; + private Set npcIDs; - private HashSet objectIDs; + private Set objectIDs; /** * The regions that an NPC or Object has to be in to be marked (eg. Exam Centre locked chest Hard Clue requires * killing a Barbarian in Barbarian Village, or Konar Slayer requires killing monsters in a certain area) */ - private HashSet region; + private Set region; private BufferedImage worldImage; @Builder.Default diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java index a4380ae9a4..3d3b864b51 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java @@ -1,7 +1,8 @@ package net.runelite.client.ui.overlay.arrow; import java.util.ArrayList; -import java.util.HashSet; +import java.util.List; +import java.util.Set; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.ObjectDefinition; @@ -10,7 +11,7 @@ import net.runelite.api.Tile; class ArrowUtil { - static ArrayList getObjects(final Client client, HashSet objectIDs) + static List getObjects(final Client client, Set objectIDs) { final Scene scene = client.getScene(); final Tile[][] tiles = scene.getTiles()[client.getPlane()]; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java index 72301360f6..d822998223 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java @@ -28,8 +28,8 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; -import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -105,7 +105,7 @@ public class ArrowWorldOverlay extends Overlay else if (arrowPoint.types.contains(ArrowType.OBJECT)) { - ArrayList objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); + List objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); if (objects.isEmpty() && fallBackPoint != null) { renderWorldArrow(graphics, arrowPoint, fallBackPoint); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java index fba19f5013..c5c65893c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java @@ -67,7 +67,7 @@ public class TextComponent implements RenderableEntity for (String textSplitOnCol : parts) { final String textWithoutCol = textWithoutColTags(textSplitOnCol); - final String colColor = textSplitOnCol.substring(textSplitOnCol.indexOf("=") + 1, textSplitOnCol.indexOf(">")); + final String colColor = textSplitOnCol.substring(textSplitOnCol.indexOf('=') + 1, textSplitOnCol.indexOf('>')); renderText(graphics, x, position.y, textWithoutCol, Color.decode("#" + colColor), borderColor); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java index 6edbca14e8..117b021eca 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java @@ -341,7 +341,7 @@ public class TableComponent implements LayoutableRenderableEntity defaultColor); } - public void setColumnAlignment(final int col, final TableAlignment alignment) + private void setColumnAlignment(final int col, final TableAlignment alignment) { assert columns.size() > col; columns.get(col).setAlignment(alignment); @@ -409,7 +409,7 @@ public class TableComponent implements LayoutableRenderableEntity this.rows.add(row); } - public void addRows(@Nonnull final String[]... rows) + private void addRows(@Nonnull final String[]... rows) { for (String[] row : rows) { @@ -434,7 +434,7 @@ public class TableComponent implements LayoutableRenderableEntity this.rows.addAll(Arrays.asList(elements)); } - public void addColumn(@Nonnull final String col) + private void addColumn(@Nonnull final String col) { this.columns.add(TableElement.builder().content(col).build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java index 6cd6e140d4..33400b0bdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java @@ -46,7 +46,7 @@ import org.pushingpixels.substance.api.painter.overlay.TopLineOverlayPainter; import org.pushingpixels.substance.api.shaper.ClassicButtonShaper; import org.pushingpixels.substance.internal.utils.SubstanceColorUtilities; -public class ObsidianSkin extends SubstanceSkin +class ObsidianSkin extends SubstanceSkin { /** * Display name for this skin.