diff --git a/ci/settings.xml b/ci/settings.xml index 30d386d764..d6caa8f543 100644 --- a/ci/settings.xml +++ b/ci/settings.xml @@ -259,6 +259,7 @@ under the License. false false + false diff --git a/runelite-client/pmd-ruleset.xml b/runelite-client/pmd-ruleset.xml new file mode 100644 index 0000000000..3cdece031e --- /dev/null +++ b/runelite-client/pmd-ruleset.xml @@ -0,0 +1,96 @@ + + + + + + RuneLite PMD ruleset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 6c1b5934d0..5462a2a3a2 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -40,6 +40,7 @@ 2.4.0-rc-20200429 true + true @@ -415,6 +416,39 @@ + + org.apache.maven.plugins + maven-pmd-plugin + 3.13.0 + + + net.sourceforge.pmd + pmd-core + 6.29.0 + + + net.sourceforge.pmd + pmd-java + 6.29.0 + + + + true + true + + ${basedir}/pmd-ruleset.xml + + false + true + + + + + check + + + + diff --git a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java index ff4e0fa07c..2470b55056 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java @@ -36,7 +36,7 @@ import net.runelite.api.Client; @Slf4j public class ClientThread { - private ConcurrentLinkedQueue invokes = new ConcurrentLinkedQueue<>(); + private final ConcurrentLinkedQueue invokes = new ConcurrentLinkedQueue<>(); @Inject private Client client; @@ -90,7 +90,7 @@ public class ClientThread { assert client.isClientThread(); Iterator ir = invokes.iterator(); - for (; ir.hasNext(); ) + while (ir.hasNext()) { BooleanSupplier r = ir.next(); boolean remove = true; diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index 4640c90c99..7faa7ac564 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -115,7 +115,7 @@ public class ChatMessageManager boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; Color usernameColor = null; - Color senderColor = null; + Color senderColor; switch (chatMessageType) { diff --git a/runelite-client/src/main/java/net/runelite/client/config/ModifierlessKeybind.java b/runelite-client/src/main/java/net/runelite/client/config/ModifierlessKeybind.java index 6e7a53a43e..28a312b337 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ModifierlessKeybind.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ModifierlessKeybind.java @@ -49,6 +49,7 @@ public class ModifierlessKeybind extends Keybind * KeyReleased event this returns if the event is this hotkey being * released */ + @Override public boolean matches(KeyEvent e) { return matches(e, true); diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 7650d6acc5..21769f98a1 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -50,7 +50,6 @@ import net.runelite.api.Constants; import static net.runelite.api.Constants.CLIENT_DEFAULT_ZOOM; import net.runelite.api.GameState; import net.runelite.api.ItemComposition; -import net.runelite.api.ItemID; import static net.runelite.api.ItemID.*; import net.runelite.api.SpritePixels; import net.runelite.api.events.GameStateChanged; @@ -296,11 +295,11 @@ public class ItemManager */ public int getItemPrice(int itemID, boolean ignoreUntradeableMap) { - if (itemID == ItemID.COINS_995) + if (itemID == COINS_995) { return 1; } - if (itemID == ItemID.PLATINUM_TOKEN) + if (itemID == PLATINUM_TOKEN) { return 1000; } @@ -490,7 +489,7 @@ public class ItemManager */ private BufferedImage loadItemOutline(final int itemId, final int itemQuantity, final Color outlineColor) { - final SpritePixels itemSprite = client.createItemSprite(itemId, itemQuantity, 1, 0, 0, false, Constants.CLIENT_DEFAULT_ZOOM); + final SpritePixels itemSprite = client.createItemSprite(itemId, itemQuantity, 1, 0, 0, false, CLIENT_DEFAULT_ZOOM); return itemSprite.toBufferedOutline(outlineColor); } diff --git a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java index 03c78617b1..6a7311bea1 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java @@ -40,7 +40,6 @@ public class SkillIconManager public BufferedImage getSkillImage(Skill skill, boolean small) { int skillIdx = skill.ordinal() + (small ? Skill.values().length : 0); - BufferedImage skillImage = null; if (imgCache[skillIdx] != null) { @@ -50,7 +49,7 @@ public class SkillIconManager String skillIconPath = (small ? "/skill_icons_small/" : "/skill_icons/") + skill.getName().toLowerCase() + ".png"; log.debug("Loading skill icon from {}", skillIconPath); - skillImage = ImageUtil.getResourceStreamFromClass(getClass(), skillIconPath); + BufferedImage skillImage = ImageUtil.getResourceStreamFromClass(getClass(), skillIconPath); imgCache[skillIdx] = skillImage; return skillImage; diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java index 646ba7e6af..52fcf92cd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java @@ -63,7 +63,7 @@ public class ChatboxItemSearch extends ChatboxTextInput private final ItemManager itemManager; private final Client client; - private Map results = new LinkedHashMap<>(); + private final Map results = new LinkedHashMap<>(); private String tooltipText; private int index = -1; diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 51b20e0da9..67129b0ba5 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -232,24 +232,6 @@ public class MenuManager actions[unused] = npcOption; } - private void removeNpcOption(NPCComposition composition, String npcOption) - { - String[] actions = composition.getActions(); - - if (composition.getActions() == null) - { - return; - } - - for (int i = 0; i < actions.length; ++i) - { - if (actions[i] != null && actions[i].equals(npcOption)) - { - actions[i] = null; - } - } - } - @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java index 4aeb37b213..5b77ac6c12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java @@ -52,7 +52,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ScheduledExecutorService; import java.util.function.BiConsumer; import java.util.stream.Collectors; import javax.inject.Inject; @@ -92,7 +91,6 @@ public class PluginManager private final EventBus eventBus; private final Scheduler scheduler; private final ConfigManager configManager; - private final ScheduledExecutorService executor; private final Provider sceneTileManager; private final List plugins = new CopyOnWriteArrayList<>(); private final List activePlugins = new CopyOnWriteArrayList<>(); @@ -108,7 +106,6 @@ public class PluginManager final EventBus eventBus, final Scheduler scheduler, final ConfigManager configManager, - final ScheduledExecutorService executor, final Provider sceneTileManager) { this.developerMode = developerMode; @@ -116,7 +113,6 @@ public class PluginManager this.eventBus = eventBus; this.scheduler = scheduler; this.configManager = configManager; - this.executor = executor; this.sceneTileManager = sceneTileManager; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/CombatLevelRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/CombatLevelRequirement.java index 302822e534..0b79715498 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/CombatLevelRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/CombatLevelRequirement.java @@ -40,8 +40,9 @@ public class CombatLevelRequirement implements Requirement return level + " " + "Combat"; } + @Override public boolean satisfiesRequirement(Client client) { - return client.getLocalPlayer() == null ? false : client.getLocalPlayer().getCombatLevel() >= level; + return client.getLocalPlayer() != null && client.getLocalPlayer().getCombatLevel() >= level; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java index 916033f206..a39953492c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java @@ -42,6 +42,7 @@ public class FavourRequirement implements Requirement return percent + "% " + house.getName() + " favour"; } + @Override public boolean satisfiesRequirement(Client client) { int realFavour = client.getVar(house.getVarbit()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/OrRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/OrRequirement.java index 44f9ebb0d5..ac31fb6c45 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/OrRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/OrRequirement.java @@ -46,6 +46,7 @@ public class OrRequirement implements Requirement return Joiner.on(" or ").join(requirements); } + @Override public boolean satisfiesRequirement(Client client) { for (Requirement r : getRequirements()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestPointRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestPointRequirement.java index 0813e6bed0..d126222544 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestPointRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestPointRequirement.java @@ -41,6 +41,7 @@ public class QuestPointRequirement implements Requirement return qp + " " + "Quest points"; } + @Override public boolean satisfiesRequirement(Client client) { return client.getVar(VarPlayer.QUEST_POINTS) >= qp; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestRequirement.java index ca02ee682d..9b8a1c2e1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/QuestRequirement.java @@ -53,6 +53,7 @@ public class QuestRequirement implements Requirement return quest.getName(); } + @Override public boolean satisfiesRequirement(Client client) { QuestState questState = quest.getState(client); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/SkillRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/SkillRequirement.java index ded0a3c84d..8469e7f0c4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/SkillRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/SkillRequirement.java @@ -42,6 +42,7 @@ public class SkillRequirement implements Requirement return level + " " + skill.getName(); } + @Override public boolean satisfiesRequirement(Client client) { return client.getRealSkillLevel(skill) >= level; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java index a13d9b3689..a3abe20df1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java @@ -44,7 +44,6 @@ import net.runelite.api.MenuAction; import net.runelite.api.NPC; import net.runelite.api.NullNpcID; import net.runelite.api.Player; -import net.runelite.api.Skill; import static net.runelite.api.Skill.AGILITY; import net.runelite.api.Tile; import net.runelite.api.TileItem; @@ -159,7 +158,7 @@ public class AgilityPlugin extends Plugin { overlayManager.add(agilityOverlay); overlayManager.add(lapCounterOverlay); - agilityLevel = client.getBoostedSkillLevel(Skill.AGILITY); + agilityLevel = client.getBoostedSkillLevel(AGILITY); } @Override 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 7583d7639b..eecaa99843 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 @@ -278,7 +278,7 @@ public class AttackStylesPlugin extends Plugin if (warnedSkills.contains(skill)) { if (weaponSwitch) - { + { // NOPMD EmptyIfStmt // TODO : chat message to warn players that their weapon switch also caused an unwanted attack style change } warnedSkillSelected = true; @@ -319,7 +319,7 @@ public class AttackStylesPlugin extends Plugin } // Magic staves defensive casting mode - if (attackStyle == AttackStyle.DEFENSIVE_CASTING || !enabled) + if (attackStyle == DEFENSIVE_CASTING || !enabled) { widgetsToHide.put(equippedWeaponType, WidgetInfo.COMBAT_DEFENSIVE_SPELL_BOX, enabled && warnedSkill); widgetsToHide.put(equippedWeaponType, WidgetInfo.COMBAT_DEFENSIVE_SPELL_ICON, enabled && warnedSkill); 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 186ca422e9..d1e491e19e 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 @@ -72,13 +72,11 @@ import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemVariationMapping; import net.runelite.client.game.SpriteManager; import net.runelite.client.game.chatbox.ChatboxPanelManager; -import net.runelite.client.input.KeyManager; import net.runelite.client.input.MouseManager; import net.runelite.client.input.MouseWheelListener; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.plugins.banktags.tabs.BankSearch; import net.runelite.client.plugins.banktags.tabs.TabInterface; import static net.runelite.client.plugins.banktags.tabs.TabInterface.FILTERED_CHARS; import net.runelite.client.plugins.banktags.tabs.TabSprites; @@ -138,12 +136,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener @Inject private TabInterface tabInterface; - @Inject - private BankSearch bankSearch; - - @Inject - private KeyManager keyManager; - @Inject private SpriteManager spriteManager; 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 1799b4f9f2..3b3a7037d6 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 @@ -113,7 +113,6 @@ public class TabInterface private static final String TAG_GEAR = "Tag-equipment"; private static final String TAG_INVENTORY = "Tag-inventory"; private static final String TAB_MENU_KEY = "tagtabs"; - private static final String TAB_MENU = TAG_SEARCH + TAB_MENU_KEY; private static final String OPEN_TAB_MENU = "View tag tabs"; private static final String SHOW_WORN = "Show worn items"; private static final String SHOW_SETTINGS = "Show menu"; @@ -142,10 +141,10 @@ public class TabInterface private final BankTagsConfig config; private final Notifier notifier; private final BankSearch bankSearch; + private final ChatboxItemSearch searchProvider; private final Rectangle bounds = new Rectangle(); private final Rectangle canvasBounds = new Rectangle(); - private ChatboxItemSearch searchProvider; @Getter private TagTab activeTab; @Getter diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index d430ef0c01..686cecbf2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -39,8 +39,6 @@ import net.runelite.client.ui.overlay.OverlayPosition; class BarrowsOverlay extends Overlay { - private static final int MAX_DISTANCE = 2350; - private final Client client; private final BarrowsPlugin plugin; private final BarrowsConfig config; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java index f76348a7b7..078463bfb3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java @@ -79,7 +79,7 @@ enum Boss bosses = builder.build(); } - private Boss(int id, long period, ChronoUnit unit, int itemSpriteId) + Boss(int id, long period, ChronoUnit unit, int itemSpriteId) { this.id = id; this.spawnTime = Duration.of(period, unit); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java index 6e8eb1bd4d..ded2628348 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java @@ -141,6 +141,7 @@ public class CipherClue extends ClueScroll implements TextClueScroll, NpcClueScr return null; } + @Override public String[] getNpcs() { return new String[] {npc}; 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 dfcd13828d..24ab3264bf 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 @@ -369,6 +369,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat this.location = wp; } + @Override public String[] getNpcs() { return new String[] {npc}; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java index 0439c6bb34..2800580294 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java @@ -208,6 +208,7 @@ public class MapClue extends ClueScroll implements ObjectClueScroll return null; } + @Override public int[] getObjectIds() { return new int[] {objectId}; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AnyRequirementCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AnyRequirementCollection.java index 886cf13f0c..ae223285c5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AnyRequirementCollection.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/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/item/MultipleOfItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java index 064d92eddc..88432a4ca3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java @@ -30,8 +30,8 @@ import net.runelite.api.ItemComposition; public class MultipleOfItemRequirement implements ItemRequirement { - private int itemId; - private int quantity; + private final int itemId; + private final int quantity; public MultipleOfItemRequirement(int itemId, int quantity) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/RangeItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/RangeItemRequirement.java index 51a0d34f8b..ef81ced371 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/RangeItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/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/item/SingleItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java index 698fa9cfec..1571e004af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java @@ -30,7 +30,7 @@ import net.runelite.api.ItemComposition; 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/item/SlotLimitationRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SlotLimitationRequirement.java index 604355c4f1..f52f0ee19d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SlotLimitationRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/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/config/UnitFormatter.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/UnitFormatter.java index 4945a4a65e..efe2181d9b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/UnitFormatter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/UnitFormatter.java @@ -61,7 +61,7 @@ final class UnitFormatter extends JFormattedTextField.AbstractFormatter } catch (NumberFormatException e) { - throw new ParseException(trimmedText + " is not an integer.", 0); + throw new ParseException(trimmedText + " is not an integer.", 0); // NOPMD: PreserveStackTrace } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java index c3f922eab7..6998e96eef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java @@ -54,17 +54,15 @@ class CookingOverlay extends OverlayPanel private final Client client; private final CookingPlugin plugin; - private final CookingConfig config; private final XpTrackerService xpTrackerService; @Inject - private CookingOverlay(Client client, CookingPlugin plugin, CookingConfig config, XpTrackerService xpTrackerService) + private CookingOverlay(Client client, CookingPlugin plugin, XpTrackerService xpTrackerService) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); this.client = client; this.plugin = plugin; - this.config = config; this.xpTrackerService = xpTrackerService; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Cooking overlay")); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY, COOKING_RESET, "Cooking overlay")); 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 9ad661094c..284e8caea9 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 @@ -90,9 +90,6 @@ public class CorpPlugin extends Plugin @Inject private CoreOverlay coreOverlay; - @Inject - private CorpConfig config; - @Provides CorpConfig getConfig(ConfigManager configManager) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldConfig.java index 3a750f2e42..d53ede7a7b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldConfig.java @@ -31,7 +31,7 @@ import net.runelite.client.config.ConfigItem; @ConfigGroup(DefaultWorldConfig.GROUP) public interface DefaultWorldConfig extends Config { - final String GROUP = "defaultworld"; + String GROUP = "defaultworld"; @ConfigItem( keyName = "defaultWorld", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryDeltaPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryDeltaPanel.java index 665a1fa674..72c22af6f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryDeltaPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryDeltaPanel.java @@ -76,6 +76,7 @@ class InventoryDeltaPanel extends JPanel implements Scrollable // Listen for resize events addComponentListener(new ComponentAdapter() { + @Override public void componentResized(final ComponentEvent componentEvent) { // Account for container and slot padding diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryInspector.java index 60afafd2f1..44b7f141dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/InventoryInspector.java @@ -206,7 +206,7 @@ class InventoryInspector extends JFrame node.add(new InventoryLogNode(invLog)); // Cull very old stuff - for (; node.getChildCount() > MAX_LOG_ENTRIES; ) + while (node.getChildCount() > MAX_LOG_ENTRIES) { node.remove(0); } @@ -317,7 +317,7 @@ class InventoryInspector extends JFrame final int qty = e.getValue(); final ItemComposition c = itemManager.getItemComposition(e.getKey()); - InventoryItem[] items = new InventoryItem[]{ + InventoryItem[] items = { new InventoryItem(-1, new Item(id, qty), c.getName(), c.isStackable()) }; if (!c.isStackable() && (qty > 1 || qty < -1)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/ScriptInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/ScriptInspector.java index 1cc8582c9a..5956baed72 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/ScriptInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/ScriptInspector.java @@ -90,8 +90,8 @@ public class ScriptInspector extends JFrame private int lastTick; private Set blacklist; private Set highlights; - private JList jList; - private DefaultListModel listModel; + private final JList jList; + private final DefaultListModel listModel; private ListState state = ListState.BLACKLIST; private enum ListState @@ -401,7 +401,7 @@ public class ScriptInspector extends JFrame tracker.add(tree); // Cull very old stuff - for (; tracker.getComponentCount() > MAX_LOG_ENTRIES; ) + while (tracker.getComponentCount() > MAX_LOG_ENTRIES) { tracker.remove(0); } 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 e39a0bcba2..089a7461d0 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 @@ -209,7 +209,7 @@ class VarInspector extends JFrame tracker.add(new JLabel(String.format("%s %s changed: %s -> %s", type.getName(), name, old, neew))); // Cull very old stuff - for (; tracker.getComponentCount() > MAX_LOG_ENTRIES; ) + while (tracker.getComponentCount() > MAX_LOG_ENTRIES) { tracker.remove(0); } 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 7c8673a2ec..7407711d58 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 @@ -345,7 +345,7 @@ class WidgetInspector extends JFrame DefaultMutableTreeNode node = root; deeper: - for (; !treePath.empty(); ) + while (!treePath.empty()) { Widget w = treePath.pop(); for (Enumeration it = node.children(); it.hasMoreElements(); ) 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 e2b0cb157b..f4cdaa34a5 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 @@ -291,7 +291,7 @@ public class DiscordPlugin extends Plugin @Override public void onResponse(Call call, Response response) throws IOException { - try + try // NOPMD: UseTryWithResources { if (!response.isSuccessful()) { 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 0f7d008131..0c2497cf3b 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 @@ -68,7 +68,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); @Provides XpDropConfig provideConfig(ConfigManager configManager) 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 9f57996a27..28e480ba34 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 @@ -68,9 +68,9 @@ import net.runelite.client.util.Text; ) public class FairyRingPlugin extends Plugin { - private static final String[] leftDial = new String[]{"A", "D", "C", "B"}; - private static final String[] middleDial = new String[]{"I", "L", "K", "J"}; - private static final String[] rightDial = new String[]{"P", "S", "R", "Q"}; + private static final String[] leftDial = {"A", "D", "C", "B"}; + private static final String[] middleDial = {"I", "L", "K", "J"}; + private static final String[] rightDial = {"P", "S", "R", "Q"}; private static final int ENTRY_PADDING = 3; 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 5da8e4b4c5..5cc4ea0bd9 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 @@ -61,9 +61,6 @@ public class FeedPlugin extends Plugin @Inject private ClientToolbar clientToolbar; - @Inject - private FeedConfig config; - @Inject private ScheduledExecutorService executorService; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatPlugin.java index 87cb324c8d..8413c225e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatPlugin.java @@ -120,13 +120,13 @@ public class FriendsChatPlugin extends Plugin private ChatboxPanelManager chatboxPanelManager; private List chats = new ArrayList<>(); - private List members = new ArrayList<>(); + private final List members = new ArrayList<>(); private MembersIndicator membersIndicator; /** * queue of temporary messages added to the client */ private final Deque joinMessages = new ArrayDeque<>(); - private Map activityBuffer = new HashMap<>(); + private final Map activityBuffer = new HashMap<>(); private int joinedTick; private boolean kickConfirmed = false; 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 3bd04c4132..5f458f1762 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 @@ -441,7 +441,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks if (uniformBufferId != -1) { - GLUtil.glDeleteBuffer(gl, uniformBufferId); + glDeleteBuffer(gl, uniformBufferId); uniformBufferId = -1; } @@ -796,9 +796,9 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } else if (paint.getBufferLen() > 0) { - x = tileX * Perspective.LOCAL_TILE_SIZE; - y = 0; - z = tileY * Perspective.LOCAL_TILE_SIZE; + final int localX = tileX * Perspective.LOCAL_TILE_SIZE; + final int localY = 0; + final int localZ = tileY * Perspective.LOCAL_TILE_SIZE; GpuIntBuffer b = modelBufferUnordered; ++unorderedModels; @@ -810,7 +810,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks buffer.put(2); buffer.put(targetBufferOffset); buffer.put(FLAG_SCENE_BUFFER); - buffer.put(x).put(y).put(z); + buffer.put(localX).put(localY).put(localZ); targetBufferOffset += 2 * 3; } @@ -830,9 +830,9 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } else if (model.getBufferLen() > 0) { - x = tileX * Perspective.LOCAL_TILE_SIZE; - y = 0; - z = tileY * Perspective.LOCAL_TILE_SIZE; + final int localX = tileX * Perspective.LOCAL_TILE_SIZE; + final int localY = 0; + final int localZ = tileY * Perspective.LOCAL_TILE_SIZE; GpuIntBuffer b = modelBufferUnordered; ++unorderedModels; @@ -844,7 +844,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks buffer.put(model.getBufferLen() / 3); buffer.put(targetBufferOffset); buffer.put(FLAG_SCENE_BUFFER); - buffer.put(x).put(y).put(z); + buffer.put(localX).put(localY).put(localZ); targetBufferOffset += model.getBufferLen(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Shader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Shader.java index 759db67cb6..bba1827245 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Shader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Shader.java @@ -49,10 +49,6 @@ public class Shader private final String filename; } - public Shader() - { - } - public Shader add(int type, String name) { units.add(new Unit(type, name)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/template/Template.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/template/Template.java index c2d366a7b8..67ed68ca7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/template/Template.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/template/Template.java @@ -37,10 +37,6 @@ public class Template { private final List> resourceLoaders = new ArrayList<>(); - public Template() - { - } - public String process(String str) { StringBuilder sb = new StringBuilder(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java index b4495ad90a..13405426b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java @@ -45,7 +45,8 @@ import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; import net.runelite.api.GrandExchangeOffer; -import net.runelite.api.GrandExchangeOfferState; +import static net.runelite.api.GrandExchangeOfferState.BOUGHT; +import static net.runelite.api.GrandExchangeOfferState.BUYING; import static net.runelite.api.GrandExchangeOfferState.CANCELLED_BUY; import static net.runelite.api.GrandExchangeOfferState.CANCELLED_SELL; import static net.runelite.api.GrandExchangeOfferState.EMPTY; @@ -209,9 +210,9 @@ public class GrandExchangeOfferSlot extends JPanel itemName.setText(offerItem.getName()); itemIcon.setIcon(new ImageIcon(itemImage)); - boolean buying = newOffer.getState() == GrandExchangeOfferState.BOUGHT - || newOffer.getState() == GrandExchangeOfferState.BUYING - || newOffer.getState() == GrandExchangeOfferState.CANCELLED_BUY; + boolean buying = newOffer.getState() == BOUGHT + || newOffer.getState() == BUYING + || newOffer.getState() == CANCELLED_BUY; String offerState = (buying ? "Bought " : "Sold ") + QuantityFormatter.quantityToRSDecimalStack(newOffer.getQuantitySold()) + " / " 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 5c1b8553cf..4bedc5c28e 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 @@ -640,7 +640,7 @@ public class GroundItemsPlugin extends Plugin final Player local = client.getLocalPlayer(); final StringBuilder notificationStringBuilder = new StringBuilder() - .append("[") + .append('[') .append(local.getName()) .append("] received a ") .append(dropType) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index f4b17c6358..73e93f86ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -53,7 +53,6 @@ import net.runelite.api.events.MenuOptionClicked; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.chatbox.ChatboxPanelManager; -import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -96,9 +95,6 @@ public class GroundMarkerPlugin extends Plugin @Inject private GroundMarkerMinimapOverlay minimapOverlay; - @Inject - private KeyManager keyManager; - @Inject private ChatboxPanelManager chatboxPanelManager; 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 373184744e..7876289da6 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 @@ -114,7 +114,7 @@ public class HiscorePanel extends PluginPanel ZALCANO, ZULRAH ); - private static final HiscoreEndpoint[] ENDPOINTS = new HiscoreEndpoint[] { + private static final HiscoreEndpoint[] ENDPOINTS = { HiscoreEndpoint.NORMAL, HiscoreEndpoint.IRONMAN, HiscoreEndpoint.HARDCORE_IRONMAN, HiscoreEndpoint.ULTIMATE_IRONMAN, HiscoreEndpoint.DEADMAN, HiscoreEndpoint.LEAGUE }; @@ -347,7 +347,7 @@ public class HiscorePanel extends PluginPanel label.setIcon(new ImageIcon(ImageUtil.getResourceStreamFromClass(getClass(), skillIcon))); - boolean totalLabel = skill == HiscoreSkill.OVERALL || skill == null; //overall or combat + boolean totalLabel = skill == OVERALL || skill == null; //overall or combat label.setIconTextGap(totalLabel ? 10 : 4); JPanel skillPanel = new JPanel(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java index 28073677b0..75e41f6018 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java @@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; import com.google.inject.Provides; import java.awt.image.BufferedImage; -import java.util.concurrent.ScheduledExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.Nullable; @@ -78,9 +77,6 @@ public class HiscorePlugin extends Plugin @Inject private ClientToolbar clientToolbar; - @Inject - private ScheduledExecutorService executor; - @Inject private HiscoreConfig config; 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 1b7c8a2419..7fd0b6aeaf 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 @@ -32,7 +32,6 @@ import java.util.Arrays; import java.util.List; import javax.inject.Inject; import net.runelite.api.Actor; -import net.runelite.api.AnimationID; import static net.runelite.api.AnimationID.*; import net.runelite.api.Client; import net.runelite.api.Constants; @@ -86,7 +85,7 @@ public class IdleNotifierPlugin extends Plugin private IdleNotifierConfig config; private Instant lastAnimating; - private int lastAnimation = AnimationID.IDLE; + private int lastAnimation = IDLE; private Instant lastInteracting; private Actor lastInteract; private Instant lastMoving; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java index 38803e3c1b..003a5bbc2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java @@ -28,7 +28,6 @@ import com.google.inject.Binder; import javax.inject.Inject; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.WidgetMenuOptionClicked; -import net.runelite.api.widgets.WidgetInfo; import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_OPTION; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; @@ -45,7 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager; ) public class InstanceMapPlugin extends Plugin { - private final WidgetMenuOption openMapOption = new WidgetMenuOption("Show", "Instance Map", WidgetInfo.WORLD_MAP_OPTION); + private final WidgetMenuOption openMapOption = new WidgetMenuOption("Show", "Instance Map", WORLD_MAP_OPTION); @Inject private InstanceMapInputListener inputListener; 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 74a13531f2..3a0f73d9be 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 @@ -40,8 +40,7 @@ import net.runelite.client.plugins.itemstats.StatsChanges; @RequiredArgsConstructor public class SaradominBrew implements Effect { - private static final Stat[] saradominBrewStats = new Stat[] - { + private static final Stat[] saradominBrewStats = { ATTACK, STRENGTH, RANGED, MAGIC }; 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 38493055d7..d5747bd1b8 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 @@ -40,8 +40,7 @@ import net.runelite.client.plugins.itemstats.StatsChanges; @RequiredArgsConstructor public class SuperRestore implements Effect { - private static final Stat[] superRestoreStats = new Stat[] - { + private static final Stat[] superRestoreStats = { ATTACK, DEFENCE, STRENGTH, RANGED, MAGIC, COOKING, WOODCUTTING, FLETCHING, FISHING, FIREMAKING, CRAFTING, SMITHING, MINING, HERBLORE, AGILITY, THIEVING, SLAYER, FARMING, RUNECRAFT, HUNTER, 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 6842b34e7d..df50006369 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 @@ -34,7 +34,7 @@ import net.runelite.client.ui.FontManager; class BookPanel extends JPanel { - private JLabel location = new JLabel(); + private final JLabel location = new JLabel(); BookPanel(Book b) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java index 69b1a5deec..a77473853b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java @@ -274,7 +274,7 @@ class Library assert bookSequence >= 0; bookcaseIndex -= step * bookSequence; - for (; bookcaseIndex < 0; ) + while (bookcaseIndex < 0) { bookcaseIndex += byIndex.size(); } 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 927b222dc7..f0248b19be 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 @@ -80,8 +80,8 @@ class LootTrackerBox extends JPanel private final List items = 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/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index c8ad0fb91e..23caa3ea3f 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 @@ -64,7 +64,6 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemVariationMapping; -import net.runelite.client.input.KeyManager; import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.WidgetMenuOption; import net.runelite.client.plugins.Plugin; @@ -134,9 +133,6 @@ public class MenuEntrySwapperPlugin extends Plugin @Inject private ConfigManager configManager; - @Inject - private KeyManager keyManager; - @Inject private MenuManager menuManager; @@ -812,7 +808,7 @@ public class MenuEntrySwapperPlugin extends Plugin sortedInsert(list2, index1); } - private static > void sortedInsert(List list, T value) + private static > void sortedInsert(List list, T value) // NOPMD: UnusedPrivateMethod: false positive { int idx = Collections.binarySearch(list, value); list.add(idx < 0 ? -idx - 1 : idx, value); 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 d8a3b8e2aa..adecd59fa9 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 @@ -78,7 +78,6 @@ import net.runelite.client.ui.overlay.OverlayMenuEntry; @PluginDependency(XpTrackerPlugin.class) public class MiningPlugin extends Plugin { - private static final int ROCK_DISTANCE = 14; private static final Pattern MINING_PATERN = Pattern.compile( "You " + "(?:manage to|just)" + diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java index 5b7d6bffa1..3ed1da90dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java @@ -28,7 +28,6 @@ import com.google.inject.Provides; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; -import net.runelite.api.Client; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; import net.runelite.client.plugins.Plugin; @@ -46,9 +45,6 @@ import net.runelite.client.ui.overlay.OverlayManager; ) public class MTAPlugin extends Plugin { - @Inject - private Client client; - @Inject private OverlayManager overlayManager; 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 24e5bbf9a5..d8fa6e81de 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 @@ -63,7 +63,6 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; -import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -107,9 +106,6 @@ public class NpcIndicatorsPlugin extends Plugin @Inject private NpcMinimapOverlay npcMinimapOverlay; - @Inject - private KeyManager keyManager; - @Inject private ClientThread clientThread; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java index 01af41f6ad..9582288ea1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java @@ -29,7 +29,6 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; -import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.NPCComposition; import net.runelite.api.Point; @@ -40,14 +39,12 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class NpcMinimapOverlay extends Overlay { - private final Client client; private final NpcIndicatorsConfig config; private final NpcIndicatorsPlugin plugin; @Inject - NpcMinimapOverlay(Client client, NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin) + NpcMinimapOverlay(NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin) { - this.client = client; this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); 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 dc028cb0c0..29a39edf98 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 @@ -71,7 +71,6 @@ import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -106,9 +105,6 @@ public class ObjectIndicatorsPlugin extends Plugin @Inject private ObjectIndicatorsOverlay overlay; - @Inject - private KeyManager keyManager; - @Inject private ObjectIndicatorsConfig config; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java index 5dc68a3bf1..dc9cb8c1c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java @@ -33,7 +33,6 @@ import java.awt.Point; import java.awt.Rectangle; import javax.inject.Inject; import net.runelite.api.Actor; -import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.NPC; import net.runelite.api.Player; @@ -55,7 +54,6 @@ class OpponentInfoOverlay extends OverlayPanel private static final Color HP_GREEN = new Color(0, 146, 54, 230); private static final Color HP_RED = new Color(102, 15, 16, 230); - private final Client client; private final OpponentInfoPlugin opponentInfoPlugin; private final OpponentInfoConfig opponentInfoConfig; private final HiscoreManager hiscoreManager; @@ -68,14 +66,12 @@ class OpponentInfoOverlay extends OverlayPanel @Inject private OpponentInfoOverlay( - Client client, OpponentInfoPlugin opponentInfoPlugin, OpponentInfoConfig opponentInfoConfig, HiscoreManager hiscoreManager, NPCManager npcManager) { super(opponentInfoPlugin); - this.client = client; this.opponentInfoPlugin = opponentInfoPlugin; this.opponentInfoConfig = opponentInfoConfig; this.hiscoreManager = hiscoreManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java index 7517e4e3bf..840e4cae0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java @@ -54,7 +54,7 @@ class PlayerComparisonOverlay extends Overlay private static final Color NEUTRAL_TEXT_COLOR = Color.WHITE; private static final Color HIGHLIGHT_COLOR = new Color(255, 200, 0, 255); - private static final Skill[] COMBAT_SKILLS = new Skill[]{ + private static final Skill[] COMBAT_SKILLS = { Skill.ATTACK, Skill.STRENGTH, Skill.DEFENCE, @@ -64,7 +64,7 @@ class PlayerComparisonOverlay extends Overlay Skill.PRAYER }; - private static final HiscoreSkill[] HISCORE_COMBAT_SKILLS = new HiscoreSkill[]{ + private static final HiscoreSkill[] HISCORE_COMBAT_SKILLS = { HiscoreSkill.ATTACK, HiscoreSkill.STRENGTH, HiscoreSkill.DEFENCE, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 80b97dd61c..d6c008d40d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -60,7 +60,6 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.events.PartyChanged; -import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.party.data.PartyData; @@ -104,9 +103,6 @@ public class PartyPlugin extends Plugin @Inject private PartyPingOverlay partyPingOverlay; - @Inject - private KeyManager keyManager; - @Inject private WSClient wsClient; 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 a2ae27835b..79608ac725 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(WorldPoint worldPoint, PartyMember member) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java index 960b589737..69a636e7ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java @@ -34,7 +34,6 @@ import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; -import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.NPC; import net.runelite.api.NpcID; @@ -70,9 +69,6 @@ public class PestControlPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private Client client; - @Inject private PestControlOverlay overlay; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java index 717071b866..2eb39344b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java @@ -40,8 +40,7 @@ import net.runelite.client.ui.overlay.OverlayPosition; public class PohOverlay extends Overlay { - private static final PohIcons[] PORTALS = new PohIcons[] - { + private static final PohIcons[] PORTALS = { PohIcons.LUMBRIDGE, PohIcons.FALADOR, PohIcons.VARROCK, PohIcons.CAMELOT, PohIcons.ARDOUGNE, PohIcons.YANILLE, PohIcons.LUNARISLE, PohIcons.WATERBIRTH, PohIcons.FISHINGGUILD, PohIcons.SENNTISTEN, PohIcons.KHARYLL, PohIcons.ANNAKARL, PohIcons.KOUREND, PohIcons.MARIM, 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/pathfinding/IDAStarMM.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java index a869ee13c4..bfd8788a0f 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 @@ -38,9 +38,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/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index ea7fc0ea3c..7b750f1c63 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 @@ -49,24 +49,22 @@ import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldRegion; import net.runelite.http.api.worlds.WorldResult; -public class RaidsOverlay extends OverlayPanel +class RaidsOverlay extends OverlayPanel { private static final int OLM_PLANE = 0; static final String BROADCAST_ACTION = "Broadcast layout"; static final String SCREENSHOT_ACTION = "Screenshot"; - private Client client; - private RaidsPlugin plugin; - private RaidsConfig config; + private final Client client; + private final RaidsPlugin plugin; + private final RaidsConfig config; + private final WorldService worldService; @Getter private boolean scoutOverlayShown = false; @Inject - private WorldService worldService; - - @Inject - private RaidsOverlay(Client client, RaidsPlugin plugin, RaidsConfig config) + private RaidsOverlay(Client client, RaidsPlugin plugin, RaidsConfig config, WorldService worldService) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); @@ -74,6 +72,7 @@ public class RaidsOverlay extends OverlayPanel this.client = client; this.plugin = plugin; this.config = config; + this.worldService = worldService; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Raids overlay")); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY, BROADCAST_ACTION, "Raids overlay")); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY, SCREENSHOT_ACTION, "Raids overlay")); 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 853063c88b..f42b1c82f0 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 @@ -177,16 +177,16 @@ public class RaidsPlugin extends Plugin private EventBus eventBus; @Getter - private final Set roomWhitelist = new HashSet(); + private final Set roomWhitelist = new HashSet<>(); @Getter - private final Set roomBlacklist = new HashSet(); + private final Set roomBlacklist = new HashSet<>(); @Getter - private final Set rotationWhitelist = new HashSet(); + private final Set rotationWhitelist = new HashSet<>(); @Getter - private final Set layoutWhitelist = new HashSet(); + private final Set layoutWhitelist = new HashSet<>(); @Setter(AccessLevel.PACKAGE) // for the test @Getter 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 3843370e87..4a2d8a7dd1 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 @@ -41,7 +41,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; -public class RegenMeterOverlay extends Overlay +class RegenMeterOverlay extends Overlay { private static final Color HITPOINTS_COLOR = brighter(0x9B0703); private static final Color SPECIAL_COLOR = brighter(0x1E95B0); @@ -50,8 +50,8 @@ public class RegenMeterOverlay extends Overlay private static final int OFFSET = 27; private final Client client; - private RegenMeterPlugin plugin; - private RegenMeterConfig config; + private final RegenMeterPlugin plugin; + private final RegenMeterConfig config; private static Color brighter(int color) { 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 1a1d415d06..2d52329d1c 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 @@ -28,7 +28,6 @@ import java.util.HashMap; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; -import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.InventoryID; import net.runelite.api.ItemContainer; @@ -64,9 +63,6 @@ public class RoguesDenPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private boolean hasGem; - @Inject - private Client client; - @Inject private OverlayManager overlayManager; 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 f1e0c60bde..ed60dd119a 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 @@ -34,9 +34,9 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; -public class ScreenMarkerCreationOverlay extends Overlay +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/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index e6f17c1572..7ecc64af50 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 @@ -65,7 +65,6 @@ import static net.runelite.api.widgets.WidgetID.LEVEL_UP_GROUP_ID; import static net.runelite.api.widgets.WidgetID.QUEST_COMPLETED_GROUP_ID; import static net.runelite.api.widgets.WidgetID.THEATRE_OF_BLOOD_REWARD_GROUP_ID; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.Notifier; import static net.runelite.client.RuneLite.SCREENSHOT_DIR; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -134,9 +133,6 @@ public class ScreenshotPlugin extends Plugin @Inject private ScreenshotOverlay screenshotOverlay; - @Inject - private Notifier notifier; - @Inject private Client client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java index 969ac792f5..4959390271 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.skillcalculator; import com.google.gson.Gson; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; @@ -43,10 +44,16 @@ class CacheSkillData return cache.get(dataFile); } - InputStream skillDataFile = SkillCalculatorPlugin.class.getResourceAsStream(dataFile); - SkillData skillData = new Gson().fromJson(new InputStreamReader(skillDataFile, StandardCharsets.UTF_8), SkillData.class); + try (InputStream skillDataFile = SkillCalculatorPlugin.class.getResourceAsStream(dataFile)) + { + SkillData skillData = new Gson().fromJson(new InputStreamReader(skillDataFile, StandardCharsets.UTF_8), SkillData.class); - cache.put(dataFile, skillData); - return skillData; + cache.put(dataFile, skillData); + return skillData; + } + catch (IOException e) + { + throw new RuntimeException(e); + } } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java index ffc6ddd871..91f9fada23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/Skybox.java @@ -110,7 +110,7 @@ class Skybox { m.reset(line); int end = 0; - for (; end < line.length(); ) + while (end < line.length()) { m.region(end, line.length()); if (!m.find()) @@ -378,9 +378,6 @@ class Skybox x /= 8.d; y /= 8.d; - int cx = (int) x; - int cy = (int) y; - int centerChunkData = chunkData(px / 8, py / 8, plane, chunkMapper); if (centerChunkData == -1) { 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 1ed8afbea0..72ad3524ee 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 @@ -213,7 +213,7 @@ public class SlayerPlugin extends Plugin private int cachedXp = -1; private Instant infoTimer; private boolean loginFlag; - private List targetNames = new ArrayList<>(); + private final List targetNames = new ArrayList<>(); @Override protected void startUp() throws Exception diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java index 482fb45089..eaeb0a0cda 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java @@ -33,15 +33,13 @@ import net.runelite.client.ui.overlay.infobox.Counter; class SpecialCounter extends Counter { - private final SpecialCounterPlugin plugin; - private SpecialWeapon weapon; + private final SpecialWeapon weapon; @Getter(AccessLevel.PACKAGE) private final Map partySpecs = new HashMap<>(); SpecialCounter(BufferedImage image, SpecialCounterPlugin plugin, int hitValue, SpecialWeapon weapon) { super(image, plugin, hitValue); - this.plugin = plugin; this.weapon = weapon; } 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 af4f5ec5b9..dbe313272c 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 @@ -166,7 +166,6 @@ public class SpecialCounterPlugin extends Plugin { Actor target = hitsplatApplied.getActor(); Hitsplat hitsplat = hitsplatApplied.getHitsplat(); - Hitsplat.HitsplatType hitsplatType = hitsplat.getHitsplatType(); // Ignore all hitsplats other than mine if (!hitsplat.isMine() || target == client.getLocalPlayer()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java index 9f9e136d06..b6883037b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java @@ -27,7 +27,7 @@ package net.runelite.client.plugins.statusbars; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import net.runelite.client.plugins.statusbars.Config.BarMode; +import net.runelite.client.plugins.statusbars.config.BarMode; @ConfigGroup("statusbars") public interface StatusBarsConfig extends Config 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 b61a057f98..2d76c59b41 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 @@ -49,7 +49,7 @@ import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.itemstats.Effect; import net.runelite.client.plugins.itemstats.ItemStatChangesService; import net.runelite.client.plugins.itemstats.StatChange; -import net.runelite.client.plugins.statusbars.Config.BarMode; +import net.runelite.client.plugins.statusbars.config.BarMode; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Config/BarMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java similarity index 96% rename from runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Config/BarMode.java rename to runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java index 9cf32e0b47..53ee959127 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Config/BarMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.statusbars.Config; +package net.runelite.client.plugins.statusbars.config; public enum BarMode { 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 0af69e7863..d75eb0bb6a 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 @@ -91,8 +91,8 @@ public class TearsOfGuthixPlugin extends Plugin { DecorativeObject object = event.getDecorativeObject(); - if (event.getDecorativeObject().getId() == ObjectID.BLUE_TEARS || - event.getDecorativeObject().getId() == ObjectID.BLUE_TEARS_6665) + if (object.getId() == ObjectID.BLUE_TEARS || + object.getId() == ObjectID.BLUE_TEARS_6665) { if (client.getLocalPlayer().getWorldLocation().getRegionID() == TOG_REGION) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java index 243b5a4511..dd3a2bba5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TabContentPanel.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.timetracking; -import java.awt.Dimension; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.TextStyle; @@ -46,12 +45,6 @@ public abstract class TabContentPanel extends JPanel public abstract void update(); - @Override - public Dimension getPreferredSize() - { - return super.getPreferredSize(); - } - public static String getFormattedEstimate(long remainingSeconds, TimeFormatMode mode) { DateTimeFormatter formatter = getDateTimeFormatter(mode); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java index f24ff6b7d2..dce174eeee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java @@ -54,8 +54,6 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; -import net.runelite.client.game.SpriteManager; -import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.JagexColors; @@ -77,9 +75,6 @@ public class WikiPlugin extends Plugin private static final String MENUOP_WIKI = "Wiki"; - @Inject - private SpriteManager spriteManager; - @Inject private WikiConfig config; @@ -89,9 +84,6 @@ public class WikiPlugin extends Plugin @Inject private Client client; - @Inject - private ChatboxPanelManager chatboxPanelManager; - @Inject private ItemManager itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java index c796ceda32..8552d90eef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java @@ -67,7 +67,6 @@ public class WikiSearchChatboxTextInput extends ChatboxTextInput private static final int PREDICTION_DEBOUNCE_DELAY_MS = 200; private final ChatboxPanelManager chatboxPanelManager; - private final OkHttpClient okHttpClient; private final Gson gson = new Gson(); private Future runningRequest = null; @@ -83,7 +82,6 @@ public class WikiSearchChatboxTextInput extends ChatboxTextInput { super(chatboxPanelManager, clientThread); this.chatboxPanelManager = chatboxPanelManager; - this.okHttpClient = okHttpClient; lines(1); prompt("OSRS Wiki Search"); @@ -138,7 +136,7 @@ public class WikiSearchChatboxTextInput extends ChatboxTextInput public void onResponse(Call call, Response response) throws IOException { String body = response.body().string(); - try + try // NOPMD: UseTryWithResources { JsonArray jar = new JsonParser().parse(body).getAsJsonArray(); List apredictions = gson.fromJson(jar.get(1), new TypeToken>() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index f91e490f3e..8f9b9060b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -65,7 +65,6 @@ import net.runelite.api.events.PlayerMenuOptionClicked; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WorldListLoad; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; @@ -112,9 +111,6 @@ public class WorldHopperPlugin extends Plugin @Inject private Client client; - @Inject - private ClientThread clientThread; - @Inject private ConfigManager configManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java index 7d3102127b..486d88f373 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java @@ -63,8 +63,8 @@ class WorldSwitcherPanel extends PluginPanel private WorldOrder orderIndex = WorldOrder.WORLD; private boolean ascendingOrder = true; - private ArrayList rows = new ArrayList<>(); - private WorldHopperPlugin plugin; + private final ArrayList rows = new ArrayList<>(); + private final WorldHopperPlugin plugin; @Setter(AccessLevel.PACKAGE) private SubscriptionFilterMode filterMode; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java index 3abf40fa2f..d67d5b6bb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java @@ -78,7 +78,7 @@ class WorldTableRow extends JPanel private JLabel playerCountField; private JLabel activityField; private JLabel pingField; - private BiConsumer onFavorite; + private final BiConsumer onFavorite; @Getter private final World world; @@ -89,11 +89,9 @@ class WorldTableRow extends JPanel private int ping; private Color lastBackground; - private boolean current; WorldTableRow(World world, boolean current, boolean favorite, Integer ping, Consumer onSelect, BiConsumer onFavorite) { - this.current = current; this.world = world; this.onFavorite = onFavorite; this.updatedPlayerCount = world.getPlayers(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java index fb79e63b12..dc0d25a722 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java @@ -424,11 +424,11 @@ public class WorldMapPlugin extends Plugin // Get first uncompleted quest. Else, return the last quest. Quest quest = null; - for (int i = 0; i < quests.length; i++) + for (Quest q : quests) { - if (quests[i].getState(client) != QuestState.FINISHED) + if (q.getState(client) != QuestState.FINISHED) { - quest = quests[i]; + quest = q; break; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java index b692bda0b3..46b514151e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java @@ -33,7 +33,6 @@ import java.util.Comparator; import java.util.List; import javax.inject.Inject; import lombok.Getter; -import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.MenuAction; import net.runelite.api.Skill; @@ -65,9 +64,6 @@ public class XpGlobesPlugin extends Plugin @Getter private final List xpGlobes = new ArrayList<>(); - @Inject - private Client client; - @Inject private XpGlobesConfig config; diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java index 2f9be1db5c..ba9d3ebe2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java @@ -48,7 +48,7 @@ class ClientConfigLoader final RSConfig config = new RSConfig(); - try (final Response response = okHttpClient.newCall(request).execute()) + try (Response response = okHttpClient.newCall(request).execute()) { if (!response.isSuccessful()) { diff --git a/runelite-client/src/main/java/net/runelite/client/rs/TeeInputStream.java b/runelite-client/src/main/java/net/runelite/client/rs/TeeInputStream.java index 6b9b08910d..143f50740e 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/TeeInputStream.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/TeeInputStream.java @@ -71,7 +71,7 @@ class TeeInputStream extends FilterInputStream { byte[] buf = new byte[(int) Math.min(n, 0x4000)]; long total = 0; - for (; n > 0; ) + while (n > 0) { int read = (int) Math.min(n, buf.length); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index 99a5baf689..a25b194d56 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -109,8 +109,6 @@ public class ClientUI private static final String CONFIG_CLIENT_BOUNDS = "clientBounds"; private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized"; private static final String CONFIG_CLIENT_SIDEBAR_CLOSED = "clientSidebarClosed"; - private static final int CLIENT_WELL_HIDDEN_MARGIN = 160; - private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10; public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runelite.png"); @Getter 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 210de8f799..8394093fe7 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..9dddff5bb7 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 @@ -47,8 +47,8 @@ public 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..9ba4fe0463 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,6 @@ public class MaterialTab extends JLabel { super(string); - this.group = group; this.content = content; if (selected) diff --git a/runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java b/runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java index 76530b6ab6..60b3b305f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java @@ -65,7 +65,7 @@ public class ReflectUtil } catch (ReflectiveOperationException ex) { - throw new RuntimeException(ex); + throw new RuntimeException(ex); // NOPMD: PreserveStackTrace: ignore e } } } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java index 2ca7409b8d..02b679e496 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java @@ -123,7 +123,7 @@ public class PluginManagerTest @Test public void testLoadPlugins() throws Exception { - PluginManager pluginManager = new PluginManager(false, false, null, null, null, null, null); + PluginManager pluginManager = new PluginManager(false, false, null, null, null, null); pluginManager.setOutdated(true); pluginManager.loadCorePlugins(); Collection plugins = pluginManager.getPlugins(); @@ -134,7 +134,7 @@ public class PluginManagerTest .count(); assertEquals(expected, plugins.size()); - pluginManager = new PluginManager(false, false, null, null, null, null, null); + pluginManager = new PluginManager(false, false, null, null, null, null); pluginManager.loadCorePlugins(); plugins = pluginManager.getPlugins(); @@ -159,7 +159,7 @@ public class PluginManagerTest RuneLite.DEFAULT_SESSION_FILE, RuneLite.DEFAULT_CONFIG_FILE)); - PluginManager pluginManager = new PluginManager(true, false, null, null, null, null, null); + PluginManager pluginManager = new PluginManager(true, false, null, null, null, null); pluginManager.loadCorePlugins(); modules.addAll(pluginManager.getPlugins());