diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b6ab279e6c..d40fcd14f5 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,6 +1,8 @@ name: OpenOSRS - CI (PR) -on: pull_request +on: + pull_request: + types: ['opened', 'edited', 'reopened', 'synchronize'] jobs: pr-lint: @@ -10,7 +12,7 @@ jobs: steps: - name: PR title lint if: github.event_name == 'pull_request' - uses: seferov/pr-lint-action@master + uses: seferov/pr-lint-action@v1.0.3 with: title-regex: '^([\w-/]+): \w+' @@ -116,4 +118,4 @@ jobs: if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' uses: hmarr/auto-approve-action@v2.0.0 with: - github-token: ${{ secrets.Owain }} \ No newline at end of file + github-token: ${{ secrets.Owain }} diff --git a/README.md b/README.md index f287b3039c..20cceef16f 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,17 @@ -# OpenOSRS +# OpenOSRS + [![Build Status](https://github.com/open-osrs/runelite/workflows/OpenOSRS%20-%20CI%20(push)/badge.svg)](https://github.com/open-osrs/runelite/actions?query=workflow%3A%22OpenOSRS+-+CI+%28push%29%22) [![HitCount](http://hits.dwyl.io/open-osrs/runelite.svg)](http://hits.dwyl.io/open-osrs/runelite) -[OpenOSRS](https://openosrs.com) is an extended version of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying more open-source. We are not affiliated with RuneLite. +[OpenOSRS](https://openosrs.com) is an extended version of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying fully open-source. We are not affiliated with RuneLite. + +## Discord -## Discord [![Discord](https://img.shields.io/discord/373382904769675265.svg)](https://discord.gg/HN5gf3m) -## Project Layout +## Project Layout - [cache](cache/src/main/java/net/runelite/cache) - Libraries used for reading/writing cache files, as well as the data in it - [deobfuscator](deobfuscator/src/main/java/net/runelite/deob) - Can decompile and cleanup gamepacks as well as map updates to newer revs @@ -23,38 +25,18 @@ - [runescape-api](runescape-api/src/main/java/net/runelite) - Mappings correspond to these interfaces, runelite-api is a subset of this - [runelite-client](runelite-client/src/main/java/net/runelite/client) - Game client with plugins -## Building +## Building + We have migrated the project to Gradle. Information on how to setup and build the project can be found at https://github.com/open-osrs/runelite/wiki/Building-with-IntelliJ-IDEA -## Private Servers -Currently we support RSMod which can be found at: https://github.com/Tomm0017/rsmod but should work with any server that follows osrs protocol. -``` -Gradle -enter -run --args='--rs=RSPS' -into the tasks box - -Jar -Use -rs=RSPS arg. - -Exe -Use --clientargs="--rs=RSPS" arg. - ------ - -Codebase is set to 127.0.0.1 by default and can be changed in the Private Server plugin (requires restart) -Update modulus in Private Server plugin. - -Disable Default World plugin if you have it enabled, this causes issues with codebase. -``` -## License +## License OpenOSRS is licensed under the BSD 2-clause license. See the license header in the respective file to be sure. -## Contribute and Develop +## Contribute and Develop We've set up a separate document for our [contribution guidelines](https://github.com/open-osrs/runelite/blob/master/.github/CONTRIBUTING.md). -## Supported By +## Supported By OpenOSRS uses profiling tools provided by [![YourKit](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/java/profiler/) diff --git a/runelite-client/src/main/java/net/runelite/client/Notifier.java b/runelite-client/src/main/java/net/runelite/client/Notifier.java index ea52314b89..0585c7a026 100644 --- a/runelite-client/src/main/java/net/runelite/client/Notifier.java +++ b/runelite-client/src/main/java/net/runelite/client/Notifier.java @@ -316,7 +316,7 @@ public class Notifier private static Process sendCommand(final List commands) throws IOException { - return new ProcessBuilder(commands.toArray(new String[commands.size()])) + return new ProcessBuilder(commands.toArray(new String[0])) .redirectErrorStream(true) .start(); } diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 029e97adbb..924de7ca81 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -238,7 +238,7 @@ public class RuneLite Authenticator.setDefault(new Authenticator() { - private PasswordAuthentication auth = new PasswordAuthentication(user, pass); + private final PasswordAuthentication auth = new PasswordAuthentication(user, pass); protected PasswordAuthentication getPasswordAuthentication() { @@ -308,7 +308,7 @@ public class RuneLite log.info("Client initialization took {}ms. Uptime: {}ms", end - start, uptime); } - public void start() throws Exception + private void start() throws Exception { // Load RuneLite or Vanilla client final boolean isOutdated = client == null; diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index 964708fefb..274c920b07 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -41,8 +41,8 @@ import net.runelite.client.callback.Hooks; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; -import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.config.OpenOSRSConfig; +import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.eventbus.EventBus; import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index 47f744ec42..62e2f22e4b 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -139,6 +139,7 @@ public class Hooks implements Callbacks /** * Get the Graphics2D for the MainBufferProvider image * This caches the Graphics2D instance so it can be reused + * * @param mainBufferProvider * @return */ diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java index 0c10d6753a..0b9b395146 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageBuilder.java @@ -25,8 +25,8 @@ package net.runelite.client.chat; import java.awt.Color; -import net.runelite.client.util.ColorUtil; import net.runelite.api.util.Text; +import net.runelite.client.util.ColorUtil; public class ChatMessageBuilder { 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 f00fa0cac4..4ead00a62a 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 @@ -46,13 +46,13 @@ import net.runelite.api.MessageNode; import net.runelite.api.Player; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.ResizeableChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.VarbitChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.ui.JagexColors; import net.runelite.client.util.ColorUtil; diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java index 77c58c7e86..0fb461efc1 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java @@ -71,6 +71,7 @@ public @interface ConfigItem /** * For Config items that have a value of multiple enums, + * * @return the number of rows that are display in the item without having to scroll. */ int displayRows() default 2; @@ -82,6 +83,7 @@ public @interface ConfigItem /** * Use this to indicate the enum class that is going to be used in the multiple select config. * This implementation made debugging problems with multiple selects a lot easier + * * @return The Enum that will be used for the multiple select */ Class enumClass() default Enum.class; diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index fff6a449c3..a4a0765cc3 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -59,10 +59,10 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.RuneLite; import static net.runelite.client.RuneLite.PROFILES_DIR; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.util.ColorUtil; import org.apache.commons.lang3.StringUtils; diff --git a/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java b/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java index d52a266cd3..119c5d5f66 100644 --- a/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java +++ b/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java @@ -64,7 +64,7 @@ public class DatabaseManager Settings settings = new Settings(); settings.setExecuteLogging(false); - return DSL.using(connection, SQLDialect.H2, settings); + return DSL.using(connection, SQLDialect.H2, settings); } public boolean checkTableExists(String table) diff --git a/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java b/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java index d273cf5411..76a9234b41 100644 --- a/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java @@ -21,9 +21,9 @@ import net.runelite.client.config.OpenOSRSConfig; @Singleton public class EventBus implements EventBusInterface { - private Map subscriptionList = new HashMap<>(); - private Map, Relay> subjectList = new HashMap<>(); - private Map subscriptionsMap = new HashMap<>(); + private final Map subscriptionList = new HashMap<>(); + private final Map, Relay> subjectList = new HashMap<>(); + private final Map subscriptionsMap = new HashMap<>(); @Inject private OpenOSRSConfig openOSRSConfig; diff --git a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java index ec5730788d..fd26b8d9c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java +++ b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java @@ -59,7 +59,7 @@ public class Flexo extends Robot public static final int fixedWidth = Constants.GAME_FIXED_WIDTH; public static final int fixedHeight = Constants.GAME_FIXED_HEIGHT; public static boolean isStretched; - public static int minDelay = 45; + public static final int minDelay = 45; public static MouseMotionFactory currentMouseMotionFactory; public boolean pausedIndefinitely = false; private Robot peer; @@ -74,7 +74,7 @@ public class Flexo extends Robot .getDefaultScreenDevice()); } - private void init(GraphicsDevice screen) throws AWTException + private void init(GraphicsDevice screen) { try { diff --git a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java index d0441e964d..8771076e1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java +++ b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java @@ -26,18 +26,7 @@ package net.runelite.client.game; import lombok.Getter; -import static net.runelite.api.NullObjectID.NULL_25337; -import static net.runelite.api.NullObjectID.NULL_26371; -import static net.runelite.api.NullObjectID.NULL_26375; -import static net.runelite.api.NullObjectID.NULL_26884; -import static net.runelite.api.NullObjectID.NULL_26886; -import static net.runelite.api.NullObjectID.NULL_29868; -import static net.runelite.api.NullObjectID.NULL_29869; -import static net.runelite.api.NullObjectID.NULL_29870; -import static net.runelite.api.NullObjectID.NULL_31823; -import static net.runelite.api.NullObjectID.NULL_31849; -import static net.runelite.api.NullObjectID.NULL_33327; -import static net.runelite.api.NullObjectID.NULL_33328; +import static net.runelite.api.NullObjectID.*; import static net.runelite.api.ObjectID.*; import net.runelite.api.coords.WorldPoint; @@ -45,40 +34,40 @@ import net.runelite.api.coords.WorldPoint; public enum AgilityShortcut { GENERIC_SHORTCUT(1, "Shortcut", null, - // Trollheim - ROCKS_3790, ROCKS_3791, - // Fremennik Slayer Cave - STEPS_29993, - // Fossil Island - LADDER_30938, LADDER_30939, LADDER_30940, LADDER_30941, RUBBER_CAP_MUSHROOM, - // Brimhaven dungeon - CREVICE_30198, - // Lumbridge - STILE_12982, - // Gu'Tanoth Bridge - GAP, GAP_2831, - // Lumbridge Swamp Caves - STEPPING_STONE_5948, STEPPING_STONE_5949, ROCKS_6673, - // Morytania Pirate Ship - ROCK_16115, - // Lumber Yard - BROKEN_FENCE_2618, - // McGrubor's Wood - LOOSE_RAILING, - // Underwater Area Fossil Island - TUNNEL_30959, HOLE_30966, OBSTACLE, OBSTACLE_30767, OBSTACLE_30964, OBSTACLE_30962, PLANT_DOOR_30961, - // Tree Gnome Village - LOOSE_RAILING_2186, - // Burgh de Rott - LOW_FENCE, - // Taverley - STILE, - // Asgarnian Ice Dungeon - STEPS, - // Fossil Island Wyvern Cave - STAIRS_31485, - // Trollweiss Mountain Cave - ROCKY_HANDHOLDS, ROCKY_HANDHOLDS_19847), + // Trollheim + ROCKS_3790, ROCKS_3791, + // Fremennik Slayer Cave + STEPS_29993, + // Fossil Island + LADDER_30938, LADDER_30939, LADDER_30940, LADDER_30941, RUBBER_CAP_MUSHROOM, + // Brimhaven dungeon + CREVICE_30198, + // Lumbridge + STILE_12982, + // Gu'Tanoth Bridge + GAP, GAP_2831, + // Lumbridge Swamp Caves + STEPPING_STONE_5948, STEPPING_STONE_5949, ROCKS_6673, + // Morytania Pirate Ship + ROCK_16115, + // Lumber Yard + BROKEN_FENCE_2618, + // McGrubor's Wood + LOOSE_RAILING, + // Underwater Area Fossil Island + TUNNEL_30959, HOLE_30966, OBSTACLE, OBSTACLE_30767, OBSTACLE_30964, OBSTACLE_30962, PLANT_DOOR_30961, + // Tree Gnome Village + LOOSE_RAILING_2186, + // Burgh de Rott + LOW_FENCE, + // Taverley + STILE, + // Asgarnian Ice Dungeon + STEPS, + // Fossil Island Wyvern Cave + STAIRS_31485, + // Trollweiss Mountain Cave + ROCKY_HANDHOLDS, ROCKY_HANDHOLDS_19847), BRIMHAVEN_DUNGEON_MEDIUM_PIPE_RETURN(1, "Pipe Squeeze", null, new WorldPoint(2698, 9491, 0), PIPE_21727), BRIMHAVEN_DUNGEON_PIPE_RETURN(1, "Pipe Squeeze", null, new WorldPoint(2655, 9573, 0), PIPE_21728), BRIMHAVEN_DUNGEON_STEPPING_STONES_RETURN(1, "Pipe Squeeze", null, STEPPING_STONE_21739), @@ -206,7 +195,7 @@ public enum AgilityShortcut REVENANT_CAVES_ANKOU_EAST(75, "Jump", new WorldPoint(3201, 10195, 0), PILLAR_31561), REVENANT_CAVES_ANKOU_NORTH(75, "Jump", new WorldPoint(3180, 10209, 0), PILLAR_31561), ZUL_ANDRA_ISLAND_CROSSING(76, "Stepping Stone", new WorldPoint(2156, 3073, 0), STEPPING_STONE_10663), - SHILO_VILLAGE_STEPPING_STONES( 77, "Stepping Stones", new WorldPoint(2863, 2974, 0), STEPPING_STONE_16466), + SHILO_VILLAGE_STEPPING_STONES(77, "Stepping Stones", new WorldPoint(2863, 2974, 0), STEPPING_STONE_16466), IORWERTHS_DUNGEON_NORTHERN_SHORTCUT_EAST(78, "Tight Gap", new WorldPoint(3221, 12441, 0), TIGHT_GAP), IORWERTHS_DUNGEON_NORTHERN_SHORTCUT_WEST(78, "Tight Gap", new WorldPoint(3215, 12441, 0), TIGHT_GAP_36693), KHARAZI_JUNGLE_VINE_CLIMB(79, "Vine", new WorldPoint(2897, 2939, 0), NULL_26884, NULL_26886), diff --git a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java index 932bf5ac02..c02d85c955 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java @@ -45,9 +45,9 @@ import net.runelite.api.IndexedSprite; import net.runelite.api.SpriteID; import net.runelite.api.events.ClanChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.util.Text; import net.runelite.client.eventbus.EventBus; import net.runelite.client.util.ImageUtil; -import net.runelite.api.util.Text; @Singleton public class ClanManager diff --git a/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java b/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java index dbe603dc8d..13f8141cc3 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java @@ -51,7 +51,7 @@ class HiscoreLoader extends CacheLoader cache = CacheBuilder.newBuilder() + private final Cache cache = CacheBuilder.newBuilder() .maximumSize(128L) .expireAfterAccess(1, TimeUnit.HOURS) .build(); diff --git a/runelite-client/src/main/java/net/runelite/client/game/XpDropManager.java b/runelite-client/src/main/java/net/runelite/client/game/XpDropManager.java index 614437b2a1..36055ae9a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/XpDropManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/XpDropManager.java @@ -21,9 +21,8 @@ public class XpDropManager private int damage = 0; @Getter(AccessLevel.PACKAGE) private int tickShow = 0; - private int previousExpGained; - private Client client; - private EventBus eventBus; + private final Client client; + private final EventBus eventBus; @Inject private XpDropManager( @@ -50,7 +49,7 @@ public class XpDropManager Integer previous = previousSkillExpTable.put(skill, xp); if (previous != null) { - previousExpGained = xp - previous; + int previousExpGained = xp - previous; XpDropEvent xpDropEvent = new XpDropEvent(); xpDropEvent.setExp(previousExpGained); xpDropEvent.setSkill(skill); 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 8a4d885fb8..d474aca6a8 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 @@ -59,7 +59,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; @@ -68,7 +68,7 @@ public class ChatboxItemSearch extends ChatboxTextInput @Inject private ChatboxItemSearch(ChatboxPanelManager chatboxPanelManager, ClientThread clientThread, - ItemManager itemManager, Client client) + ItemManager itemManager, Client client) { super(chatboxPanelManager, clientThread); this.chatboxPanelManager = chatboxPanelManager; @@ -181,7 +181,7 @@ public class ChatboxItemSearch extends ChatboxTextInput { if (onItemSelected != null) { - onItemSelected.accept(results.keySet().toArray(new Integer[results.size()])[index]); + onItemSelected.accept(results.keySet().toArray(new Integer[0])[index]); } chatboxPanelManager.close(); diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java index 3880b7b400..f8641f374d 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java @@ -48,6 +48,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.FontID; import net.runelite.api.FontTypeFace; +import net.runelite.api.util.Text; import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetPositionMode; @@ -58,7 +59,6 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseListener; import net.runelite.client.util.MiscUtils; -import net.runelite.api.util.Text; @Slf4j public class ChatboxTextInput extends ChatboxInput implements KeyListener, MouseListener @@ -67,7 +67,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse private static final Pattern BREAK_MATCHER = Pattern.compile("[^a-zA-Z0-9']"); private final ChatboxPanelManager chatboxPanelManager; - protected final ClientThread clientThread; + final ClientThread clientThread; private static IntPredicate getDefaultCharValidator() { @@ -135,7 +135,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse return this; } - public ChatboxTextInput lines(int lines) + protected ChatboxTextInput lines(int lines) { this.lines = lines; if (built) @@ -573,7 +573,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse } @Override - protected void close() + void close() { if (this.onClose != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/menus/BaseComparableEntry.java b/runelite-client/src/main/java/net/runelite/client/menus/BaseComparableEntry.java index a5c6ea436b..6609486bb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/BaseComparableEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/BaseComparableEntry.java @@ -83,10 +83,7 @@ public class BaseComparableEntry extends AbstractComparableEntry { int type = entry.getOpcode(); - if (this.type != type) - { - return false; - } + return this.type == type; } return true; diff --git a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntries.java b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntries.java index 3383191584..f3e324f283 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntries.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntries.java @@ -11,7 +11,6 @@ public interface ComparableEntries * * @param option has to equal entry option * @param target has to equal entry option - * * @return a new BaseComparableEntry */ static BaseComparableEntry newBaseComparableEntry(String option, String target) @@ -23,10 +22,9 @@ public interface ComparableEntries * BaseComparableEntries should only be used if there's * no better ComparableEntry available. * - * @param option has to equal option - * @param target equal or contains depending on strictTarget + * @param option has to equal option + * @param target equal or contains depending on strictTarget * @param strictTarget read up one line - * * @return a new BaseComparableEntry */ static BaseComparableEntry newBaseComparableEntry(String option, String target, boolean strictTarget) @@ -38,13 +36,12 @@ public interface ComparableEntries * BaseComparableEntries should only be used if there's * no better ComparableEntry available. * - * @param option equal or contains depending on strictOption - * @param target equal or contains depending on strictTarget - * @param id has to be the same, or -1 to skip checking - * @param type has to be the same, or -1 to skip checking + * @param option equal or contains depending on strictOption + * @param target equal or contains depending on strictTarget + * @param id has to be the same, or -1 to skip checking + * @param type has to be the same, or -1 to skip checking * @param strictOption strict option or nah * @param strictTarget strict target or nah - * * @return a new BaseComparableEntry */ static BaseComparableEntry newBaseComparableEntry(String option, String target, int id, int type, boolean strictOption, boolean strictTarget) @@ -57,7 +54,7 @@ public interface ComparableEntries * in their name. It then checks the ItemDefinition * for each of them, to see if it's possible for * the item to have option as one of their options. - * + *

* This has to be ran on the clientthread! */ static ItemComparableEntry newInvItemComparableEntry(Client client, String option, String itemName) 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 0b4bb2fb29..c8b551b659 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 @@ -639,7 +639,7 @@ public class MenuManager /** * Adds to the map of swaps. */ - public void addSwap(String option, String target, String option2, String target2, boolean strictOption, boolean strictTarget) + private void addSwap(String option, String target, String option2, String target2, boolean strictOption, boolean strictTarget) { option = option.trim().toLowerCase(); target = Text.standardize(target); @@ -660,7 +660,7 @@ public class MenuManager } - public void removeSwap(String option, String target, String option2, String target2, boolean strictOption, boolean strictTarget) + private void removeSwap(String option, String target, String option2, String target2, boolean strictOption, boolean strictTarget) { option = option.trim().toLowerCase(); target = Text.standardize(target); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java index 705637fe9f..0c517ca2dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java @@ -77,7 +77,9 @@ public abstract class Plugin implements Module for (Method method : this.getClass().getDeclaredMethods()) { if (method.getAnnotation(Subscribe.class) == null) + { continue; + } assert method.getParameterCount() == 1 : "Methods annotated with @Subscribe should have only one parameter"; 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 181cd1752e..0e19d0b66c 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 @@ -570,6 +570,7 @@ public class PluginManager * Plugins in group 2 has dependents in group 1, etc. * This allows for loading dependent groups serially, starting from the last group, * while loading plugins within each group in parallel. + * * @param graph * @param * @return 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 4befd43eb1..1a16de26f4 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 @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.achievementdiary; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public class CombatLevelRequirement implements Requirement { private final int level; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirement.java index 9da905fe14..bf583c27b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirement.java @@ -27,9 +27,10 @@ package net.runelite.client.plugins.achievementdiary; import com.google.common.collect.ImmutableList; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) class DiaryRequirement { private final String task; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java index 2e98877aaf..b0211c33fe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java @@ -79,16 +79,6 @@ public class DiaryRequirementsPlugin extends Plugin @Inject private ClientThread clientThread; - @Override - protected void startUp() throws Exception - { - } - - @Override - protected void shutDown() throws Exception - { - } - @Subscribe private void onWidgetLoaded(final WidgetLoaded event) { 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 575faa0e75..035c032e23 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 @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.achievementdiary; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Favour; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public class FavourRequirement implements Requirement { private final Favour house; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/GenericDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/GenericDiaryRequirement.java index ba7834b151..f34d2ac505 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/GenericDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/GenericDiaryRequirement.java @@ -27,11 +27,12 @@ package net.runelite.client.plugins.achievementdiary; import java.util.HashSet; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; public abstract class GenericDiaryRequirement { - @Getter + @Getter(AccessLevel.PACKAGE) private Set requirements = new HashSet<>(); protected void add(String task, Requirement... requirements) 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 7b852426f9..9270b5203b 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 @@ -27,11 +27,12 @@ package net.runelite.client.plugins.achievementdiary; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; public class OrRequirement implements Requirement { - @Getter + @Getter(AccessLevel.PACKAGE) private final List requirements; public OrRequirement(Requirement... reqs) 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 c2b13e7c9b..b8917067db 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 @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.achievementdiary; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public class QuestPointRequirement implements Requirement { private final int 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 cbc471651f..2781e55f03 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 @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.achievementdiary; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Quest; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public class QuestRequirement implements Requirement { 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 1a711f91ac..1f331a9aee 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 @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.achievementdiary; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Skill; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public class SkillRequirement implements Requirement { private final Skill skill; 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 aa1812a366..1ccf31b81e 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 @@ -135,12 +135,6 @@ public class AgilityPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private int agilityLevel; - @Provides - AgilityConfig getConfig(ConfigManager configManager) - { - return configManager.getConfig(AgilityConfig.class); - } - // Config values @Getter(AccessLevel.PACKAGE) private boolean removeDistanceCap; @@ -167,8 +161,14 @@ public class AgilityPlugin extends Plugin private boolean notifyAgilityArena; private boolean showAgilityArenaTimer; + @Provides + AgilityConfig getConfig(ConfigManager configManager) + { + return configManager.getConfig(AgilityConfig.class); + } + @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -183,7 +183,7 @@ public class AgilityPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { eventBus.unregister(MENU_SUBS); @@ -255,7 +255,7 @@ public class AgilityPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.removeDistanceCap = config.removeDistanceCap(); this.showLapCount = config.showLapCount(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java index 1c6e413a46..116f5725b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.agility; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Client; @@ -32,8 +33,8 @@ import net.runelite.api.Experience; import net.runelite.api.Skill; import net.runelite.api.VarPlayer; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) class AgilitySession { private final Courses course; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java index 91bc97da84..10ad4af459 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java @@ -70,6 +70,12 @@ import net.runelite.client.ui.overlay.OverlayManager; @Singleton public class HydraPlugin extends Plugin { + private static final int[] HYDRA_REGIONS = { + 5279, 5280, + 5535, 5536 + }; + private static final int STUN_LENGTH = 7; + @Getter(AccessLevel.PACKAGE) private Map poisonProjectiles = new HashMap<>(); @@ -87,13 +93,7 @@ public class HydraPlugin extends Plugin private boolean inHydraInstance; private int lastAttackTick; - - private static final int[] HYDRA_REGIONS = { - 5279, 5280, - 5535, 5536 - }; - private static final int STUN_LENGTH = 7; - + @Inject private Client client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java index 2eaf1e50ac..051229ee41 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java @@ -64,7 +64,7 @@ public class AmmoPlugin extends Plugin private AmmoCounter counterBox; @Override - protected void startUp() throws Exception + protected void startUp() { clientThread.invokeLater(() -> @@ -79,7 +79,7 @@ public class AmmoPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { infoBoxManager.removeInfoBox(counterBox); counterBox = null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java index 3d922d2546..9a7050c0a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java @@ -58,13 +58,13 @@ public class AnimationSmoothingPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { update(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { client.setInterpolatePlayerAnimations(false); client.setInterpolateNpcAnimations(false); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java index 86a45cee98..da40cdf465 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java @@ -74,20 +74,74 @@ public class AntiDragPlugin extends Plugin @Inject private KeyManager keyManager; - @Provides - AntiDragConfig getConfig(ConfigManager configManager) - { - return configManager.getConfig(AntiDragConfig.class); - } - private boolean toggleDrag; private boolean configOverlay; private boolean changeCursor; private CustomCursor selectedCursor; private Keybind key; + private final HotkeyListener toggleListener = new HotkeyListener(() -> this.key) + { + @Override + public void hotkeyPressed() + { + toggleDrag = !toggleDrag; + if (toggleDrag) + { + if (configOverlay) + { + overlayManager.add(overlay); + } + if (changeCursor) + { + clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString()); + } + + client.setInventoryDragDelay(config.dragDelay()); + } + else + { + overlayManager.remove(overlay); + client.setInventoryDragDelay(DEFAULT_DELAY); + clientUI.resetCursor(); + } + } + }; + + private final HotkeyListener holdListener = new HotkeyListener(() -> this.key) + { + @Override + public void hotkeyPressed() + { + if (configOverlay) + { + overlayManager.add(overlay); + } + if (changeCursor) + { + clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString()); + } + + client.setInventoryDragDelay(config.dragDelay()); + } + + @Override + public void hotkeyReleased() + { + overlayManager.remove(overlay); + client.setInventoryDragDelay(DEFAULT_DELAY); + clientUI.resetCursor(); + } + }; + + @Provides + AntiDragConfig getConfig(ConfigManager configManager) + { + return configManager.getConfig(AntiDragConfig.class); + } + @Override - protected void startUp() throws Exception + protected void startUp() { overlay.setColor(config.color()); updateConfig(); @@ -100,7 +154,7 @@ public class AntiDragPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { client.setInventoryDragDelay(DEFAULT_DELAY); keyManager.unregisterKeyListener(holdListener); @@ -194,58 +248,4 @@ public class AntiDragPlugin extends Plugin keyManager.unregisterKeyListener(toggleListener); } } - - private final HotkeyListener toggleListener = new HotkeyListener(() -> this.key) - { - @Override - public void hotkeyPressed() - { - toggleDrag = !toggleDrag; - if (toggleDrag) - { - if (configOverlay) - { - overlayManager.add(overlay); - } - if (changeCursor) - { - clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString()); - } - - client.setInventoryDragDelay(config.dragDelay()); - } - else - { - overlayManager.remove(overlay); - client.setInventoryDragDelay(DEFAULT_DELAY); - clientUI.resetCursor(); - } - } - }; - - private final HotkeyListener holdListener = new HotkeyListener(() -> this.key) - { - @Override - public void hotkeyPressed() - { - if (configOverlay) - { - overlayManager.add(overlay); - } - if (changeCursor) - { - clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString()); - } - - client.setInventoryDragDelay(config.dragDelay()); - } - - @Override - public void hotkeyReleased() - { - overlayManager.remove(overlay); - client.setInventoryDragDelay(DEFAULT_DELAY); - clientUI.resetCursor(); - } - }; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java index bf288c62ac..16d7902528 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java @@ -37,12 +37,12 @@ public enum AoeProjectileInfo LIZARDMAN_SHAMAN_AOE(ProjectileID.LIZARDMAN_SHAMAN_AOE, 5), CRAZY_ARCHAEOLOGIST_AOE(ProjectileID.CRAZY_ARCHAEOLOGIST_AOE, 3), ICE_DEMON_RANGED_AOE(ProjectileID.ICE_DEMON_RANGED_AOE, 3), - + /** * When you don't have pray range on ice demon does an ice barrage */ ICE_DEMON_ICE_BARRAGE_AOE(ProjectileID.ICE_DEMON_ICE_BARRAGE_AOE, 3), - + /** * The AOE when vasa first starts */ @@ -63,7 +63,7 @@ public enum AoeProjectileInfo */ GALVEK_MINE(ProjectileID.GALVEK_MINE, 3), GALVEK_BOMB(ProjectileID.GALVEK_BOMB, 3), - + /** * the AOEs of Grotesque Guardians */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java index 28fd21d42b..acce255546 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.aoewarnings; import java.awt.Color; import java.awt.Font; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.client.config.Config; @@ -40,7 +41,7 @@ import net.runelite.client.config.Title; @ConfigGroup("aoe") public interface AoeWarningConfig extends Config { - @Getter + @Getter(AccessLevel.PACKAGE) @AllArgsConstructor enum FontStyle { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index 165b330042..0d486a65ec 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -72,30 +72,42 @@ import net.runelite.client.ui.overlay.OverlayManager; @Slf4j public class AoeWarningPlugin extends Plugin { - @Inject - public AoeWarningConfig config; - @Inject - private Notifier notifier; - @Inject - private OverlayManager overlayManager; - @Inject - private AoeWarningOverlay coreOverlay; - @Inject - private BombOverlay bombOverlay; - @Inject - private Client client; - @Getter(AccessLevel.PACKAGE) - private List lightningTrail = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private List acidTrail = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private List crystalSpike = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private List wintertodtSnowFall = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) private final Set bombs = new HashSet<>(); + @Getter(AccessLevel.PACKAGE) private final Set projectiles = new HashSet<>(); + + @Inject + public AoeWarningConfig config; + + @Inject + private Notifier notifier; + + @Inject + private OverlayManager overlayManager; + + @Inject + private AoeWarningOverlay coreOverlay; + + @Inject + private BombOverlay bombOverlay; + + @Inject + private Client client; + + @Getter(AccessLevel.PACKAGE) + private List lightningTrail = new ArrayList<>(); + + @Getter(AccessLevel.PACKAGE) + private List acidTrail = new ArrayList<>(); + + @Getter(AccessLevel.PACKAGE) + private List crystalSpike = new ArrayList<>(); + + @Getter(AccessLevel.PACKAGE) + private List wintertodtSnowFall = new ArrayList<>(); + // Config values private boolean aoeNotifyAll; @Getter(AccessLevel.PACKAGE) @@ -176,7 +188,7 @@ public class AoeWarningPlugin extends Plugin overlayManager.remove(coreOverlay); overlayManager.remove(bombOverlay); reset(); - } + } @Subscribe private void onConfigChanged(ConfigChanged event) 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 5a93eaa358..2e70cda3e8 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 @@ -70,7 +70,7 @@ public class AttackStylesPlugin extends Plugin private int attackStyleVarbit = -1; private int equippedWeaponTypeVarbit = -1; private int castingModeVarbit = -1; - @Getter + @Getter(AccessLevel.PACKAGE) @Nullable private AttackStyle attackStyle; private final Set warnedSkills = new HashSet<>(); @@ -112,7 +112,7 @@ public class AttackStylesPlugin extends Plugin boolean removeWarnedStyles; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java index d2473e55dd..ff6d0e4408 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java @@ -160,7 +160,7 @@ public class BankPlugin extends Plugin private boolean rightClickBankLoot; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); searchString = ""; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java index 5fc2a423b5..d2543a7adc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java @@ -57,8 +57,8 @@ class ContainerCalculation return null; } - final int newHash = hashItems(items); - + final int newHash = hashItems(items); + if (containerPrices != null && hash == newHash) { return containerPrices; 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 fe94f066c6..7018939a22 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 @@ -97,9 +97,9 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis { public static final String CONFIG_GROUP = "banktags"; public static final String TAG_SEARCH = "tag:"; - private static final String EDIT_TAGS_MENU_OPTION = "Edit-tags"; public static final String ICON_SEARCH = "icon_"; public static final String VAR_TAG_SUFFIX = "*"; + private static final String EDIT_TAGS_MENU_OPTION = "Edit-tags"; private static final String NUMBER_REGEX = "[0-9]+(\\.[0-9]+)?[kmb]?"; private static final String SEARCH_BANK_INPUT_TEXT = @@ -112,6 +112,8 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis " *(((?[<>=]|>=|<=) *(?" + NUMBER_REGEX + "))|" + "((?" + NUMBER_REGEX + ") *- *(?" + NUMBER_REGEX + ")))$", Pattern.CASE_INSENSITIVE); + @VisibleForTesting + final Multiset itemQuantities = HashMultiset.create(); @Inject private ItemManager itemManager; @@ -151,8 +153,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis private boolean shiftPressed = false; private int nextRowIndex = 0; - @VisibleForTesting - Multiset itemQuantities = HashMultiset.create(); @Provides BankTagsConfig getConfig(ConfigManager configManager) @@ -171,6 +171,18 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis spriteManager.addSpriteOverrides(TabSprites.values()); } + @Override + public void shutDown() + { + keyManager.unregisterKeyListener(this); + mouseManager.unregisterMouseWheelListener(this); + clientThread.invokeLater(tabInterface::destroy); + spriteManager.removeSpriteOverrides(TabSprites.values()); + + shiftPressed = false; + itemQuantities.clear(); + } + @Deprecated private void cleanConfig() { @@ -224,19 +236,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis } } - @Override - public void shutDown() - { - keyManager.unregisterKeyListener(this); - mouseManager.unregisterMouseWheelListener(this); - clientThread.invokeLater(tabInterface::destroy); - spriteManager.removeSpriteOverrides(TabSprites.values()); - - shiftPressed = false; - itemQuantities.clear(); - } - -private boolean isSearching() + private boolean isSearching() { return client.getVar(VarClientInt.INPUT_TYPE) == InputType.SEARCH.getType() || (client.getVar(VarClientInt.INPUT_TYPE) <= 0 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java index 16bf1ce927..5f8f299c1a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java @@ -33,6 +33,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.ItemID; +import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemVariationMapping; @@ -45,7 +46,6 @@ import net.runelite.client.plugins.cluescrolls.clues.FairyRingClue; import net.runelite.client.plugins.cluescrolls.clues.HotColdClue; import net.runelite.client.plugins.cluescrolls.clues.MapClue; import net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirement; -import net.runelite.api.util.Text; @Singleton public class TagManager 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 ea42cb3779..ed5638729b 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 @@ -131,7 +131,7 @@ public class TabInterface private final Rectangle bounds = new Rectangle(); private final Rectangle canvasBounds = new Rectangle(); - private ChatboxItemSearch searchProvider; + private final ChatboxItemSearch searchProvider; private TagTab activeTab; private int maxTabs; private int currentTabIndex; @@ -302,7 +302,7 @@ public class TabInterface final Iterator dataIter = Text.fromCSV(dataString).iterator(); String name = dataIter.next(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (char c : name.toCharArray()) { if (FILTERED_CHARS.test(c)) @@ -324,7 +324,7 @@ public class TabInterface while (dataIter.hasNext()) { - final int itemId = Integer.valueOf(dataIter.next()); + final int itemId = Integer.parseInt(dataIter.next()); tagManager.addTag(itemId, name, itemId < 0); } @@ -600,10 +600,10 @@ public class TabInterface } if ((event.getIdentifier() == WidgetInfo.BANK_ITEM_CONTAINER.getId() - || event.getIdentifier() == WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getId()) + || event.getIdentifier() == WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getId()) && event.getMenuOpcode() == MenuOpcode.EXAMINE_ITEM_BANK_EQ && (event.getOption().equalsIgnoreCase("withdraw-x") - || event.getOption().equalsIgnoreCase("deposit-x"))) + || event.getOption().equalsIgnoreCase("deposit-x"))) { waitSearchTick = true; rememberedSearch = client.getVar(VarClientStr.INPUT_TEXT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabManager.java index cbe90f19e4..12466c6c32 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabManager.java @@ -33,12 +33,13 @@ import java.util.Optional; import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; +import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import static net.runelite.client.plugins.banktags.BankTagsPlugin.CONFIG_GROUP; import static net.runelite.client.plugins.banktags.BankTagsPlugin.ICON_SEARCH; -import net.runelite.api.util.Text; import org.apache.commons.lang3.math.NumberUtils; @Singleton @@ -46,7 +47,7 @@ class TabManager { private static final String TAG_TABS_CONFIG = "tagtabs"; - @Getter + @Getter(AccessLevel.PACKAGE) private final List tabs = new ArrayList<>(); private final ConfigManager configManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabSprites.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabSprites.java index 20f9d0dfb6..7961380b1a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabSprites.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabSprites.java @@ -25,6 +25,7 @@ */ package net.runelite.client.plugins.banktags.tabs; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.client.game.SpriteOverride; @@ -39,9 +40,9 @@ public enum TabSprites implements SpriteOverride DOWN_ARROW(-204, "down-arrow.png"), NEW_TAB(-205, "new-tab.png"); - @Getter + @Getter(AccessLevel.PUBLIC) private final int spriteId; - @Getter + @Getter(AccessLevel.PUBLIC) private final String fileName; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index ba1abbfec8..15f44c09ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -106,7 +106,7 @@ public class BanListPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -116,7 +116,7 @@ public class BanListPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { wdrScamSet.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java index 3e4452f3b1..6c091bd9c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java @@ -55,10 +55,10 @@ class AboveSceneOverlay extends Overlay private static final int EGG_DIAMETER = Perspective.LOCAL_HALF_TILE_SIZE / 4; private static final Color HEALTH_BAR_COLOR = new Color(225, 35, 0, 125); private static final ImmutableMap TEAMMATES = ImmutableMap.of( - WidgetInfo.BA_HEAL_TEAMMATE1, new Point(28, 2), - WidgetInfo.BA_HEAL_TEAMMATE2, new Point(26, 2), - WidgetInfo.BA_HEAL_TEAMMATE3, new Point(26, 2), - WidgetInfo.BA_HEAL_TEAMMATE4, new Point(25, 2)); + WidgetInfo.BA_HEAL_TEAMMATE1, new Point(28, 2), + WidgetInfo.BA_HEAL_TEAMMATE2, new Point(26, 2), + WidgetInfo.BA_HEAL_TEAMMATE3, new Point(26, 2), + WidgetInfo.BA_HEAL_TEAMMATE4, new Point(25, 2)); private final Client client; private final BarbarianAssaultPlugin game; @@ -123,9 +123,9 @@ class AboveSceneOverlay extends Overlay graphics.setColor(HEALTH_BAR_COLOR); graphics.fillRect((widget.getCanvasLocation().getX() - teammate.getValue().getX()), - (widget.getCanvasLocation().getY() - teammate.getValue().getY()), - getBarWidth(Integer.parseInt(teammateHealth[1]), Integer.parseInt(teammateHealth[0])), - HEALTH_BAR_HEIGHT); + (widget.getCanvasLocation().getY() - teammate.getValue().getY()), + getBarWidth(Integer.parseInt(teammateHealth[1]), Integer.parseInt(teammateHealth[0])), + HEALTH_BAR_HEIGHT); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java index 29e8b94f97..dfe2930e08 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java @@ -45,6 +45,7 @@ public interface BarbarianAssaultConfig extends Config { return true; } + @ConfigItem( keyName = "showTimer", name = "Show call change timer", @@ -223,7 +224,7 @@ public interface BarbarianAssaultConfig extends Config /*///************///*/ /*/// Defender ///*/ /*///************///*/ - + @ConfigSection( name = "Defender", description = "", @@ -301,7 +302,7 @@ public interface BarbarianAssaultConfig extends Config /*///**********///*/ /*/// Healer ///*/ /*///**********///*/ - + @ConfigSection( name = "Healer", description = "", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java index 461848ce7d..341ada9685 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java @@ -75,7 +75,7 @@ class BarbarianAssaultMenu void clearHiddenMenus() { // Clears menus from MenuManager and tracker - for (Iterator iterator = tracker.iterator(); iterator.hasNext();) + for (Iterator iterator = tracker.iterator(); iterator.hasNext(); ) { menuManager.removeHiddenEntry(iterator.next()); iterator.remove(); @@ -118,7 +118,7 @@ class BarbarianAssaultMenu case BLOCK_PENANCE_CAVE: return ((role != Role.DEFENDER && role != null) && game.isRemoveUnusedMenus()) - || (role == Role.DEFENDER && game.isRemovePenanceCave()); + || (role == Role.DEFENDER && game.isRemovePenanceCave()); case DUNK_LAVA_CRATER: case FIX: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index c33c3b7ce9..0db9e27d9b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -122,6 +122,24 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private static final ImmutableList attackStyles = ImmutableList.of(WidgetInfo.COMBAT_STYLE_ONE, WidgetInfo.COMBAT_STYLE_TWO, WidgetInfo.COMBAT_STYLE_THREE, WidgetInfo.COMBAT_STYLE_FOUR); + @Getter(AccessLevel.PACKAGE) + private final Map redEggs = new HashMap<>(); + + @Getter(AccessLevel.PACKAGE) + private final Map greenEggs = new HashMap<>(); + + @Getter(AccessLevel.PACKAGE) + private final Map blueEggs = new HashMap<>(); + + @Getter(AccessLevel.PACKAGE) + private final Map yellowEggs = new HashMap<>(); + + @Getter(AccessLevel.PACKAGE) + private final Map healers = new HashMap<>(); + + private final List deathTimes = new ArrayList<>(); + private final Map projectiles = new HashMap<>(); + @Inject private Client client; @@ -155,99 +173,50 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener @Inject private KeyManager keyManager; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean inGame = false; - - @Getter + @Getter(AccessLevel.PACKAGE) private Wave wave = null; - - @Getter + @Getter(AccessLevel.PACKAGE) private Role role = null; - - @Getter + @Getter(AccessLevel.PACKAGE) private Scorecard scorecard = null; - - @Getter + @Getter(AccessLevel.PACKAGE) private Timer gameTimer = null; - - @Getter + @Getter(AccessLevel.PACKAGE) private Timer callTimer = null; - - @Getter + @Getter(AccessLevel.PACKAGE) private int stage = -1; - - @Getter + @Getter(AccessLevel.PACKAGE) private BufferedImage clockImage; - - @Getter + @Getter(AccessLevel.PACKAGE) private Font font = null; - @Getter - private final Map redEggs = new HashMap<>(); - - @Getter - private final Map greenEggs = new HashMap<>(); - - @Getter - private final Map blueEggs = new HashMap<>(); - - @Getter - private final Map yellowEggs = new HashMap<>(); - - @Getter - private final Map healers = new HashMap<>(); - - @Getter - private String lastCallText = null; - - @Getter - private String lastListenText = null; - // private String lastClickedTell = null; - + @Getter(AccessLevel.PACKAGE) + private String lastCallText = null; + @Getter(AccessLevel.PACKAGE) + private String lastListenText = null; private int lastCallColor = -1; - private int lastInteracted = -1; - private int lastHealerPoisoned = -1; - - private int tickNum = 0; - // private int gameTick = -1; - + private int lastHealerPoisoned = -1; + private int tickNum = 0; private int inGameBit = 0; - private boolean syncd = true; - private boolean tickReset = false; - private boolean hornCalled = false; - private boolean hornListened = false; - - @Getter + @Getter(AccessLevel.PACKAGE) private boolean usingGloryHorn = false; - private boolean shiftDown = false; - private boolean controlDown = false; - private BufferedImage torsoImage, fighterImage, healerImage, rangerImage, runnerImage; - - private final List deathTimes = new ArrayList<>(); - - private final Map projectiles = new HashMap<>(); - private TimerBox tickCounter; private String poisonUsed = null; - @Provides - BarbarianAssaultConfig provideConfig(ConfigManager configManager) - { - return configManager.getConfig(BarbarianAssaultConfig.class); - } - // save config values @Getter(AccessLevel.PACKAGE) private boolean swapLadder; @@ -302,8 +271,14 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener @Getter(AccessLevel.PACKAGE) private boolean showEggCountOverlay; + @Provides + BarbarianAssaultConfig provideConfig(ConfigManager configManager) + { + return configManager.getConfig(BarbarianAssaultConfig.class); + } + @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -321,7 +296,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(widgetsOverlay); overlayManager.remove(sceneOverlay); @@ -343,7 +318,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener menu.clearHiddenMenus(); } -@Override + @Override public void keyTyped(KeyEvent e) { } @@ -399,7 +374,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener case "swapLadder": case "swapCollectorBag": case "swapDestroyEggs": - if (Boolean.valueOf(configChanged.getNewValue())) + if (Boolean.parseBoolean(configChanged.getNewValue())) { menu.enableSwaps(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java index e7b21a1ecf..f40657bb3a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java @@ -40,17 +40,17 @@ class Healer { @Getter(AccessLevel.NONE) private static final List> CODES = ImmutableList.of( - // ImmutableList.of(firstCallFood, secondCallFood, lastFoodTime), - ImmutableList.of(new int[]{1, 1}, new int[]{0, 0}, new int[]{0, 0}), - ImmutableList.of(new int[]{1, 1, 2}, new int[]{0, 0, 0}, new int[]{0, 0, 21}), - ImmutableList.of(new int[]{1, 6, 2}, new int[]{0, 0, 0}, new int[]{0, 0, 0}), - ImmutableList.of(new int[]{2, 5, 2, 0}, new int[]{0, 0, 7, 10}, new int[]{0, 0, 0, 0}), - ImmutableList.of(new int[]{2, 5, 2, 3, 0}, new int[]{0, 0, 0, 0, 7}, new int[]{0, 0, 21, 30, 0}), - ImmutableList.of(new int[]{3, 5, 2, 2, 0, 0}, new int[]{0, 0, 0, 2, 9, 10}, new int[]{12, 18, 21, 0, 0, 0}), - ImmutableList.of(new int[]{3, 7, 1, 1, 0, 0, 0}, new int[]{2, 0, 1, 1, 2, 4, 10}, new int[]{0, 21, 0, 0, 30, 45, 0}), - ImmutableList.of(new int[]{1, 9, 1, 1, 0, 0, 0}, new int[]{1, 0, 1, 1, 2, 2, 10}, new int[]{0, 0, 0, 0, 33, 42, 0}), - ImmutableList.of(new int[]{2, 8, 1, 1, 0, 0, 0, 0}, new int[]{1, 0, 1, 1, 2, 1, 1, 10}, new int[]{0, 21, 0, 0, 0, 0, 0, 0, 0}), - ImmutableList.of(new int[]{2, 5, 1, 1, 0, 0, 0}, new int[]{1, 0, 1, 1, 4, 4, 8}, new int[]{21, 33, 0, 33, 30, 45, 0})); + // ImmutableList.of(firstCallFood, secondCallFood, lastFoodTime), + ImmutableList.of(new int[]{1, 1}, new int[]{0, 0}, new int[]{0, 0}), + ImmutableList.of(new int[]{1, 1, 2}, new int[]{0, 0, 0}, new int[]{0, 0, 21}), + ImmutableList.of(new int[]{1, 6, 2}, new int[]{0, 0, 0}, new int[]{0, 0, 0}), + ImmutableList.of(new int[]{2, 5, 2, 0}, new int[]{0, 0, 7, 10}, new int[]{0, 0, 0, 0}), + ImmutableList.of(new int[]{2, 5, 2, 3, 0}, new int[]{0, 0, 0, 0, 7}, new int[]{0, 0, 21, 30, 0}), + ImmutableList.of(new int[]{3, 5, 2, 2, 0, 0}, new int[]{0, 0, 0, 2, 9, 10}, new int[]{12, 18, 21, 0, 0, 0}), + ImmutableList.of(new int[]{3, 7, 1, 1, 0, 0, 0}, new int[]{2, 0, 1, 1, 2, 4, 10}, new int[]{0, 21, 0, 0, 30, 45, 0}), + ImmutableList.of(new int[]{1, 9, 1, 1, 0, 0, 0}, new int[]{1, 0, 1, 1, 2, 2, 10}, new int[]{0, 0, 0, 0, 33, 42, 0}), + ImmutableList.of(new int[]{2, 8, 1, 1, 0, 0, 0, 0}, new int[]{1, 0, 1, 1, 2, 1, 1, 10}, new int[]{0, 21, 0, 0, 0, 0, 0, 0, 0}), + ImmutableList.of(new int[]{2, 5, 1, 1, 0, 0, 0}, new int[]{1, 0, 1, 1, 4, 4, 8}, new int[]{21, 33, 0, 33, 30, 45, 0})); private final NPC npc; @@ -89,7 +89,7 @@ class Healer else { long time = Duration.between(timeLastPoisoned, Instant.now()).getSeconds(); - return time > 20 ? 0 : (int)(20 - time); + return time > 20 ? 0 : (int) (20 - time); } } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java index 1c5651ce00..013c0093cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableSet; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.MenuOpcode; @@ -86,10 +87,10 @@ public enum Menus MEDIC_HORN(null, newBaseComparableEntry("medic", "r horn", -1, -1, true, false)), USE_HORN(null, newBaseComparableEntry("use", "r horn", -1, -1, true, false)); - @Getter + @Getter(AccessLevel.PACKAGE) private final Role role; - @Getter + @Getter(AccessLevel.PACKAGE) private final BaseComparableEntry entry; private static final ImmutableSet ALL = ImmutableSet.copyOf(Menus.values()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java index 1f1e58e26a..696aa6b502 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableMap; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Client; @@ -39,90 +40,90 @@ import net.runelite.api.widgets.WidgetInfo; enum Role { ATTACKER(WidgetInfo.BA_ATK_WAVE_TEXT, WidgetInfo.BA_ATK_LISTEN_TOP_TEXT, WidgetInfo.BA_ATK_HORN_LISTEN_TEXT, - WidgetInfo.BA_ATK_CALL_TEXT, WidgetInfo.BA_COLL_HORN_LISTEN_TEXT, WidgetInfo.BA_ATK_ROLE_TEXT, - WidgetInfo.BA_ATK_ROLE_SPRITE), + WidgetInfo.BA_ATK_CALL_TEXT, WidgetInfo.BA_COLL_HORN_LISTEN_TEXT, WidgetInfo.BA_ATK_ROLE_TEXT, + WidgetInfo.BA_ATK_ROLE_SPRITE), DEFENDER(WidgetInfo.BA_DEF_WAVE_TEXT, WidgetInfo.BA_DEF_LISTEN_TEXT, WidgetInfo.BA_DEF_HORN_LISTEN_TEXT, - WidgetInfo.BA_DEF_CALL_TEXT, WidgetInfo.BA_HEAL_HORN_LISTEN_TEXT, WidgetInfo.BA_DEF_ROLE_TEXT, - WidgetInfo.BA_DEF_ROLE_SPRITE), + WidgetInfo.BA_DEF_CALL_TEXT, WidgetInfo.BA_HEAL_HORN_LISTEN_TEXT, WidgetInfo.BA_DEF_ROLE_TEXT, + WidgetInfo.BA_DEF_ROLE_SPRITE), COLLECTOR(WidgetInfo.BA_COLL_WAVE_TEXT, WidgetInfo.BA_COLL_LISTEN_TEXT, WidgetInfo.BA_COLL_HORN_LISTEN_TEXT, - WidgetInfo.BA_COLL_CALL_TEXT, WidgetInfo.BA_ATK_HORN_LISTEN_TEXT, WidgetInfo.BA_COLL_ROLE_TEXT, - WidgetInfo.BA_COLL_ROLE_SPRITE), + WidgetInfo.BA_COLL_CALL_TEXT, WidgetInfo.BA_ATK_HORN_LISTEN_TEXT, WidgetInfo.BA_COLL_ROLE_TEXT, + WidgetInfo.BA_COLL_ROLE_SPRITE), HEALER(WidgetInfo.BA_HEAL_WAVE_TEXT, WidgetInfo.BA_HEAL_LISTEN_TEXT, WidgetInfo.BA_DEF_HORN_LISTEN_TEXT, - WidgetInfo.BA_HEAL_CALL_TEXT, WidgetInfo.BA_DEF_HORN_LISTEN_TEXT, WidgetInfo.BA_HEAL_ROLE_TEXT, - WidgetInfo.BA_HEAL_ROLE_SPRITE); + WidgetInfo.BA_HEAL_CALL_TEXT, WidgetInfo.BA_DEF_HORN_LISTEN_TEXT, WidgetInfo.BA_HEAL_ROLE_TEXT, + WidgetInfo.BA_HEAL_ROLE_SPRITE); - @Getter + @Getter(AccessLevel.PACKAGE) private final WidgetInfo wave; - @Getter + @Getter(AccessLevel.PACKAGE) private final WidgetInfo listen; - @Getter + @Getter(AccessLevel.PACKAGE) private final WidgetInfo gloryListen; - @Getter + @Getter(AccessLevel.PACKAGE) private final WidgetInfo call; - @Getter + @Getter(AccessLevel.PACKAGE) private final WidgetInfo gloryCall; - @Getter + @Getter(AccessLevel.PACKAGE) private final WidgetInfo roleText; - @Getter + @Getter(AccessLevel.PACKAGE) private final WidgetInfo roleSprite; // Duplicate* entries are to catch instances where the horn of glory has // text different than the normal horn private static final ImmutableMap TELLS = ImmutableMap.builder() - .put("Red egg", "Tell-red") - .put("Green egg", "Tell-green") - .put("Blue egg", "Tell-blue") - .put("Controlled/Bullet/Wind", "Tell-controlled") - .put("Accurate/Field/Water", "Tell-accurate") - .put("Aggressive/Blunt/Earth", "Tell-aggressive") - .put("Defensive/Barbed/Fire", "Tell-defensive") - .put("Tofu", "Tell-tofu") - .put("Crackers", "Tell-crackers") - .put("Worms", "Tell-worms") - .put("Poison Worms", "Tell-worms") - .put("Pois. Worms", "Tell-worms") - .put("Poison Tofu", "Tell-tofu") - .put("Pois. Tofu", "Tell-tofu") - .put("Poison Meat", "Tell-meat") - .put("Pois. Meat", "Tell-meat") - .build(); + .put("Red egg", "Tell-red") + .put("Green egg", "Tell-green") + .put("Blue egg", "Tell-blue") + .put("Controlled/Bullet/Wind", "Tell-controlled") + .put("Accurate/Field/Water", "Tell-accurate") + .put("Aggressive/Blunt/Earth", "Tell-aggressive") + .put("Defensive/Barbed/Fire", "Tell-defensive") + .put("Tofu", "Tell-tofu") + .put("Crackers", "Tell-crackers") + .put("Worms", "Tell-worms") + .put("Poison Worms", "Tell-worms") + .put("Pois. Worms", "Tell-worms") + .put("Poison Tofu", "Tell-tofu") + .put("Pois. Tofu", "Tell-tofu") + .put("Poison Meat", "Tell-meat") + .put("Pois. Meat", "Tell-meat") + .build(); private static final ImmutableMap GLORY_CALLS = ImmutableMap.builder() - .put("Controlled/Bullet/Wind", "Controlled/") - .put("Accurate/Field/Water", "Accurate/") - .put("Aggressive/Blunt/Earth", "Aggressive/") - .put("Defensive/Barbed/Fire", "Defensive/") - .put("Tofu", "Tofu") - .put("Crackers", "Crackers") - .put("Worms", "Worms") - .put("Poison worms", "Pois. Worms") - .put("Poison tofu", "Pois. Tofu") - .put("Poison meat", "Pois. Meat") - .put("Red egg", "Red egg") - .put("Green egg", "Green egg") - .put("Blue egg", "Blue egg") - .build(); + .put("Controlled/Bullet/Wind", "Controlled/") + .put("Accurate/Field/Water", "Accurate/") + .put("Aggressive/Blunt/Earth", "Aggressive/") + .put("Defensive/Barbed/Fire", "Defensive/") + .put("Tofu", "Tofu") + .put("Crackers", "Crackers") + .put("Worms", "Worms") + .put("Poison worms", "Pois. Worms") + .put("Poison tofu", "Pois. Tofu") + .put("Poison meat", "Pois. Meat") + .put("Red egg", "Red egg") + .put("Green egg", "Green egg") + .put("Blue egg", "Blue egg") + .build(); private static final ImmutableMap ITEMS = ImmutableMap.builder() - .put("Tofu", ItemID.TOFU) - .put("Crackers", ItemID.CRACKERS) - .put("Worms", ItemID.WORMS) - .put("Pois. Worms", ItemID.POISONED_WORMS) - .put("Pois. Tofu", ItemID.POISONED_TOFU) - .put("Pois. Meat", ItemID.POISONED_MEAT) - .put("Defensive/", ItemID.BARBED_ARROW) - .put("Aggressive/", ItemID.BLUNT_ARROW) - .put("Accurate/", ItemID.FIELD_ARROW) - .put("Controlled/", ItemID.BULLET_ARROW) - .build(); + .put("Tofu", ItemID.TOFU) + .put("Crackers", ItemID.CRACKERS) + .put("Worms", ItemID.WORMS) + .put("Pois. Worms", ItemID.POISONED_WORMS) + .put("Pois. Tofu", ItemID.POISONED_TOFU) + .put("Pois. Meat", ItemID.POISONED_MEAT) + .put("Defensive/", ItemID.BARBED_ARROW) + .put("Aggressive/", ItemID.BLUNT_ARROW) + .put("Accurate/", ItemID.FIELD_ARROW) + .put("Controlled/", ItemID.BULLET_ARROW) + .build(); private static final ImmutableMap SPLIT_LISTENS = ImmutableMap.builder() - .put("Controlled/", "Bullet/Wind") - .put("Bullet/Wind", "Controlled/") - .put("Accurate/", "Field/Water") - .put("Field/Water", "Accurate/") - .put("Aggressive/", "Blunt/Earth") - .put("Blunt/Earth", "Aggressive/") - .put("Defensive/", "Barbed/Fire") - .put("Barbed/Fire", "Defensive/") - .build(); + .put("Controlled/", "Bullet/Wind") + .put("Bullet/Wind", "Controlled/") + .put("Accurate/", "Field/Water") + .put("Field/Water", "Accurate/") + .put("Aggressive/", "Blunt/Earth") + .put("Blunt/Earth", "Aggressive/") + .put("Defensive/", "Barbed/Fire") + .put("Barbed/Fire", "Defensive/") + .build(); int getListenItem(String listen) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java index f6d6ffd1ce..39308e6b29 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java @@ -41,31 +41,31 @@ public class Wave { @Getter(AccessLevel.NONE) private static final ImmutableList WIDGETS = ImmutableList.of( - WidgetInfo.BA_FAILED_ATTACKER_ATTACKS, - WidgetInfo.BA_RUNNERS_PASSED, - WidgetInfo.BA_EGGS_COLLECTED, - WidgetInfo.BA_HITPOINTS_REPLENISHED, - WidgetInfo.BA_WRONG_POISON_PACKS, - WidgetInfo.BA_HONOUR_POINTS_REWARD + WidgetInfo.BA_FAILED_ATTACKER_ATTACKS, + WidgetInfo.BA_RUNNERS_PASSED, + WidgetInfo.BA_EGGS_COLLECTED, + WidgetInfo.BA_HITPOINTS_REPLENISHED, + WidgetInfo.BA_WRONG_POISON_PACKS, + WidgetInfo.BA_HONOUR_POINTS_REWARD ); @Getter(AccessLevel.NONE) private static final ImmutableList POINTSWIDGETS = ImmutableList.of( - //Base - WidgetInfo.BA_BASE_POINTS, - //Attacker - WidgetInfo.BA_FAILED_ATTACKER_ATTACKS_POINTS, - WidgetInfo.BA_RANGERS_KILLED, - WidgetInfo.BA_FIGHTERS_KILLED, - //Defender - WidgetInfo.BA_RUNNERS_PASSED_POINTS, - WidgetInfo.BA_RUNNERS_KILLED, - //Collector - WidgetInfo.BA_EGGS_COLLECTED_POINTS, - //Healer - WidgetInfo.BA_HEALERS_KILLED, - WidgetInfo.BA_HITPOINTS_REPLENISHED_POINTS, - WidgetInfo.BA_WRONG_POISON_PACKS_POINTS + //Base + WidgetInfo.BA_BASE_POINTS, + //Attacker + WidgetInfo.BA_FAILED_ATTACKER_ATTACKS_POINTS, + WidgetInfo.BA_RANGERS_KILLED, + WidgetInfo.BA_FIGHTERS_KILLED, + //Defender + WidgetInfo.BA_RUNNERS_PASSED_POINTS, + WidgetInfo.BA_RUNNERS_KILLED, + //Collector + WidgetInfo.BA_EGGS_COLLECTED_POINTS, + //Healer + WidgetInfo.BA_HEALERS_KILLED, + WidgetInfo.BA_HITPOINTS_REPLENISHED_POINTS, + WidgetInfo.BA_WRONG_POISON_PACKS_POINTS ); @Getter(AccessLevel.NONE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index 9e1ab990d6..3157167fbf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -101,7 +101,7 @@ public class BarrowsPlugin extends Plugin private LoopTimer barrowsPrayerDrainTimer; private boolean wasInCrypt = false; - @Getter + @Getter(AccessLevel.PACKAGE) private Widget puzzleAnswer; @Inject @@ -125,12 +125,6 @@ public class BarrowsPlugin extends Plugin @Inject private BarrowsConfig config; - @Provides - BarrowsConfig provideConfig(ConfigManager configManager) - { - return configManager.getConfig(BarrowsConfig.class); - } - @Getter(AccessLevel.PACKAGE) private boolean showMinimap; @Getter(AccessLevel.PACKAGE) @@ -143,8 +137,14 @@ public class BarrowsPlugin extends Plugin private boolean showPuzzleAnswer; private boolean showPrayerDrainTimer; + @Provides + BarrowsConfig provideConfig(ConfigManager configManager) + { + return configManager.getConfig(BarrowsConfig.class); + } + @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java index 6e81e938fc..8be40b6da6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java @@ -81,12 +81,16 @@ public class BlackjackPlugin extends Plugin @Inject private Client client; + @Inject private BlackjackConfig config; + @Inject private EventBus eventBus; + @Inject private MenuManager menuManager; + private boolean pickpocketOnAggro; private boolean random; private long nextKnockOutTick = 0; @@ -98,7 +102,7 @@ public class BlackjackPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { menuManager.addPriorityEntry(KNOCKOUT_BANDIT); menuManager.addPriorityEntry(KNOCKOUT_MENAPHITE); @@ -106,7 +110,7 @@ public class BlackjackPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { menuManager.removePriorityEntry(PICKPOCKET_BANDIT); menuManager.removePriorityEntry(PICKPOCKET_MENAPHITE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BarsOres.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BarsOres.java index 52a295afd3..d7b522e8a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BarsOres.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BarsOres.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.blastfurnace; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; import net.runelite.api.Varbits; @@ -64,9 +65,9 @@ public enum BarsOres VARBIT = builder.build(); } - @Getter + @Getter(AccessLevel.PACKAGE) private final Varbits varbit; - @Getter + @Getter(AccessLevel.PACKAGE) private final int itemID; BarsOres(Varbits varbit, int itemID) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java index b74ab77d30..7714c9f2c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java @@ -38,8 +38,8 @@ import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; -import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; +import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.QuantityFormatter; @Singleton diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java index 1eae30f7a9..25080d2891 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java @@ -103,7 +103,7 @@ public class BlastFurnacePlugin extends Plugin private boolean showBarDispenser; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -124,7 +124,7 @@ public class BlastFurnacePlugin extends Plugin foremanTimer = null; } -@Provides + @Provides BlastFurnaceConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(BlastFurnaceConfig.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java index 95880eed3b..c76bf99bdd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java @@ -73,12 +73,6 @@ public class BlastMinePlugin extends Plugin @Inject private BlastMinePluginConfig config; - @Provides - BlastMinePluginConfig getConfig(ConfigManager configManager) - { - return configManager.getConfig(BlastMinePluginConfig.class); - } - @Getter(AccessLevel.PACKAGE) private boolean showOreOverlay; @Getter(AccessLevel.PACKAGE) @@ -92,8 +86,14 @@ public class BlastMinePlugin extends Plugin @Getter(AccessLevel.PACKAGE) private Color warningColor; + @Provides + BlastMinePluginConfig getConfig(ConfigManager configManager) + { + return configManager.getConfig(BlastMinePluginConfig.class); + } + @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -102,7 +102,7 @@ public class BlastMinePlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(blastMineRockOverlay); overlayManager.remove(blastMineOreCountOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java index 77642e72ac..1cd517308a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java @@ -100,7 +100,7 @@ public interface BoostsConfig extends Config { return false; } - + @ConfigItem( keyName = "displayNextBuffChange", name = "Display next buff change", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index a5313bc3c0..c345eb734c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -73,6 +73,11 @@ public class BoostsPlugin extends Plugin Skill.COOKING, Skill.CRAFTING, Skill.FIREMAKING, Skill.FLETCHING, Skill.WOODCUTTING, Skill.RUNECRAFT, Skill.SLAYER, Skill.FARMING, Skill.CONSTRUCTION, Skill.HUNTER); + @Getter + private final Set shownSkills = new LinkedHashSet<>(); + private final int[] lastSkillLevels = new int[Skill.values().length - 1]; + private final List boostedSkillsChanged = new ArrayList<>(); + @Inject private Notifier notifier; @@ -88,26 +93,21 @@ public class BoostsPlugin extends Plugin @Inject private BoostsOverlay boostsOverlay; - //made this a LinkedHashSet so the order stays consistent for my OCD - @Getter - private final Set shownSkills = new LinkedHashSet<>(); @Inject private BoostsConfig config; @Inject private SkillIconManager skillIconManager; + @Inject private CombatIconsOverlay combatIconsOverlay; private boolean isChangedDown = false; private boolean isChangedUp = false; - private final int[] lastSkillLevels = new int[Skill.values().length - 1]; private int lastChangeDown = -1; private int lastChangeUp = -1; private boolean preserveBeenActive = false; private long lastTickMillis; - private final List boostedSkillsChanged = new ArrayList<>(); - private BoostsConfig.DisplayBoosts displayBoosts; @Getter(AccessLevel.PACKAGE) private boolean useRelativeBoost; @@ -130,7 +130,7 @@ public class BoostsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -154,7 +154,7 @@ public class BoostsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(boostsOverlay); overlayManager.remove(combatIconsOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java index 446cd5f800..ee15c1e851 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java @@ -11,6 +11,7 @@ import net.runelite.api.Client; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Skill; import net.runelite.client.game.SkillIconManager; +import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; import net.runelite.client.ui.overlay.OverlayMenuEntry; @@ -20,7 +21,6 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; -import net.runelite.client.ui.FontManager; import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ImageUtil; @@ -51,12 +51,12 @@ class CombatIconsOverlay extends Overlay { return null; } - + if (plugin.isBoldIconFont()) { graphics.setFont(FontManager.getRunescapeBoldFont()); } - + panelComponent.getChildren().clear(); panelComponent.setPreferredSize(new Dimension(28, 0)); panelComponent.setWrapping(2); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java index 7155cb7f1e..9ba549be66 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java @@ -52,12 +52,7 @@ public class BossTimersPlugin extends Plugin private ItemManager itemManager; @Override - protected void startUp() throws Exception - { - } - - @Override - protected void shutDown() throws Exception + protected void shutDown() { infoBoxManager.removeIf(t -> t instanceof RespawnTimer); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java index b3d026289e..ad6afee6cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTracker.java @@ -36,7 +36,7 @@ public class BossTimeTracker extends InfoBox { private final Instant startTime; private LocalTime time; - private Instant lastTime; + private final Instant lastTime; public BossTimeTracker(BufferedImage image, BossTimeTrackerPlugin plugin, Instant startTime, Instant lastTime) { @@ -80,10 +80,7 @@ public class BossTimeTracker extends InfoBox @Override public String getTooltip() { - StringBuilder builder = new StringBuilder(); - builder.append("Elapsed time: "); - builder.append(time.format(DateTimeFormatter.ofPattern("HH:mm:ss"))); - - return builder.toString(); + return "Elapsed time: " + + time.format(DateTimeFormatter.ofPattern("HH:mm:ss")); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java index 62e9d741c5..5308c34802 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java @@ -30,6 +30,7 @@ import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -76,7 +77,7 @@ public class BossTimeTrackerPlugin extends Plugin @Inject private ConfigManager configManager; - @Getter + @Getter(AccessLevel.PACKAGE) private BossTimeTracker timer; private Instant startTime; @@ -84,11 +85,6 @@ public class BossTimeTrackerPlugin extends Plugin private Boolean started = false; private boolean loggingIn; - @Override - public void startUp() - { - } - @Subscribe public void onGameStateChanged(GameStateChanged event) { @@ -238,14 +234,14 @@ public class BossTimeTrackerPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { removeTimer(); resetConfig(); resetVars(); } -private void loadConfig() + private void loadConfig() { startTime = configManager.getConfiguration(CONFIG_GROUP, CONFIG_TIME, Instant.class); started = configManager.getConfiguration(CONFIG_GROUP, CONFIG_STARTED, Boolean.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzeManOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzeManOverlay.java index 2f10fbe748..3480fe881f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzeManOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzeManOverlay.java @@ -2,15 +2,15 @@ package net.runelite.client.plugins.bronzeman; import java.awt.Dimension; import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; -import javax.inject.Inject; -import java.awt.image.BufferedImage; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java index 155cc8a0f6..2c32a0d697 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.List; import javax.imageio.ImageIO; import javax.inject.Inject; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -60,7 +61,7 @@ public class BronzemanPlugin extends Plugin private List unlockedItems; - @Getter + @Getter(AccessLevel.PACKAGE) private BufferedImage unlockImage = null; /** * Loads GrandExchange widgets for further manipulation of the interface @@ -69,7 +70,7 @@ public class BronzemanPlugin extends Plugin private Widget grandExchangeChatBox; @Override - protected void startUp() throws Exception + protected void startUp() { loadUnlockImage(); unlockedItems = new ArrayList<>(); @@ -77,13 +78,13 @@ public class BronzemanPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { unlockedItems = null; overlayManager.remove(bronzemanOverlay); } -/** + /** * Loads players unlocks on login **/ @Subscribe @@ -178,7 +179,7 @@ public class BronzemanPlugin extends Plugin /** * Queues a new unlock to be properly displayed **/ - public void queueItemUnlock(int itemId) + private void queueItemUnlock(int itemId) { unlockedItems.add(itemId); bronzemanOverlay.addItemUnlock(itemId); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/ItemUnlock.java b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/ItemUnlock.java index f061bb5b9c..55f02ef83f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/ItemUnlock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/ItemUnlock.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.bronzeman; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -11,14 +12,14 @@ import lombok.Setter; public class ItemUnlock { - @Getter + @Getter(AccessLevel.PACKAGE) private final int itemId; - @Getter + @Getter(AccessLevel.PACKAGE) private long initTime; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int locationY; ItemUnlock(int itemId) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index 5fecf67fa3..64292067e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -79,34 +79,49 @@ public class CannonPlugin extends Plugin ); private CannonCounter counter; private boolean skipProjectileCheckThisTick; + @Getter(AccessLevel.PACKAGE) private int cballsLeft; + @Getter(AccessLevel.PACKAGE) private boolean cannonPlaced; + @Getter(AccessLevel.PACKAGE) private WorldPoint cannonPosition; + @Getter(AccessLevel.PACKAGE) private GameObject cannon; + @Getter(AccessLevel.PACKAGE) private List spotPoints = new ArrayList<>(); + @Inject private ItemManager itemManager; + @Inject private InfoBoxManager infoBoxManager; + @Inject private Notifier notifier; + @Inject private OverlayManager overlayManager; + @Inject private CannonOverlay cannonOverlay; + @Inject private CannonSpotOverlay cannonSpotOverlay; + @Inject private CannonConfig config; + @Inject private Client client; + @Inject private ClientThread clientThread; + private boolean lock; private boolean showEmptyCannonNotification; private boolean showInfobox; @@ -126,7 +141,7 @@ public class CannonPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -136,7 +151,7 @@ public class CannonPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { cannonSpotOverlay.setHidden(true); overlayManager.remove(cannonOverlay); @@ -271,7 +286,7 @@ public class CannonPlugin extends Plugin // counter doesn't decrease if the player has been too far away // from the cannon due to the projectiels not being in memory, // so our counter can be higher than it is supposed to be. - int amt = Integer.valueOf(m.group()); + int amt = Integer.parseInt(m.group()); if (cballsLeft + amt >= MAX_CBALLS) { skipProjectileCheckThisTick = true; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java index b8b8ddd9c5..2deec48ded 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.cannon; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; @@ -67,7 +68,7 @@ public enum CannonSpots ICE_WARRIOR(new WorldPoint(2955, 3876, 0)), BANDIT(new WorldPoint(3037, 3700, 0)); - @Getter + @Getter(AccessLevel.PACKAGE) private static final List cannonSpots = new ArrayList<>(); static diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java index 4872e9ede6..68bdedb1a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.GameState; import net.runelite.api.NPC; @@ -50,7 +51,7 @@ import net.runelite.client.ui.overlay.OverlayManager; @Singleton public class CerberusPlugin extends Plugin { - @Getter + @Getter(AccessLevel.PACKAGE) private final List ghosts = new ArrayList<>(); @Inject @@ -60,13 +61,13 @@ public class CerberusPlugin extends Plugin private CerberusOverlay overlay; @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); ghosts.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformanceConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformanceConfig.java index 977ac469ee..58b487b252 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformanceConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformanceConfig.java @@ -32,10 +32,10 @@ import net.runelite.client.config.ConfigItem; public interface ChatboxPerformanceConfig extends Config { @ConfigItem( - position = 1, - keyName = "Chatbox", - name = "Toggle gradient", - description = "Toggles the gradient inside the chatbox." + position = 1, + keyName = "Chatbox", + name = "Toggle gradient", + description = "Toggles the gradient inside the chatbox." ) default boolean transparentChatBox() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java index 22844444ea..88d5dd65a1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java @@ -89,7 +89,7 @@ public class ChatboxPerformancePlugin extends Plugin { clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0)); } - } + } @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent ev) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 1c2a61ed72..1a0e2fb9ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -148,6 +148,192 @@ public class ChatCommandsPlugin extends Plugin @Inject private ChatKeyboardListener chatKeyboardListener; + /** + * Returns the ironman status based on the symbol in the name of the player. + * + * @param name player name + * @return hiscore endpoint + */ + private static HiscoreEndpoint getHiscoreEndpointByName(final String name) + { + if (name.contains(IconID.IRONMAN.toString())) + { + return toEndPoint(AccountType.IRONMAN); + } + else if (name.contains(IconID.ULTIMATE_IRONMAN.toString())) + { + return toEndPoint(AccountType.ULTIMATE_IRONMAN); + } + else if (name.contains(IconID.HARDCORE_IRONMAN.toString())) + { + return toEndPoint(AccountType.HARDCORE_IRONMAN); + } + else + { + return toEndPoint(AccountType.NORMAL); + } + } + + /** + * Converts account type to hiscore endpoint + * + * @param accountType account type + * @return hiscore endpoint + */ + private static HiscoreEndpoint toEndPoint(final AccountType accountType) + { + switch (accountType) + { + case IRONMAN: + return HiscoreEndpoint.IRONMAN; + case ULTIMATE_IRONMAN: + return HiscoreEndpoint.ULTIMATE_IRONMAN; + case HARDCORE_IRONMAN: + return HiscoreEndpoint.HARDCORE_IRONMAN; + default: + return HiscoreEndpoint.NORMAL; + } + } + + private static String longBossName(String boss) + { + switch (boss.toLowerCase()) + { + case "corp": + return "Corporeal Beast"; + + case "jad": + return "TzTok-Jad"; + + case "kq": + return "Kalphite Queen"; + + case "chaos ele": + return "Chaos Elemental"; + + case "dusk": + case "dawn": + case "gargs": + return "Grotesque Guardians"; + + case "crazy arch": + return "Crazy Archaeologist"; + + case "deranged arch": + return "Deranged Archaeologist"; + + case "mole": + return "Giant Mole"; + + case "vetion": + return "Vet'ion"; + + case "vene": + return "Venenatis"; + + case "kbd": + return "King Black Dragon"; + + case "vork": + return "Vorkath"; + + case "sire": + return "Abyssal Sire"; + + case "smoke devil": + case "thermy": + return "Thermonuclear Smoke Devil"; + + case "cerb": + return "Cerberus"; + + case "zuk": + case "inferno": + return "TzKal-Zuk"; + + case "hydra": + return "Alchemical Hydra"; + + // gwd + case "sara": + case "saradomin": + case "zilyana": + case "zily": + return "Commander Zilyana"; + case "zammy": + case "zamorak": + case "kril": + case "kril trutsaroth": + return "K'ril Tsutsaroth"; + case "arma": + case "kree": + case "kreearra": + case "armadyl": + return "Kree'arra"; + case "bando": + case "bandos": + case "graardor": + return "General Graardor"; + + // dks + case "supreme": + return "Dagannoth Supreme"; + case "rex": + return "Dagannoth Rex"; + case "prime": + return "Dagannoth Prime"; + + case "wt": + return "Wintertodt"; + case "barrows": + return "Barrows Chests"; + case "herbi": + return "Herbiboar"; + + // cox + case "cox": + case "xeric": + case "chambers": + case "olm": + case "raids": + return "Chambers of Xeric"; + + // cox cm + case "cox cm": + case "xeric cm": + case "chambers cm": + case "olm cm": + case "raids cm": + return "Chambers of Xeric Challenge Mode"; + + // tob + case "tob": + case "theatre": + case "verzik": + case "verzik vitur": + case "raids 2": + return "Theatre of Blood"; + + // agility course + case "prif": + case "prifddinas": + return "Prifddinas Agility Course"; + + // The Gauntlet + case "gaunt": + case "gauntlet": + return "Gauntlet"; + + // Corrupted Gauntlet + case "cgaunt": + case "cgauntlet": + return "Corrupted Gauntlet"; + + default: + return WordUtils.capitalize(boss); + } + } + @Override public void startUp() { @@ -185,7 +371,7 @@ public class ChatCommandsPlugin extends Plugin chatCommandManager.unregisterCommand(DUEL_ARENA_COMMAND); } -@Provides + @Provides ChatCommandsConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(ChatCommandsConfig.class); @@ -721,7 +907,6 @@ public class ChatCommandsPlugin extends Plugin return true; } - private void personalBestLookup(ChatMessage chatMessage, String message) { if (!config.pb()) @@ -1219,196 +1404,10 @@ public class ChatCommandsPlugin extends Plugin return toEndPoint(client.getAccountType()); } - /** - * Returns the ironman status based on the symbol in the name of the player. - * - * @param name player name - * @return hiscore endpoint - */ - private static HiscoreEndpoint getHiscoreEndpointByName(final String name) - { - if (name.contains(IconID.IRONMAN.toString())) - { - return toEndPoint(AccountType.IRONMAN); - } - else if (name.contains(IconID.ULTIMATE_IRONMAN.toString())) - { - return toEndPoint(AccountType.ULTIMATE_IRONMAN); - } - else if (name.contains(IconID.HARDCORE_IRONMAN.toString())) - { - return toEndPoint(AccountType.HARDCORE_IRONMAN); - } - else - { - return toEndPoint(AccountType.NORMAL); - } - } - - /** - * Converts account type to hiscore endpoint - * - * @param accountType account type - * @return hiscore endpoint - */ - private static HiscoreEndpoint toEndPoint(final AccountType accountType) - { - switch (accountType) - { - case IRONMAN: - return HiscoreEndpoint.IRONMAN; - case ULTIMATE_IRONMAN: - return HiscoreEndpoint.ULTIMATE_IRONMAN; - case HARDCORE_IRONMAN: - return HiscoreEndpoint.HARDCORE_IRONMAN; - default: - return HiscoreEndpoint.NORMAL; - } - } - @Value private static class HiscoreLookup { private final String name; private final HiscoreEndpoint endpoint; } - - private static String longBossName(String boss) - { - switch (boss.toLowerCase()) - { - case "corp": - return "Corporeal Beast"; - - case "jad": - return "TzTok-Jad"; - - case "kq": - return "Kalphite Queen"; - - case "chaos ele": - return "Chaos Elemental"; - - case "dusk": - case "dawn": - case "gargs": - return "Grotesque Guardians"; - - case "crazy arch": - return "Crazy Archaeologist"; - - case "deranged arch": - return "Deranged Archaeologist"; - - case "mole": - return "Giant Mole"; - - case "vetion": - return "Vet'ion"; - - case "vene": - return "Venenatis"; - - case "kbd": - return "King Black Dragon"; - - case "vork": - return "Vorkath"; - - case "sire": - return "Abyssal Sire"; - - case "smoke devil": - case "thermy": - return "Thermonuclear Smoke Devil"; - - case "cerb": - return "Cerberus"; - - case "zuk": - case "inferno": - return "TzKal-Zuk"; - - case "hydra": - return "Alchemical Hydra"; - - // gwd - case "sara": - case "saradomin": - case "zilyana": - case "zily": - return "Commander Zilyana"; - case "zammy": - case "zamorak": - case "kril": - case "kril trutsaroth": - return "K'ril Tsutsaroth"; - case "arma": - case "kree": - case "kreearra": - case "armadyl": - return "Kree'arra"; - case "bando": - case "bandos": - case "graardor": - return "General Graardor"; - - // dks - case "supreme": - return "Dagannoth Supreme"; - case "rex": - return "Dagannoth Rex"; - case "prime": - return "Dagannoth Prime"; - - case "wt": - return "Wintertodt"; - case "barrows": - return "Barrows Chests"; - case "herbi": - return "Herbiboar"; - - // cox - case "cox": - case "xeric": - case "chambers": - case "olm": - case "raids": - return "Chambers of Xeric"; - - // cox cm - case "cox cm": - case "xeric cm": - case "chambers cm": - case "olm cm": - case "raids cm": - return "Chambers of Xeric Challenge Mode"; - - // tob - case "tob": - case "theatre": - case "verzik": - case "verzik vitur": - case "raids 2": - return "Theatre of Blood"; - - // agility course - case "prif": - case "prifddinas": - return "Prifddinas Agility Course"; - - // The Gauntlet - case "gaunt": - case "gauntlet": - return "Gauntlet"; - - // Corrupted Gauntlet - case "cgaunt": - case "cgauntlet": - return "Corrupted Gauntlet"; - - default: - return WordUtils.capitalize(boss); - } - } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java index cd2678e520..a4b269f912 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java @@ -28,8 +28,8 @@ import java.awt.event.KeyEvent; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; -import net.runelite.api.ScriptID; import net.runelite.api.GameState; +import net.runelite.api.ScriptID; import net.runelite.api.VarClientStr; import net.runelite.client.callback.ClientThread; import net.runelite.client.input.KeyListener; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index 5e617fd438..5d244290a0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -94,7 +94,7 @@ public class ChatFilterPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -103,7 +103,7 @@ public class ChatFilterPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { filteredPatterns.clear(); client.refreshChat(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 3d4d6a18e7..09f3eba7c8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -88,6 +88,24 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener private boolean retainChatHistory; private boolean pmTargetCycling; + /** + * Small hack to prevent plugins checking for specific messages to match. This works because the "—" character + * cannot be seen in-game. This replacement preserves wrapping on chat history messages. + * + * @param message message + * @return message with invisible character before every space + */ + private static String tweakSpaces(final String message) + { + if (message != null) + { + // First replacement cleans up prior applications of this so as not to keep extending the message + return message.replace("— ", " ").replace(" ", "— "); + } + + return null; + } + @Provides ChatHistoryConfig getConfig(ConfigManager configManager) { @@ -191,22 +209,9 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener } } - /** - * Small hack to prevent plugins checking for specific messages to match. This works because the "—" character - * cannot be seen in-game. This replacement preserves wrapping on chat history messages. - * - * @param message message - * @return message with invisible character before every space - */ - private static String tweakSpaces(final String message) + @Override + public void keyTyped(KeyEvent e) { - if (message != null) - { - // First replacement cleans up prior applications of this so as not to keep extending the message - return message.replace("— ", " ").replace(" ", "— "); - } - - return null; } @Override @@ -239,11 +244,6 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener }); } - @Override - public void keyTyped(KeyEvent e) - { - } - @Override public void keyReleased(KeyEvent e) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java index 929c7caa03..5d9227c8f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java @@ -97,12 +97,12 @@ public interface ChatNotificationsConfig extends Config { return false; } - + @ConfigItem( - position = 6, - keyName = "notifyOnPm", - name = "Notify on private messsage", - description = "Notifies you whenever a private message was received" + position = 6, + keyName = "notifyOnPm", + name = "Notify on private messsage", + description = "Notifies you whenever a private message was received" ) default boolean notifyOnPm() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 6996c4a6af..e1f38c3cdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -61,6 +61,9 @@ import net.runelite.client.plugins.PluginDescriptor; @Singleton public class ChatNotificationsPlugin extends Plugin { + // Private message cache used to avoid duplicate notifications from ChatHistory. + private final Set privateMessageHashes = new HashSet<>(); + @Inject private Client client; @@ -77,10 +80,6 @@ public class ChatNotificationsPlugin extends Plugin private Pattern usernameMatcher = null; private String usernameReplacer = ""; private Pattern highlightMatcher = null; - - // Private message cache used to avoid duplicate notifications from ChatHistory. - private final Set privateMessageHashes = new HashSet<>(); - private boolean highlightOwnName; private String highlightWordsString; private boolean notifyOnOwnName; @@ -89,6 +88,49 @@ public class ChatNotificationsPlugin extends Plugin private boolean notifyOnDuel; private boolean notifyOnPm; + /** + * Get the last color tag from a string, or null if there was none + * + * @param str + * @return + */ + private static String getLastColor(String str) + { + int colIdx = str.lastIndexOf(""); + + if (colEndIdx > colIdx) + { + // ends in a which resets the color to normal + return ""; + } + + if (colIdx == -1) + { + return null; // no color + } + + int closeIdx = str.indexOf('>', colIdx); + if (closeIdx == -1) + { + return null; // unclosed col tag + } + + return str.substring(colIdx, closeIdx + 1); // include the > + } + + /** + * Strip color tags from a string. + * + * @param str + * @return + */ + @VisibleForTesting + static String stripColor(String str) + { + return str.replaceAll("(|)", ""); + } + @Provides ChatNotificationsConfig provideConfig(ConfigManager configManager) { @@ -315,47 +357,4 @@ public class ChatNotificationsPlugin extends Plugin return stringBuilder.toString(); } - - /** - * Get the last color tag from a string, or null if there was none - * - * @param str - * @return - */ - private static String getLastColor(String str) - { - int colIdx = str.lastIndexOf(""); - - if (colEndIdx > colIdx) - { - // ends in a which resets the color to normal - return ""; - } - - if (colIdx == -1) - { - return null; // no color - } - - int closeIdx = str.indexOf('>', colIdx); - if (closeIdx == -1) - { - return null; // unclosed col tag - } - - return str.substring(colIdx, closeIdx + 1); // include the > - } - - /** - * Strip color tags from a string. - * - * @param str - * @return - */ - @VisibleForTesting - static String stripColor(String str) - { - return str.replaceAll("(|)", ""); - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 89d4496a4b..2f62859442 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -83,7 +83,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } @Override - protected void startUp() throws Exception + protected void startUp() { translator.setInLang(config.publicTargetLanguage()); translator.setOutLang(config.playerTargetLanguage()); @@ -112,7 +112,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } @Override - protected void shutDown() throws Exception + protected void shutDown() { eventBus.unregister(OPTION); eventBus.unregister(PUBLIC); @@ -265,6 +265,12 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener client.refreshChat(); } + @Override + public void keyTyped(KeyEvent e) + { + // Nothing. + } + @Override public void keyPressed(KeyEvent event) { @@ -313,10 +319,4 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { // Nothing. } - - @Override - public void keyTyped(KeyEvent e) - { - // Nothing. - } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java index c1078c768c..d7bd91e1b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.chattranslation; +import lombok.AccessLevel; import lombok.Getter; // TODO: Doesn't Locale pretty much do this as well? @@ -12,7 +13,7 @@ public enum Languages FRENCH("French", "fr"), GERMAN("German", "de"); - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; private final String shortName; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java index 88f5eb85ac..5b0a4aa8c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java @@ -23,6 +23,7 @@ class Translator { incomingUrlBase = BASE_URL + SOURCE + CENT_URL + lang.toShortString() + LAST_URL; } + void setOutLang(Languages lang) { outgoingUrlBase = BASE_URL + SOURCE + CENT_URL + lang.toShortString() + LAST_URL; @@ -40,7 +41,7 @@ class Translator return translate(new URL(url)); } - public String translate(URL url) throws IOException + private String translate(URL url) throws IOException { HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestProperty("User-Agent", "Mozilla/5.0"); @@ -57,10 +58,6 @@ class Translator return parseResult(response.toString()); } - catch (IOException e) - { - throw e; - } } private String parseResult(String inputJson) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java index 12476cc675..7700bff76e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java @@ -137,7 +137,7 @@ public interface ClanChatConfig extends Config { return false; } - + @ConfigItem( position = 9, keyName = "clanname", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index e1ec236ac3..acd9988a4b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -95,6 +95,12 @@ public class ClanChatPlugin extends Plugin private static final String RECENT_TITLE = "Recent CCs"; private static final int JOIN_LEAVE_DURATION = 20; private static final int MESSAGE_DELAY = 10; + private static final CopyOnWriteArrayList clanMembers = new CopyOnWriteArrayList<>(); + /** + * queue of temporary messages added to the client + */ + private final Deque clanJoinMessages = new ArrayDeque<>(); + private final Map activityBuffer = new HashMap<>(); @Inject private Client client; @@ -115,22 +121,8 @@ public class ClanChatPlugin extends Plugin private ClientThread clientThread; private List chats = new ArrayList<>(); - - @SuppressWarnings("unchecked") - public static CopyOnWriteArrayList getClanMembers() - { - return (CopyOnWriteArrayList) clanMembers.clone(); - } - - private static final CopyOnWriteArrayList clanMembers = new CopyOnWriteArrayList<>(); private ClanChatIndicator clanMemberCounter; - /** - * queue of temporary messages added to the client - */ - private final Deque clanJoinMessages = new ArrayDeque<>(); - private final Map activityBuffer = new HashMap<>(); private int clanJoinedTick; - private boolean clanChatIcons; private boolean recentChats; private boolean showClanCounter; @@ -142,6 +134,12 @@ public class ClanChatPlugin extends Plugin private boolean clanTabChat; private String clanname; + @SuppressWarnings("unchecked") + public static CopyOnWriteArrayList getClanMembers() + { + return (CopyOnWriteArrayList) clanMembers.clone(); + } + @Provides ClanChatConfig getConfig(ConfigManager configManager) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java index 970a3515a1..43cce0cd77 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java @@ -34,6 +34,13 @@ import net.runelite.client.ui.overlay.OverlayManager; @Singleton public class ClanManModePlugin extends Plugin { + final Map clan = new HashMap<>(); + int wildernessLevel; + int clanmin; + int clanmax; + int inwildy; + int ticks; + @Inject private OverlayManager overlayManager; @@ -89,15 +96,8 @@ public class ClanManModePlugin extends Plugin return configManager.getConfig(ClanManModeConfig.class); } - int wildernessLevel; - int clanmin; - int clanmax; - int inwildy; - int ticks; - final Map clan = new HashMap<>(); - @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -107,7 +107,7 @@ public class ClanManModePlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(ClanManModeOverlay); overlayManager.remove(ClanManModeTileOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java index 02ccf87b7c..6ee96df85d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java @@ -99,7 +99,7 @@ public class ClanManModeService consumer.accept(player, plugin.getGetClanMemberColor()); } if (plugin.isHighlightAttacked() && interactors.containsKey(player.getName())) - { + { String attackername = interactors.get(player.getName()); boolean found = false; for (Player attacker : client.getPlayers()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 1f7234ccd5..3d1696fee6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; @@ -122,24 +123,24 @@ public class ClueScrollPlugin extends Plugin 13150, 9011, 13151, 9012 }; - - @Getter - private ClueScroll clue; - - @Getter + @Getter(AccessLevel.PUBLIC) private final List npcsToMark = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PUBLIC) private final List objectsToMark = new ArrayList<>(); + private final TextComponent textComponent = new TextComponent(); - @Getter + @Getter(AccessLevel.PACKAGE) + private ClueScroll clue; + + @Getter(AccessLevel.PUBLIC) private Item[] equippedItems; - @Getter + @Getter(AccessLevel.PUBLIC) private Item[] inventoryItems; @Inject - @Getter + @Getter(AccessLevel.PUBLIC) private Client client; @Inject @@ -170,11 +171,33 @@ public class ClueScrollPlugin extends Plugin private BufferedImage mapArrow; private Integer clueItemId; private boolean worldMapPointsSet = false; - - private final TextComponent textComponent = new TextComponent(); - private boolean displayHintArrows; + /** + * Translate a coordinate either between overworld and real, or real and overworld + * + * @param worldPoint + * @param toOverworld whether to convert to overworld coordinates, or to real coordinates + * @return + */ + public static WorldPoint getMirrorPoint(WorldPoint worldPoint, boolean toOverworld) + { + int region = worldPoint.getRegionID(); + for (int i = 0; i < REGION_MIRRORS.length; i += 2) + { + int real = REGION_MIRRORS[i]; + int overworld = REGION_MIRRORS[i + 1]; + + // Test against what we are converting from + if (region == (toOverworld ? real : overworld)) + { + return WorldPoint.fromRegion(toOverworld ? overworld : real, + worldPoint.getRegionX(), worldPoint.getRegionY(), worldPoint.getPlane()); + } + } + return worldPoint; + } + @Provides ClueScrollConfig getConfig(ConfigManager configManager) { @@ -188,7 +211,7 @@ public class ClueScrollPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.displayHintArrows = config.displayHintArrows(); @@ -199,7 +222,7 @@ public class ClueScrollPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(clueScrollOverlay); overlayManager.remove(clueScrollEmoteOverlay); @@ -834,29 +857,4 @@ public class ClueScrollPlugin extends Plugin newScroll ); } - - /** - * Translate a coordinate either between overworld and real, or real and overworld - * - * @param worldPoint - * @param toOverworld whether to convert to overworld coordinates, or to real coordinates - * @return - */ - public static WorldPoint getMirrorPoint(WorldPoint worldPoint, boolean toOverworld) - { - int region = worldPoint.getRegionID(); - for (int i = 0; i < REGION_MIRRORS.length; i += 2) - { - int real = REGION_MIRRORS[i]; - int overworld = REGION_MIRRORS[i + 1]; - - // Test against what we are converting from - if (region == (toOverworld ? real : overworld)) - { - return WorldPoint.fromRegion(toOverworld ? overworld : real, - worldPoint.getRegionX(), worldPoint.getRegionY(), worldPoint.getPlane()); - } - } - return worldPoint; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java index 5c8e38e72a..35abffe0ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet; import java.awt.Color; import java.awt.Graphics2D; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NPC; import net.runelite.api.ObjectID; @@ -44,7 +45,7 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class AnagramClue extends ClueScroll implements TextClueScroll, NpcClueScroll, ObjectClueScroll { private static final String ANAGRAM_TEXT = "This anagram reveals who to speak to next: "; @@ -273,12 +274,12 @@ public class AnagramClue extends ClueScroll implements TextClueScroll, NpcClueSc @Override public String[] getNpcs() { - return new String[] {npc}; + return new String[]{npc}; } @Override public int[] getObjectIds() { - return new int[] {objectId}; + return new int[]{objectId}; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java index caaeaeeb61..0e84f596c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java @@ -25,11 +25,12 @@ package net.runelite.client.plugins.cluescrolls.clues; import com.google.common.collect.ImmutableList; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; import net.runelite.api.widgets.WidgetID; -@Getter +@Getter(AccessLevel.PUBLIC) public class BeginnerMapClue extends MapClue implements LocationClueScroll { private static final ImmutableList CLUES = ImmutableList.of( 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 e59e25eb56..0ed8b0652a 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 @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet; import java.awt.Color; import java.awt.Graphics2D; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NPC; import net.runelite.api.coords.WorldPoint; @@ -39,7 +40,7 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class CipherClue extends ClueScroll implements TextClueScroll, NpcClueScroll, LocationClueScroll { private static final Set CLUES = ImmutableSet.of( @@ -140,6 +141,6 @@ public class CipherClue extends ClueScroll implements TextClueScroll, NpcClueScr public String[] getNpcs() { - return new String[] {npc}; + return new String[]{npc}; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java index 6da83f5263..9e90c58169 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableMap; import java.awt.Color; import java.awt.Graphics2D; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; @@ -37,7 +38,7 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class CoordinateClue extends ClueScroll implements TextClueScroll, LocationClueScroll { private static final ImmutableMap CLUES = new ImmutableMap.Builder() @@ -206,7 +207,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati @Nullable private final WorldPoint mirrorLocation; - public CoordinateClue(String text, WorldPoint location, WorldPoint mirrorLocation) + public CoordinateClue(String text, WorldPoint location, @Nullable WorldPoint mirrorLocation) { this.text = text; this.location = location; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java index 5523ea04db..210e54d4a0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet; import java.awt.Color; import java.awt.Graphics2D; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NPC; import static net.runelite.api.NullObjectID.NULL_1293; @@ -47,7 +48,7 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueScroll, ObjectClueScroll { public static final Set CLUES = ImmutableSet.of( @@ -116,7 +117,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc new CrypticClue("Probably filled with wizards socks.", "Wizard", DRAWERS_350, new WorldPoint(3116, 9562, 0), "Search the drawers in the basement of the Wizard's Tower south of Draynor Village. Kill one of the Wizards for the key. Fairy ring DIS"), new CrypticClue("Even the seers say this clue goes right over their heads.", CRATE_14934, new WorldPoint(2707, 3488, 2), "Search the crate on the Seers Agility Course in Seers Village"), new CrypticClue("Speak to a Wyse man.", "Wyson the gardener", new WorldPoint(3026, 3378, 0), "Talk to Wyson the gardener at Falador Park."), - new CrypticClue("You'll need to look for a town with a central fountain. Look for a locked chest in the town's chapel.", "Monk" , CLOSED_CHEST_5108, new WorldPoint(3256, 3487, 0), "Search the chest by the stairs in the Varrock church. Kill a Monk in Ardougne Monastery to obtain the key."), + new CrypticClue("You'll need to look for a town with a central fountain. Look for a locked chest in the town's chapel.", "Monk", CLOSED_CHEST_5108, new WorldPoint(3256, 3487, 0), "Search the chest by the stairs in the Varrock church. Kill a Monk in Ardougne Monastery to obtain the key."), new CrypticClue("Talk to Ambassador Spanfipple in the White Knights Castle.", "Ambassador Spanfipple", new WorldPoint(2979, 3340, 0), "Ambassador Spanfipple can be found roaming on the first floor of the White Knights Castle."), new CrypticClue("Mine was the strangest birth under the sun. I left the crimson sack, yet life had not begun. Entered the world, and yet was seen by none.", new WorldPoint(2832, 9586, 0), "Inside Karamja Volcano, dig directly underneath the Red spiders' eggs respawn."), new CrypticClue("Search for a crate in Varrock Castle.", CRATE_5113, new WorldPoint(3224, 3492, 0), "Search the crate in the corner of the kitchen in Varrock Castle."), @@ -202,7 +203,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc new CrypticClue("Search the drawers on the first floor of a building overlooking Ardougne's Market.", DRAWERS_352, new WorldPoint(2657, 3322, 1), "Climb the ladder in the house north of the market."), new CrypticClue("'A bag belt only?', he asked his balding brothers.", "Abbot Langley", new WorldPoint(3058, 3487, 0), "Talk-to Abbot Langley in Monastery west of Edgeville"), new CrypticClue("Search the drawers upstairs in Falador's shield shop.", DRAWERS, new WorldPoint(2971, 3386, 1), "Cassie's Shield Shop at the northern Falador entrance."), - new CrypticClue("Go to this building to be illuminated, and check the drawers while you are there.", "Market Guard", DRAWERS_350 , new WorldPoint(2512, 3641, 1), "Search the drawers in the first floor of the Lighthouse. Kill a Rellekka marketplace guard to obtain the key."), + new CrypticClue("Go to this building to be illuminated, and check the drawers while you are there.", "Market Guard", DRAWERS_350, new WorldPoint(2512, 3641, 1), "Search the drawers in the first floor of the Lighthouse. Kill a Rellekka marketplace guard to obtain the key."), new CrypticClue("Dig near some giant mushrooms, behind the Grand Tree.", new WorldPoint(2458, 3504, 0), "Dig near the red mushrooms northwest of the Grand Tree."), new CrypticClue("Pentagrams and demons, burnt bones and remains, I wonder what the blood contains.", new WorldPoint(3297, 3890, 0), "Dig under the blood rune spawn next to the Demonic Ruins."), new CrypticClue("Search the drawers above Varrock's shops.", DRAWERS_7194, new WorldPoint(3206, 3419, 1), "Located upstairs in Thessalia's Fine Clothes shop in Varrock."), @@ -447,7 +448,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc for (TileObject gameObject : plugin.getObjectsToMark()) { OverlayUtil.renderHoverableArea(graphics, gameObject.getClickbox(), mousePosition, - CLICKBOX_FILL_COLOR, CLICKBOX_BORDER_COLOR, CLICKBOX_HOVER_BORDER_COLOR); + CLICKBOX_FILL_COLOR, CLICKBOX_BORDER_COLOR, CLICKBOX_HOVER_BORDER_COLOR); OverlayUtil.renderImageLocation(plugin.getClient(), graphics, gameObject.getLocalLocation(), plugin.getClueScrollImage(), IMAGE_Z_OFFSET); } @@ -471,12 +472,12 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc @Override public int[] getObjectIds() { - return new int[] {objectId}; + return new int[]{objectId}; } @Override public String[] getNpcs() { - return new String[] {npc}; + return new String[]{npc}; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java index dff0c2f105..108e080b88 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java @@ -31,10 +31,11 @@ import java.awt.Polygon; import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; -import static net.runelite.api.EquipmentInventorySlot.*; import static net.runelite.api.EquipmentInventorySlot.LEGS; +import static net.runelite.api.EquipmentInventorySlot.*; import net.runelite.api.Item; import net.runelite.api.ItemID; import static net.runelite.api.ItemID.*; @@ -45,19 +46,23 @@ import net.runelite.api.coords.WorldPoint; import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR; import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin; import net.runelite.client.plugins.cluescrolls.clues.emote.Emote; -import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.*; import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.BULL_ROARER; +import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.*; import net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit; -import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.*; import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SHANTAY_PASS; +import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.*; import net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirement; -import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.*; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.all; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.any; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.emptySlot; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.item; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.range; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClueScroll { private static final Set CLUES = ImmutableSet.of( @@ -195,7 +200,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu this(text, locationName, stashUnit, location, firstEmote, null, itemRequirements); } - private EmoteClue(String text, String locationName, STASHUnit stashUnit, WorldPoint location, Emote firstEmote, Emote secondEmote, @Nonnull ItemRequirement... itemRequirements) + private EmoteClue(String text, String locationName, @Nullable STASHUnit stashUnit, WorldPoint location, Emote firstEmote, Emote secondEmote, @Nonnull ItemRequirement... itemRequirements) { this.text = text; this.locationName = locationName; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FairyRingClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FairyRingClue.java index 6fc915db54..fb4662cc22 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FairyRingClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FairyRingClue.java @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet; import java.awt.Color; import java.awt.Graphics2D; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; @@ -38,7 +39,7 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class FairyRingClue extends ClueScroll implements TextClueScroll, LocationClueScroll { private static final Set CLUES = ImmutableSet.of( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java index 8350483589..bbb1a4bf8a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java @@ -29,11 +29,12 @@ import java.awt.Color; import java.awt.Graphics2D; import java.util.List; import javax.annotation.Nonnull; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Item; +import static net.runelite.api.ItemID.*; import net.runelite.api.NPC; import net.runelite.api.coords.WorldPoint; -import static net.runelite.api.ItemID.*; import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR; import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin; import static net.runelite.client.plugins.cluescrolls.ClueScrollWorldOverlay.IMAGE_Z_OFFSET; @@ -46,7 +47,7 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class FaloTheBardClue extends ClueScroll implements TextClueScroll, NpcClueScroll { private static final List CLUES = ImmutableList.of( @@ -156,7 +157,7 @@ public class FaloTheBardClue extends ClueScroll implements TextClueScroll, NpcCl @Override public String[] getNpcs() { - return new String[] {FALO_THE_BARD}; + return new String[]{FALO_THE_BARD}; } public static FaloTheBardClue forText(String text) 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 95be35bf54..6c1b1f248c 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 @@ -35,6 +35,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -54,8 +55,8 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@EqualsAndHashCode(callSuper = false, exclude = { "hotColdSolver", "location" }) -@Getter +@EqualsAndHashCode(callSuper = false, exclude = {"hotColdSolver", "location"}) +@Getter(AccessLevel.PUBLIC) @Slf4j public class HotColdClue extends ClueScroll implements LocationClueScroll, LocationsClueScroll, TextClueScroll, NpcClueScroll { @@ -122,7 +123,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat if (hotColdSolver.getLastWorldPoint() == null) { - return new WorldPoint[] {npcLocation}; + return new WorldPoint[]{npcLocation}; } else { @@ -366,6 +367,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat public String[] getNpcs() { - return new String[] {npc}; + 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 e3b6a3d098..87cd2c5c31 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 @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet; import java.awt.Color; import java.awt.Graphics2D; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import static net.runelite.api.ItemID.*; import net.runelite.api.ObjectDefinition; @@ -49,7 +50,7 @@ import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -@Getter +@Getter(AccessLevel.PUBLIC) public class MapClue extends ClueScroll implements ObjectClueScroll { private static final Set CLUES = ImmutableSet.of( @@ -204,6 +205,6 @@ public class MapClue extends ClueScroll implements ObjectClueScroll public int[] getObjectIds() { - return new int[] {objectId}; + return new int[]{objectId}; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java index cc27dabbbb..32e9ed61f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java @@ -42,7 +42,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; @AllArgsConstructor(access = AccessLevel.PRIVATE) -@Getter +@Getter(AccessLevel.PUBLIC) public class MusicClue extends ClueScroll implements NpcClueScroll { private static final WorldPoint LOCATION = new WorldPoint(2990, 3384, 0); @@ -91,7 +91,7 @@ public class MusicClue extends ClueScroll implements NpcClueScroll @Override public String[] getNpcs() { - return new String[] {CECILIA}; + return new String[]{CECILIA}; } public static MusicClue forText(String text) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java index eb5d246e43..7da0669dcd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java @@ -25,6 +25,12 @@ package net.runelite.client.plugins.cluescrolls.clues; import com.google.common.collect.ImmutableSet; +import java.awt.Color; +import java.awt.Graphics2D; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -32,28 +38,28 @@ import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.Item; import net.runelite.api.ItemID; import net.runelite.api.NPC; +import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR; import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin; +import static net.runelite.client.plugins.cluescrolls.ClueScrollWorldOverlay.IMAGE_Z_OFFSET; import net.runelite.client.plugins.cluescrolls.clues.item.AnyRequirementCollection; -import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.*; import net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirement; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.all; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.any; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.emptySlot; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.item; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.range; +import static net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirements.xOfItem; import net.runelite.client.plugins.cluescrolls.clues.item.SingleItemRequirement; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -import java.awt.Color; -import java.awt.Graphics2D; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR; -import static net.runelite.client.plugins.cluescrolls.ClueScrollWorldOverlay.IMAGE_Z_OFFSET; -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillChallengeClue extends ClueScroll implements NpcClueScroll { @AllArgsConstructor - @Getter + @Getter(AccessLevel.PRIVATE) enum ChallengeType { CHARLIE("Charlie the Tramp", "Southern Entrance to Varrock"), @@ -124,14 +130,14 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll any("Earth Rune x15", xOfItem(ItemID.EARTH_RUNE, 15), xOfItem(ItemID.DUST_RUNE, 15), xOfItem(ItemID.MUD_RUNE, 15), xOfItem(ItemID.LAVA_RUNE, 15), item(ItemID.STAFF_OF_EARTH), item(ItemID.EARTH_BATTLESTAFF), item(ItemID.MYSTIC_EARTH_STAFF), item(ItemID.MUD_BATTLESTAFF), item(ItemID.MYSTIC_MUD_STAFF), item(ItemID.DUST_BATTLESTAFF), item(ItemID.MYSTIC_DUST_STAFF), item(ItemID.LAVA_BATTLESTAFF), item(ItemID.MYSTIC_LAVA_STAFF), item(ItemID.LAVA_BATTLESTAFF_21198), item(ItemID.MYSTIC_LAVA_STAFF_21200)), any("Unenchanted Dragonstone Jewellery", item(ItemID.DRAGONSTONE_RING), item(ItemID.DRAGON_NECKLACE), item(ItemID.DRAGON_BRACELET), item(ItemID.DRAGONSTONE_AMULET))), new SkillChallengeClue("Craft a nature rune.", item(ItemID.PURE_ESSENCE)), - new SkillChallengeClue("Catch a mottled eel with aerial fishing in Lake Molch.", any("Fish chunks or King worms", item(ItemID.FISH_CHUNKS), item(ItemID.KING_WORM)), emptySlot("No Gloves", EquipmentInventorySlot.GLOVES), emptySlot("No Weapon", EquipmentInventorySlot.WEAPON), emptySlot("No Shield", EquipmentInventorySlot.SHIELD)), + new SkillChallengeClue("Catch a mottled eel with aerial fishing in Lake Molch.", any("Fish chunks or King worms", item(ItemID.FISH_CHUNKS), item(ItemID.KING_WORM)), emptySlot("No Gloves", EquipmentInventorySlot.GLOVES), emptySlot("No Weapon", EquipmentInventorySlot.WEAPON), emptySlot("No Shield", EquipmentInventorySlot.SHIELD)), new SkillChallengeClue("Score a goal in skullball.", true, any("Ring of Charos", item(ItemID.RING_OF_CHAROS), item(ItemID.RING_OF_CHAROSA))), new SkillChallengeClue("Complete a lap of Ape atoll agility course.", true, any("Ninja Monkey Greegree", item(ItemID.NINJA_MONKEY_GREEGREE), item(ItemID.NINJA_MONKEY_GREEGREE_4025), item(ItemID.KRUK_MONKEY_GREEGREE))), new SkillChallengeClue("Create a super defence potion.", item(ItemID.CADANTINE_POTION_UNF), item(ItemID.WHITE_BERRIES)), new SkillChallengeClue("Steal from a chest in King Lathas' castle in East Ardougne."), new SkillChallengeClue("Craft a green d'hide body.", xOfItem(ItemID.GREEN_DRAGON_LEATHER, 3), item(ItemID.NEEDLE), item(ItemID.THREAD)), new SkillChallengeClue("String a yew longbow.", item(ItemID.YEW_LONGBOW_U), item(ItemID.BOW_STRING)), - new SkillChallengeClue("Kill a Dust Devil.", "slay a dust devil.", true, any("Facemask or Slayer Helmet", item(ItemID.FACEMASK), item(ItemID.SLAYER_HELMET), item(ItemID. SLAYER_HELMET_I), item(ItemID. BLACK_SLAYER_HELMET), item(ItemID. BLACK_SLAYER_HELMET_I), item(ItemID. PURPLE_SLAYER_HELMET), item(ItemID. PURPLE_SLAYER_HELMET_I), item(ItemID. RED_SLAYER_HELMET), item(ItemID. RED_SLAYER_HELMET_I), item(ItemID.GREEN_SLAYER_HELMET), item(ItemID. GREEN_SLAYER_HELMET_I), item(ItemID. TURQUOISE_SLAYER_HELMET), item(ItemID. TURQUOISE_SLAYER_HELMET_I), item(ItemID. HYDRA_SLAYER_HELMET), item(ItemID. HYDRA_SLAYER_HELMET_I))), + new SkillChallengeClue("Kill a Dust Devil.", "slay a dust devil.", true, any("Facemask or Slayer Helmet", item(ItemID.FACEMASK), item(ItemID.SLAYER_HELMET), item(ItemID.SLAYER_HELMET_I), item(ItemID.BLACK_SLAYER_HELMET), item(ItemID.BLACK_SLAYER_HELMET_I), item(ItemID.PURPLE_SLAYER_HELMET), item(ItemID.PURPLE_SLAYER_HELMET_I), item(ItemID.RED_SLAYER_HELMET), item(ItemID.RED_SLAYER_HELMET_I), item(ItemID.GREEN_SLAYER_HELMET), item(ItemID.GREEN_SLAYER_HELMET_I), item(ItemID.TURQUOISE_SLAYER_HELMET), item(ItemID.TURQUOISE_SLAYER_HELMET_I), item(ItemID.HYDRA_SLAYER_HELMET), item(ItemID.HYDRA_SLAYER_HELMET_I))), new SkillChallengeClue("Catch a black warlock.", item(ItemID.BUTTERFLY_JAR), any("Butterfly Net", item(ItemID.BUTTERFLY_NET), item(ItemID.MAGIC_BUTTERFLY_NET))), new SkillChallengeClue("Catch a red chinchompa.", item(ItemID.BOX_TRAP)), new SkillChallengeClue("Mine a piece of mithril ore.", ANY_PICKAXE), @@ -177,7 +183,7 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll new SkillChallengeClue("Chop a redwood log.", "chop a redwood log whilst sporting the finest lumberjack gear.", true, ANY_AXE, all("Lumberjack outfit", item(ItemID.LUMBERJACK_HAT), item(ItemID.LUMBERJACK_TOP), item(ItemID.LUMBERJACK_LEGS), item(ItemID.LUMBERJACK_BOOTS))), new SkillChallengeClue("Craft a light orb in the Dorgesh-Kaan bank.", item(ItemID.CAVE_GOBLIN_WIRE), item(ItemID.EMPTY_LIGHT_ORB)), new SkillChallengeClue("Kill a reanimated Abyssal Demon.", "kill a reanimated abyssal.", xOfItem(ItemID.SOUL_RUNE, 4), xOfItem(ItemID.BLOOD_RUNE, 1), any("Nature Rune x4", xOfItem(ItemID.NATURE_RUNE, 4), item(ItemID.BRYOPHYTAS_STAFF)), range("Ensouled abyssal head", ItemID.ENSOULED_ABYSSAL_HEAD, ItemID.ENSOULED_ABYSSAL_HEAD_13508)), - new SkillChallengeClue("Kill a Fiyr shade inside Mort'tons shade catacombs.", any("Any Silver Shade Key", item(ItemID.SILVER_KEY_RED), item(ItemID.SILVER_KEY_BROWN), item(ItemID.SILVER_KEY_CRIMSON), item(ItemID.SILVER_KEY_BLACK), item(ItemID.SILVER_KEY_PURPLE))) + new SkillChallengeClue("Kill a Fiyr shade inside Mort'tons shade catacombs.", any("Any Silver Shade Key", item(ItemID.SILVER_KEY_RED), item(ItemID.SILVER_KEY_BROWN), item(ItemID.SILVER_KEY_CRIMSON), item(ItemID.SILVER_KEY_BLACK), item(ItemID.SILVER_KEY_PURPLE))) ); private final ChallengeType type; @@ -191,7 +197,7 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll private boolean challengeCompleted; // Charlie Tasks - private SkillChallengeClue(String challenge, String rawChallenge, String returnText, SingleItemRequirement returnItem, ItemRequirement ... itemRequirements) + private SkillChallengeClue(String challenge, String rawChallenge, String returnText, SingleItemRequirement returnItem, ItemRequirement... itemRequirements) { this.type = ChallengeType.CHARLIE; this.challenge = challenge; @@ -204,25 +210,25 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll } // Non-cryptic Sherlock Tasks - private SkillChallengeClue(String challenge, ItemRequirement ... itemRequirements) + private SkillChallengeClue(String challenge, ItemRequirement... itemRequirements) { this(challenge, challenge.toLowerCase(), itemRequirements); } // Non-cryptic Sherlock Tasks - private SkillChallengeClue(String challenge, boolean requireEquip, ItemRequirement ... itemRequirements) + private SkillChallengeClue(String challenge, boolean requireEquip, ItemRequirement... itemRequirements) { this(challenge, challenge.toLowerCase(), requireEquip, itemRequirements); } // Sherlock Tasks - private SkillChallengeClue(String challenge, String rawChallenge, ItemRequirement ... itemRequirements) + private SkillChallengeClue(String challenge, String rawChallenge, ItemRequirement... itemRequirements) { this(challenge, rawChallenge, false, itemRequirements); } // Sherlock Tasks - private SkillChallengeClue(String challenge, String rawChallenge, boolean requireEquip, ItemRequirement ... itemRequirements) + private SkillChallengeClue(String challenge, String rawChallenge, boolean requireEquip, ItemRequirement... itemRequirements) { this.type = ChallengeType.SHERLOCK; this.challenge = challenge; @@ -296,7 +302,7 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll } } - private static List getRequirements(ClueScrollPlugin plugin, boolean requireEquipped, ItemRequirement ... requirements) + private static List getRequirements(ClueScrollPlugin plugin, boolean requireEquipped, ItemRequirement... requirements) { List components = new ArrayList<>(); @@ -356,6 +362,6 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll @Override public String[] getNpcs() { - return new String[] {type.getName()}; + return new String[]{type.getName()}; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/ThreeStepCrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/ThreeStepCrypticClue.java index ffc461d470..c5cf8289e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/ThreeStepCrypticClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/ThreeStepCrypticClue.java @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Stream; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Client; @@ -42,15 +43,15 @@ import static net.runelite.api.ItemID.TORN_CLUE_SCROLL_PART_2; import static net.runelite.api.ItemID.TORN_CLUE_SCROLL_PART_3; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ItemContainerChanged; +import net.runelite.api.util.Text; import net.runelite.client.game.ItemManager; import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR; import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin; import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -import net.runelite.api.util.Text; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public class ThreeStepCrypticClue extends ClueScroll implements TextClueScroll, ObjectClueScroll, NpcClueScroll, LocationsClueScroll { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/Emote.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/Emote.java index 1be5825d72..004f9fe6a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/Emote.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/Emote.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.cluescrolls.clues.emote; +import lombok.AccessLevel; import lombok.Getter; import static net.runelite.api.SpriteID.*; -@Getter +@Getter(AccessLevel.PUBLIC) public enum Emote { BULL_ROARER("Bull Roarer", -1), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java index 05874dd05b..26d397422d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.cluescrolls.clues.emote; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NullObjectID; import net.runelite.api.coords.WorldPoint; -@Getter +@Getter(AccessLevel.PUBLIC) public enum STASHUnit { NEAR_A_SHED_IN_LUMBRIDGE_SWAMP(NullObjectID.NULL_28958, new WorldPoint(3201, 3171, 0)), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdArea.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdArea.java index 0835fba279..a73bef8900 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdArea.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdArea.java @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.cluescrolls.clues.hotcold; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public enum HotColdArea { ASGARNIA("Asgarnia"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index 9d896d8ed7..83290d4ca1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -27,20 +27,11 @@ package net.runelite.client.plugins.cluescrolls.clues.hotcold; import java.awt.Rectangle; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.coords.WorldPoint; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.ASGARNIA; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.DESERT; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.FELDIP_HILLS; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.FREMENNIK_PROVINCE; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.KANDARIN; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.KARAMJA; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.MISTHALIN; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.MORYTANIA; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.WESTERN_PROVINCE; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.WILDERNESS; -import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.ZEAH; +import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea.*; // The locations contains all hot/cold points and their descriptions according to the wiki // these central points were obtained by checking wiki location pictures against a coordinate map @@ -48,7 +39,7 @@ import static net.runelite.client.plugins.cluescrolls.clues.hotcold.HotColdArea. // calculations are done considering the 9x9 grid around the central point where the strange device shakes // because the calculations consider the 9x9 grid, slightly off-center points should still be found by the calculations @AllArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public enum HotColdLocation { ASGARNIA_WARRIORS(new WorldPoint(2860, 3562, 0), ASGARNIA, "North of the Warriors' Guild in Burthorpe."), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdSolver.java index 052fef03ea..1169e2f6c7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdSolver.java @@ -30,6 +30,7 @@ import java.awt.Rectangle; import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; @@ -42,7 +43,7 @@ import net.runelite.api.coords.WorldPoint; * with specific set of solution points, so this solver will filter from a provided set of possible solutions as new * signals of temperatures and temperature changes are provided. */ -@Getter +@Getter(AccessLevel.PUBLIC) public class HotColdSolver { private final Set possibleLocations; @@ -63,7 +64,7 @@ public class HotColdSolver * @param temperature The temperature of the checked point * @param temperatureChange The change of temperature of the checked point compared to the previously-checked point * @return A set of {@link HotColdLocation}s which are still possible after the filtering occurs. This return value - * is the same as would be returned by {@code getPossibleLocations()}. + * is the same as would be returned by {@code getPossibleLocations()}. */ public Set signal(@Nonnull final WorldPoint worldPoint, @Nonnull final HotColdTemperature temperature, @Nullable final HotColdTemperatureChange temperatureChange) { @@ -118,11 +119,11 @@ public class HotColdSolver * @param secondPoint Second point to test * @param rect Rectangle, whose corner points will be compared to the first and second points passed * @return {@code true} if {@code firstPoint} is closer to each of {@code rect}'s four corner points than - * {@code secondPoint}, {@code false} otherwise. + * {@code secondPoint}, {@code false} otherwise. * @see WorldPoint#distanceTo2D */ @VisibleForTesting - static boolean isFirstPointCloserRect(final WorldPoint firstPoint, final WorldPoint secondPoint, final Rectangle rect) + private static boolean isFirstPointCloserRect(final WorldPoint firstPoint, final WorldPoint secondPoint, final Rectangle rect) { final WorldPoint nePoint = new WorldPoint((rect.x + rect.width), (rect.y + rect.height), 0); @@ -156,11 +157,11 @@ public class HotColdSolver * @param secondPoint Second point to test * @param worldPoint Point to compare to the first and second points passed * @return {@code true} if {@code firstPoint} is closer to {@code worldPoint} than {@code secondPoint}, - * {@code false} otherwise. + * {@code false} otherwise. * @see WorldPoint#distanceTo2D */ @VisibleForTesting - static boolean isFirstPointCloser(final WorldPoint firstPoint, final WorldPoint secondPoint, final WorldPoint worldPoint) + private static boolean isFirstPointCloser(final WorldPoint firstPoint, final WorldPoint secondPoint, final WorldPoint worldPoint) { return firstPoint.distanceTo2D(worldPoint) < secondPoint.distanceTo2D(worldPoint); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java index f495b1f36b..923da763e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java @@ -30,12 +30,13 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.util.Text; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public enum HotColdTemperature { ICE_COLD("ice cold", 500, 5000), @@ -82,9 +83,9 @@ public enum HotColdTemperature * @param temperatureSet A set of temperature values to select from * @param message A string containing a temperature value * @return The corresponding enum from the given temperature set. - *

- * Note that in cases where two temperature values in the given set are equally likely to be the given - * temperature (say, two temperatures with identical text values), the behavior is undefined. + *

+ * Note that in cases where two temperature values in the given set are equally likely to be the given + * temperature (say, two temperatures with identical text values), the behavior is undefined. */ @Nullable public static HotColdTemperature getFromTemperatureSet(final Set temperatureSet, final String message) 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 f5e5905ab8..152840c027 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.ItemDefinition; 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/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index add766632f..415aed3e9d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -237,7 +237,7 @@ public class CombatCounter extends Plugin ); @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); addSubscriptions(); @@ -252,7 +252,7 @@ public class CombatCounter extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { eventBus.unregister(this); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java index e7ba96147a..4ac83f1bb0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java @@ -95,7 +95,7 @@ public class CombatLevelPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -108,7 +108,7 @@ public class CombatLevelPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); Widget combatLevelWidget = client.getWidget(WidgetInfo.COMBAT_LEVEL); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index b8ef9d4ff6..ff256507c9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -149,7 +149,7 @@ public class ConfigPanel extends PluginPanel private final OpenOSRSConfig OpenOSRSConfig; private final ChatColorConfig chatColorConfig; private final ColorPickerManager colorPickerManager; - public static List pluginList = new ArrayList<>(); + public static final List pluginList = new ArrayList<>(); private final IconTextField searchBar = new IconTextField(); private final JPanel topPanel; @@ -1238,11 +1238,13 @@ public class ConfigPanel extends PluginPanel cid.getItem().keyName(), EnumSet.class); if (enumSet == null) { + //noinspection unchecked enumSet = EnumSet.noneOf(enumType); } enumSet.clear(); EnumSet finalEnumSet = enumSet; + //noinspection unchecked jList.getSelectedValuesList().forEach(value -> finalEnumSet.add(Enum.valueOf(cid.getItem().enumClass(), value.toString()))); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java index b1a577df98..2acaf6af08 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java @@ -88,7 +88,7 @@ public class ConfigPlugin extends Plugin private NavigationButton navButton; @Override - protected void startUp() throws Exception + protected void startUp() { configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, OpenOSRSConfig, chatColorConfig, colorPickerManager); @@ -106,7 +106,7 @@ public class ConfigPlugin extends Plugin } @Override - public void shutDown() throws Exception + public void shutDown() { clientToolbar.removeNavigation(navButton); RuneLite.getInjector().getInstance(ClientThread.class).invokeLater(() -> diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 05f8f3c513..c3b48368c8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -66,7 +66,7 @@ public class PluginListItem extends JPanel private final ConfigPanel configPanel; - @Getter + @Getter(AccessLevel.PACKAGE) @Nullable private final Plugin plugin; @@ -93,13 +93,13 @@ public class PluginListItem extends JPanel private final IconButton configButton = new IconButton(CONFIG_ICON, CONFIG_ICON_HOVER); private final IconButton toggleButton = new IconButton(OFF_SWITCHER); - @Getter + @Getter(AccessLevel.PACKAGE) private boolean isPluginEnabled = false; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean isPinned = false; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean isHidden = false; private Color color = null; 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 a98151815b..f3fbadee3f 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 @@ -29,8 +29,8 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.text.DecimalFormat; -import java.time.Instant; import java.time.Duration; +import java.time.Instant; import javax.inject.Inject; import javax.inject.Singleton; import static net.runelite.api.AnimationID.COOKING_FIRE; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java index ef796aff7c..e8ba114f82 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java @@ -97,7 +97,7 @@ public class CookingPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -106,7 +106,7 @@ public class CookingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { infoBoxManager.removeIf(FermentTimer.class::isInstance); overlayManager.remove(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 c9cfa9d697..5ba48932e1 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 @@ -111,7 +111,7 @@ public class CorpPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -120,7 +120,7 @@ public class CorpPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(corpOverlay); overlayManager.remove(coreOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java index fa3d740e5f..6648fc4e53 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java @@ -88,27 +88,35 @@ public class CoxPlugin extends Plugin { private static final int ANIMATION_ID_G1 = 430; private static final Pattern TP_REGEX = Pattern.compile("You have been paired with (.*)! The magical power will enact soon..."); + @Inject @Getter(AccessLevel.NONE) private Client client; + @Inject @Getter(AccessLevel.NONE) private ChatMessageManager chatMessageManager; + @Inject @Getter(AccessLevel.NONE) private CoxOverlay coxOverlay; + @Inject @Getter(AccessLevel.NONE) private CoxInfoBox coxInfoBox; + @Inject @Getter(AccessLevel.NONE) private CoxConfig config; + @Inject @Getter(AccessLevel.NONE) private OverlayManager overlayManager; + @Inject @Getter(AccessLevel.NONE) private EventBus eventBus; + private boolean handCripple; private boolean runOlm; private int vanguards; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java index d5048877c9..2faf9df5a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java @@ -81,7 +81,7 @@ class NPCContainer MELEE("Melee", Color.RED), UNKNOWN("Unknown", Color.WHITE); - private String name = ""; + private String name; private Color color; } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java index d4d8da33f4..431d1006dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java @@ -44,6 +44,7 @@ import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +import org.jetbrains.annotations.NotNull; @PluginDescriptor( name = "Crystal Math Labs", @@ -71,7 +72,7 @@ public class CrystalMathLabs extends Plugin private long lastXp; @Override - protected void startUp() throws Exception + protected void startUp() { fetchXp = true; @@ -80,7 +81,7 @@ public class CrystalMathLabs extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { eventBus.unregister(this); } @@ -146,13 +147,13 @@ public class CrystalMathLabs extends Plugin httpClient.newCall(request).enqueue(new Callback() { @Override - public void onFailure(Call call, IOException e) + public void onFailure(@NotNull Call call, @NotNull IOException e) { log.warn("Error submitting CML update, caused by {}.", e.getMessage()); } @Override - public void onResponse(Call call, Response response) throws IOException + public void onResponse(@NotNull Call call, @NotNull Response response) { response.close(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bone.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bone.java index 28daed468e..4144632a40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bone.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bone.java @@ -2,6 +2,7 @@ package net.runelite.client.plugins.deathindicator; import java.time.Duration; import java.time.Instant; +import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @@ -12,8 +13,8 @@ import net.runelite.client.util.ColorUtil; import net.runelite.client.util.MiscUtils; @EqualsAndHashCode -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) class Bone { private String name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bones.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bones.java index 40e44c1073..5d886b56a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bones.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/Bones.java @@ -15,7 +15,7 @@ import net.runelite.client.config.ConfigManager; import static net.runelite.http.api.RuneLiteAPI.GSON; @Slf4j -public class Bones +class Bones { private static final String CONFIG_GROUP = "deathIndicator"; private static final String BONES_PREFIX = "bones_"; 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/defaultworld/DefaultWorldPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java index d10cd8dc20..60debf3556 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java @@ -67,7 +67,7 @@ public class DefaultWorldPlugin extends Plugin private boolean worldChangeRequired; @Override - protected void startUp() throws Exception + protected void startUp() { worldChangeRequired = true; @@ -75,13 +75,13 @@ public class DefaultWorldPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { worldChangeRequired = true; changeWorld(worldCache); } -@Provides + @Provides DefaultWorldConfig getConfig(ConfigManager configManager) { return configManager.getConfig(DefaultWorldConfig.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java index fb876683c7..fb0e30f048 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.demonicgorilla; import java.util.Arrays; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Actor; @@ -34,7 +35,7 @@ import net.runelite.api.NPC; import net.runelite.api.NPCDefinition; import net.runelite.api.coords.WorldArea; -public class DemonicGorilla +class DemonicGorilla { static final int MAX_ATTACK_RANGE = 10; // Needs <= 10 tiles to reach target static final int ATTACK_RATE = 5; // 5 ticks between each attack @@ -45,7 +46,7 @@ public class DemonicGorilla static final int PROJECTILE_MAGIC_DELAY = 12; // Requires an extra 12 tiles static final int PROJECTILE_RANGED_DELAY = 9; // Requires an extra 9 tiles - public static final AttackStyle[] ALL_REGULAR_ATTACK_STYLES = + static final AttackStyle[] ALL_REGULAR_ATTACK_STYLES = { AttackStyle.MELEE, AttackStyle.RANGED, @@ -60,66 +61,66 @@ public class DemonicGorilla BOULDER } - @Getter + @Getter(AccessLevel.PACKAGE) private NPC npc; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private List nextPosibleAttackStyles; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int attacksUntilSwitch; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int nextAttackTick; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int lastTickAnimation; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private WorldArea lastWorldArea; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean initiatedCombat; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Actor lastTickInteracting; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean takenDamageRecently; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int recentProjectileId; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean changedPrayerThisTick; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean changedAttackStyleThisTick; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean changedAttackStyleLastTick; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private HeadIcon lastTickOverheadIcon; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int disabledMeleeMovementForTicks; - public DemonicGorilla(NPC npc) + DemonicGorilla(NPC npc) { this.npc = npc; this.nextPosibleAttackStyles = Arrays.asList(ALL_REGULAR_ATTACK_STYLES); @@ -128,7 +129,7 @@ public class DemonicGorilla this.recentProjectileId = -1; } - public HeadIcon getOverheadIcon() + HeadIcon getOverheadIcon() { NPCDefinition composition = this.npc.getDefinition(); if (composition != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java index b9eeb05b52..5599484b7e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java @@ -95,7 +95,7 @@ public class DemonicGorillaPlugin extends Plugin private Map memorizedPlayers; @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); gorillas = new HashMap<>(); @@ -106,7 +106,7 @@ public class DemonicGorillaPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); gorillas = null; @@ -115,7 +115,7 @@ public class DemonicGorillaPlugin extends Plugin memorizedPlayers = null; } -private void clear() + private void clear() { recentBoulders.clear(); pendingAttacks.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsButton.java index e21af75f5a..eb56041e48 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsButton.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsButton.java @@ -26,11 +26,12 @@ package net.runelite.client.plugins.devtools; import java.awt.Color; import javax.swing.JButton; +import lombok.AccessLevel; import lombok.Getter; class DevToolsButton extends JButton { - @Getter + @Getter(AccessLevel.PACKAGE) private boolean active; DevToolsButton(String title) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java index 06363ec64d..710c9dbad1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java @@ -32,6 +32,7 @@ import java.awt.image.BufferedImage; import static java.lang.Math.min; import java.util.List; import javax.inject.Inject; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -67,7 +68,7 @@ import org.slf4j.LoggerFactory; tags = {"panel"}, developerPlugin = true ) -@Getter +@Getter(AccessLevel.PACKAGE) public class DevToolsPlugin extends Plugin { private static final List EXAMINE_MENU_ACTIONS = ImmutableList.of(MenuOpcode.EXAMINE_ITEM, @@ -141,7 +142,7 @@ public class DevToolsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { players = new DevToolsButton("Players"); @@ -204,7 +205,7 @@ public class DevToolsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(locationOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SoundEffectOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SoundEffectOverlay.java index ea9f060ee6..86b878d8c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SoundEffectOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SoundEffectOverlay.java @@ -77,7 +77,7 @@ class SoundEffectOverlay extends Overlay { String text = "Id: " + event.getSoundId() + - " - D: " + event.getDelay(); + " - D: " + event.getDelay(); panelComponent.getChildren().add(LineComponent.builder() .left(text) @@ -110,10 +110,10 @@ class SoundEffectOverlay extends Overlay String text = "Id: " + event.getSoundId() + - " - S: " + (event.getSource() != null ? event.getSource().getName() : "") + - " - L: " + event.getSceneX() + "," + event.getSceneY() + - " - R: " + event.getRange() + - " - D: " + event.getDelay(); + " - S: " + (event.getSource() != null ? event.getSource().getName() : "") + + " - L: " + event.getSceneX() + "," + event.getSceneY() + + " - R: " + event.getRange() + + " - D: " + event.getDelay(); panelComponent.getChildren().add(LineComponent.builder() .left(text) 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 a02659b4c5..5a5ced2878 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 @@ -45,6 +45,7 @@ import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.border.CompoundBorder; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -64,7 +65,7 @@ import net.runelite.client.ui.FontManager; @Slf4j class VarInspector extends JFrame { - @Getter + @Getter(AccessLevel.PACKAGE) private enum VarType { VARBIT("Varbit"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java index 6c8c26054b..243f1a9c08 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.devtools; import java.util.function.BiConsumer; import java.util.function.Function; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.widgets.Widget; @@ -34,7 +35,7 @@ import org.slf4j.helpers.MessageFormatter; @Slf4j public class WidgetField { - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; private final Function getter; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java index acd8851c0b..91180a5125 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java @@ -35,7 +35,7 @@ import javax.swing.table.AbstractTableModel; import net.runelite.api.widgets.Widget; import net.runelite.client.callback.ClientThread; -public class WidgetInfoTableModel extends AbstractTableModel +class WidgetInfoTableModel extends AbstractTableModel { @Inject private ClientThread clientThread; 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 6048e6d12a..7d3c124b84 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 @@ -53,13 +53,13 @@ import javax.swing.SwingUtilities; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.MenuEntry; import net.runelite.api.MenuOpcode; import net.runelite.api.SpriteID; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.widgets.JavaScriptCallback; @@ -70,6 +70,7 @@ import net.runelite.api.widgets.WidgetItem; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ColorUtil; @@ -103,15 +104,15 @@ class WidgetInspector extends JFrame private DefaultMutableTreeNode root; - @Getter + @Getter(AccessLevel.PACKAGE) private Widget selectedWidget; - @Getter + @Getter(AccessLevel.PACKAGE) private int selectedItem; private Widget picker = null; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean pickerSelected = false; @Inject @@ -450,12 +451,9 @@ class WidgetInspector extends JFrame Widget[] roots = client.getWidgetRoots(); parent = Stream.of(roots) - .filter(w -> w.getType() == WidgetType.LAYER && w.getContentType() == 0 && !w.isSelfHidden()) - .sorted(Comparator.comparing((Widget w) -> w.getRelativeX() + w.getRelativeY()) + .filter(w -> w.getType() == WidgetType.LAYER && w.getContentType() == 0 && !w.isSelfHidden()).max(Comparator.comparing((Widget w) -> w.getRelativeX() + w.getRelativeY()) .reversed() - .thenComparing(Widget::getId) - .reversed()) - .findFirst().get(); + .thenComparing(Widget::getId)).get(); x = 4; y = 4; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WorldMapRegionOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WorldMapRegionOverlay.java index 1e136267b8..a7c55edfbb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WorldMapRegionOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WorldMapRegionOverlay.java @@ -47,6 +47,7 @@ class WorldMapRegionOverlay extends Overlay private static final int LABEL_PADDING = 4; private static final int REGION_SIZE = 1 << 6; // Bitmask to return first coordinate in region + @SuppressWarnings("PointlessBitwiseExpression") private static final int REGION_TRUNCATE = ~((1 << 6) - 1); private final Client client; private final DevToolsPlugin plugin; @@ -77,7 +78,7 @@ class WorldMapRegionOverlay extends Overlay { RenderOverview ro = client.getRenderOverview(); Widget map = client.getWidget(WidgetInfo.WORLD_MAP_VIEW); - Float pixelsPerTile = ro.getWorldMapZoom(); + float pixelsPerTile = ro.getWorldMapZoom(); if (map == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index d493b9980c..981b83b154 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -88,70 +88,70 @@ enum DiscordGameEventType BOSS_ZULRAH("Zulrah", DiscordAreaType.BOSSES, 9007), // Cities - CITY_AL_KHARID("Al Kharid" , DiscordAreaType.CITIES, 13105, 13106), - CITY_APE_ATOLL("Ape Atoll" , DiscordAreaType.CITIES, 10795, 11051, 10974, 11050), - CITY_ARCEUUS_HOUSE("Arceuus" , DiscordAreaType.CITIES, 6459, 6715, 6458, 6714), - CITY_ARDOUGNE("Ardougne" , DiscordAreaType.CITIES, 10548, 10547, 10292, 10291, 10036, 10035, 9780, 9779), - CITY_BARBARIAN_VILLAGE("Barbarian Village" , DiscordAreaType.CITIES, 12341), - CITY_BANDIT_CAMP("Bandit Camp" , DiscordAreaType.CITIES, 12591), - CITY_BEDABIN_CAMP("Bedabin Camp" , DiscordAreaType.CITIES, 12590), - CITY_BRIMHAVEN("Brimhaven" , DiscordAreaType.CITIES, 11057, 11058), - CITY_BURGH_DE_ROTT("Burgh de Rott" , DiscordAreaType.CITIES, 13874, 13873, 14130, 14129), - CITY_BURTHORPE("Burthorpe" , DiscordAreaType.CITIES, 11319, 11575), - CITY_CANIFIS("Canifis" , DiscordAreaType.CITIES, 13878), - CITY_CATHERBY("Catherby" , DiscordAreaType.CITIES, 11317, 11318, 11061), - CITY_CORSAIR_CAVE("Corsair Cove" , DiscordAreaType.CITIES, 10028, 10284), - CITY_DORGESH_KAAN("Dorgesh-Kaan" , DiscordAreaType.CITIES, 10835, 10834), - CITY_DRAYNOR("Draynor" , DiscordAreaType.CITIES, 12338), - CITY_EDGEVILLE("Edgeville" , DiscordAreaType.CITIES, 12342), - CITY_ENTRANA("Entrana" , DiscordAreaType.CITIES, 11060, 11316), - CITY_FALADOR("Falador" , DiscordAreaType.CITIES, 11828, 11572, 11571, 11827, 12084), - CITY_GOBLIN_VILLAGE("Goblin Village" , DiscordAreaType.CITIES, 11830), - CITY_GUTANOTH("Gu'Tanoth" , DiscordAreaType.CITIES, 10031), + CITY_AL_KHARID("Al Kharid", DiscordAreaType.CITIES, 13105, 13106), + CITY_APE_ATOLL("Ape Atoll", DiscordAreaType.CITIES, 10795, 11051, 10974, 11050), + CITY_ARCEUUS_HOUSE("Arceuus", DiscordAreaType.CITIES, 6459, 6715, 6458, 6714), + CITY_ARDOUGNE("Ardougne", DiscordAreaType.CITIES, 10548, 10547, 10292, 10291, 10036, 10035, 9780, 9779), + CITY_BARBARIAN_VILLAGE("Barbarian Village", DiscordAreaType.CITIES, 12341), + CITY_BANDIT_CAMP("Bandit Camp", DiscordAreaType.CITIES, 12591), + CITY_BEDABIN_CAMP("Bedabin Camp", DiscordAreaType.CITIES, 12590), + CITY_BRIMHAVEN("Brimhaven", DiscordAreaType.CITIES, 11057, 11058), + CITY_BURGH_DE_ROTT("Burgh de Rott", DiscordAreaType.CITIES, 13874, 13873, 14130, 14129), + CITY_BURTHORPE("Burthorpe", DiscordAreaType.CITIES, 11319, 11575), + CITY_CANIFIS("Canifis", DiscordAreaType.CITIES, 13878), + CITY_CATHERBY("Catherby", DiscordAreaType.CITIES, 11317, 11318, 11061), + CITY_CORSAIR_CAVE("Corsair Cove", DiscordAreaType.CITIES, 10028, 10284), + CITY_DORGESH_KAAN("Dorgesh-Kaan", DiscordAreaType.CITIES, 10835, 10834), + CITY_DRAYNOR("Draynor", DiscordAreaType.CITIES, 12338), + CITY_EDGEVILLE("Edgeville", DiscordAreaType.CITIES, 12342), + CITY_ENTRANA("Entrana", DiscordAreaType.CITIES, 11060, 11316), + CITY_FALADOR("Falador", DiscordAreaType.CITIES, 11828, 11572, 11571, 11827, 12084), + CITY_GOBLIN_VILLAGE("Goblin Village", DiscordAreaType.CITIES, 11830), + CITY_GUTANOTH("Gu'Tanoth", DiscordAreaType.CITIES, 10031), CITY_GWENITH("Gwenith", DiscordAreaType.CITIES, 8501, 8757, 9013), - CITY_HOSIDIUS_HOUSE("Hosidius" , DiscordAreaType.CITIES, 6713, 6712, 6455, 6711, 6710, 6965, 6966, 7222, 7223, 6967), - CITY_JATISZO("Jatizso" , DiscordAreaType.CITIES, 9531), - CITY_JIGGIG("Jiggig" , DiscordAreaType.CITIES, 9775), - CITY_KARAMJA("Karamja" , DiscordAreaType.CITIES, 11569, 11568, 11567, 11566, 11313, 11312, 11311), - CITY_KELDAGRIM("Keldagrim" , DiscordAreaType.CITIES, 11423, 11422, 11679, 11678), - CITY_LLETYA("Lletya" , DiscordAreaType.CITIES, 9265), - CITY_LOVAKENGJ_HOUSE("Lovakengj" , DiscordAreaType.CITIES, 5692, 5948, 5691, 5947, 6203, 6202, 5690, 5946), - CITY_LUMBRIDGE("Lumbridge" , DiscordAreaType.CITIES, 12850), - CITY_LUNAR_ISLE("Lunar Isle" , DiscordAreaType.CITIES, 8253, 8252, 8509, 8508), - CITY_MEIYERDITCH("Meiyerditch" , DiscordAreaType.CITIES, 14132, 14388, 14387, 14386, 14385), - CITY_MISCELLANIA("Miscellania" , DiscordAreaType.CITIES, 10044, 10300), - CITY_MOS_LE_HARMLESS("Mos Le'Harmless" , DiscordAreaType.CITIES, 14638), - CITY_MORTTON("Mort'ton" , DiscordAreaType.CITIES, 13875), - CITY_MOR_UI_REK("Mor UI Rek" , DiscordAreaType.CITIES, 9808, 9807, 10064, 10063), + CITY_HOSIDIUS_HOUSE("Hosidius", DiscordAreaType.CITIES, 6713, 6712, 6455, 6711, 6710, 6965, 6966, 7222, 7223, 6967), + CITY_JATISZO("Jatizso", DiscordAreaType.CITIES, 9531), + CITY_JIGGIG("Jiggig", DiscordAreaType.CITIES, 9775), + CITY_KARAMJA("Karamja", DiscordAreaType.CITIES, 11569, 11568, 11567, 11566, 11313, 11312, 11311), + CITY_KELDAGRIM("Keldagrim", DiscordAreaType.CITIES, 11423, 11422, 11679, 11678), + CITY_LLETYA("Lletya", DiscordAreaType.CITIES, 9265), + CITY_LOVAKENGJ_HOUSE("Lovakengj", DiscordAreaType.CITIES, 5692, 5948, 5691, 5947, 6203, 6202, 5690, 5946), + CITY_LUMBRIDGE("Lumbridge", DiscordAreaType.CITIES, 12850), + CITY_LUNAR_ISLE("Lunar Isle", DiscordAreaType.CITIES, 8253, 8252, 8509, 8508), + CITY_MEIYERDITCH("Meiyerditch", DiscordAreaType.CITIES, 14132, 14388, 14387, 14386, 14385), + CITY_MISCELLANIA("Miscellania", DiscordAreaType.CITIES, 10044, 10300), + CITY_MOS_LE_HARMLESS("Mos Le'Harmless", DiscordAreaType.CITIES, 14638), + CITY_MORTTON("Mort'ton", DiscordAreaType.CITIES, 13875), + CITY_MOR_UI_REK("Mor UI Rek", DiscordAreaType.CITIES, 9808, 9807, 10064, 10063), CITY_MOUNT_KARUULM("Mount Karuulm", DiscordAreaType.CITIES, 5179, 4923, 5180), - CITY_NARDAH("Nardah" , DiscordAreaType.CITIES, 13613), - CITY_NEITIZNOT("Neitiznot" , DiscordAreaType.CITIES, 9275), - CITY_PISCATORIS("Piscatoris" , DiscordAreaType.CITIES, 9273), - CITY_POLLNIVNEACH("Pollnivneach" , DiscordAreaType.CITIES, 13358), - CITY_PORT_KHAZARD("Port Khazard" , DiscordAreaType.CITIES, 10545), - CITY_PORT_PHASMATYS("Port Phasmatys" , DiscordAreaType.CITIES, 14646), - CITY_PORT_SARIM("Port Sarim" , DiscordAreaType.CITIES, 12082), - CITY_PISCARILIUS_HOUSE("Port Piscarilius" , DiscordAreaType.CITIES, 6971, 7227, 6970, 7226), + CITY_NARDAH("Nardah", DiscordAreaType.CITIES, 13613), + CITY_NEITIZNOT("Neitiznot", DiscordAreaType.CITIES, 9275), + CITY_PISCATORIS("Piscatoris", DiscordAreaType.CITIES, 9273), + CITY_POLLNIVNEACH("Pollnivneach", DiscordAreaType.CITIES, 13358), + CITY_PORT_KHAZARD("Port Khazard", DiscordAreaType.CITIES, 10545), + CITY_PORT_PHASMATYS("Port Phasmatys", DiscordAreaType.CITIES, 14646), + CITY_PORT_SARIM("Port Sarim", DiscordAreaType.CITIES, 12082), + CITY_PISCARILIUS_HOUSE("Port Piscarilius", DiscordAreaType.CITIES, 6971, 7227, 6970, 7226), CITY_PRIFDDINAS("Prifddinas", DiscordAreaType.CITIES, 12894, 12895, 13150, 13151), - CITY_RELLEKKA("Rellekka" , DiscordAreaType.CITIES, 10553), - CITY_RIMMINGTON("Rimmington" , DiscordAreaType.CITIES, 11826, 11570), - CITY_SEERS_VILLAGE("Seers' Village" , DiscordAreaType.CITIES, 10806), - CITY_SHAYZIEN_HOUSE("Shayzien" , DiscordAreaType.CITIES, 5944, 5943, 6200, 6199, 5688), - CITY_SHILO_VILLAGE("Shilo Village" , DiscordAreaType.CITIES, 11310), - CITY_SOPHANEM("Sophanem" , DiscordAreaType.CITIES, 13099), - CITY_TAI_BWO_WANNAI("Tai Bwo Wannai" , DiscordAreaType.CITIES, 11056, 11055), - CITY_TAVERLEY("Taverley" , DiscordAreaType.CITIES, 11574, 11573), - CITY_TREE_GNOME_STRONGHOLD("Tree Gnome Stronghold" , DiscordAreaType.CITIES, 9782, 9781), - CITY_TREE_GNOME_VILLAGE("Tree Gnome Village" , DiscordAreaType.CITIES, 10033), - CITY_TROLL_STRONGHOLD("Troll Stronghold" , DiscordAreaType.CITIES, 11321), - CITY_TYRAS_CAMP("Tyras Camp" , DiscordAreaType.CITIES, 8753, 8752), - CITY_UZER("Uzer" , DiscordAreaType.CITIES, 13872), - CITY_VARROCK("Varrock" , DiscordAreaType.CITIES, 12596, 12597, 12598, 12852, 12853, 12854, 13108, 13109, 13110), - CITY_WITCHHAVEN("Witchaven" , DiscordAreaType.CITIES, 10803), + CITY_RELLEKKA("Rellekka", DiscordAreaType.CITIES, 10553), + CITY_RIMMINGTON("Rimmington", DiscordAreaType.CITIES, 11826, 11570), + CITY_SEERS_VILLAGE("Seers' Village", DiscordAreaType.CITIES, 10806), + CITY_SHAYZIEN_HOUSE("Shayzien", DiscordAreaType.CITIES, 5944, 5943, 6200, 6199, 5688), + CITY_SHILO_VILLAGE("Shilo Village", DiscordAreaType.CITIES, 11310), + CITY_SOPHANEM("Sophanem", DiscordAreaType.CITIES, 13099), + CITY_TAI_BWO_WANNAI("Tai Bwo Wannai", DiscordAreaType.CITIES, 11056, 11055), + CITY_TAVERLEY("Taverley", DiscordAreaType.CITIES, 11574, 11573), + CITY_TREE_GNOME_STRONGHOLD("Tree Gnome Stronghold", DiscordAreaType.CITIES, 9782, 9781), + CITY_TREE_GNOME_VILLAGE("Tree Gnome Village", DiscordAreaType.CITIES, 10033), + CITY_TROLL_STRONGHOLD("Troll Stronghold", DiscordAreaType.CITIES, 11321), + CITY_TYRAS_CAMP("Tyras Camp", DiscordAreaType.CITIES, 8753, 8752), + CITY_UZER("Uzer", DiscordAreaType.CITIES, 13872), + CITY_VARROCK("Varrock", DiscordAreaType.CITIES, 12596, 12597, 12598, 12852, 12853, 12854, 13108, 13109, 13110), + CITY_WITCHHAVEN("Witchaven", DiscordAreaType.CITIES, 10803), CITY_WOODCUTTING_GUILD("Woodcutting Guild", DiscordAreaType.CITIES, 6454, 6198, 6298), - CITY_YANILLE("Yanille" , DiscordAreaType.CITIES, 10288, 10032), - CITY_ZANARIS("Zanaris" , DiscordAreaType.CITIES, 9285, 9541, 9540, 9797), - CITY_ZULANDRA("Zul-Andra" , DiscordAreaType.CITIES, 8751), + CITY_YANILLE("Yanille", DiscordAreaType.CITIES, 10288, 10032), + CITY_ZANARIS("Zanaris", DiscordAreaType.CITIES, 9285, 9541, 9540, 9797), + CITY_ZULANDRA("Zul-Andra", DiscordAreaType.CITIES, 8751), // Dungeons DUNGEON_ABANDONED_MINE("Abandoned Mine", DiscordAreaType.DUNGEONS, 13718, 11079, 11078, 11077, 10823, 10822, 10821), 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 3bd5db3bad..40fa5ffafd 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 @@ -76,6 +76,7 @@ import okhttp3.Call; import okhttp3.Callback; import okhttp3.Request; import okhttp3.Response; +import org.jetbrains.annotations.NotNull; @PluginDescriptor( name = "Discord", @@ -131,7 +132,7 @@ public class DiscordPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -157,7 +158,7 @@ public class DiscordPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { clientToolbar.removeNavigation(discordButton); discordState.reset(); @@ -283,7 +284,7 @@ public class DiscordPlugin extends Plugin if (split.length == 2) { - int disc = Integer.valueOf(split[1]); + int disc = Integer.parseInt(split[1]); int avatarId = disc % 5; url = "https://cdn.discordapp.com/embed/avatars/" + avatarId + ".png"; } @@ -298,14 +299,15 @@ public class DiscordPlugin extends Plugin RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() { @Override - public void onFailure(Call call, IOException e) + public void onFailure(@NotNull Call call, @NotNull IOException e) { } @Override - public void onResponse(Call call, Response response) throws IOException + public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { + //noinspection TryFinallyCanBeTryWithResources try { if (!response.isSuccessful()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java index 247b6cc92a..79e3ead171 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java @@ -75,10 +75,13 @@ public class DropPartyPlugin extends Plugin @Inject private OverlayManager overlayManager; + @Inject private DropPartyOverlay coreOverlay; + @Inject private Client client; + @Getter(AccessLevel.PACKAGE) private int fontStyle; @Getter(AccessLevel.PACKAGE) @@ -103,7 +106,7 @@ public class DropPartyPlugin extends Plugin { overlayManager.remove(coreOverlay); reset(); - } + } @Subscribe private void onGameTick(GameTick event) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/AttackStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/AttackStyle.java index 3813c30fe0..058dbc8f53 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/AttackStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/AttackStyle.java @@ -24,12 +24,13 @@ package net.runelite.client.plugins.dynamicmaxhit; import java.awt.Color; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Prayer; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum AttackStyle { MAGE("Mage", Color.CYAN, Prayer.PROTECT_FROM_MAGIC), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java index afbc6cdaf0..6560fc0f92 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java @@ -114,8 +114,8 @@ public class DynamicMaxHit extends Plugin @Getter(AccessLevel.PACKAGE) private Map victims = new HashMap<>(); private boolean antiFireActive; - private ExecutorService httpExecutor = Executors.newFixedThreadPool(100); - private Map resultCache = new HashMap<>(); + private final ExecutorService httpExecutor = Executors.newFixedThreadPool(100); + private final Map resultCache = new HashMap<>(); private boolean enablePrayer; private boolean enablePotions; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Potions.java b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Potions.java index 4bcb49bd39..eaca31d43c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Potions.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Potions.java @@ -23,11 +23,12 @@ */ package net.runelite.client.plugins.dynamicmaxhit; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.http.api.hiscore.HiscoreSkill; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Potions { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Spells.java b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Spells.java index f361f20257..11f4717f5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Spells.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Spells.java @@ -23,10 +23,11 @@ */ package net.runelite.client.plugins.dynamicmaxhit; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor enum Spells { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Weapons.java b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Weapons.java index d1d3f21294..6d43bf9a18 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Weapons.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/Weapons.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.dynamicmaxhit; import com.google.common.collect.ImmutableSet; import java.util.Set; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum Weapons { ABYSSAL_DAGGER(ImmutableSet.of(ItemID.ABYSSAL_DAGGER, ItemID.ABYSSAL_DAGGER_P, ItemID.ABYSSAL_DAGGER_P_13269, ItemID.ABYSSAL_DAGGER_P_13271), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java index 76e2e4c444..cafd835cce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java @@ -73,11 +73,6 @@ public class EmojiPlugin extends Plugin loadEmojiIcons(); } - @Override - protected void shutDown() throws Exception - { - } - @Subscribe void onGameStateChanged(GameStateChanged gameStateChanged) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java index 7ea1670f22..40c51b24d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java @@ -148,7 +148,7 @@ public class EntityHiderPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { client.setIsHidingEntities(false); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index 5024fdb3f1..6acd23e680 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -113,7 +113,7 @@ public class EquipmentInspectorPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -137,7 +137,7 @@ public class EquipmentInspectorPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { menuManager.removePlayerMenuItem(INSPECT_EQUIPMENT); pluginToolbar.removeNavigation(navButton); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index ea8648e3c1..a7db4ca64f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -273,7 +273,7 @@ public class ExaminePlugin extends Plugin Widget widgetItem = widget.getChild(1); if (widgetItem != null) { - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.SMITHING_INVENTORY_ITEMS_CONTAINER.getGroupId() == widgetGroup) @@ -281,7 +281,7 @@ public class ExaminePlugin extends Plugin Widget widgetItem = widget.getChild(2); if (widgetItem != null) { - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getGroupId() == widgetGroup @@ -290,7 +290,7 @@ public class ExaminePlugin extends Plugin Widget widgetItem = widget.getChild(actionParam); if (widgetItem != null) { - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup @@ -305,7 +305,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.SHOP_ITEMS_CONTAINER.getGroupId() == widgetGroup) @@ -314,25 +314,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[] {1, widgetItem.getItemId()}; - } - } - else if (WidgetInfo.CLUE_SCROLL_REWARD_ITEM_CONTAINER.getGroupId() == widgetGroup) - { - Widget[] children = widget.getDynamicChildren(); - if (actionParam < children.length) - { - Widget widgetItem = children[actionParam]; - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; - } - } - else if (WidgetInfo.LOOTING_BAG_CONTAINER.getGroupId() == widgetGroup) - { - Widget[] children = widget.getDynamicChildren(); - if (actionParam < children.length) - { - Widget widgetItem = children[actionParam]; - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[]{1, widgetItem.getItemId()}; } } else if (WidgetID.SEED_VAULT_GROUP_ID == widgetGroup) @@ -341,16 +323,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; - } - } - else if (WidgetID.SEED_VAULT_INVENTORY_GROUP_ID == widgetGroup) - { - Widget[] children = widget.getDynamicChildren(); - if (actionParam < children.length) - { - Widget widgetItem = children[actionParam]; - return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/DefaultColors.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/DefaultColors.java index 227d82b3ee..5ac836435f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/DefaultColors.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/DefaultColors.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.experiencedrop; import java.awt.Color; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -40,6 +41,6 @@ enum DefaultColors ORANGE(new Color(0xFF, 0x98, 0x1F)), PINK(new Color(0xFF, 0xC8, 0xC8)); - @Getter + @Getter(AccessLevel.PACKAGE) private final Color color; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java index 5efa95a184..62d5e4937b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java @@ -36,7 +36,7 @@ public interface XpDropConfig extends Config { NONE, ABOVE_OPPONENT, - IN_XP_DROP; + IN_XP_DROP } @ConfigItem( 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 df131187fd..004a8cdf14 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 @@ -72,14 +72,19 @@ public class XpDropPlugin extends Plugin private static final double TL_MULTIPLIER_RATIO = 5; private static final int TWISTED_LEAGUE_WAY_OF_THE_WARRIOR = 3; private static final int TWISTED_LEAGUE_XERICS_WISDOM = 3; + @Inject private Client client; + @Inject private XpDropConfig config; + @Inject private NPCManager npcManager; + @Inject private OverlayManager overlayManager; + @Inject private XpDropOverlay overlay; @@ -116,7 +121,7 @@ public class XpDropPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -129,7 +134,7 @@ public class XpDropPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } @@ -355,7 +360,7 @@ public class XpDropPlugin extends Plugin private void calculateDamageDealt(int diff) { double damageDealt = diff / HITPOINT_RATIO; - + // DeadMan mode has an XP modifier of 10x, Twisted League mode has an XP modifier of 5x if (client.getWorldType().contains(WorldType.DEADMAN)) { @@ -364,7 +369,7 @@ public class XpDropPlugin extends Plugin if (client.getWorldType().contains(WorldType.LEAGUE)) { damageDealt = damageDealt / TL_MULTIPLIER_RATIO; - + if (client.getVar(Varbits.TWISTED_LEAGUE_RELIC_3) == TWISTED_LEAGUE_WAY_OF_THE_WARRIOR) { damageDealt = damageDealt / 2; @@ -374,7 +379,7 @@ public class XpDropPlugin extends Plugin damageDealt = damageDealt / 2; } } - + // Some NPCs have an XP modifier, account for it here. Actor a = client.getLocalPlayer().getInteracting(); if (!(a instanceof NPC) && !(a instanceof Player)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpPrayer.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpPrayer.java index 2d7c2d39c5..a3651267d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpPrayer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpPrayer.java @@ -24,24 +24,10 @@ */ package net.runelite.client.plugins.experiencedrop; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Prayer; -import static net.runelite.api.Prayer.AUGURY; -import static net.runelite.api.Prayer.BURST_OF_STRENGTH; -import static net.runelite.api.Prayer.CHIVALRY; -import static net.runelite.api.Prayer.CLARITY_OF_THOUGHT; -import static net.runelite.api.Prayer.EAGLE_EYE; -import static net.runelite.api.Prayer.HAWK_EYE; -import static net.runelite.api.Prayer.IMPROVED_REFLEXES; -import static net.runelite.api.Prayer.INCREDIBLE_REFLEXES; -import static net.runelite.api.Prayer.MYSTIC_LORE; -import static net.runelite.api.Prayer.MYSTIC_MIGHT; -import static net.runelite.api.Prayer.MYSTIC_WILL; -import static net.runelite.api.Prayer.PIETY; -import static net.runelite.api.Prayer.RIGOUR; -import static net.runelite.api.Prayer.SHARP_EYE; -import static net.runelite.api.Prayer.SUPERHUMAN_STRENGTH; -import static net.runelite.api.Prayer.ULTIMATE_STRENGTH; +import static net.runelite.api.Prayer.*; import static net.runelite.client.plugins.experiencedrop.PrayerType.MAGIC; import static net.runelite.client.plugins.experiencedrop.PrayerType.MELEE; import static net.runelite.client.plugins.experiencedrop.PrayerType.RANGE; @@ -65,9 +51,9 @@ enum XpPrayer XP_RIGOUR(RIGOUR, RANGE), XP_AUGURY(AUGURY, MAGIC); - @Getter + @Getter(AccessLevel.PACKAGE) private final Prayer prayer; - @Getter + @Getter(AccessLevel.PACKAGE) private final PrayerType type; XpPrayer(Prayer prayer, PrayerType type) 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 60f7e24b25..f52c6c7d11 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 @@ -71,9 +71,9 @@ import net.runelite.client.plugins.PluginDescriptor; @Singleton 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 = 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 int ENTRY_PADDING = 3; @@ -112,16 +112,11 @@ public class FairyRingPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.autoOpen = config.autoOpen(); } - @Override - protected void shutDown() throws Exception - { - } - @Subscribe private void onConfigChanged(ConfigChanged event) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRings.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRings.java index 344094a2ba..9cc44b44b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRings.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRings.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.fairyring; +import lombok.AccessLevel; import lombok.Getter; public enum FairyRings @@ -83,10 +84,10 @@ public enum FairyRings DLR("(Island) Poison Waste south of Isafdar"), DLS("Myreque hideout under The Hollows"); - @Getter + @Getter(AccessLevel.PACKAGE) private final String destination; - @Getter + @Getter(AccessLevel.PACKAGE) private final String tags; FairyRings(String destination) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java index 437f32700c..0fb4bfb418 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java @@ -65,6 +65,7 @@ import okhttp3.Callback; import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; +import org.jetbrains.annotations.NotNull; @Slf4j @Singleton @@ -163,13 +164,13 @@ class FeedPanel extends PluginPanel RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() { @Override - public void onFailure(Call call, IOException e) + public void onFailure(@NotNull Call call, @NotNull IOException e) { log.warn(null, e); } @Override - public void onResponse(Call call, Response response) throws IOException + public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { 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 9913e4884e..15824c894e 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 @@ -86,7 +86,7 @@ public class FeedPlugin extends Plugin }, 10, TimeUnit.MINUTES); @Override - protected void startUp() throws Exception + protected void startUp() { feedPanel = new FeedPanel(config, feedSupplier); @@ -104,7 +104,7 @@ public class FeedPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { clientToolbar.removeNavigation(navButton); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java index 96ab6099a3..55560b55b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java @@ -120,16 +120,22 @@ public class FightCavePlugin extends Plugin @Inject private Client client; + @Inject private NPCManager npcManager; + @Inject private OverlayManager overlayManager; + @Inject private WaveOverlay waveOverlay; + @Inject private FightCaveOverlay fightCaveOverlay; + @Inject private FightCaveConfig config; + @Getter(AccessLevel.PACKAGE) private Set fightCaveContainer = new HashSet<>(); @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index 1e3476691e..b7c17443d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -166,7 +166,7 @@ public class FishingPlugin extends Plugin private Color aerialOverlayColor; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -176,7 +176,7 @@ public class FishingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { spotOverlay.setHidden(true); fishingSpotMinimapOverlay.setHidden(true); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java index d01b2e8fa6..c9fd8d1cd4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java @@ -26,84 +26,12 @@ package net.runelite.client.plugins.fishing; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; -import static net.runelite.api.NpcID.FISHING_SPOT_1497; -import static net.runelite.api.NpcID.FISHING_SPOT_1498; -import static net.runelite.api.NpcID.FISHING_SPOT_1510; -import static net.runelite.api.NpcID.FISHING_SPOT_1511; -import static net.runelite.api.NpcID.FISHING_SPOT_1514; -import static net.runelite.api.NpcID.FISHING_SPOT_1518; -import static net.runelite.api.NpcID.FISHING_SPOT_1519; -import static net.runelite.api.NpcID.FISHING_SPOT_1520; -import static net.runelite.api.NpcID.FISHING_SPOT_1521; -import static net.runelite.api.NpcID.FISHING_SPOT_1522; -import static net.runelite.api.NpcID.FISHING_SPOT_1523; -import static net.runelite.api.NpcID.FISHING_SPOT_1524; -import static net.runelite.api.NpcID.FISHING_SPOT_1525; -import static net.runelite.api.NpcID.FISHING_SPOT_1528; -import static net.runelite.api.NpcID.FISHING_SPOT_1530; -import static net.runelite.api.NpcID.FISHING_SPOT_1536; -import static net.runelite.api.NpcID.FISHING_SPOT_1542; -import static net.runelite.api.NpcID.FISHING_SPOT_1544; -import static net.runelite.api.NpcID.FISHING_SPOT_2653; -import static net.runelite.api.NpcID.FISHING_SPOT_2654; -import static net.runelite.api.NpcID.FISHING_SPOT_2655; -import static net.runelite.api.NpcID.FISHING_SPOT_3913; -import static net.runelite.api.NpcID.FISHING_SPOT_3914; -import static net.runelite.api.NpcID.FISHING_SPOT_3915; -import static net.runelite.api.NpcID.FISHING_SPOT_4316; -import static net.runelite.api.NpcID.FISHING_SPOT_4476; -import static net.runelite.api.NpcID.FISHING_SPOT_4477; -import static net.runelite.api.NpcID.FISHING_SPOT_4710; -import static net.runelite.api.NpcID.FISHING_SPOT_4712; -import static net.runelite.api.NpcID.FISHING_SPOT_4713; -import static net.runelite.api.NpcID.FISHING_SPOT_5233; -import static net.runelite.api.NpcID.FISHING_SPOT_5234; -import static net.runelite.api.NpcID.FISHING_SPOT_5820; -import static net.runelite.api.NpcID.FISHING_SPOT_5821; -import static net.runelite.api.NpcID.FISHING_SPOT_6488; -import static net.runelite.api.NpcID.FISHING_SPOT_7155; -import static net.runelite.api.NpcID.FISHING_SPOT_7199; -import static net.runelite.api.NpcID.FISHING_SPOT_7200; -import static net.runelite.api.NpcID.FISHING_SPOT_7323; -import static net.runelite.api.NpcID.FISHING_SPOT_7459; -import static net.runelite.api.NpcID.FISHING_SPOT_7460; -import static net.runelite.api.NpcID.FISHING_SPOT_7461; -import static net.runelite.api.NpcID.FISHING_SPOT_7462; -import static net.runelite.api.NpcID.FISHING_SPOT_7465; -import static net.runelite.api.NpcID.FISHING_SPOT_7466; -import static net.runelite.api.NpcID.FISHING_SPOT_7467; -import static net.runelite.api.NpcID.FISHING_SPOT_7469; -import static net.runelite.api.NpcID.FISHING_SPOT_7470; -import static net.runelite.api.NpcID.FISHING_SPOT_7730; -import static net.runelite.api.NpcID.FISHING_SPOT_7731; -import static net.runelite.api.NpcID.FISHING_SPOT_7732; -import static net.runelite.api.NpcID.FISHING_SPOT_7733; -import static net.runelite.api.NpcID.FISHING_SPOT_7946; -import static net.runelite.api.NpcID.FISHING_SPOT_7947; -import static net.runelite.api.NpcID.FISHING_SPOT_8523; -import static net.runelite.api.NpcID.FISHING_SPOT_8525; -import static net.runelite.api.NpcID.FISHING_SPOT_8526; -import static net.runelite.api.NpcID.FISHING_SPOT_8527; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1508; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1509; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1513; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1515; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1516; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1526; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1527; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_6825; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7463; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7464; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7468; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7676; -import static net.runelite.api.NpcID.ROD_FISHING_SPOT_8524; -import static net.runelite.api.NpcID.FISHING_SPOT_4928; -import static net.runelite.api.NpcID.FISHING_SPOT_6784; +import static net.runelite.api.NpcID.*; -@Getter +@Getter(AccessLevel.PACKAGE) enum FishingSpot { SHRIMP("Shrimp, Anchovies", ItemID.RAW_SHRIMPS, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java index d6fbb42d10..dd641e8e96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java @@ -106,7 +106,7 @@ public class FpsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { limitMode = fpsConfig.limitMode(); @@ -117,7 +117,7 @@ public class FpsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); drawManager.unregisterEveryFrameListener(drawListener); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index eae75918f5..7daa3b7089 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.freezetimers; import java.awt.Color; +import static java.awt.Color.WHITE; import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics2D; @@ -42,7 +43,6 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.ImageUtil; -import static java.awt.Color.WHITE; @Singleton public class FreezeTimersOverlay extends Overlay @@ -264,7 +264,7 @@ public class FreezeTimersOverlay extends Overlay g.setColor(WHITE); final int xOffset = plugin.getOffset(); renderActorTextAndImage(g, actor, text, Color.WHITE, image, yOffset, - xOffset); + xOffset); } private void renderImageLocation(Graphics2D graphics, Point imgLoc, BufferedImage image) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index 3d92318883..93a0566faa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -68,14 +68,19 @@ public class FreezeTimersPlugin extends Plugin @Inject private Client client; + @Inject private OverlayManager overlayManager; + @Inject private Timers timers; + @Inject private PrayerTracker prayerTracker; + @Inject private FreezeTimersOverlay overlay; + @Inject private FreezeTimersConfig config; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index 303a5d4868..7e025e6ad4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -34,7 +34,7 @@ import net.runelite.api.Actor; @Slf4j @Singleton -public class Timers +class Timers { private final Map> timerMap = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java index 62ecadc1e1..84d27d15f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java @@ -52,11 +52,6 @@ public class FriendListPlugin extends Plugin @Inject private Client client; - @Override - protected void startUp() throws Exception - { - } - @Override protected void shutDown() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java index dad4d61b39..272ae40e96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java @@ -32,6 +32,7 @@ import java.awt.Color; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -83,22 +84,22 @@ public class FriendNotesPlugin extends Plugin @Inject private ChatboxPanelManager chatboxPanelManager; - @Getter + @Getter(AccessLevel.PACKAGE) private HoveredFriend hoveredFriend = null; @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } -/** + /** * Set a friend note, or unset by passing a null/empty note. */ private void setFriendNote(String displayName, String note) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java index ed4d639cf4..886312fbb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java @@ -83,7 +83,7 @@ public class FriendTaggingPlugin extends Plugin private ChatboxPanelManager chatboxPanelManager; @Override - protected void startUp() throws Exception + protected void startUp() { menuManager.addManagedCustomMenu(friendsTabMenuOption); @@ -94,7 +94,7 @@ public class FriendTaggingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { menuManager.removeManagedCustomMenu(friendsTabMenuOption); menuManager.removeManagedCustomMenu(ignoreTabMenuOption); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletOverlay.java index a65a72a335..1f70af8837 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletOverlay.java @@ -62,22 +62,22 @@ public class GauntletOverlay extends Overlay { @Inject private OverlayManager overlayManager; + @Inject private GauntletCounter GauntletCounter; + private static final Color FLASH_COLOR = new Color(255, 0, 0, 70); private static final int MAX_DISTANCE = 2400; private final Client client; private final GauntletPlugin plugin; - private final GauntletConfig config; private final ModelOutlineRenderer outlineRenderer; private int timeout; @Inject - private GauntletOverlay(Client client, GauntletConfig config, GauntletPlugin plugin, ModelOutlineRenderer outlineRenderer) + private GauntletOverlay(Client client, GauntletPlugin plugin, ModelOutlineRenderer outlineRenderer) { this.client = client; this.plugin = plugin; - this.config = config; this.outlineRenderer = outlineRenderer; setPosition(OverlayPosition.DYNAMIC); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java index 76c20cc221..626df7f17c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java @@ -115,43 +115,57 @@ public class GauntletPlugin extends Plugin ); private static final int GATHERING_HERB = 0; private static final int GATHERING_CLOTH = 1; + @Inject @Getter(AccessLevel.NONE) private Client client; + @Inject @Getter(AccessLevel.NONE) private ClientThread clientThread; + @Inject @Getter(AccessLevel.NONE) private OverlayManager overlayManager; + @Inject @Getter(AccessLevel.NONE) private GauntletOverlay overlay; + @Inject @Getter(AccessLevel.NONE) private GauntletInfoBoxOverlay infoboxoverlay; + @Inject @Getter(AccessLevel.NONE) private GauntletConfig config; + @Inject @Getter(AccessLevel.NONE) private EventBus eventBus; + @Inject @Getter(AccessLevel.NONE) private GauntletTimer timer; + @Inject @Getter(AccessLevel.NONE) private SkillIconManager skillIconManager; + @Inject @Getter(AccessLevel.NONE) private GauntletCounter GauntletCounter; + @Setter(AccessLevel.PACKAGE) @Nullable private Hunllef hunllef; + @Inject private InfoBoxManager infoBoxManager; + @Inject private ItemManager itemManager; + private boolean attackVisualOutline; private boolean completeStartup = false; private boolean displayTimerChat; 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 bd32780bb6..89e385bf9a 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 @@ -261,7 +261,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -440,7 +440,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks }); } -@Provides + @Provides GpuPluginConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(GpuPluginConfig.class); @@ -600,7 +600,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks gl.glBindVertexArray(vaoUiHandle); FloatBuffer vboUiBuf = GpuFloatBuffer.allocateDirect(5 * 4); - vboUiBuf.put(new float[] { + vboUiBuf.put(new float[]{ // positions // texture coords 1f, 1f, 0.0f, 1.0f, 0f, // top right 1f, -1f, 0.0f, 1.0f, 1f, // bottom right @@ -727,7 +727,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks gl.glUseProgram(glProgram); - float[] matrix = new float[] { + float[] matrix = new float[]{ 2 / (right - left), 0, 0, 0, 0, 2 / (top - bottom), 0, 0, 0, 0, -2 / (far - near), 0, @@ -752,8 +752,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } public void drawScenePaint(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, - TilePaint paint, int tileZ, int tileX, int tileY, - int zoom, int centerX, int centerY) + TilePaint paint, int tileZ, int tileX, int tileY, + int zoom, int centerX, int centerY) { if (paint.getBufferLen() > 0) { @@ -778,8 +778,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } public void drawSceneModel(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, - TileModel model, int tileZ, int tileX, int tileY, - int zoom, int centerX, int centerY) + TileModel model, int tileZ, int tileX, int tileY, + int zoom, int centerX, int centerY) { if (model.getBufferLen() > 0) { @@ -816,7 +816,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks shutDown(); startUp(); } - catch (Exception e) + catch (Exception ignored) { } return; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java index cfcd1bcc87..4a7e8bd628 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java @@ -30,16 +30,16 @@ import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.DecorativeObject; +import net.runelite.api.Entity; import net.runelite.api.GameObject; import net.runelite.api.GroundObject; import net.runelite.api.Model; import net.runelite.api.Perspective; import net.runelite.api.Point; -import net.runelite.api.Entity; import net.runelite.api.Scene; +import net.runelite.api.Tile; import net.runelite.api.TileModel; import net.runelite.api.TilePaint; -import net.runelite.api.Tile; import net.runelite.api.WallObject; import static net.runelite.client.plugins.gpu.GpuPlugin.SMALL_TRIANGLE_COUNT; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AnisotropicFilteringMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AnisotropicFilteringMode.java index a5fd8aa831..6c10002a85 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AnisotropicFilteringMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AnisotropicFilteringMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.gpu.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public enum AnisotropicFilteringMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AntiAliasingMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AntiAliasingMode.java index 3d1efa2d56..131c639da4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AntiAliasingMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/AntiAliasingMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.gpu.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public enum AntiAliasingMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java index 107518652c..a7fbc8824b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java @@ -31,10 +31,10 @@ import javax.inject.Singleton; import javax.swing.SwingUtilities; import net.runelite.api.Client; import net.runelite.api.MenuEntry; +import net.runelite.api.util.Text; import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseAdapter; import static net.runelite.client.plugins.grandexchange.GrandExchangePlugin.SEARCH_GRAND_EXCHANGE; -import net.runelite.api.util.Text; @Singleton public class GrandExchangeInputListener extends MouseAdapter implements KeyListener diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java index 9d119fcb46..0909d7dec8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java @@ -40,8 +40,8 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; -import net.runelite.client.util.AsyncBufferedImage; import net.runelite.client.ui.ColorScheme; +import net.runelite.client.util.AsyncBufferedImage; import net.runelite.client.util.LinkBrowser; import net.runelite.client.util.QuantityFormatter; 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 b90a1b05d5..348b7a2b87 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 @@ -40,8 +40,8 @@ import java.awt.image.BufferedImage; import javax.annotation.Nullable; import javax.inject.Singleton; import javax.swing.ImageIcon; -import javax.swing.JMenuItem; import javax.swing.JLabel; +import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.border.EmptyBorder; @@ -50,8 +50,8 @@ import net.runelite.api.GrandExchangeOfferState; import static net.runelite.api.GrandExchangeOfferState.CANCELLED_BUY; import static net.runelite.api.GrandExchangeOfferState.CANCELLED_SELL; import static net.runelite.api.GrandExchangeOfferState.EMPTY; -import static net.runelite.client.plugins.grandexchange.GrandExchangeItemPanel.geLink; import net.runelite.api.ItemDefinition; +import static net.runelite.client.plugins.grandexchange.GrandExchangeItemPanel.geLink; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.ThinProgressBar; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java index b58e28cbac..e73987f0fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java @@ -30,6 +30,7 @@ import java.awt.CardLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.image.BufferedImage; +import java.util.Arrays; import javax.inject.Singleton; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; @@ -98,10 +99,7 @@ class GrandExchangeOffersPanel extends JPanel void resetOffers() { offerPanel.removeAll(); - for (int i = 0; i < offerSlotPanels.length; i++) - { - offerSlotPanels[i] = null; - } + Arrays.fill(offerSlotPanels, null); updateEmptyOffersPanel(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java index 6452f17903..048c9598f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java @@ -46,11 +46,11 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ItemDefinition; import net.runelite.client.callback.ClientThread; -import net.runelite.client.util.AsyncBufferedImage; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.components.IconTextField; import net.runelite.client.ui.components.PluginErrorPanel; +import net.runelite.client.util.AsyncBufferedImage; import net.runelite.http.api.item.ItemPrice; /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java index 8c508356e9..273233eabf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java @@ -50,16 +50,22 @@ import net.runelite.client.ui.overlay.OverlayManager; public class GrotesqueGuardiansPlugin extends Plugin { private static final int GARGOYLES_REGION = 6727; + @Inject private Client client; + @Inject private OverlayManager overlayManager; + @Inject private GrotesqueGuardiansPrayerOverlay prayerOverlay; + @Nullable private DuskAttack prayAgainst; + @Nullable private NPC dusk; + private boolean inGargs; private boolean needingToRun; @@ -73,7 +79,7 @@ public class GrotesqueGuardiansPlugin extends Plugin private GrotesqueGuardiansOverlay overlay; @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); @@ -83,7 +89,7 @@ public class GrotesqueGuardiansPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(prayerOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java index 93e840a3e6..507553913d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java @@ -73,7 +73,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay BufferedImage prayerImage; prayerImage = getPrayerImage(attack); imagePanelComponent.setBackgroundColor(client - .isPrayerActive(attack.getPrayer()) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); + .isPrayerActive(attack.getPrayer()) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); NPC dusk = plugin.getDusk(); imagePanelComponent.getChildren().add(new ImageComponent(prayerImage)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java index 9a28266918..33250fbc60 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java @@ -34,8 +34,7 @@ import net.runelite.api.coords.WorldPoint; @Data @Builder -public -class GroundItem +public class GroundItem { private int id; private int itemId; @@ -53,14 +52,14 @@ class GroundItem private boolean isAlwaysPrivate; private boolean isOwnedByPlayer; private Instant droppedInstant; - + @Nonnull private LootType lootType; /** * Is dropped by me */ private boolean isDropped; - + @Nullable private Instant spawnTime; 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 c3ec437c1f..7309679418 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 @@ -389,38 +389,53 @@ public class GroundItemsPlugin extends Plugin @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private Map.Entry textBoxBounds; + @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private Map.Entry hiddenBoxBounds; + @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private Map.Entry highlightBoxBounds; + @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private boolean hotKeyPressed; + @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private boolean hideAll; + private List hiddenItemList = new CopyOnWriteArrayList<>(); private List highlightedItemsList = new CopyOnWriteArrayList<>(); + @Inject private GroundItemInputListener inputListener; + @Inject private MouseManager mouseManager; + @Inject private KeyManager keyManager; + @Inject private Client client; + @Inject private ItemManager itemManager; + @Inject private OverlayManager overlayManager; + @Inject private GroundItemsConfig config; + @Inject private GroundItemsOverlay overlay; + @Inject private Notifier notifier; + private LoadingCache highlightedItems; private Color defaultColor; private Color highlightedColor; @@ -493,7 +508,7 @@ public class GroundItemsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); mouseManager.unregisterMouseListener(inputListener); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java index abd6c815e0..7a07226d61 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java @@ -28,5 +28,5 @@ enum LootType { UNKNOWN, PVP, - PVM; + PVM } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ItemHighlightMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ItemHighlightMode.java index f6d1b0c80f..3cccecd936 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ItemHighlightMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ItemHighlightMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.grounditems.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public enum ItemHighlightMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/MenuHighlightMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/MenuHighlightMode.java index e103109c59..8d62f86c8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/MenuHighlightMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/MenuHighlightMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.grounditems.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public enum MenuHighlightMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/PriceDisplayMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/PriceDisplayMode.java index 5d64fa723c..b93c556b8c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/PriceDisplayMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/PriceDisplayMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.grounditems.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public enum PriceDisplayMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/TimerDisplayMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/TimerDisplayMode.java index e8236e8a34..33b8fa0afe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/TimerDisplayMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/TimerDisplayMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.grounditems.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public enum TimerDisplayMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ValueCalculationMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ValueCalculationMode.java index 26830f14ba..948f0b73d6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ValueCalculationMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ValueCalculationMode.java @@ -25,10 +25,11 @@ package net.runelite.client.plugins.grounditems.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public enum ValueCalculationMode { 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 f6dca821a7..b8162cb442 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 @@ -404,7 +404,7 @@ public class GroundMarkerPlugin extends Plugin points.clear(); } -private void markTile(LocalPoint localPoint, int group) + private void markTile(LocalPoint localPoint, int group) { if (localPoint == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java index 1d4e987862..99b1b489b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java @@ -30,7 +30,7 @@ import lombok.EqualsAndHashCode; import lombok.Value; @Value -@EqualsAndHashCode(exclude = { "group" }) +@EqualsAndHashCode(exclude = {"group"}) class GroundMarkerPoint { private int regionId; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java index 2cb9567ed1..ea27aeaa7c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java @@ -36,6 +36,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; + @Singleton public class HerbiboarMinimapOverlay extends Overlay { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java index 4dd77d1f5f..6eac5222c4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java @@ -47,7 +47,7 @@ class HerbiboarOverlay extends Overlay { private static final Color TRANSPARENT = new Color(0, 0, 0, 0); - private Client client; + private final Client client; private final HerbiboarPlugin plugin; private final ModelOutlineRenderer modelOutlineRenderer; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java index 95384f8aca..0ef828c8e9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java @@ -146,16 +146,16 @@ public class HerbiboarPlugin extends Plugin @Setter(AccessLevel.PACKAGE) private int finishId; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Set previousShownTrailIds; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Integer previousTrailId = null; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean herbiboarRendered = false; @Getter(AccessLevel.PACKAGE) @@ -188,7 +188,7 @@ public class HerbiboarPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -198,13 +198,13 @@ public class HerbiboarPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); } -private void updateTrailData() + private void updateTrailData() { currentTrail = null; currentPath = -1; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarTrail.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarTrail.java index 6f1dba41fb..f7d70558b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarTrail.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarTrail.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.herbiboars; import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Varbits; @@ -61,18 +62,18 @@ public enum HerbiboarTrail TRAIL_31369(31369, Varbits.HB_TRAIL_31369, new WorldPoint(3706, 3811, 0), null, null, null), TRAIL_31372(31372, Varbits.HB_TRAIL_31372, new WorldPoint(3713, 3840, 0), null, null, null); - @Getter + @Getter(AccessLevel.PACKAGE) private final int trailId; - @Getter + @Getter(AccessLevel.PACKAGE) private final Varbits varbit; private final WorldPoint objectLoc1; private final WorldPoint objectLoc2; private final WorldPoint objectLoc3; private final WorldPoint objectLoc4; - @Getter + @Getter(AccessLevel.PACKAGE) private static Set trailIds = new HashSet<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private static Set allObjectLocs = new HashSet<>(); static diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java index 0784dac22b..1e2ccbb828 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java @@ -76,7 +76,7 @@ public interface HidePrayersConfig extends Config { return false; } - + @ConfigItem( position = 0, keyName = "showindividualprayers", @@ -538,7 +538,7 @@ public interface HidePrayersConfig extends Config { return false; } - + @ConfigItem( position = 3, keyName = "barrows", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java index 148ca10632..dcc474db34 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java @@ -166,7 +166,7 @@ public class HidePrayersPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -174,7 +174,7 @@ public class HidePrayersPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { restorePrayers(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Armadyl.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Armadyl.java index 72231afd7e..80802f5a22 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Armadyl.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Armadyl.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Armadyl { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Bandos.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Bandos.java index bf94c424db..c3f0c39294 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Bandos.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Bandos.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Bandos { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Barrows.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Barrows.java index db72e23b56..414024f356 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Barrows.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Barrows.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Barrows { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Cerberus.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Cerberus.java index a6cc36c16b..3894a71b12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Cerberus.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Cerberus.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Cerberus { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PVPPrayers.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PVPPrayers.java index 80c62073ac..8571c7611c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PVPPrayers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PVPPrayers.java @@ -24,11 +24,13 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.hideprayers.util;; +package net.runelite.client.plugins.hideprayers.util; + +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum PVPPrayers { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Saradomin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Saradomin.java index 34c5912cb0..8b108f50f0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Saradomin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Saradomin.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Saradomin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Vorkath.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Vorkath.java index e3aa580a8c..499566d9ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Vorkath.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Vorkath.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Vorkath { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zamorak.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zamorak.java index 5d57ffee3c..fd77e1f848 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zamorak.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zamorak.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Zamorak { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zulrah.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zulrah.java index ccb57f49a8..2590016edd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zulrah.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/Zulrah.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.hideprayers.util; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Zulrah { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideunder/HideUnder.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideunder/HideUnder.java index 15ffef6f90..7d21aac95a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideunder/HideUnder.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideunder/HideUnder.java @@ -56,9 +56,11 @@ public class HideUnder extends Plugin { @Inject private Client client; + @Inject private EventBus eventBus; - private Set playerContainer = new HashSet<>(); + + private final Set playerContainer = new HashSet<>(); @Override protected void startUp() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java index 99d9bb17c1..81aa12827c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java @@ -92,7 +92,7 @@ public class HighAlchemyPlugin extends Plugin private boolean usingFireRunes; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); buildGroupList(); @@ -100,7 +100,7 @@ public class HighAlchemyPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } @@ -127,7 +127,7 @@ public class HighAlchemyPlugin extends Plugin if (this.showInventory) { Arrays.stream( - new int[] { + new int[]{ DEPOSIT_BOX_GROUP_ID, BANK_INVENTORY_GROUP_ID, SHOP_INVENTORY_GROUP_ID, 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 dabafe40f2..76989fd3e0 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 @@ -65,35 +65,7 @@ import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreResult; import net.runelite.http.api.hiscore.HiscoreSkill; -import static net.runelite.http.api.hiscore.HiscoreSkill.AGILITY; -import static net.runelite.http.api.hiscore.HiscoreSkill.ATTACK; -import static net.runelite.http.api.hiscore.HiscoreSkill.BOUNTY_HUNTER_HUNTER; -import static net.runelite.http.api.hiscore.HiscoreSkill.BOUNTY_HUNTER_ROGUE; -import static net.runelite.http.api.hiscore.HiscoreSkill.CLUE_SCROLL_ALL; -import static net.runelite.http.api.hiscore.HiscoreSkill.CONSTRUCTION; -import static net.runelite.http.api.hiscore.HiscoreSkill.COOKING; -import static net.runelite.http.api.hiscore.HiscoreSkill.CRAFTING; -import static net.runelite.http.api.hiscore.HiscoreSkill.DEFENCE; -import static net.runelite.http.api.hiscore.HiscoreSkill.FARMING; -import static net.runelite.http.api.hiscore.HiscoreSkill.FIREMAKING; -import static net.runelite.http.api.hiscore.HiscoreSkill.FISHING; -import static net.runelite.http.api.hiscore.HiscoreSkill.FLETCHING; -import static net.runelite.http.api.hiscore.HiscoreSkill.HERBLORE; -import static net.runelite.http.api.hiscore.HiscoreSkill.HITPOINTS; -import static net.runelite.http.api.hiscore.HiscoreSkill.HUNTER; -import static net.runelite.http.api.hiscore.HiscoreSkill.LAST_MAN_STANDING; -import static net.runelite.http.api.hiscore.HiscoreSkill.LEAGUE_POINTS; -import static net.runelite.http.api.hiscore.HiscoreSkill.MAGIC; -import static net.runelite.http.api.hiscore.HiscoreSkill.MINING; -import static net.runelite.http.api.hiscore.HiscoreSkill.OVERALL; -import static net.runelite.http.api.hiscore.HiscoreSkill.PRAYER; -import static net.runelite.http.api.hiscore.HiscoreSkill.RANGED; -import static net.runelite.http.api.hiscore.HiscoreSkill.RUNECRAFT; -import static net.runelite.http.api.hiscore.HiscoreSkill.SLAYER; -import static net.runelite.http.api.hiscore.HiscoreSkill.SMITHING; -import static net.runelite.http.api.hiscore.HiscoreSkill.STRENGTH; -import static net.runelite.http.api.hiscore.HiscoreSkill.THIEVING; -import static net.runelite.http.api.hiscore.HiscoreSkill.WOODCUTTING; +import static net.runelite.http.api.hiscore.HiscoreSkill.*; import net.runelite.http.api.hiscore.Skill; @Slf4j 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 1b6a054ba8..85beadca87 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 @@ -110,7 +110,7 @@ public class HiscorePlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -138,7 +138,7 @@ public class HiscorePlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { hiscorePanel.removeInputKeyListener(autocompleter); clientToolbar.removeNavigation(navButton); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java index f7cb357861..fbf164e897 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java @@ -111,7 +111,7 @@ public class HunterPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); lastActionTime = Instant.ofEpochMilli(0); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java index d4760eb136..dc063bdcc3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java @@ -94,7 +94,7 @@ public class BabyHydraPlugin extends Plugin private boolean PrayerHelper; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -110,7 +110,7 @@ public class BabyHydraPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(hydraOverlay); overlayManager.remove(hydraPrayOverlay); 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 2422aefc0d..8b33be30ef 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 @@ -989,16 +989,11 @@ public class IdleNotifierPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); } - @Override - protected void shutDown() throws Exception - { - } - @Subscribe private void onConfigChanged(ConfigChanged event) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/OutOfItemsMapping.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/OutOfItemsMapping.java index 10738f1273..b2adb691cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/OutOfItemsMapping.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/OutOfItemsMapping.java @@ -27,7 +27,10 @@ package net.runelite.client.plugins.idlenotifier; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import java.util.Collection; -import static net.runelite.api.ItemID.*; +import static net.runelite.api.ItemID.BLUEGILL; +import static net.runelite.api.ItemID.COMMON_TENCH; +import static net.runelite.api.ItemID.GREATER_SIREN; +import static net.runelite.api.ItemID.MOTTLED_EEL; public enum OutOfItemsMapping { @@ -58,7 +61,7 @@ public enum OutOfItemsMapping * Some actions consume multiple different items. To properly handle these * cases for the out of items notification the different items must be * recognised as belonging to a single group. - * + *

* Map an item that is part of a group of items that are consumed by a single * action to the first item in that group. */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/Impling.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/Impling.java index 69aa92f625..04d1c6e2eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/Impling.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/Impling.java @@ -26,12 +26,13 @@ package net.runelite.client.plugins.implings; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.NpcID; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum Impling { BABY(ImplingType.BABY, NpcID.BABY_IMPLING), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java index bcd2fb41d5..d625eff9b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java @@ -7,9 +7,9 @@ import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; -import net.runelite.client.ui.overlay.components.PanelComponent; @Singleton public class ImplingCounterOverlay extends Overlay diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java index 45c5e75184..1dd486c3f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java @@ -239,7 +239,7 @@ public interface ImplingsConfig extends Config { return new Color(71, 70, 75); } - + @ConfigItem( position = 19, keyName = "showCrystal", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java index 6658a37345..d3f9915aad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java @@ -96,7 +96,7 @@ public interface InfernoConfig extends Config { return false; } - + @ConfigSection( name = "Bats", description = "Configuration options for Bats", @@ -107,7 +107,7 @@ public interface InfernoConfig extends Config { return false; } - + @ConfigSection( name = "Blobs", description = "Configuration options for Blobs", @@ -129,7 +129,7 @@ public interface InfernoConfig extends Config { return false; } - + @ConfigSection( name = "Rangers", description = "Configuration options for Rangers", @@ -140,7 +140,7 @@ public interface InfernoConfig extends Config { return false; } - + @ConfigSection( name = "Magers", description = "Configuration options for Magers", @@ -196,7 +196,7 @@ public interface InfernoConfig extends Config return false; } - + @ConfigItem( position = 0, keyName = "prayerDisplayMode", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java index 6e6e122785..175c4bedb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java @@ -40,7 +40,7 @@ import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; import org.apache.commons.lang3.ArrayUtils; -public class InfernoNPC +class InfernoNPC { @Getter(AccessLevel.PACKAGE) private NPC npc; @@ -63,7 +63,7 @@ public class InfernoNPC this.ticksTillNextAttack = 0; this.lastAnimation = -1; this.lastCanAttack = false; - this.safeSpotCache = new HashMap(); + this.safeSpotCache = new HashMap<>(); } void updateNextAttack(Attack nextAttack, int ticksTillNextAttack) @@ -235,7 +235,7 @@ public class InfernoNPC case BAT: // Range + LOS check for bat because it suffers from the defense animation bug, also dont activate on "stand" animation if (this.canAttack(client, client.getLocalPlayer().getWorldLocation()) - && this.getNpc().getAnimation() != AnimationID.JAL_MEJRAH_STAND && this.getNpc().getAnimation() != -1) + && this.getNpc().getAnimation() != AnimationID.JAL_MEJRAH_STAND && this.getNpc().getAnimation() != -1) { this.updateNextAttack(this.getType().getDefaultAttack(), this.getType().getTicksAfterAnimation()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java index c710e00eb2..41d2a4a86b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java @@ -165,9 +165,9 @@ public class InfernoOverlay extends Overlay continue; } - Color colorEdge1 = null; + Color colorEdge1; Color colorEdge2 = null; - Color colorFill = null; + Color colorFill; switch (safeSpotId) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 73217cc4b6..166f13336b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -237,7 +237,7 @@ public class InfernoPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -261,7 +261,7 @@ public class InfernoPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(infernoOverlay); overlayManager.remove(waveOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java index b411ec2d0e..9a51598f43 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java @@ -48,7 +48,7 @@ public class InfoPlugin extends Plugin @Override - protected void startUp() throws Exception + protected void startUp() { InfoPanel panel = injector.getInstance(InfoPanel.class); panel.init(); @@ -66,7 +66,7 @@ public class InfoPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { clientToolbar.removeNavigation(navButton); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java index e86007d0b0..1edf78ca6d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java @@ -53,14 +53,14 @@ public class JRichTextPane extends JEditorPane ek.getStyleSheet().addRule("a {color: #DDDDDD }"); } - public JRichTextPane(String type, String text) + private JRichTextPane(String type, String text) { this(); setContentType(type); setText(text); } - void enableAutoLinkHandler(boolean enable) + private void enableAutoLinkHandler(boolean enable) { if (enable == (linkHandler == null)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java index 0db24547e1..b76369c0b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java @@ -37,9 +37,9 @@ import lombok.Getter; import lombok.Setter; import net.runelite.api.Client; import net.runelite.api.Player; +import net.runelite.api.Sprite; import static net.runelite.api.SpriteID.WINDOW_CLOSE_BUTTON_RED_X; import static net.runelite.api.SpriteID.WINDOW_CLOSE_BUTTON_RED_X_HOVERED; -import net.runelite.api.Sprite; import net.runelite.api.Tile; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.GameStateChanged; @@ -90,7 +90,7 @@ class InstanceMapOverlay extends Overlay @Setter(AccessLevel.PACKAGE) private boolean isCloseButtonHovered; - @Getter + @Getter(AccessLevel.PACKAGE) private Rectangle closeButtonBounds; private BufferedImage closeButtonImage; 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 0750a4dd43..f27bee9ae0 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 @@ -84,7 +84,7 @@ public class InstanceMapPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); @@ -95,7 +95,7 @@ public class InstanceMapPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlay.setShowMap(false); overlayManager.remove(overlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java index d4996a4c37..668afae749 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java @@ -87,14 +87,14 @@ public class InterfaceStylesPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); clientThread.invoke(this::updateAllOverrides); } @Override - protected void shutDown() throws Exception + protected void shutDown() { clientThread.invoke(() -> { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java index 6a91aecbf8..a71c109185 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java @@ -26,14 +26,15 @@ package net.runelite.client.plugins.inventorysetups; import java.util.List; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor public class InventorySetup { - @Getter + @Getter(AccessLevel.PUBLIC) private List inventory; - @Getter + @Getter(AccessLevel.PUBLIC) private List equipment; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java index a3136be8b1..cda1fc2c89 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java @@ -25,16 +25,17 @@ */ package net.runelite.client.plugins.inventorysetups; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor public class InventorySetupItem { - @Getter + @Getter(AccessLevel.PUBLIC) private final int id; - @Getter + @Getter(AccessLevel.PUBLIC) private final String name; - @Getter + @Getter(AccessLevel.PUBLIC) private final int quantity; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index a1e28130b2..593797ae0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -426,7 +426,7 @@ public class InventorySetupPlugin extends Plugin clientToolbar.removeNavigation(navButton); } -final int[] getCurrentInventorySetupIds() + final int[] getCurrentInventorySetupIds() { InventorySetup setup = inventorySetups.get(panel.getSelectedInventorySetup()); if (setup == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java index 0ad4e36247..85121c3920 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java @@ -35,6 +35,7 @@ import net.runelite.client.plugins.inventorysetups.InventorySetup; import net.runelite.client.plugins.inventorysetups.InventorySetupItem; import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin; import net.runelite.client.ui.ColorScheme; + @Singleton public class InventorySetupInventoryPanel extends InventorySetupContainerPanel { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java index 56cb562a8a..65ba41e5c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java @@ -146,7 +146,7 @@ public class InventoryTagsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -155,7 +155,7 @@ public class InventoryTagsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { removeInventoryMenuOptions(); overlayManager.remove(overlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java index 4494924196..0b13bf9149 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java @@ -38,8 +38,8 @@ import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.InventoryID; import net.runelite.api.Item; -import net.runelite.api.ItemDefinition; import net.runelite.api.ItemContainer; +import net.runelite.api.ItemDefinition; import net.runelite.api.VarClientInt; import net.runelite.api.vars.InterfaceTab; import net.runelite.client.game.ItemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java index 79f8510ebb..c6cf5a613d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java @@ -34,13 +34,13 @@ import net.runelite.api.ItemID; import net.runelite.api.widgets.WidgetItem; import static net.runelite.client.plugins.itemcharges.ItemChargeType.ABYSSAL_BRACELET; import static net.runelite.client.plugins.itemcharges.ItemChargeType.BELLOWS; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.FRUIT_BASKET; import static net.runelite.client.plugins.itemcharges.ItemChargeType.FUNGICIDE_SPRAY; import static net.runelite.client.plugins.itemcharges.ItemChargeType.IMPBOX; import static net.runelite.client.plugins.itemcharges.ItemChargeType.SACK; import static net.runelite.client.plugins.itemcharges.ItemChargeType.TELEPORT; import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERCAN; import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERSKIN; -import static net.runelite.client.plugins.itemcharges.ItemChargeType.FRUIT_BASKET; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 22bd7ac801..0cd4ab76cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -251,7 +251,7 @@ public class ItemChargePlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(recoilOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java index 8a80d84de0..eebd7786e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java @@ -64,7 +64,7 @@ class ItemRecoilOverlay extends Overlay { BufferedImage recoilImage = plugin.getRecoilRingImage(); imagePanelComponent.setBackgroundColor(plugin - .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); + .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); imagePanelComponent.getChildren().add(new ImageComponent(recoilImage)); imagePanelComponent.getChildren().add(tableComponent); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java index 8a96c772bf..13f9d607f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java @@ -31,9 +31,9 @@ import java.awt.Point; import java.awt.Rectangle; import static net.runelite.api.widgets.WidgetID.GUIDE_PRICE_GROUP_ID; import static net.runelite.api.widgets.WidgetID.KEPT_ON_DEATH_GROUP_ID; +import static net.runelite.api.widgets.WidgetID.KINGDOM_GROUP_ID; import static net.runelite.api.widgets.WidgetID.LOOTING_BAG_GROUP_ID; import static net.runelite.api.widgets.WidgetID.SEED_BOX_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.KINGDOM_GROUP_ID; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.FontManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java index 23e3fb3524..957805663e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java @@ -74,14 +74,14 @@ public class ItemPricesPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); overlayManager.add(overlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java index bbb8e1b66a..48d2df85f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java @@ -33,7 +33,7 @@ import net.runelite.api.ItemID; /** * Certain Items receive a white outline by Jagex as they are always lost on death. This is sometimes incorrectly * added to Items by Jagex as the item is actually kept in non-pvp areas of the game, such as the Rune Pouch. - * + *

* The white outline will be added to these items when they are lost on death. */ @AllArgsConstructor diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/DynamicPriceItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/DynamicPriceItem.java index 4726555485..3e5a47564f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/DynamicPriceItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/DynamicPriceItem.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.itemskeptondeath; import com.google.common.collect.ImmutableMap; import java.util.Map; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; @@ -38,7 +39,7 @@ import net.runelite.api.ItemID; * Death Price = Charge price * Current Charges */ @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum DynamicPriceItem { GAMES_NECKLACE1(ItemID.GAMES_NECKLACE1, 1, 8, ItemID.GAMES_NECKLACE8), @@ -91,12 +92,13 @@ enum DynamicPriceItem /** * Calculates the price off the partially charged jewelry based on the base items price + * * @param basePrice price of the base item, usually the trade-able variant * @return death price of the current DynamicPriceItem */ int calculateDeathPrice(final int basePrice) { - return (basePrice / maxCharges) * currentCharges; + return (basePrice / maxCharges) * currentCharges; } @Nullable diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java index ba5a1e08f5..34e1ee25b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.itemskeptondeath; import com.google.common.collect.ImmutableMap; import java.util.Map; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; @@ -35,7 +36,7 @@ import net.runelite.api.ItemID; * Some items have a fixed price that is added to its default value when calculating death prices. * These are typically imbued items, such as Berserker ring (i), to help it protect over the non-imbued variants. */ -@Getter +@Getter(AccessLevel.PACKAGE) enum FixedPriceItem { IMBUED_BLACK_MASK_I(ItemID.BLACK_MASK_I, 5000), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java index 120c2e0578..f4b2142bbd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java @@ -38,6 +38,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -81,7 +82,7 @@ public class ItemsKeptOnDeathPlugin extends Plugin private static final Pattern WILDERNESS_LEVEL_PATTERN = Pattern.compile("^Level: (\\d+).*"); @AllArgsConstructor - @Getter + @Getter(AccessLevel.PACKAGE) @VisibleForTesting static class DeathItems { @@ -126,16 +127,6 @@ public class ItemsKeptOnDeathPlugin extends Plugin @VisibleForTesting int wildyLevel; - @Override - protected void startUp() throws Exception - { - } - - @Override - protected void shutDown() throws Exception - { - } - @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { @@ -356,9 +347,9 @@ public class ItemsKeptOnDeathPlugin extends Plugin && !LostIfNotProtected.isLostIfNotProtected(id) && !isTradeable(itemManager.getItemDefinition(id)) && (wildyLevel <= 0 - || LockedItem.getBaseIdFromLockedId(id) != null - || (wildyLevel <= DEEP_WILDY && ItemReclaimCost.of(id) != null)) - ) + || LockedItem.getBaseIdFromLockedId(id) != null + || (wildyLevel <= DEEP_WILDY && ItemReclaimCost.of(id) != null)) + ) { keptItems.add(new ItemStack(id, qty)); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LockedItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LockedItem.java index 249a9184bb..6c1689eb53 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LockedItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LockedItem.java @@ -33,7 +33,7 @@ import net.runelite.api.ItemID; /** * A locked item will be kept in its unbroken state upon dying with it past level 20 Wildy but its locked status will be lost. * Only certain untradeable items can be combined with a Trouver parchment by talking to Perdu and paying a fee. - * + *

* View the Trouver parchment wiki page for more information: https://oldschool.runescape.wiki/w/Trouver_parchment */ @AllArgsConstructor @@ -101,6 +101,7 @@ public enum LockedItem final private int baseID; private final static Map ITEMS; + static { final ImmutableMap.Builder builder = new ImmutableMap.Builder<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LostIfNotProtected.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LostIfNotProtected.java index 56a12c4b79..edfa3bb7ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LostIfNotProtected.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/LostIfNotProtected.java @@ -38,7 +38,7 @@ final class LostIfNotProtected ItemID.KERIS, ItemID.KERISP, ItemID.KERISP_10583, ItemID.KERISP_10584 ); - public static boolean isLostIfNotProtected(int id) + static boolean isLostIfNotProtected(int id) { return ITEMS.contains(id); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/Pets.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/Pets.java index 045bf54839..32fd8798a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/Pets.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/Pets.java @@ -36,27 +36,27 @@ final class Pets private static final Set PETS = ImmutableSet.of( //Cats - HELL_CAT, - HELLKITTEN, - LAZY_CAT, - LAZY_CAT_6550, - LAZY_CAT_6551, - LAZY_CAT_6552, - LAZY_CAT_6553, + HELL_CAT, + HELLKITTEN, + LAZY_CAT, + LAZY_CAT_6550, + LAZY_CAT_6551, + LAZY_CAT_6552, + LAZY_CAT_6553, LAZY_CAT_6554, - LAZY_HELL_CAT, - OVERGROWN_HELLCAT, + LAZY_HELL_CAT, + OVERGROWN_HELLCAT, PET_CAT, PET_CAT_1562, PET_CAT_1563, PET_CAT_1564, - PET_CAT_1565, + PET_CAT_1565, PET_CAT_1566, PET_CAT_1567, PET_CAT_1568, PET_CAT_1569, PET_CAT_1570, - PET_CAT_1571, + PET_CAT_1571, PET_CAT_1572, PET_KITTEN, PET_KITTEN_1556, @@ -64,17 +64,17 @@ final class Pets PET_KITTEN_1558, PET_KITTEN_1559, PET_KITTEN_1560, - WILY_CAT, - WILY_CAT_6556, - WILY_CAT_6557, - WILY_CAT_6558, - WILY_CAT_6559, + WILY_CAT, + WILY_CAT_6556, + WILY_CAT_6557, + WILY_CAT_6558, + WILY_CAT_6559, WILY_CAT_6560, WILY_HELLCAT, - + //ClueScroll Pets BLOODHOUND, - + //PVM Pets ABYSSAL_ORPHAN, BABY_MOLE, @@ -126,7 +126,7 @@ final class Pets VETION_JR_13180, VORKI, YOUNGLLEF, - + //Skilling Pets BABY_CHINCHOMPA, BABY_CHINCHOMPA_13324, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/TrueItemValue.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/TrueItemValue.java index 8dc5522417..11bdcc6e01 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/TrueItemValue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/TrueItemValue.java @@ -3,6 +3,7 @@ package net.runelite.client.plugins.itemskeptondeath; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import static net.runelite.api.ItemID.ABYSSAL_TENTACLE; @@ -14,7 +15,7 @@ import static net.runelite.api.ItemID.GRANITE_MAUL_24227; import static net.runelite.api.ItemID.KRAKEN_TENTACLE; import static net.runelite.api.ItemID.ORNATE_MAUL_HANDLE; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public enum TrueItemValue { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/WidgetButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/WidgetButton.java index 93cb27e41c..15fdd40534 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/WidgetButton.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/WidgetButton.java @@ -125,7 +125,7 @@ class WidgetButton final int yIncrement = BACKGROUND_HEIGHT + PADDING; int maxRowItems = container.getWidth() / xIncrement; // Ensure at least 1 button per row - maxRowItems = maxRowItems < 1 ? 1 : maxRowItems; + maxRowItems = Math.max(maxRowItems, 1); int index = 0; for (final WidgetButton w : buttons) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java index d7e2aa22b5..e57d28b504 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java @@ -31,7 +31,13 @@ import java.util.HashSet; import java.util.Map; import lombok.extern.slf4j.Slf4j; import static net.runelite.api.ItemID.*; -import static net.runelite.client.plugins.itemstats.Builders.*; +import static net.runelite.client.plugins.itemstats.Builders.boost; +import static net.runelite.client.plugins.itemstats.Builders.combo; +import static net.runelite.client.plugins.itemstats.Builders.dec; +import static net.runelite.client.plugins.itemstats.Builders.food; +import static net.runelite.client.plugins.itemstats.Builders.heal; +import static net.runelite.client.plugins.itemstats.Builders.perc; +import static net.runelite.client.plugins.itemstats.Builders.range; import net.runelite.client.plugins.itemstats.food.Anglerfish; import net.runelite.client.plugins.itemstats.potions.GauntletPotion; import net.runelite.client.plugins.itemstats.potions.PrayerPotion; @@ -43,7 +49,7 @@ import static net.runelite.client.plugins.itemstats.stats.Stats.*; @Singleton @Slf4j -public class ItemStatChanges +class ItemStatChanges { ItemStatChanges() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java index 914e707671..45dfaef6e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java @@ -137,14 +137,14 @@ public class ItemStatPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); overlayManager.add(overlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); clientThread.invokeLater(this::resetGEInventory); @@ -376,7 +376,7 @@ public class ItemStatPlugin extends Plugin } private static Widget createText(Widget parent, String text, int fontId, int textColor, - int x, int y, int width, int height) + int x, int y, int width, int height) { final Widget widget = parent.createChild(-1, WidgetType.TEXT); widget.setText(text); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java index 5d55a70694..cab36f3003 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.itemstats; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Client; @@ -31,11 +32,11 @@ import net.runelite.client.plugins.itemstats.stats.Stat; public abstract class StatBoost extends SingleEffect { - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PUBLIC) private Stat stat; - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PUBLIC) private boolean boost; protected StatBoost(Stat stat, boolean boost) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatsChanges.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatsChanges.java index 55ebb7206e..87c454c30c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatsChanges.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatsChanges.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.itemstats; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -34,11 +35,11 @@ public class StatsChanges * * @see Positivity */ - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PUBLIC) private Positivity positivity; - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PUBLIC) private StatChange[] statChanges; public StatsChanges(int len) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/GauntletPotion.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/GauntletPotion.java index 9ecee451ce..e0be4bcfe7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/GauntletPotion.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/GauntletPotion.java @@ -47,7 +47,7 @@ public class GauntletPotion implements Effect { // Restores prayer similar to PrayerPotion but there aren't any possible boost so simplify the calculation final int restorePerc = (int) (client.getRealSkillLevel(Skill.PRAYER) * PRAYER_RESTORE_PERCENT); - final StatChange prayer = heal(Stats.PRAYER, restorePerc + PRAYER_RESTORE_DELTA).effect(client); + final StatChange prayer = heal(Stats.PRAYER, restorePerc + PRAYER_RESTORE_DELTA).effect(client); final StatChange runEnergy = heal(Stats.RUN_ENERGY, 40).effect(client); 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 3ddcf0b137..c3b69d8619 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 @@ -34,27 +34,7 @@ import net.runelite.client.plugins.itemstats.SimpleStatBoost; import net.runelite.client.plugins.itemstats.StatChange; import net.runelite.client.plugins.itemstats.StatsChanges; import net.runelite.client.plugins.itemstats.stats.Stat; -import static net.runelite.client.plugins.itemstats.stats.Stats.AGILITY; -import static net.runelite.client.plugins.itemstats.stats.Stats.ATTACK; -import static net.runelite.client.plugins.itemstats.stats.Stats.CONSTRUCTION; -import static net.runelite.client.plugins.itemstats.stats.Stats.COOKING; -import static net.runelite.client.plugins.itemstats.stats.Stats.CRAFTING; -import static net.runelite.client.plugins.itemstats.stats.Stats.DEFENCE; -import static net.runelite.client.plugins.itemstats.stats.Stats.FARMING; -import static net.runelite.client.plugins.itemstats.stats.Stats.FIREMAKING; -import static net.runelite.client.plugins.itemstats.stats.Stats.FISHING; -import static net.runelite.client.plugins.itemstats.stats.Stats.FLETCHING; -import static net.runelite.client.plugins.itemstats.stats.Stats.HERBLORE; -import static net.runelite.client.plugins.itemstats.stats.Stats.HUNTER; -import static net.runelite.client.plugins.itemstats.stats.Stats.MAGIC; -import static net.runelite.client.plugins.itemstats.stats.Stats.MINING; -import static net.runelite.client.plugins.itemstats.stats.Stats.RANGED; -import static net.runelite.client.plugins.itemstats.stats.Stats.RUNECRAFT; -import static net.runelite.client.plugins.itemstats.stats.Stats.SLAYER; -import static net.runelite.client.plugins.itemstats.stats.Stats.SMITHING; -import static net.runelite.client.plugins.itemstats.stats.Stats.STRENGTH; -import static net.runelite.client.plugins.itemstats.stats.Stats.THIEVING; -import static net.runelite.client.plugins.itemstats.stats.Stats.WOODCUTTING; +import static net.runelite.client.plugins.itemstats.stats.Stats.*; @RequiredArgsConstructor public class SuperRestore implements Effect diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 3a5af0bb65..b440ff879c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -125,7 +125,7 @@ public class KeyRemappingPlugin extends Plugin private ModifierlessKeybind esc; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -144,7 +144,7 @@ public class KeyRemappingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { clientThread.invoke(() -> { @@ -157,7 +157,7 @@ public class KeyRemappingPlugin extends Plugin keyManager.unregisterKeyListener(inputListener); } -@Provides + @Provides KeyRemappingConfig getConfig(ConfigManager configManager) { return configManager.getConfig(KeyRemappingConfig.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java index a89b8e84c4..37f5096b44 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java @@ -50,12 +50,11 @@ class KingdomCounter extends Counter @Override public String getTooltip() { - return new StringBuilder("Favor: ") - .append(plugin.getFavor()) - .append("/127") - .append("
") - .append("Coffer: ") - .append(QuantityFormatter.quantityToStackSize(plugin.getCoffer())) - .toString(); + return "Favor: " + + plugin.getFavor() + + "/127" + + "
" + + "Coffer: " + + QuantityFormatter.quantityToStackSize(plugin.getCoffer()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java index e6d27abc3c..5779567d48 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java @@ -99,13 +99,13 @@ public class KingdomPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { removeKingdomInfobox(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java index 8c64ac708e..56cd385f6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java @@ -30,8 +30,8 @@ import java.util.Map; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; -import net.runelite.client.util.AsyncBufferedImage; import net.runelite.client.game.ItemManager; +import net.runelite.client.util.AsyncBufferedImage; enum Book { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java index f8b8b50bb2..87434af369 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java @@ -116,7 +116,7 @@ public class KourendLibraryPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { hideButton = config.hideButton(); 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 42f2faf090..5fd23ac9b1 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 @@ -37,32 +37,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.coords.WorldPoint; -import static net.runelite.client.plugins.kourendlibrary.Book.BYRNES_CORONATION_SPEECH; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13514; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13515; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13516; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13517; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13518; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13519; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13520; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13521; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13522; -import static net.runelite.client.plugins.kourendlibrary.Book.DARK_MANUSCRIPT_13523; -import static net.runelite.client.plugins.kourendlibrary.Book.EATHRAM_RADA_EXTRACT; -import static net.runelite.client.plugins.kourendlibrary.Book.HOSIDIUS_LETTER; -import static net.runelite.client.plugins.kourendlibrary.Book.IDEOLOGY_OF_DARKNESS; -import static net.runelite.client.plugins.kourendlibrary.Book.KILLING_OF_A_KING; -import static net.runelite.client.plugins.kourendlibrary.Book.RADAS_CENSUS; -import static net.runelite.client.plugins.kourendlibrary.Book.RADAS_JOURNEY; -import static net.runelite.client.plugins.kourendlibrary.Book.RICKTORS_DIARY_7; -import static net.runelite.client.plugins.kourendlibrary.Book.SOUL_JOURNEY; -import static net.runelite.client.plugins.kourendlibrary.Book.TRANSPORTATION_INCANTATIONS; -import static net.runelite.client.plugins.kourendlibrary.Book.TRANSVERGENCE_THEORY; -import static net.runelite.client.plugins.kourendlibrary.Book.TREACHERY_OF_ROYALTY; -import static net.runelite.client.plugins.kourendlibrary.Book.TRISTESSAS_TRAGEDY; -import static net.runelite.client.plugins.kourendlibrary.Book.TWILL_ACCORD; -import static net.runelite.client.plugins.kourendlibrary.Book.VARLAMORE_ENVOY; -import static net.runelite.client.plugins.kourendlibrary.Book.WINTERTODT_PARABLE; +import static net.runelite.client.plugins.kourendlibrary.Book.*; /** * Library represents a instance of the Kourend/Arceuus House library. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java index 9f62f109b0..138e187991 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java @@ -46,10 +46,12 @@ public class LearnToClickPlugin extends Plugin @Inject private LearnToClickConfig config; - private boolean forceRightClickFlag; + @Inject private Client client; + private boolean forceRightClickFlag; + private boolean shouldBlockCompass; private boolean shouldRightClickMap; private boolean shouldRightClickXp; @@ -63,13 +65,13 @@ public class LearnToClickPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { forceRightClickFlag = false; hideOrbWidgets(false); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index 8a1662ea5d..c88b214d81 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -85,7 +85,7 @@ public class LizardmenShamanPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.showTimer = config.showTimer(); @@ -95,7 +95,7 @@ public class LizardmenShamanPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); spawns.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java index 11e9132a90..3324f69452 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java @@ -74,7 +74,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener private String username; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -85,7 +85,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener } @Override - protected void shutDown() throws Exception + protected void shutDown() { if (this.syncUsername) { @@ -97,7 +97,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener keyManager.unregisterKeyListener(this); } -@Provides + @Provides LoginScreenConfig getConfig(ConfigManager configManager) { return configManager.getConfig(LoginScreenConfig.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java index 4a30bd276d..7cc3426bd4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java @@ -34,14 +34,14 @@ public class LootAssistPlugin extends Plugin static final ConcurrentHashMap lootPiles = new ConcurrentHashMap<>(); @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(lootAssistOverlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { lootPiles.clear(); overlayManager.remove(lootAssistOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java index c8353c0181..dc426083f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java @@ -97,6 +97,7 @@ public class LootingBagViewerOverlay extends Overlay if (!items[i].equals(tempItems[i])) { items = tempItems; + break; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java index d3356155c4..ebd7d4be8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java @@ -37,7 +37,7 @@ import net.runelite.client.ui.overlay.WidgetItemOverlay; @Singleton public class LootingBagViewerWidgetOverlay extends WidgetItemOverlay { - private LootingBagViewerPlugin plugin; + private final LootingBagViewerPlugin plugin; @Inject LootingBagViewerWidgetOverlay(final LootingBagViewerPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java index 926b6e8ae2..47e25c686b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java @@ -14,6 +14,7 @@ package net.runelite.client.plugins.loottracker; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.time.Duration; +import lombok.AccessLevel; import lombok.Getter; public enum LootRecordDateFilter @@ -28,7 +29,7 @@ public enum LootRecordDateFilter ALL("All", Duration.ZERO); private final String name; - @Getter + @Getter(AccessLevel.PACKAGE) private final Duration duration; static RuntimeMXBean mxBean = ManagementFactory.getRuntimeMXBean(); @@ -36,11 +37,11 @@ public enum LootRecordDateFilter /** * Constructor for a Loot Tracker filter that filters by date, more specifically Duration. * - * @param name - String the name that represents the date filter. This is what will be displayed in the GUI + * @param name - String the name that represents the date filter. This is what will be displayed in the GUI * @param duration - The duration the current time - the time of the loot record must be greater than to display if * a date filter other than all or Session is enabled */ - private LootRecordDateFilter(String name, Duration duration) + LootRecordDateFilter(String name, Duration duration) { this.name = name; this.duration = duration; 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 8a370ca3ed..bab4320e56 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 @@ -30,6 +30,7 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; +import java.awt.Font; import java.awt.GridLayout; import java.awt.image.BufferedImage; import java.text.DateFormat; @@ -50,12 +51,12 @@ import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; import lombok.AccessLevel; import lombok.Getter; -import net.runelite.client.util.AsyncBufferedImage; +import net.runelite.api.util.Text; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; +import net.runelite.client.util.AsyncBufferedImage; import net.runelite.client.util.ImageUtil; -import net.runelite.api.util.Text; import net.runelite.client.util.QuantityFormatter; class LootTrackerBox extends JPanel @@ -66,9 +67,7 @@ class LootTrackerBox extends JPanel private final JPanel itemContainer = new JPanel(); private final JLabel priceLabel = new JLabel(); private final JLabel subTitleLabel = new JLabel(); - private final JLabel dateLabel = new JLabel(); private final JPanel logTitle = new JPanel(); - private final JLabel titleLabel = new JLabel(); private final ItemManager itemManager; @Getter(AccessLevel.PACKAGE) private final String id; @@ -79,9 +78,8 @@ class LootTrackerBox extends JPanel private final List records = new ArrayList<>(); private long totalPrice; - private boolean hideIgnoredItems; - private BiConsumer onItemToggle; - private final long timeStamp; + private final boolean hideIgnoredItems; + private final BiConsumer onItemToggle; LootTrackerBox( final long timeStamp, @@ -94,7 +92,6 @@ class LootTrackerBox extends JPanel @Nullable final Boolean showDate, final BiConsumer onItemToggle) { - this.timeStamp = timeStamp; this.id = id; this.itemManager = itemManager; this.onItemToggle = onItemToggle; @@ -109,6 +106,7 @@ class LootTrackerBox extends JPanel logTitle.setBorder(new EmptyBorder(7, 7, 7, 7)); logTitle.setBackground(ColorScheme.DARKER_GRAY_COLOR.darker()); + JLabel titleLabel = new JLabel(); titleLabel.setText(Text.removeTags(id)); titleLabel.setFont(FontManager.getRunescapeSmallFont()); titleLabel.setForeground(Color.WHITE); @@ -119,7 +117,8 @@ class LootTrackerBox extends JPanel subTitleLabel.setFont(FontManager.getRunescapeSmallFont()); subTitleLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR); - dateLabel.setFont(FontManager.getRunescapeSmallFont().deriveFont(FontManager.getRunescapeSmallFont().getSize() - 2)); + JLabel dateLabel = new JLabel(); + dateLabel.setFont(FontManager.getRunescapeSmallFont().deriveFont(Font.PLAIN, FontManager.getRunescapeSmallFont().getSize() - 2)); dateLabel.setForeground(Color.LIGHT_GRAY); dateLabel.setText(DateFormat.getDateInstance().format(new Date(timeStamp))); @@ -157,7 +156,7 @@ class LootTrackerBox extends JPanel { return hideIgnoredItems ? records.stream().filter( - r -> !Arrays.stream(r.getItems()).allMatch(LootTrackerItem::isIgnored)).count() + r -> !Arrays.stream(r.getItems()).allMatch(LootTrackerItem::isIgnored)).count() : records.size(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java index 3a0e53d846..1b4d389560 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java @@ -40,7 +40,7 @@ class LootTrackerItem private final int quantity; @Getter(AccessLevel.PACKAGE) private final long gePrice; - @Getter + @Getter(AccessLevel.PACKAGE) private final long haPrice; @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java index 3d88ce95be..b01fef82f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java @@ -50,6 +50,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -117,7 +118,6 @@ class LootTrackerPanel extends PluginPanel private final JLabel groupedLootBtn = new JLabel(); private final JLabel resetIcon = new JLabel(); private final JLabel collapseBtn = new JLabel(); - private JComboBox dateFilterComboBox = new JComboBox<>(new Vector<>(Arrays.asList(LootRecordDateFilter.values()))); // Log collection private final List records = new ArrayList<>(); @@ -170,8 +170,8 @@ class LootTrackerPanel extends PluginPanel EXPAND_ICON = new ImageIcon(expandedImg); } - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private LootRecordSortType lootRecordSortType = LootRecordSortType.TIMESTAMP; LootTrackerPanel(final LootTrackerPlugin plugin, final ItemManager itemManager, final LootTrackerConfig config) @@ -301,14 +301,14 @@ class LootTrackerPanel extends PluginPanel } }); + JComboBox dateFilterComboBox = new JComboBox<>(new Vector<>(Arrays.asList(LootRecordDateFilter.values()))); dateFilterComboBox.setSelectedItem(this.dateFilter); dateFilterComboBox.setToolTipText("Filter the displayed loot records by date"); dateFilterComboBox.setMaximumSize(new Dimension(15, 0)); dateFilterComboBox.setMaximumRowCount(3); dateFilterComboBox.addItemListener(e -> { - final LootRecordDateFilter dateFilterSelected = (LootRecordDateFilter) e.getItem(); - dateFilter = dateFilterSelected; + dateFilter = (LootRecordDateFilter) e.getItem(); rebuild(); } ); @@ -435,7 +435,7 @@ class LootTrackerPanel extends PluginPanel actionsContainer.setVisible(true); } - void updateCollapseText() + private void updateCollapseText() { if (isAllCollapsed()) { @@ -452,7 +452,7 @@ class LootTrackerPanel extends PluginPanel private boolean isAllCollapsed() { return boxes.stream() - .filter(i -> i.isCollapsed()) + .filter(LootTrackerBox::isCollapsed) .count() == boxes.size(); } @@ -613,7 +613,6 @@ class LootTrackerPanel extends PluginPanel if (records.get(i).getTimestamp().toEpochMilli() > dateFilter.getDuration().toMillis()) { buildBox(records.get(i)); - continue; } } else diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 0658e1c5e1..b004c56732 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -79,11 +79,10 @@ import net.runelite.api.Varbits; import net.runelite.api.WorldType; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; -import net.runelite.api.events.PlayerDeath; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.PlayerDeath; import net.runelite.api.events.PlayerSpawned; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.util.Text; @@ -210,24 +209,34 @@ public class LootTrackerPlugin extends Plugin @Inject private ClientToolbar clientToolbar; + @Inject private ItemManager itemManager; + @Inject private ChatMessageManager chatMessageManager; + @Inject private SpriteManager spriteManager; + @Inject private LootTrackerConfig config; + @Inject private ClientThread clientThread; + @Inject private SessionManager sessionManager; + @Inject private ScheduledExecutorService executor; + @Inject private LootRecordWriter writer; + @Inject private DatabaseManager databaseManager; + private LootTrackerPanel panel; private NavigationButton navButton; private String eventType; @@ -240,9 +249,9 @@ public class LootTrackerPlugin extends Plugin private LootTrackerClient lootTrackerClient; private final List queuedLoots = new ArrayList<>(); - private Map killCountMap = new HashMap<>(); + private final Map killCountMap = new HashMap<>(); private boolean gotPet = false; - private Map userUuidMap = new HashMap<>(); + private final Map userUuidMap = new HashMap<>(); private static Collection stack(Collection items) { @@ -356,7 +365,7 @@ public class LootTrackerPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { ignoredItems = Text.fromCSV(config.getIgnoredItems()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/Pet.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/Pet.java index c5de642cbd..2cd3809b1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/Pet.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/Pet.java @@ -26,10 +26,11 @@ package net.runelite.client.plugins.loottracker; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; -@Getter +@Getter(AccessLevel.PACKAGE) public enum Pet { // GWD Pets diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/attackstyle/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/attackstyle/WeaponType.java index dc9f59fb70..2858c6ee99 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/attackstyle/WeaponType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/attackstyle/WeaponType.java @@ -26,16 +26,7 @@ package net.runelite.client.plugins.maxhit.attackstyle; import java.util.HashMap; import java.util.Map; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.ACCURATE; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.ACCURATERANGING; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.AGGRESSIVE; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.CASTING; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.CONTROLLED; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.DEFENSIVE; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.DEFENSIVE_CASTING; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.LONGRANGE; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.OTHER; -import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.RANGING; +import static net.runelite.client.plugins.maxhit.attackstyle.AttackStyle.*; public enum WeaponType { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index 820e6e7b8c..46265bdcdb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -1357,11 +1357,11 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - keyName = "swapFairyTree", - name = "Fairy Tree", - description = "Swap options on PoH Fairy Tree", - position = 2, - section = "teleportationSection" + keyName = "swapFairyTree", + name = "Fairy Tree", + description = "Swap options on PoH Fairy Tree", + position = 2, + section = "teleportationSection" ) default boolean swapFairyTree() { @@ -1369,13 +1369,13 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - keyName = "fairyTree", - name = "Mode", - description = "", - position = 3, - section = "teleportationSection", - hidden = true, - unhide = "swapFairyTree" + keyName = "fairyTree", + name = "Mode", + description = "", + position = 3, + section = "teleportationSection", + hidden = true, + unhide = "swapFairyTree" ) default FairyTreeMode swapFairyTreeMode() { 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 a1fa6676fe..5704501eb8 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 @@ -34,14 +34,12 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.inject.Provides; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -158,28 +156,31 @@ public class MenuEntrySwapperPlugin extends Plugin @Inject private Client client; + @Inject private ClientThread clientThread; + @Inject private MenuEntrySwapperConfig config; + @Inject private PluginManager pluginManager; + @Inject private MenuManager menuManager; + @Inject private KeyManager keyManager; + @Inject private EventBus eventBus; + @Inject private PvpToolsPlugin pvpTools; + @Inject private PvpToolsConfig pvpToolsConfig; - /** - * Migrates old custom swaps config - * This should be removed after a reasonable amount of time. - */ - @Inject - private ConfigManager configManager; + private boolean buildingMode; private boolean inTobRaid = false; private boolean inCoxRaid = false; @@ -316,7 +317,6 @@ public class MenuEntrySwapperPlugin extends Plugin { this.lastDes = JewelleryBoxDestination.withOption(config.lastDes()); - migrateConfig(); updateConfig(); if (config.lastJewel()) { @@ -2037,90 +2037,6 @@ public class MenuEntrySwapperPlugin extends Plugin } } - /** - * Migrates old custom swaps config - * This should be removed after a reasonable amount of time. - */ - private static boolean oldParse(String value) - { - try - { - final StringBuilder sb = new StringBuilder(); - - for (String str : value.split("\n")) - { - if (!str.startsWith("//")) - { - sb.append(str).append("\n"); - } - } - - NEWLINE_SPLITTER.withKeyValueSeparator(':').split(sb); - return true; - } - catch (IllegalArgumentException ex) - { - return false; - } - } - - /** - * Migrates old custom swaps config - * This should be removed after a reasonable amount of time. - */ - private void migrateConfig() - { - final String customSwaps = config.customSwaps(); - - if (!CustomSwapParse.parse(customSwaps) && oldParse(customSwaps)) - { - final StringBuilder sb = new StringBuilder(); - - for (String str : customSwaps.split("\n")) - { - if (!str.startsWith("//")) - { - sb.append(str).append("\n"); - } - } - - final Map split = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(sb); - - sb.setLength(0); - - for (Map.Entry entry : split.entrySet()) - { - String val = entry.getValue(); - if (!val.contains(",")) - { - continue; - } - - sb.append(entry.getValue()).append(":0\n"); - } - - configManager.setConfiguration("menuentryswapper", "customSwaps", sb.toString()); - } - - // Ugly band-aid i'm sorry - configManager.setConfiguration("menuentryswapper", "customSwaps", - Arrays.stream(config.customSwaps() - .split("\n")) - .distinct() - .filter(swap -> !"walk here" - .equals(swap. - split(":")[0] - .trim() - .toLowerCase())) - .filter(swap -> !"cancel" - .equals(swap - .split(":")[0] - .trim() - .toLowerCase())) - .collect(Collectors.joining("\n")) - ); - } - private final HotkeyListener hotkey = new HotkeyListener(() -> this.hotkeyMod) { @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/comparables/GrimyHerbComparableEntry.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/comparables/GrimyHerbComparableEntry.java index 9b0c75a664..970a00c557 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/comparables/GrimyHerbComparableEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/comparables/GrimyHerbComparableEntry.java @@ -13,7 +13,7 @@ import org.apache.commons.lang3.StringUtils; public class GrimyHerbComparableEntry extends AbstractComparableEntry { - private SwapGrimyHerbMode mode; + private final SwapGrimyHerbMode mode; private final GrimyHerbLookup lookup = new GrimyHerbLookup(); private final Client client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java index 3a0a88b953..f7cf38599f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/GrimyHerbLookup.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; public class GrimyHerbLookup { - private static Map mapping; + private static final Map mapping; static { @@ -47,7 +47,7 @@ public class GrimyHerbLookup return mapping.keySet().stream().mapToInt(Integer::valueOf).boxed().collect(Collectors.toList()); } - private class HerbInfo + private static class HerbInfo { @SerializedName("cleaned") private int cleanedId; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/JewelleryBoxDestination.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/JewelleryBoxDestination.java index e971dade60..88cfde5496 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/JewelleryBoxDestination.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/JewelleryBoxDestination.java @@ -70,6 +70,7 @@ public enum JewelleryBoxDestination final int childIndex; private static final ImmutableMap map; + static { final ImmutableMap.Builder builder = ImmutableMap.builderWithExpectedSize(values().length); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/QuestCapeMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/QuestCapeMode.java index 813787bd10..c7974f0c72 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/QuestCapeMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/QuestCapeMode.java @@ -3,7 +3,7 @@ package net.runelite.client.plugins.menuentryswapper.util; public enum QuestCapeMode { TRIM("Trim"), - TELEPORT ("Teleport"); + TELEPORT("Teleport"); private final String name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java index 89f2a14af3..1df45356d5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java @@ -75,7 +75,7 @@ public class MinimapPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -85,7 +85,7 @@ public class MinimapPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { updateMinimapWidgetVisibility(false); restoreOriginalDots(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java index 5fb773ece8..ab800ee722 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java @@ -76,7 +76,7 @@ class MiningOverlay extends Overlay } Instant now = Instant.now(); - for (Iterator it = respawns.iterator(); it.hasNext();) + for (Iterator it = respawns.iterator(); it.hasNext(); ) { Color pieFillColor = config.progressPieColor(); Color pieBorderColor; @@ -133,7 +133,7 @@ class MiningOverlay extends Overlay /** * Checks if the given point is "upstairs" in the mlm. * The upper floor is actually on z=0. - * + *

* This method assumes that the given point is already in the mlm * and is not meaningful when outside the mlm. * 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 53d49d99e6..67a64cd674 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 @@ -129,14 +129,14 @@ public class MiningPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(miningOverlay); overlayManager.remove(coalBagOverlay); respawns.clear(); } -@Provides + @Provides MiningConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(MiningConfig.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java index 4a183e3ba1..86c3e06888 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java @@ -39,6 +39,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; + @Singleton public class MotherlodeGemOverlay extends Overlay { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java index 65888c0f74..2b28c7618c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java @@ -34,6 +34,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; + @Singleton public class MotherlodeOreOverlay extends Overlay { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index 254be2a75b..62bd0d1a0f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -146,7 +146,7 @@ class MouseHighlightOverlay extends Overlay private boolean shouldNotRenderMenuAction(int type) { return type == MenuOpcode.RUNELITE_OVERLAY.getId() - || (!plugin.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type)); + || (!plugin.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type)); } private boolean isMenuActionRightClickOnly(int type) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java index 365e1b4367..eadb926055 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java @@ -54,6 +54,7 @@ public class MouseHighlightPlugin extends Plugin { @Inject MouseHighlightConfig config; + @Inject private Client client; @@ -81,7 +82,7 @@ public class MouseHighlightPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -90,7 +91,7 @@ public class MouseHighlightPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { resetTips(); overlayManager.remove(overlay); 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 a5531dbcde..282a52c76c 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 @@ -52,17 +52,22 @@ public class MTAPlugin extends Plugin @Inject private AlchemyRoom alchemyRoom; + @Inject private GraveyardRoom graveyardRoom; + @Inject private TelekineticRoom telekineticRoom; + @Inject private EnchantmentRoom enchantmentRoom; @Inject private EventBus eventBus; + @Inject private MTASceneOverlay sceneOverlay; + @Inject private MTAInventoryOverlay inventoryOverlay; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java index c7f45bfc50..4d4da7c1cb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.mta.alchemy; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; @@ -38,9 +39,9 @@ public enum AlchemyItem POSSIBLY_EMPTY("", ItemID.CAKE_OF_GUIDANCE), UNKNOWN("Unknown", ItemID.CAKE_OF_GUIDANCE); - @Getter + @Getter(AccessLevel.PACKAGE) private final int id; - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; AlchemyItem(final String name, final int id) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index 01c6983d99..602a94af93 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -81,7 +81,7 @@ public class TelekineticRoom extends MTARoom private Rectangle bounds; private NPC guardian; private Maze maze; - private EventBus eventBus; + private final EventBus eventBus; @Inject private TelekineticRoom(MTAConfig config, Client client, EventBus eventBus) @@ -114,7 +114,7 @@ public class TelekineticRoom extends MTARoom telekineticWalls.clear(); } - public void onWallObjectSpawned(WallObjectSpawned event) + private void onWallObjectSpawned(WallObjectSpawned event) { final WallObject wall = event.getWallObject(); if (wall.getId() != TELEKINETIC_WALL) @@ -125,7 +125,7 @@ public class TelekineticRoom extends MTARoom telekineticWalls.add(wall); } - public void onGameStateChanged(GameStateChanged event) + private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java index ae21c93190..be4008b8eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java @@ -30,6 +30,7 @@ import java.awt.Rectangle; import java.awt.Shape; import java.awt.geom.Area; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.runelite.api.Constants; @@ -127,10 +128,7 @@ public class MapLocations private static void initializeWithEmptyLists(List[] array) { - for (int i = 0; i < array.length; i++) - { - array[i] = new ArrayList<>(); - } + Arrays.fill(array, new ArrayList<>()); } static diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java index 129c63317f..5129025cac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java @@ -33,11 +33,11 @@ import java.awt.Rectangle; import java.awt.geom.GeneralPath; import javax.inject.Inject; import javax.inject.Singleton; -import net.runelite.api.geometry.Geometry; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; import net.runelite.api.coords.LocalPoint; +import net.runelite.api.geometry.Geometry; 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/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java index 2f13a8c685..85dcbbada9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java @@ -127,7 +127,7 @@ public class MultiIndicatorsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -146,7 +146,7 @@ public class MultiIndicatorsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); @@ -154,7 +154,7 @@ public class MultiIndicatorsPlugin extends Plugin uninitializePaths(); } -private void initializePaths() + private void initializePaths() { multicombatPathToDisplay = new GeneralPath[Constants.MAX_Z]; pvpPathToDisplay = new GeneralPath[Constants.MAX_Z]; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java index b5e55fac7f..d2d9792e5a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java @@ -548,11 +548,10 @@ public class MusicPlugin extends Plugin @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent ev) { - switch (ev.getEventName()) + // We have to override this script because it gets invoked periodically from the server + if ("optionsAllSounds".equals(ev.getEventName())) { - case "optionsAllSounds": - // We have to override this script because it gets invoked periodically from the server - client.getIntStack()[client.getIntStackSize() - 1] = -1; + client.getIntStack()[client.getIntStackSize() - 1] = -1; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java index e01c7615cf..a59d36bdfa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java @@ -111,12 +111,12 @@ class NightmareZoneOverlay extends Overlay tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); tableComponent.addRow("Points:", QuantityFormatter.formatNumber(currentPoints)); tableComponent.addRow("Points/Hour:", QuantityFormatter.formatNumber(plugin.getPointsPerHour())); - + if (plugin.isShowtotalpoints()) { tableComponent.addRow("Total:", QuantityFormatter.formatNumber(totalPoints)); } - + panelComponent.getChildren().add(tableComponent); return panelComponent.render(graphics); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java index 8f889d4964..4eda504879 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java @@ -75,7 +75,7 @@ public class NightmareZonePlugin extends Plugin @Inject private NightmareZoneOverlay overlay; - @Getter + @Getter(AccessLevel.PACKAGE) private int pointsPerHour; private Instant nmzSessionStartTime; @@ -102,7 +102,7 @@ public class NightmareZonePlugin extends Plugin private Color absorptionColorBelowThreshold; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -111,7 +111,7 @@ public class NightmareZonePlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlay.removeAbsorptionCounter(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NoteTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NoteTab.java index d66026ff24..5103cdffe7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NoteTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NoteTab.java @@ -47,7 +47,7 @@ class NoteTab extends JPanel private final JTextArea notesEditor = new JTextArea(); private final UndoManager undoRedo = new UndoManager(); - private int index; + private final int index; NoteTab(NotesManager mManager, int mIndex) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java index 933f007030..30f7fc14e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesManager.java @@ -31,6 +31,7 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import joptsimple.internal.Strings; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.client.config.ConfigManager; @@ -40,7 +41,7 @@ import net.runelite.client.plugins.notes.events.PageDeleted; @Singleton @Slf4j -public class NotesManager +class NotesManager { @Inject private ConfigManager configManager; @@ -51,7 +52,7 @@ public class NotesManager @Inject private EventBus eventBus; - @Getter + @Getter(AccessLevel.PACKAGE) private List notes = new ArrayList<>(); void loadNotes() @@ -91,7 +92,7 @@ public class NotesManager save(); } - void save() + private void save() { final Gson gson = new Gson(); final String json = gson.toJson(notes); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java index b3552cf093..13d30f2a94 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java @@ -65,7 +65,7 @@ public class NotesPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { panel = injector.getInstance(NotesPanel.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageAdded.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageAdded.java index 710d1b5fd4..dfeb339b74 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageAdded.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageAdded.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.notes.events; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import net.runelite.api.events.Event; @AllArgsConstructor public class PageAdded implements Event { - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PUBLIC) private int index; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageDeleted.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageDeleted.java index 060c65cd45..bf2358920c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageDeleted.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/events/PageDeleted.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.notes.events; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import net.runelite.api.events.Event; @AllArgsConstructor public class PageDeleted implements Event { - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PUBLIC) private int index; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java index b7022c56e5..4e0ba4d5d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java @@ -34,6 +34,7 @@ import lombok.Setter; import net.runelite.api.NPC; import net.runelite.api.NPCDefinition; import net.runelite.api.coords.WorldPoint; + @Getter(AccessLevel.PACKAGE) class MemorizedNpc { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsInput.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsInput.java index a744208264..82cf727fb1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsInput.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsInput.java @@ -28,7 +28,7 @@ import java.awt.event.KeyEvent; import javax.inject.Inject; import net.runelite.client.input.KeyListener; -public class NpcIndicatorsInput implements KeyListener +class NpcIndicatorsInput implements KeyListener { private static final int HOTKEY = KeyEvent.VK_SHIFT; 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 a54729c047..1912a1c492 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 @@ -212,7 +212,7 @@ public class NpcIndicatorsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -228,7 +228,7 @@ public class NpcIndicatorsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(npcSceneOverlay); overlayManager.remove(npcMinimapOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java index 2558a3b9cd..895d754a2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java @@ -220,9 +220,7 @@ public class NpcSceneOverlay extends Overlay final Color squareColor = color; getSquare(wp, size).forEach(square -> - { - drawTile(graphics, square, squareColor, 1, 255, 50); - }); + drawTile(graphics, square, squareColor, 1, 255, 50)); break; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java index 8ae35eb262..a95f30014a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java @@ -29,11 +29,11 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import net.runelite.api.Actor; import net.runelite.api.NPC; import net.runelite.api.coords.WorldArea; -import net.runelite.api.Actor; -@Getter +@Getter(AccessLevel.PACKAGE) class MemorizedNPC { private NPC npc; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 460be53358..92066fc671 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -99,7 +99,7 @@ public class NpcStatusPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.getRange = config.getRange(); @@ -107,7 +107,7 @@ public class NpcStatusPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(npcStatusOverlay); memorizedNPCs.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java index 916b74450a..3fb8cf2bf4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java @@ -24,8 +24,6 @@ */ package net.runelite.client.plugins.npcunaggroarea; -import javax.inject.Singleton; -import net.runelite.api.geometry.Geometry; import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; @@ -34,10 +32,12 @@ import java.awt.Rectangle; import java.awt.geom.GeneralPath; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; import net.runelite.api.coords.LocalPoint; +import net.runelite.api.geometry.Geometry; 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/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index 022c324a01..29ebd0a5f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -157,7 +157,7 @@ public class NpcAggroAreaPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -173,7 +173,7 @@ public class NpcAggroAreaPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { removeTimer(); overlayManager.remove(overlay); @@ -192,7 +192,7 @@ public class NpcAggroAreaPlugin extends Plugin Arrays.fill(linesToDisplay, null); } -private Area generateSafeArea() + private Area generateSafeArea() { final Area area = new Area(); 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 a6211f6bfa..8e6959bbca 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 @@ -152,7 +152,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener hotKeyPressed = false; } -@Override + @Override public void keyTyped(KeyEvent e) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java index db4bd4a902..676d4fb7f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java @@ -74,7 +74,7 @@ public class OpenOSRSPlugin extends Plugin @Inject private ClientThread clientThread; - private HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind) + private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind) { @Override public void hotkeyPressed() @@ -91,7 +91,7 @@ public class OpenOSRSPlugin extends Plugin private Keybind keybind; @Override - protected void startUp() throws Exception + protected void startUp() { entered = -1; @@ -102,7 +102,7 @@ public class OpenOSRSPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { entered = 0; enterIdx = 0; 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 8fb33c8164..fb9cc8f5ae 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 @@ -37,6 +37,7 @@ import net.runelite.api.Actor; import net.runelite.api.Client; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Varbits; +import net.runelite.api.util.Text; import net.runelite.client.ui.overlay.Overlay; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; import net.runelite.client.ui.overlay.OverlayMenuEntry; @@ -46,7 +47,6 @@ import net.runelite.client.ui.overlay.components.ComponentConstants; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.ProgressBarComponent; import net.runelite.client.ui.overlay.components.TitleComponent; -import net.runelite.api.util.Text; @Singleton class OpponentInfoOverlay extends Overlay diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index 283d5ecf57..79c35128c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -129,7 +129,7 @@ public class OpponentInfoPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.attackingColTag = ColorUtil.colorTag(config.attackingColor()); this.showAttackers = config.showAttackersMenu(); @@ -144,7 +144,7 @@ public class OpponentInfoPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { eventBus.unregister(MENU); @@ -154,7 +154,7 @@ public class OpponentInfoPlugin extends Plugin overlayManager.remove(playerComparisonOverlay); } -private void updateMenuSubs() + private void updateMenuSubs() { if (showAttackers || showAttacking || showHitpoints) { 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 2b98855c9e..c3689f89e6 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 @@ -35,6 +35,7 @@ import net.runelite.api.Client; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Player; import net.runelite.api.Skill; +import net.runelite.api.util.Text; import net.runelite.client.game.HiscoreManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; @@ -46,7 +47,6 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; -import net.runelite.api.util.Text; import net.runelite.http.api.hiscore.HiscoreResult; import net.runelite.http.api.hiscore.HiscoreSkill; 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 749ec2c974..5fa8ea24d0 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 @@ -155,7 +155,7 @@ public class PartyPlugin extends Plugin implements KeyListener } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -169,7 +169,7 @@ public class PartyPlugin extends Plugin implements KeyListener } @Override - protected void shutDown() throws Exception + protected void shutDown() { partyDataMap.clear(); pendingTilePings.clear(); @@ -185,7 +185,7 @@ public class PartyPlugin extends Plugin implements KeyListener sendAlert = false; } -@Provides + @Provides public PartyConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(PartyConfig.class); @@ -243,6 +243,7 @@ public class PartyPlugin extends Plugin implements KeyListener if ("walk here".equalsIgnoreCase(menuEntry.getOption())) { isOnCanvas = true; + break; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyData.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyData.java index 2593c4fe8f..efd483b173 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyData.java @@ -26,14 +26,15 @@ package net.runelite.client.plugins.party.data; import java.awt.Color; import java.util.UUID; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.worldmap.WorldMapPoint; -@Setter -@Getter +@Setter(AccessLevel.PUBLIC) +@Getter(AccessLevel.PUBLIC) @RequiredArgsConstructor public class PartyData { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyTilePingData.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyTilePingData.java index 467e69dd2a..1629e4f660 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyTilePingData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/data/PartyTilePingData.java @@ -25,14 +25,15 @@ package net.runelite.client.plugins.party.data; import java.awt.Color; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import net.runelite.api.coords.WorldPoint; @RequiredArgsConstructor -@Getter -@Setter +@Getter(AccessLevel.PUBLIC) +@Setter(AccessLevel.PUBLIC) public class PartyTilePingData { private final WorldPoint point; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/messages/SkillUpdate.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/messages/SkillUpdate.java index fd7f8f12ed..4c5fd33b47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/messages/SkillUpdate.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/messages/SkillUpdate.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.party.messages; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Skill; @@ -31,7 +32,7 @@ import net.runelite.api.events.Event; import net.runelite.http.api.ws.messages.party.PartyMemberMessage; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillUpdate extends PartyMemberMessage implements Event { private final Skill skill; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java index 25336dbb38..eecf8b95ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java @@ -91,7 +91,7 @@ class Performance extends PartyMemberMessage double getDPS() { - return Math.round( (this.damageDealt / this.getSecondsSpent()) * 100) / 100.00; + return Math.round((this.damageDealt / this.getSecondsSpent()) * 100) / 100.00; } String getHumanReadableSecondsSpent() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java index d5c484f8fc..445250b107 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java @@ -100,7 +100,7 @@ public class PerformanceStatsOverlay extends Overlay { continue; } - + final String[] eles = createRowElements(p); tableComponent.addRow(eles); } @@ -111,12 +111,12 @@ public class PerformanceStatsOverlay extends Overlay private String[] createRowElements(Performance performance) { return new String[] - { - performance.getUsername(), - (int) Math.round(performance.getDamageDealt()) + " | " + (int) Math.round(performance.getHighestHitDealt()), - (int) Math.round(performance.getDamageTaken()) + " | " + (int) Math.round(performance.getHighestHitTaken()), - String.valueOf(performance.getDPS()), - performance.getHumanReadableSecondsSpent() - }; + { + performance.getUsername(), + (int) Math.round(performance.getDamageDealt()) + " | " + (int) Math.round(performance.getHighestHitDealt()), + (int) Math.round(performance.getDamageTaken()) + " | " + (int) Math.round(performance.getHighestHitTaken()), + String.valueOf(performance.getDPS()), + performance.getHumanReadableSecondsSpent() + }; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java index 236da58053..d007cd4067 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 @@ -182,14 +182,14 @@ public class PestControlPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); loadPlugin(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { unloadPlugin(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java index 4e55a3af6b..57331eed79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java @@ -92,7 +92,7 @@ public class PileIndicatorsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -100,7 +100,7 @@ public class PileIndicatorsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java index dffc76d65d..1e6e9c1388 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java @@ -61,8 +61,8 @@ public class PlayerIndicatorsOverlay extends Overlay "no-agility.png"); private final BufferedImage skullIcon = ImageUtil.getResourceStreamFromClass(PlayerIndicatorsPlugin.class, "skull.png"); - private PlayerIndicatorsPlugin plugin; - private PlayerIndicatorsService playerIndicatorsService; + private final PlayerIndicatorsPlugin plugin; + private final PlayerIndicatorsService playerIndicatorsService; @Inject private Client client; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index 27e18d7a5c..0db196ad3f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -87,27 +87,35 @@ public class PlayerIndicatorsPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private final Map resultCache = new HashMap<>(); private final ExecutorService executorService = Executors.newFixedThreadPool(100); + @Inject @Getter(AccessLevel.NONE) private OverlayManager overlayManager; + @Inject @Getter(AccessLevel.NONE) private PlayerIndicatorsConfig config; + @Inject @Getter(AccessLevel.NONE) private PlayerIndicatorsOverlay playerIndicatorsOverlay; + @Inject @Getter(AccessLevel.NONE) private PlayerIndicatorsMinimapOverlay playerIndicatorsMinimapOverlay; + @Inject @Getter(AccessLevel.NONE) private Client client; + @Inject @Getter(AccessLevel.NONE) private ClanManager clanManager; + @Inject @Getter(AccessLevel.NONE) private EventBus eventBus; + private ClanMemberRank callerRank; private PlayerIndicatorsPlugin.AgilityFormats agilityFormat; private PlayerIndicatorsPlugin.MinimapSkullLocations skullLocation; @@ -137,7 +145,7 @@ public class PlayerIndicatorsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); resultCache.clear(); @@ -147,7 +155,7 @@ public class PlayerIndicatorsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(playerIndicatorsOverlay); overlayManager.remove(playerIndicatorsMinimapOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index 4ffa83cfb0..3de622159c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -62,7 +62,7 @@ public class PlayerIndicatorsService && client.isFriended(player.getName(), false) && plugin.getLocationHashMap().containsKey(PlayerRelation.FRIEND)); - clan = (player) -> (player.isClanMember() && !client.getLocalPlayer().equals(player) && !client.isFriended(player.getName(), false) + clan = (player) -> (player.isClanMember() && !client.getLocalPlayer().equals(player) && !client.isFriended(player.getName(), false) && plugin.getLocationHashMap().containsKey(PlayerRelation.CLAN)); team = (player) -> (Objects.requireNonNull(client.getLocalPlayer()).getTeam() != 0 && !player.isClanMember() @@ -100,7 +100,7 @@ public class PlayerIndicatorsService consumer.accept(p, PlayerRelation.CALLER); continue; } - if (callerTarget.test(p) ) + if (callerTarget.test(p)) { consumer.accept(p, PlayerRelation.CALLER_TARGET); continue; @@ -135,7 +135,7 @@ public class PlayerIndicatorsService consumer.accept(p, PlayerRelation.TARGET); } } -} + } private boolean highlight() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java index 1b99b22165..7eb37e25c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java @@ -92,7 +92,7 @@ public class PlayerInfoPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -120,7 +120,7 @@ public class PlayerInfoPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { infoBoxManager.removeIf(i -> i instanceof PlayerInfoCustomIndicator); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java index a454cc4053..317e4d475b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java @@ -97,14 +97,19 @@ public class PlayerScouter extends Plugin private static final Map WILD_LOCS = WorldLocation.getLOCATION_MAP(); private static final SimpleDateFormat SDF = new SimpleDateFormat("MMM dd h:mm a z"); private static final String ICON_URL = "https://www.osrsbox.com/osrsbox-db/items-icons/"; // Add item id + ".png" + @Inject private Client client; + @Inject private ItemManager itemManager; + @Inject private PlayerScouterConfig config; + @Inject private EventBus eventBus; + private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2); private final Set playerContainer = new HashSet<>(); private final Map resultCache = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java deleted file mode 100644 index e6b8ad44f1..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2018, https://openosrs.com - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.pluginsorter; - -import javax.inject.Inject; -import javax.inject.Singleton; -import net.runelite.client.config.ConfigManager; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; - -@PluginDescriptor( - name = "Plugin Organizer", - hidden = true -) -@Singleton -public class PluginSorterPlugin extends Plugin -{ - @Inject - private ConfigManager configManager; - - /** - * Migrates configs from plugin organizer to the OpenOSRS global plugin and deletes the old config values. - * This method should be removed after a reasonable amount of time. - */ - @Deprecated - private void migrateConfigs() - { - migrateConfig("pluginsorter", "pluginSortMode"); - migrateConfig("pluginsorter", "hidePlugins"); - migrateConfig("pluginsorter", "hideExternalPlugins"); - migrateConfig("pluginsorter", "hidePvmPlugins"); - migrateConfig("pluginsorter", "hideSkillingPlugins"); - migrateConfig("pluginsorter", "hidePvpPlugins"); - migrateConfig("pluginsorter", "hideUtilityPlugins"); - migrateConfig("pluginsorter", "externalColor"); - migrateConfig("pluginsorter", "pvmColor"); - migrateConfig("pluginsorter", "pvpColor"); - migrateConfig("pluginsorter", "skillingColor"); - migrateConfig("pluginsorter", "utilityColor"); - } - - /** - * Wrapper for migrating individual config options - * This method should be removed after a reasonable amount of time. - * - * @param group old group name - * @param key key name to migrate - */ - @Deprecated - private void migrateConfig(String group, String key) - { - String value = configManager.getConfiguration(group, key); - if (value != null) - { - configManager.setConfiguration("openosrs", key, value); - configManager.unsetConfiguration(group, key); - } - } - - @Override - protected void startUp() throws Exception - { - migrateConfigs(); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java index db671698fa..375b86da0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java @@ -27,176 +27,10 @@ package net.runelite.client.plugins.poh; import com.google.common.collect.ImmutableMap; import java.awt.image.BufferedImage; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; -import static net.runelite.api.NullObjectID.NULL_13615; -import static net.runelite.api.NullObjectID.NULL_13618; -import static net.runelite.api.NullObjectID.NULL_13620; -import static net.runelite.api.NullObjectID.NULL_13622; -import static net.runelite.api.NullObjectID.NULL_13625; -import static net.runelite.api.NullObjectID.NULL_13627; -import static net.runelite.api.NullObjectID.NULL_13629; -import static net.runelite.api.NullObjectID.NULL_13632; -import static net.runelite.api.NullObjectID.NULL_13634; -import static net.runelite.api.NullObjectID.NULL_29228; -import static net.runelite.api.NullObjectID.NULL_29229; -import static net.runelite.api.ObjectID.ALTAR_13179; -import static net.runelite.api.ObjectID.ALTAR_13180; -import static net.runelite.api.ObjectID.ALTAR_13181; -import static net.runelite.api.ObjectID.ALTAR_13182; -import static net.runelite.api.ObjectID.ALTAR_13183; -import static net.runelite.api.ObjectID.ALTAR_13184; -import static net.runelite.api.ObjectID.ALTAR_13185; -import static net.runelite.api.ObjectID.ALTAR_13186; -import static net.runelite.api.ObjectID.ALTAR_13187; -import static net.runelite.api.ObjectID.ALTAR_13188; -import static net.runelite.api.ObjectID.ALTAR_13189; -import static net.runelite.api.ObjectID.ALTAR_13190; -import static net.runelite.api.ObjectID.ALTAR_13191; -import static net.runelite.api.ObjectID.ALTAR_13192; -import static net.runelite.api.ObjectID.ALTAR_13193; -import static net.runelite.api.ObjectID.ALTAR_13194; -import static net.runelite.api.ObjectID.ALTAR_13196; -import static net.runelite.api.ObjectID.ALTAR_13197; -import static net.runelite.api.ObjectID.ALTAR_13198; -import static net.runelite.api.ObjectID.ALTAR_13199; -import static net.runelite.api.ObjectID.ALTAR_OF_THE_OCCULT; -import static net.runelite.api.ObjectID.AMULET_OF_GLORY; -import static net.runelite.api.ObjectID.ANCIENT_ALTAR; -import static net.runelite.api.ObjectID.ANNAKARL_PORTAL; -import static net.runelite.api.ObjectID.ANNAKARL_PORTAL_29349; -import static net.runelite.api.ObjectID.ANNAKARL_PORTAL_29357; -import static net.runelite.api.ObjectID.ARDOUGNE_PORTAL; -import static net.runelite.api.ObjectID.ARDOUGNE_PORTAL_13626; -import static net.runelite.api.ObjectID.ARDOUGNE_PORTAL_13633; -import static net.runelite.api.ObjectID.ARMOUR_REPAIR_STAND; -import static net.runelite.api.ObjectID.BASIC_JEWELLERY_BOX; -import static net.runelite.api.ObjectID.CARRALLANGAR_PORTAL; -import static net.runelite.api.ObjectID.CARRALLANGAR_PORTAL_33437; -import static net.runelite.api.ObjectID.CARRALLANGAR_PORTAL_33440; -import static net.runelite.api.ObjectID.CATHERBY_PORTAL; -import static net.runelite.api.ObjectID.CATHERBY_PORTAL_33435; -import static net.runelite.api.ObjectID.CATHERBY_PORTAL_33438; -import static net.runelite.api.ObjectID.DARK_ALTAR; -import static net.runelite.api.ObjectID.DIGSITE_PENDANT; -import static net.runelite.api.ObjectID.DIGSITE_PENDANT_33417; -import static net.runelite.api.ObjectID.DIGSITE_PENDANT_33418; -import static net.runelite.api.ObjectID.DIGSITE_PENDANT_33420; -import static net.runelite.api.ObjectID.FALADOR_PORTAL; -import static net.runelite.api.ObjectID.FALADOR_PORTAL_13624; -import static net.runelite.api.ObjectID.FALADOR_PORTAL_13631; -import static net.runelite.api.ObjectID.FANCY_JEWELLERY_BOX; -import static net.runelite.api.ObjectID.FANCY_REJUVENATION_POOL; -import static net.runelite.api.ObjectID.FISHING_GUILD_PORTAL; -import static net.runelite.api.ObjectID.FISHING_GUILD_PORTAL_29351; -import static net.runelite.api.ObjectID.FISHING_GUILD_PORTAL_29359; -import static net.runelite.api.ObjectID.GHORROCK_PORTAL; -import static net.runelite.api.ObjectID.GHORROCK_PORTAL_33436; -import static net.runelite.api.ObjectID.GHORROCK_PORTAL_33439; -import static net.runelite.api.ObjectID.KHARYRLL_PORTAL; -import static net.runelite.api.ObjectID.KHARYRLL_PORTAL_29346; -import static net.runelite.api.ObjectID.KHARYRLL_PORTAL_29354; -import static net.runelite.api.ObjectID.KOUREND_PORTAL; -import static net.runelite.api.ObjectID.KOUREND_PORTAL_29353; -import static net.runelite.api.ObjectID.KOUREND_PORTAL_29361; -import static net.runelite.api.ObjectID.LUMBRIDGE_PORTAL; -import static net.runelite.api.ObjectID.LUMBRIDGE_PORTAL_13623; -import static net.runelite.api.ObjectID.LUMBRIDGE_PORTAL_13630; -import static net.runelite.api.ObjectID.LUNAR_ALTAR; -import static net.runelite.api.ObjectID.LUNAR_ISLE_PORTAL; -import static net.runelite.api.ObjectID.LUNAR_ISLE_PORTAL_29347; -import static net.runelite.api.ObjectID.LUNAR_ISLE_PORTAL_29355; -import static net.runelite.api.ObjectID.MARIM_PORTAL; -import static net.runelite.api.ObjectID.MARIM_PORTAL_29352; -import static net.runelite.api.ObjectID.MARIM_PORTAL_29360; -import static net.runelite.api.ObjectID.OBELISK_31554; -import static net.runelite.api.ObjectID.ORNATE_JEWELLERY_BOX; -import static net.runelite.api.ObjectID.ORNATE_REJUVENATION_POOL; -import static net.runelite.api.ObjectID.POOL_OF_REJUVENATION; -import static net.runelite.api.ObjectID.POOL_OF_RESTORATION; -import static net.runelite.api.ObjectID.POOL_OF_REVITALISATION; -import static net.runelite.api.ObjectID.PORTAL_4525; -import static net.runelite.api.ObjectID.PORTAL_NEXUS; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33355; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33356; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33357; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33358; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33359; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33360; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33361; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33362; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33363; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33364; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33365; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33366; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33367; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33368; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33369; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33370; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33371; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33372; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33373; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33374; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33375; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33376; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33377; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33378; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33379; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33380; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33381; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33382; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33383; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33384; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33385; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33386; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33387; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33388; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33389; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33390; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33391; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33392; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33393; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33394; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33395; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33396; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33397; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33398; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33399; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33400; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33401; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33402; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33403; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33404; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33405; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33406; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33407; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33408; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33409; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33410; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33423; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33424; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33425; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33426; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33427; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33428; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33429; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33430; -import static net.runelite.api.ObjectID.PORTAL_NEXUS_33431; -import static net.runelite.api.ObjectID.SENNTISTEN_PORTAL; -import static net.runelite.api.ObjectID.SENNTISTEN_PORTAL_29348; -import static net.runelite.api.ObjectID.SENNTISTEN_PORTAL_29356; -import static net.runelite.api.ObjectID.SPIRIT_TREE_29227; -import static net.runelite.api.ObjectID.TROLL_STRONGHOLD_PORTAL; -import static net.runelite.api.ObjectID.TROLL_STRONGHOLD_PORTAL_33180; -import static net.runelite.api.ObjectID.TROLL_STRONGHOLD_PORTAL_33181; -import static net.runelite.api.ObjectID.WATERBIRTH_ISLAND_PORTAL; -import static net.runelite.api.ObjectID.WATERBIRTH_ISLAND_PORTAL_29350; -import static net.runelite.api.ObjectID.WATERBIRTH_ISLAND_PORTAL_29358; -import static net.runelite.api.ObjectID.XERICS_TALISMAN; -import static net.runelite.api.ObjectID.XERICS_TALISMAN_33412; -import static net.runelite.api.ObjectID.XERICS_TALISMAN_33413; -import static net.runelite.api.ObjectID.XERICS_TALISMAN_33414; -import static net.runelite.api.ObjectID.XERICS_TALISMAN_33415; -import static net.runelite.api.ObjectID.XERICS_TALISMAN_33419; +import static net.runelite.api.NullObjectID.*; +import static net.runelite.api.ObjectID.*; import net.runelite.client.util.ImageUtil; public enum PohIcons @@ -252,9 +86,9 @@ public enum PohIcons private static final Map minimapIcons; - @Getter + @Getter(AccessLevel.PACKAGE) private final String imageResource; - @Getter + @Getter(AccessLevel.PACKAGE) private final int[] Ids; private BufferedImage image; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java index 296d380b21..e9e92da487 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java @@ -139,7 +139,7 @@ public class PohPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -149,7 +149,7 @@ public class PohPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(burnerOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/ActorPoisonInfo.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/ActorPoisonInfo.java index dc9754be81..dcd54b3a60 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/ActorPoisonInfo.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/ActorPoisonInfo.java @@ -18,7 +18,7 @@ class ActorPoisonInfo /** * How many ticks after the tickcount is divisible by 30 the poison will hit. - * + *

* For instance, if something gets hit by poison on tick 607 this will be 7, as 607 % 30 == 7. * With this info you know all the times to expect a poison hit */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java index 692cff8e4c..f94edc9b5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java @@ -142,7 +142,7 @@ public class PoisonPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -161,7 +161,7 @@ public class PoisonPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(poisonOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java index 97d8bfe4c6..7ba5f8835d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java @@ -37,12 +37,12 @@ import net.runelite.api.ItemDefinition; import net.runelite.api.Player; import net.runelite.api.Point; import net.runelite.api.kit.KitType; +import net.runelite.api.util.Text; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; -import net.runelite.api.util.Text; @Singleton class PrayAgainstPlayerOverlay extends Overlay diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java index 3274ed88ed..22f86db83c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java @@ -161,7 +161,7 @@ public class PrayAgainstPlayerPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(overlayPrayerTab); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java index 705d1dc458..c768fd3749 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java @@ -153,6 +153,7 @@ class PrayerAlertOverlay extends Overlay if (item.getId() == prayerPotionId) { hasPrayerPotion = true; + break; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java index 7123eeae1a..d6739fbef8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java @@ -60,7 +60,7 @@ public class PrayerAlertPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.alwaysShowAlert = config.alwaysShowAlert(); this.oldRenderMode = config.oldRenderMode(); @@ -69,7 +69,7 @@ public class PrayerAlertPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java index cda731eef2..22bdf73d80 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java @@ -56,6 +56,7 @@ public class PrivateServerPlugin extends Plugin { @Inject private Client client; + @Inject private PrivateServerConfig config; @@ -66,7 +67,7 @@ public class PrivateServerPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { if (!RuneLite.allowPrivateServer) { @@ -80,10 +81,10 @@ public class PrivateServerPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { client.setModulus(null); - } + } @Subscribe private void onConfigChanged(ConfigChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index 2ee0d0e1a3..00ddbac501 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -436,7 +436,7 @@ class ProfilesPanel extends PluginPanel getProfileData() + data + "\n"); } - void removeProfile(String data) throws InvalidKeySpecException, NoSuchAlgorithmException, IllegalBlockSizeException, InvalidKeyException, BadPaddingException, NoSuchPaddingException + void removeProfile(String data) throws InvalidKeySpecException, NoSuchAlgorithmException, IllegalBlockSizeException, InvalidKeyException, BadPaddingException, NoSuchPaddingException { setProfileData( getProfileData().replaceAll(data + "\\n", "")); @@ -524,7 +524,7 @@ class ProfilesPanel extends PluginPanel return cipher.doFinal(text.getBytes()); } - private static String decryptText(byte[] enc, SecretKey aesKey) throws NoSuchAlgorithmException, IllegalBlockSizeException, InvalidKeyException, BadPaddingException, NoSuchPaddingException + private static String decryptText(byte[] enc, SecretKey aesKey) throws NoSuchAlgorithmException, IllegalBlockSizeException, InvalidKeyException, BadPaddingException, NoSuchPaddingException { Cipher cipher = Cipher.getInstance("AES"); SecretKeySpec newKey = new SecretKeySpec(aesKey.getEncoded(), "AES"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java index ee4df7beb6..448354f896 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java @@ -72,14 +72,10 @@ public class ProfilesPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); - if (this.switchToPanel) - { - } - panel = injector.getInstance(ProfilesPanel.class); panel.init(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java index 2ce1506b43..0b5a0abe3e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java @@ -99,7 +99,7 @@ public class PuzzleSolverPlugin extends Plugin private boolean drawDots; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -107,12 +107,12 @@ public class PuzzleSolverPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } -@Provides + @Provides PuzzleSolverConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(PuzzleSolverConfig.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSwapPattern.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSwapPattern.java index ee5789103a..4c248e711e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSwapPattern.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSwapPattern.java @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.puzzlesolver.solver; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public enum PuzzleSwapPattern { ROTATE_LEFT_UP(new int[]{1, -1, 0, -1, -1, -1, -1, 0}, 1, 1), //Reference point 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 86877c2327..c066d5f20b 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 @@ -32,20 +32,7 @@ import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSolver.BLANK import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSolver.DIMENSION; import net.runelite.client.plugins.puzzlesolver.solver.PuzzleState; import net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.LAST_PIECE_COLUMN; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.LAST_PIECE_ROW; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_DOWN_LEFT; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_DOWN_RIGHT; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_LEFT_DOWN; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_LEFT_UP; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_RIGHT_DOWN; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_RIGHT_UP; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_UP_LEFT; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.ROTATE_UP_RIGHT; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.SHUFFLE_UP_ABOVE; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.SHUFFLE_UP_BELOW; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.SHUFFLE_UP_LEFT; -import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.SHUFFLE_UP_RIGHT; +import static net.runelite.client.plugins.puzzlesolver.solver.PuzzleSwapPattern.*; import net.runelite.client.plugins.puzzlesolver.solver.heuristics.Heuristic; public class IDAStarMM extends IDAStar diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index e51a815f2b..dd2e4f82c9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -175,7 +175,7 @@ public class PvpToolsPlugin extends Plugin } }; - private int[] overheadCount = new int[] {0, 0, 0}; + private int[] overheadCount = new int[]{0, 0, 0}; @Getter private int enemyPlayerCount = 0; @@ -228,7 +228,7 @@ public class PvpToolsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -267,7 +267,7 @@ public class PvpToolsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(playerCountOverlay); keyManager.unregisterKeyListener(renderselfHotkeyListener); @@ -463,7 +463,7 @@ public class PvpToolsPlugin extends Plugin private void countOverHeads() { - overheadCount = new int[] {0, 0, 0}; + overheadCount = new int[]{0, 0, 0}; for (Player p : client.getPlayers()) { if (Objects.nonNull(p) && PvPUtil.isAttackable(client, p) && @@ -583,7 +583,7 @@ public class PvpToolsPlugin extends Plugin * * @param mode The {@link AttackMode} specifying clanmates, friends, or both. */ - public void hideAttackOptions(AttackMode mode) + private void hideAttackOptions(AttackMode mode) { switch (mode) { @@ -607,7 +607,7 @@ public class PvpToolsPlugin extends Plugin * * @param mode The {@link AttackMode} specifying clanmates, friends, or both. */ - public void hideCastOptions(AttackMode mode) + private void hideCastOptions(AttackMode mode) { switch (mode) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index 8dbdb00db9..01d31f0986 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -144,13 +144,13 @@ public class PyramidPlunderPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(pyramidPlunderOverlay); highlighted.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java index f61d21a72e..afcbecd694 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; @@ -379,7 +380,7 @@ public class QuestListPlugin extends Plugin } @AllArgsConstructor - @Getter + @Getter(AccessLevel.PRIVATE) private enum QuestContainer { FREE_QUESTS(WidgetInfo.QUESTLIST_FREE_CONTAINER), @@ -390,7 +391,7 @@ public class QuestListPlugin extends Plugin } @AllArgsConstructor - @Getter + @Getter(AccessLevel.PRIVATE) private enum QuestState { NOT_STARTED(0xff0000, "Not started", SpriteID.MINIMAP_ORB_HITPOINTS), 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 e1cd528670..edd309e661 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 @@ -44,6 +44,7 @@ import net.runelite.api.Client; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.SpriteID; +import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; @@ -62,7 +63,6 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ImageUtil; -import net.runelite.api.util.Text; @Singleton public class RaidsOverlay extends 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 9eaf7b2745..864e1712bf 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 @@ -157,51 +157,67 @@ public class RaidsPlugin extends Plugin "SCFPC.CSPCF - #WSWWNE#WSEENE" //good crabs first rare crabs second ); private static final Pattern PUZZLES = Pattern.compile("Puzzle - (\\w+)"); + @Getter(AccessLevel.NONE) @Inject private ChatMessageManager chatMessageManager; + @Getter(AccessLevel.NONE) @Inject private InfoBoxManager infoBoxManager; + @Getter(AccessLevel.NONE) @Inject private Client client; + @Getter(AccessLevel.NONE) @Inject private RaidsConfig config; + @Getter(AccessLevel.NONE) @Inject private OverlayManager overlayManager; + @Getter(AccessLevel.NONE) @Inject private RaidsOverlay overlay; + @Getter(AccessLevel.NONE) @Inject private RaidsPointsOverlay pointsOverlay; + @Getter(AccessLevel.NONE) @Inject private RaidsPartyOverlay partyOverlay; + @Getter(AccessLevel.NONE) @Inject private LayoutSolver layoutSolver; + @Getter(AccessLevel.NONE) @Inject private SpriteManager spriteManager; + @Getter(AccessLevel.NONE) @Inject private ClientThread clientThread; + @Getter(AccessLevel.NONE) @Inject private TooltipManager tooltipManager; + @Getter(AccessLevel.NONE) @Inject private ClientToolbar clientToolbar; + @Getter(AccessLevel.NONE) @Inject private ItemManager itemManager; + @Getter(AccessLevel.NONE) @Inject private EventBus eventBus; + private boolean raidStarted; @Inject @@ -288,7 +304,7 @@ public class RaidsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -314,7 +330,7 @@ public class RaidsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(pointsOverlay); @@ -1094,7 +1110,7 @@ public class RaidsPlugin extends Plugin return room; } - public void reset() + private void reset() { raid = null; upperTime = -1; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java index 2a5dfb4148..4d1b16f714 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java @@ -24,14 +24,14 @@ */ package net.runelite.client.plugins.raidsthieving.BatSolver; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.HashMap; -import java.util.TreeSet; -import java.util.List; -import java.util.HashSet; -import java.util.Set; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; public class BatSolver { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java index 88a73cb23c..05560c1f14 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java @@ -26,11 +26,11 @@ package net.runelite.client.plugins.raidsthieving.BatSolver; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; -import lombok.AccessLevel; -import lombok.Getter; import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import lombok.AccessLevel; +import lombok.Getter; // Each Thieving room has 4 empty chests // User-reported data shows these 4 come in groups, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java index da98262c6b..9688760b69 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java @@ -24,7 +24,12 @@ */ package net.runelite.client.plugins.raidsthieving; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.util.Map; import java.util.Set; +import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; @@ -36,11 +41,6 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; -import javax.inject.Inject; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.util.Map; /** * Represents the overlay that shows timers on traps that are placed by the diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConfig.java index 51b30ccbe0..9b11b7fdc9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConfig.java @@ -24,10 +24,10 @@ */ package net.runelite.client.plugins.raidsthieving; +import java.awt.Color; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import java.awt.Color; @ConfigGroup("raidsthievingplugin") public interface RaidsThievingConfig extends Config diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java index c4dc0d58a8..7810026c09 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java @@ -71,12 +71,16 @@ public class RaidsThievingPlugin extends Plugin @Inject private Client client; + @Inject private OverlayManager overlayManager; + @Inject private ChestOverlay overlay; + @Inject private Notifier notifier; + @Inject private RaidsThievingConfig config; @@ -113,13 +117,13 @@ public class RaidsThievingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); lastActionTime = Instant.ofEpochMilli(0); chests.clear(); - } + } @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java index 22949f9bab..41a357a08d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java @@ -65,7 +65,7 @@ public class ThievingChest /** * Constructor for a ThievingChest object * - * @param worldPoint The world location of the gameobject that corresponds with this trap. + * @param worldPoint The world location of the gameobject that corresponds with this trap. * @param instancePoint The world location accounting for instances of the gameobject that corresponds with this trap. */ ThievingChest(final WorldPoint worldPoint, final Point instancePoint) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java index c3fd07a809..215ce4be83 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java @@ -115,13 +115,13 @@ public class RandomEventPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { lastNotificationTick = 0; currentRandomEvent = null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java index 53938e0183..b8cb501cbb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java @@ -219,7 +219,7 @@ public class ReorderPrayersPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { refreshPrayerTabOption(); @@ -228,7 +228,7 @@ public class ReorderPrayersPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { clearPrayerTabMenus(); prayerOrder = Prayer.values(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java index 62fd01bcc0..c6329cdc7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java @@ -27,119 +27,127 @@ package net.runelite.client.plugins.roguesden; import java.awt.Color; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; +import static net.runelite.api.ObjectID.CONTORTION_BARS; +import static net.runelite.api.ObjectID.DOOR_7234; +import static net.runelite.api.ObjectID.DOOR_7246; +import static net.runelite.api.ObjectID.GRILL_7255; +import static net.runelite.api.ObjectID.LEDGE_7240; +import static net.runelite.api.ObjectID.PASSAGEWAY; +import static net.runelite.api.ObjectID.WALL_7249; +import static net.runelite.api.ObjectID.WALL_SAFE_7237; import net.runelite.api.coords.WorldPoint; -import static net.runelite.api.ObjectID.*; class Obstacles { static final Map TILE_MAP = new HashMap<>(); static final Obstacle[] OBSTACLES = - { - new Obstacle(3050, 4997, "Enter"), - new Obstacle(3049, 4997, CONTORTION_BARS), - new Obstacle(3039, 4999, "Stand"), - new Obstacle(3029, 5003, "Run"), - new Obstacle(3024, 5001, "Open", GRILL_7255), - new Obstacle(3011, 5005, "Run"), - new Obstacle(3004, 5003, "Run"), + { + new Obstacle(3050, 4997, "Enter"), + new Obstacle(3049, 4997, CONTORTION_BARS), + new Obstacle(3039, 4999, "Stand"), + new Obstacle(3029, 5003, "Run"), + new Obstacle(3024, 5001, "Open", GRILL_7255), + new Obstacle(3011, 5005, "Run"), + new Obstacle(3004, 5003, "Run"), - new Obstacle(2994, 5004, "Climb"), - new Obstacle(2993, 5004, LEDGE_7240), - new Obstacle(2994, 5005, "Climb"), - new Obstacle(2993, 5005, LEDGE_7240), + new Obstacle(2994, 5004, "Climb"), + new Obstacle(2993, 5004, LEDGE_7240), + new Obstacle(2994, 5005, "Climb"), + new Obstacle(2993, 5005, LEDGE_7240), - new Obstacle(2969, 5016, "Stand"), - new Obstacle(2969, 5017, "Stand"), - new Obstacle(2969, 5018, "Stand"), - new Obstacle(2969, 5019, "Stand"), + new Obstacle(2969, 5016, "Stand"), + new Obstacle(2969, 5017, "Stand"), + new Obstacle(2969, 5018, "Stand"), + new Obstacle(2969, 5019, "Stand"), - new Obstacle(2958, 5031, "Cross"), - new Obstacle(2962, 5050, "Stand"), - new Obstacle(2963, 5056, "Run"), + new Obstacle(2958, 5031, "Cross"), + new Obstacle(2962, 5050, "Stand"), + new Obstacle(2963, 5056, "Run"), - new Obstacle(2957, 5068, "Enter"), - new Obstacle(2957, 5069, PASSAGEWAY), + new Obstacle(2957, 5068, "Enter"), + new Obstacle(2957, 5069, PASSAGEWAY), - new Obstacle(2955, 5094, "Enter"), - new Obstacle(2955, 5095, PASSAGEWAY), + new Obstacle(2955, 5094, "Enter"), + new Obstacle(2955, 5095, PASSAGEWAY), - new Obstacle(2963, 5105, "Stand"), + new Obstacle(2963, 5105, "Stand"), - new Obstacle(2972, 5098, "Enter"), - new Obstacle(2972, 5097, PASSAGEWAY), + new Obstacle(2972, 5098, "Enter"), + new Obstacle(2972, 5097, PASSAGEWAY), - new Obstacle(2972, 5094, "Open"), - new Obstacle(2972, 5094, GRILL_7255), + new Obstacle(2972, 5094, "Open"), + new Obstacle(2972, 5094, GRILL_7255), - new Obstacle(2982, 5087, "Climb"), - new Obstacle(2983, 5087, LEDGE_7240), + new Obstacle(2982, 5087, "Climb"), + new Obstacle(2983, 5087, LEDGE_7240), - new Obstacle(2982, 5090, "Climb"), - new Obstacle(2983, 5090, LEDGE_7240), + new Obstacle(2982, 5090, "Climb"), + new Obstacle(2983, 5090, LEDGE_7240), - new Obstacle(2993, 5088, "Search"), - new Obstacle(2993, 5087, WALL_7249), - new Obstacle(2997, 5088, "Run"), + new Obstacle(2993, 5088, "Search"), + new Obstacle(2993, 5087, WALL_7249), + new Obstacle(2997, 5088, "Run"), - new Obstacle(2993, 5089, "Search"), - new Obstacle(2993, 5089, WALL_7249), - new Obstacle(2997, 5089, "Run"), + new Obstacle(2993, 5089, "Search"), + new Obstacle(2993, 5089, WALL_7249), + new Obstacle(2997, 5089, "Run"), - new Obstacle(3006, 5088, "Run"), - new Obstacle(3018, 5080, "Take"), - new Obstacle(3023, 5082, "Open", DOOR_7234), + new Obstacle(3006, 5088, "Run"), + new Obstacle(3018, 5080, "Take"), + new Obstacle(3023, 5082, "Open", DOOR_7234), - // Maze - new Obstacle(3030, 5079, GRILL_7255), - new Obstacle(3032, 5078, GRILL_7255), - new Obstacle(3036, 5076, GRILL_7255), - new Obstacle(3039, 5079, GRILL_7255), - new Obstacle(3042, 5076, GRILL_7255), - new Obstacle(3044, 5069, GRILL_7255), - new Obstacle(3041, 5068, GRILL_7255), - new Obstacle(3040, 5070, GRILL_7255), - new Obstacle(3038, 5069, GRILL_7255), + // Maze + new Obstacle(3030, 5079, GRILL_7255), + new Obstacle(3032, 5078, GRILL_7255), + new Obstacle(3036, 5076, GRILL_7255), + new Obstacle(3039, 5079, GRILL_7255), + new Obstacle(3042, 5076, GRILL_7255), + new Obstacle(3044, 5069, GRILL_7255), + new Obstacle(3041, 5068, GRILL_7255), + new Obstacle(3040, 5070, GRILL_7255), + new Obstacle(3038, 5069, GRILL_7255), - new Obstacle(3028, 5033, "Stand"), - new Obstacle(3024, 5033, "Run"), - new Obstacle(3028, 5034, "Stand"), - new Obstacle(3024, 5034, "Run"), + new Obstacle(3028, 5033, "Stand"), + new Obstacle(3024, 5033, "Run"), + new Obstacle(3028, 5034, "Stand"), + new Obstacle(3024, 5034, "Run"), - new Obstacle(3015, 5033, "Open", GRILL_7255), - new Obstacle(3010, 5033, "Run/Open", GRILL_7255), + new Obstacle(3015, 5033, "Open", GRILL_7255), + new Obstacle(3010, 5033, "Run/Open", GRILL_7255), - new Obstacle(3000, 5034, "Run"), + new Obstacle(3000, 5034, "Run"), - new Obstacle(2992, 5045, "Stand"), - new Obstacle(2992, 5053, "Run"), + new Obstacle(2992, 5045, "Stand"), + new Obstacle(2992, 5053, "Run"), - new Obstacle(2992, 5067, "Stand"), - new Obstacle(2992, 5075, "Run"), - new Obstacle(3009, 5063, "Take"), - new Obstacle(3028, 5056, "Run"), - new Obstacle(3028, 5047, "Walk"), + new Obstacle(2992, 5067, "Stand"), + new Obstacle(2992, 5075, "Run"), + new Obstacle(3009, 5063, "Take"), + new Obstacle(3028, 5056, "Run"), + new Obstacle(3028, 5047, "Walk"), - new Obstacle(3018, 5047, "Crack", WALL_SAFE_7237), + new Obstacle(3018, 5047, "Crack", WALL_SAFE_7237), - // Start of 80+ thieving shortcut - new Obstacle(2967, 5061, "80 Thieving", DOOR_7246), - new Obstacle(2967, 5066, "80 Thieving", DOOR_7246), - new Obstacle(2974, 5061, "Enter"), - new Obstacle(2974, 5060, CONTORTION_BARS), - new Obstacle(2989, 5057, "Open", GRILL_7255), - new Obstacle(2989, 5058, "Open", GRILL_7255), + // Start of 80+ thieving shortcut + new Obstacle(2967, 5061, "80 Thieving", DOOR_7246), + new Obstacle(2967, 5066, "80 Thieving", DOOR_7246), + new Obstacle(2974, 5061, "Enter"), + new Obstacle(2974, 5060, CONTORTION_BARS), + new Obstacle(2989, 5057, "Open", GRILL_7255), + new Obstacle(2989, 5058, "Open", GRILL_7255), - // The 3x3 square around the spinning blade in the middle of the maze - new AvoidObstacle(2977, 5090), new AvoidObstacle(2978, 5090), new AvoidObstacle(2979, 5090), - new AvoidObstacle(2977, 5089), new AvoidObstacle(2978, 5089), new AvoidObstacle(2979, 5089), - new AvoidObstacle(2977, 5088), new AvoidObstacle(2978, 5088), new AvoidObstacle(2979, 5088), + // The 3x3 square around the spinning blade in the middle of the maze + new AvoidObstacle(2977, 5090), new AvoidObstacle(2978, 5090), new AvoidObstacle(2979, 5090), + new AvoidObstacle(2977, 5089), new AvoidObstacle(2978, 5089), new AvoidObstacle(2979, 5089), + new AvoidObstacle(2977, 5088), new AvoidObstacle(2978, 5088), new AvoidObstacle(2979, 5088), - new TipObstacle(3014, 5063, "Stun NPC"), - new TipObstacle(2992, 5057, "Continue North"), // Hint for 80 thieving shortcut - }; + new TipObstacle(3014, 5063, "Stun NPC"), + new TipObstacle(2992, 5057, "Continue North"), // Hint for 80 thieving shortcut + }; - @Getter + @Getter(AccessLevel.PACKAGE) static class Obstacle { private WorldPoint tile; @@ -172,7 +180,7 @@ class Obstacles private static class AvoidObstacle extends Obstacle { - @Getter + @Getter(AccessLevel.PACKAGE) private final Color tileColor = Color.RED; private AvoidObstacle(int x, int y) @@ -183,7 +191,7 @@ class Obstacles private static class TipObstacle extends Obstacle { - @Getter + @Getter(AccessLevel.PACKAGE) private final Color tileColor = Color.ORANGE; private TipObstacle(int x, int y, String hint) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenMinimapOverlay.java index 4dc0c11b9e..a2f31727e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenMinimapOverlay.java @@ -39,8 +39,8 @@ import net.runelite.client.ui.overlay.OverlayUtil; class RoguesDenMinimapOverlay extends Overlay { - private Client client; - private RoguesDenPlugin plugin; + private final Client client; + private final RoguesDenPlugin plugin; @Inject public RoguesDenMinimapOverlay(Client client, RoguesDenPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java index dd9c5f6a33..8afa8a051a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java @@ -36,7 +36,6 @@ import net.runelite.api.GameObject; import net.runelite.api.Perspective; import net.runelite.api.Point; import net.runelite.api.coords.LocalPoint; -import net.runelite.client.graphics.ModelOutlineRenderer; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; @@ -50,16 +49,14 @@ public class RoguesDenOverlay extends Overlay private final Client client; private final RoguesDenPlugin plugin; - private final ModelOutlineRenderer modelOutliner; @Inject - public RoguesDenOverlay(final Client client, final RoguesDenPlugin plugin, ModelOutlineRenderer modelOutliner) + public RoguesDenOverlay(final Client client, final RoguesDenPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; - this.modelOutliner = modelOutliner; } @Override 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 b4a1ec11b4..c7012beb07 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 @@ -84,7 +84,7 @@ public class RoguesDenPlugin extends Plugin private RoguesDenMinimapOverlay minimapOverlay; @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); @@ -92,7 +92,7 @@ public class RoguesDenPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssMinimapOverlay.java index a1952b3372..0bed866126 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssMinimapOverlay.java @@ -25,6 +25,11 @@ package net.runelite.client.plugins.runecraft; import com.google.inject.Inject; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.util.HashMap; +import java.util.Map; import net.runelite.api.Client; import net.runelite.api.DecorativeObject; import net.runelite.api.Perspective; @@ -33,11 +38,6 @@ import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.util.HashMap; -import java.util.Map; class AbyssMinimapOverlay extends Overlay { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index 18d9b0baa4..88f09eda54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -100,22 +100,31 @@ public class RunecraftPlugin extends Plugin @Inject private Client client; + @Inject private OverlayManager overlayManager; + @Inject private AbyssOverlay abyssOverlay; + @Inject private AbyssMinimapOverlay abyssMinimapOverlay; + @Inject private RunecraftOverlay runecraftOverlay; + @Inject private PouchOverlay pouchOverlay; + @Inject private RunecraftConfig config; + @Inject private Notifier notifier; + @Inject private MenuManager menuManager; + @Inject private EventBus eventBus; @@ -145,7 +154,7 @@ public class RunecraftPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); overlayManager.add(abyssOverlay); @@ -155,7 +164,7 @@ public class RunecraftPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { abyssObjects.clear(); darkMage = null; @@ -166,7 +175,7 @@ public class RunecraftPlugin extends Plugin removeSwaps(); } -private void onGameTick(GameTick event) + private void onGameTick(GameTick event) { final int before = pouchVar; pouchVar = client.getVar(VarPlayer.POUCH_STATUS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java index e58c7000e6..8b90d7a785 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java @@ -88,7 +88,7 @@ public class RunedokuPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -96,7 +96,7 @@ public class RunedokuPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(runedokuOverlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 968e983d74..15217fa96c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -49,13 +49,13 @@ import net.runelite.client.util.ColorUtil; public class RunepouchOverlay extends WidgetItemOverlay { private static final Varbits[] AMOUNT_VARBITS = - { - Varbits.RUNE_POUCH_AMOUNT1, Varbits.RUNE_POUCH_AMOUNT2, Varbits.RUNE_POUCH_AMOUNT3 - }; + { + Varbits.RUNE_POUCH_AMOUNT1, Varbits.RUNE_POUCH_AMOUNT2, Varbits.RUNE_POUCH_AMOUNT3 + }; private static final Varbits[] RUNE_VARBITS = - { - Varbits.RUNE_POUCH_RUNE1, Varbits.RUNE_POUCH_RUNE2, Varbits.RUNE_POUCH_RUNE3 - }; + { + Varbits.RUNE_POUCH_RUNE1, Varbits.RUNE_POUCH_RUNE2, Varbits.RUNE_POUCH_RUNE3 + }; private static final Dimension IMAGE_SIZE = new Dimension(11, 11); private final Client client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java index 23ccb5ae42..aa7c89c0de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java @@ -69,7 +69,7 @@ public class RunepouchPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -77,7 +77,7 @@ public class RunepouchPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java index 90c46a4efd..df3ff29ff5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java @@ -70,7 +70,7 @@ public class ScreenMarkerPlugin extends Plugin private static final String DEFAULT_MARKER_NAME = "Marker"; private static final Dimension DEFAULT_SIZE = new Dimension(2, 2); - @Getter + @Getter(AccessLevel.PUBLIC) private final List screenMarkers = new ArrayList<>(); @Inject @@ -88,7 +88,7 @@ public class ScreenMarkerPlugin extends Plugin @Inject private ScreenMarkerCreationOverlay overlay; - @Getter + @Getter(AccessLevel.PUBLIC) @Inject private ColorPickerManager colorPickerManager; @@ -99,12 +99,12 @@ public class ScreenMarkerPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private ScreenMarker currentMarker; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean creatingScreenMarker = false; private Point startLocation = null; @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); loadConfig(configManager.getConfiguration(CONFIG_GROUP, CONFIG_KEY)).forEach(screenMarkers::add); @@ -128,7 +128,7 @@ public class ScreenMarkerPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.removeIf(ScreenMarkerOverlay.class::isInstance); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java index 6182765aa4..af91bb7590 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java @@ -56,7 +56,7 @@ public class ScreenMarkerRenderable implements LayoutableRenderableEntity @Setter(AccessLevel.PACKAGE) private Stroke stroke; - @Getter + @Getter(AccessLevel.PUBLIC) private final Rectangle bounds = new Rectangle(); @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java index 50ea82604a..1f03b2aa81 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java @@ -154,15 +154,16 @@ public interface ScreenshotConfig extends Config } @ConfigItem( - keyName = "playerDeath", - name = "Screenshot Deaths", - description = "Configures whether or not screenshots are automatically taken when you die.", - position = 11 + keyName = "playerDeath", + name = "Screenshot Deaths", + description = "Configures whether or not screenshots are automatically taken when you die.", + position = 11 ) default boolean screenshotPlayerDeath() { return false; } + @ConfigItem( keyName = "duels", name = "Screenshot Duels", 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 fc0387f58d..a4a82072fe 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 @@ -111,6 +111,7 @@ import okhttp3.MediaType; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @PluginDescriptor( @@ -235,7 +236,7 @@ public class ScreenshotPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -272,7 +273,7 @@ public class ScreenshotPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(screenshotOverlay); clientToolbar.removeNavigation(titleBarButton); @@ -794,13 +795,13 @@ public class ScreenshotPlugin extends Plugin RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() { @Override - public void onFailure(Call call, IOException ex) + public void onFailure(@NotNull Call call, @NotNull IOException ex) { log.warn("error uploading screenshot", ex); } @Override - public void onResponse(Call call, Response response) throws IOException + public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (InputStream in = response.body().byteStream()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java index 27b4ddd154..88499fd77b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java @@ -32,6 +32,7 @@ import java.awt.datatransfer.UnsupportedFlavorException; import java.awt.image.BufferedImage; import lombok.AllArgsConstructor; import lombok.NonNull; +import org.jetbrains.annotations.NotNull; @AllArgsConstructor class TransferableBufferedImage implements Transferable @@ -39,6 +40,7 @@ class TransferableBufferedImage implements Transferable @NonNull private final BufferedImage image; + @NotNull @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java index 6e09eef0d4..bd975ef502 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java @@ -46,7 +46,7 @@ public class ShayzienInfirmaryOverlay extends Overlay { private final ShayzienInfirmaryPlugin plugin; - private BufferedImage medPackImage; + private final BufferedImage medPackImage; @Inject public ShayzienInfirmaryOverlay(final ShayzienInfirmaryPlugin plugin, final ItemManager itemManager) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java index 06107a533f..545020d524 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java @@ -64,14 +64,14 @@ public class ShayzienInfirmaryPlugin extends Plugin private ShayzienInfirmaryOverlay overlay; @Override - protected void startUp() throws Exception + protected void startUp() { loadPlugin(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { unloadPlugin(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerConfig.java index a4e2b92543..7f5d9baca9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerConfig.java @@ -40,7 +40,7 @@ public interface ShiftWalkerConfig extends Config { return false; } - + @ConfigItem( keyName = "shiftLoot", name = "Shift to Loot", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java index e102988f50..fef979bcfd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.skillcalculator; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Skill; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum CalculatorType { MINING(Skill.MINING, "skill_mining.json"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index 25cc92e7ab..eb167bf655 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -2,16 +2,16 @@ * Copyright (c) 2018, Kruithne * Copyright (c) 2018, Psikoi * All rights reserved. - * + *

* Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + *

* 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. + * list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + *

* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java index 1d834b103a..7f3248dcd9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java @@ -94,7 +94,7 @@ public class SkillCalculatorPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "calc.png"); @@ -113,7 +113,7 @@ public class SkillCalculatorPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { clientToolbar.removeNavigation(uiNavigationButton); if (bankedUiNavigationButton != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java index 6584c85bf9..22c726deda 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java @@ -32,12 +32,13 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.FlatTextField; -@Getter +@Getter(AccessLevel.PUBLIC) public class UICalculatorInputArea extends JPanel { private final JTextField uiFieldCurrentLevel; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculator.java index 5ba8b0573a..e108c330c9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculator.java @@ -41,6 +41,7 @@ import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -68,7 +69,7 @@ public class BankedCalculator extends JPanel public static final DecimalFormat XP_FORMAT_COMMA = new DecimalFormat("#,###.#"); private final Client client; - @Getter + @Getter(AccessLevel.PUBLIC) private final SkillCalculatorConfig config; private final UICalculatorInputArea uiInput; private final ItemManager itemManager; @@ -82,17 +83,17 @@ public class BankedCalculator extends JPanel private final ModifyPanel modifyPanel; private SelectionGrid itemGrid; - @Setter + @Setter(AccessLevel.PACKAGE) private Map bankMap = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Skill currentSkill; - @Getter + @Getter(AccessLevel.PUBLIC) private int skillLevel, skillExp, endLevel, endExp; private final Collection xpModifierButtons = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PUBLIC) private float xpFactor = 1.0f; BankedCalculator(UICalculatorInputArea uiInput, Client client, SkillCalculatorConfig config, ItemManager itemManager) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculatorPanel.java index f017040e2a..f536fb62e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/BankedCalculatorPanel.java @@ -75,6 +75,7 @@ public class BankedCalculatorPanel extends PluginPanel final ComboBoxListRenderer renderer = new ComboBoxListRenderer(); renderer.setDefaultText("Select a Skill..."); + //noinspection unchecked dropdown.setRenderer(renderer); for (final Skill skill : BANKABLE_SKILLS) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java index ff53e7ce03..995fe8632a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java @@ -30,13 +30,14 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; import net.runelite.api.Skill; import net.runelite.client.game.ItemManager; -@Getter +@Getter(AccessLevel.PUBLIC) public enum Activity { /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/BankedItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/BankedItem.java index 5256d26351..483e6e0f8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/BankedItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/BankedItem.java @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.skillcalculator.banked.beans; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public class BankedItem { private final CriticalItem item; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/CriticalItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/CriticalItem.java index dad745e77e..82af5899c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/CriticalItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/CriticalItem.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.ItemDefinition; @@ -37,7 +38,7 @@ import net.runelite.api.ItemID; import net.runelite.api.Skill; import net.runelite.client.game.ItemManager; -@Getter +@Getter(AccessLevel.PUBLIC) public enum CriticalItem { /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Secondaries.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Secondaries.java index cab6b7474f..98ab85cd23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Secondaries.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Secondaries.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.skillcalculator.banked.beans; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; -@Getter +@Getter(AccessLevel.PACKAGE) public enum Secondaries { /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/XpModifiers.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/XpModifiers.java index b9fcae99c6..06c850ceef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/XpModifiers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/XpModifiers.java @@ -27,12 +27,13 @@ package net.runelite.client.plugins.skillcalculator.banked.beans; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import java.util.Collection; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Skill; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public enum XpModifiers { LIT_GILDER_ALTAR(Skill.PRAYER, "Lit Gilded Altar (350%)", 3.5f), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java index 4c2d36aa68..0d5b1cad40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java @@ -24,9 +24,10 @@ */ package net.runelite.client.plugins.skillcalculator.beans; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillData { private SkillDataEntry[] actions; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java index 675fcb51db..6cce75a62e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java @@ -24,9 +24,10 @@ */ package net.runelite.client.plugins.skillcalculator.beans; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillDataBonus { private String name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java index b21188d913..05ec9c878a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java @@ -24,9 +24,10 @@ */ package net.runelite.client.plugins.skillcalculator.beans; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillDataEntry { private String name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java index 1c8e1e806e..6a22b01d5c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java @@ -65,7 +65,7 @@ public class SkyboxPlugin extends Plugin skybox = null; } -private int mapChunk(int cx, int cy, int plane) + private int mapChunk(int cx, int cy, int plane) { cx -= client.getBaseX() / 8; cy -= client.getBaseY() / 8; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java index bbb246f495..1eb825f4ec 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java @@ -167,10 +167,10 @@ public interface SlayerConfig extends Config } @ConfigItem( - position = 14, - keyName = "pointsCommand", - name = "Points Command", - description = "Configures whether the slayer points command is enabled
!points" + position = 14, + keyName = "pointsCommand", + name = "Points Command", + description = "Configures whether the slayer points command is enabled
!points" ) default boolean pointsCommand() { 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 7d6e93b123..75edf8c6ac 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 @@ -294,7 +294,7 @@ public class SlayerPlugin extends Plugin private boolean weaknessOverlayAttached; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -336,7 +336,7 @@ public class SlayerPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(targetClickboxOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java index 4d18038bf9..4512bd502e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java @@ -25,7 +25,7 @@ import net.runelite.client.util.ImageUtil; import net.runelite.client.util.QuantityFormatter; @Singleton -public class SlayerTaskPanel extends PluginPanel +class SlayerTaskPanel extends PluginPanel { private static final long MILLIS_PER_SECOND = 1000; private static final long SECONDS_PER_MINUTE = 60; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java index 612bce5a88..0c7ec6e4d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java @@ -89,6 +89,7 @@ class SlayerXpDropLookup if (xpCombatLevel.get(i) > 0) { givesSlayerXp = true; + break; } } if (!givesSlayerXp) @@ -102,6 +103,7 @@ class SlayerXpDropLookup && xpCombatLevel.get(i) > 0) { foundCombatLevel = true; + break; } } if (foundCombatLevel) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java index f199816f21..5bf16d3edc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java @@ -165,9 +165,7 @@ public class TargetClickboxOverlay extends Overlay WorldPoint wp = actor.getWorldLocation(); getSquare(wp, size).forEach(square -> - { - drawTile(graphics, square, color, 1, 255, 50); - }); + drawTile(graphics, square, color, 1, 255, 50)); break; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java index e8aa2b9946..00f5598fcf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java @@ -33,8 +33,8 @@ import static java.util.Arrays.asList; import java.util.Collections; import java.util.List; import java.util.Map; -import lombok.AccessLevel; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; import net.runelite.api.NpcID; @@ -55,20 +55,20 @@ enum Task ABERRANT_SPECTRES("Aberrant spectres", ItemID.ABERRANT_SPECTRE, asList("Abhorrent spectre", "Deviant spectre", "Repugnant spectre"), Collections.emptyList()), ABYSSAL_DEMONS("Abyssal demons", ItemID.ABYSSAL_DEMON, - asList("Abyssal Sire"), Collections.emptyList()), + Collections.singletonList("Abyssal Sire"), Collections.emptyList()), ABYSSAL_SIRE("Abyssal Sire", ItemID.ABYSSAL_ORPHAN), ADAMANT_DRAGONS("Adamant dragons", ItemID.ADAMANT_DRAGON_MASK), ALCHEMICAL_HYDRA("Alchemical Hydra", ItemID.IKKLE_HYDRA), ANKOU("Ankou", ItemID.ANKOU_MASK), AVIANSIES("Aviansies", ItemID.ENSOULED_AVIANSIE_HEAD, - asList("Kree'arra"), Collections.emptyList()), + Collections.singletonList("Kree'arra"), Collections.emptyList()), BANSHEES("Banshees", ItemID.BANSHEE), BARROWS_BROTHERS("Barrows Brothers", ItemID.KARILS_COIF, asList("Ahrim the blighted", "Dharok the wretched", "Guthan the infested", "Karil the tainted", "Torag the corrupted", "Verac the defiled"), Collections.emptyList()), BASILISKS("Basilisks", ItemID.BASILISK), BATS("Bats", ItemID.GIRAL_BAT_2), BEARS("Bears", ItemID.ENSOULED_BEAR_HEAD, - asList("Callisto"), Collections.emptyList()), + Collections.singletonList("Callisto"), Collections.emptyList()), ENTS("Ents", ItemID.ENTS_ROOTS), LAVA_DRAGONS("Lava Dragons", ItemID.LAVA_SCALE), BANDITS("Bandits", ItemID.BANDIT), @@ -80,28 +80,28 @@ enum Task Collections.emptyList(), asList(NpcID.BABY_DRAGON_1871, NpcID.BABY_DRAGON_1872, NpcID.BABY_DRAGON_7955)), BLOODVELD("Bloodveld", ItemID.BLOODVELD), BLUE_DRAGONS("Blue dragons", ItemID.BLUE_DRAGON_MASK, - asList("Vorkath"), asList(NpcID.BABY_DRAGON, NpcID.BABY_DRAGON_242, NpcID.BABY_DRAGON_243)), + Collections.singletonList("Vorkath"), asList(NpcID.BABY_DRAGON, NpcID.BABY_DRAGON_242, NpcID.BABY_DRAGON_243)), BRINE_RATS("Brine rats", ItemID.BRINE_RAT), BRONZE_DRAGONS("Bronze dragons", ItemID.BRONZE_DRAGON_MASK), CALLISTO("Callisto", ItemID.CALLISTO_CUB), CATABLEPON("Catablepon", ItemID.LEFT_SKULL_HALF), CAVE_BUGS("Cave bugs", ItemID.SWAMP_CAVE_BUG), CAVE_CRAWLERS("Cave crawlers", ItemID.CAVE_CRAWLER, - asList("Chasm crawler"), Collections.emptyList()), + Collections.singletonList("Chasm crawler"), Collections.emptyList()), CAVE_HORRORS("Cave horrors", ItemID.CAVE_HORROR, - asList("Cave abomination"), Collections.emptyList()), + Collections.singletonList("Cave abomination"), Collections.emptyList()), CAVE_KRAKEN("Cave kraken", ItemID.CAVE_KRAKEN, - asList("Kraken"), Collections.emptyList()), + Collections.singletonList("Kraken"), Collections.emptyList()), CAVE_SLIMES("Cave slimes", ItemID.SWAMP_CAVE_SLIME), CERBERUS("Cerberus", ItemID.HELLPUPPY), CHAOS_DRUIDS("Chaos druids", ItemID.ELDER_CHAOS_HOOD), CHAOS_ELEMENTAL("Chaos Elemental", ItemID.PET_CHAOS_ELEMENTAL), CHAOS_FANATIC("Chaos Fanatic", ItemID.ANCIENT_STAFF), COCKATRICE("Cockatrice", ItemID.COCKATRICE, - asList("Cockathrice"), Collections.emptyList()), + Collections.singletonList("Cockathrice"), Collections.emptyList()), COWS("Cows", ItemID.COW_MASK), CRAWLING_HANDS("Crawling hands", ItemID.CRAWLING_HAND, - asList("Crushing hand"), Collections.emptyList()), + Collections.singletonList("Crushing hand"), Collections.emptyList()), CRAZY_ARCHAEOLOGIST("Crazy Archaeologist", ItemID.FEDORA), CROCODILES("Crocodiles", ItemID.SWAMP_LIZARD), DAGANNOTH("Dagannoth", ItemID.DAGANNOTH, @@ -109,18 +109,18 @@ enum Task DAGANNOTH_KINGS("Dagannoth Kings", ItemID.PET_DAGANNOTH_PRIME, asList("Dagannoth Rex", "Dagannoth Prime", "Dagannoth Supreme"), Collections.emptyList()), DARK_BEASTS("Dark beasts", ItemID.DARK_BEAST, - asList("Night beast"), Collections.emptyList()), + Collections.singletonList("Night beast"), Collections.emptyList()), DARK_WARRIORS("Dark warriors", ItemID.BLACK_MED_HELM), DERANGED_ARCHAEOLOGIST("Deranged Archaeologist", ItemID.ARCHAEOLOGISTS_DIARY), - DOGS("Dogs", ItemID.GUARD_DOG, asList("Jackal"), Collections.emptyList()), + DOGS("Dogs", ItemID.GUARD_DOG, Collections.singletonList("Jackal"), Collections.emptyList()), DRAKES("Drakes", ItemID.DRAKE), DUST_DEVILS("Dust devils", ItemID.DUST_DEVIL, - asList("Choke devil"), Collections.emptyList()), + Collections.singletonList("Choke devil"), Collections.emptyList()), DWARVES("Dwarves", ItemID.DWARVEN_HELMET, asList("Dwarf", "Black guard"), Collections.emptyList()), EARTH_WARRIORS("Earth warriors", ItemID.BRONZE_FULL_HELM_T), ELVES("Elves", ItemID.ELF, - asList("Elf"), Collections.emptyList()), + Collections.singletonList("Elf"), Collections.emptyList()), FEVER_SPIDERS("Fever spiders", ItemID.FEVER_SPIDER), FIRE_GIANTS("Fire giants", ItemID.FIRE_BATTLESTAFF), REVENANTS("Revenants", ItemID.REVENANT_ETHER, @@ -132,7 +132,7 @@ enum Task asList("Dusk", "Dawn"), Collections.emptyList(), 9, ItemID.ROCK_HAMMER), GENERAL_GRAARDOR("General Graardor", ItemID.PET_GENERAL_GRAARDOR), GHOSTS("Ghosts", ItemID.GHOSTSPEAK_AMULET, - asList("Tortured soul"), Collections.emptyList()), + Collections.singletonList("Tortured soul"), Collections.emptyList()), GIANT_MOLE("Giant Mole", ItemID.BABY_MOLE), GHOULS("Ghouls", ItemID.ZOMBIE_HEAD), GOBLINS("Goblins", ItemID.ENSOULED_GOBLIN_HEAD), @@ -144,39 +144,39 @@ enum Task asList("Dusk", "Dawn"), Collections.emptyList(), 0, ItemID.ROCK_HAMMER), HARPIE_BUG_SWARMS("Harpie bug swarms", ItemID.SWARM), HELLHOUNDS("Hellhounds", ItemID.HELLHOUND, - asList("Cerberus"), Collections.emptyList()), + Collections.singletonList("Cerberus"), Collections.emptyList()), HILL_GIANTS("Hill giants", ItemID.ENSOULED_GIANT_HEAD, - asList("Cyclops"), Collections.emptyList()), + Collections.singletonList("Cyclops"), Collections.emptyList()), HOBGOBLINS("Hobgoblins", ItemID.HOBGOBLIN_GUARD), HYDRAS("Hydras", ItemID.HYDRA), ICEFIENDS("Icefiends", ItemID.ICE_DIAMOND), ICE_GIANTS("Ice giants", ItemID.ICE_DIAMOND), ICE_WARRIORS("Ice warriors", ItemID.MITHRIL_FULL_HELM_T), INFERNAL_MAGES("Infernal mages", ItemID.INFERNAL_MAGE, - asList("Malevolent mage"), Collections.emptyList()), + Collections.singletonList("Malevolent mage"), Collections.emptyList()), IRON_DRAGONS("Iron dragons", ItemID.IRON_DRAGON_MASK), JAD("TzTok-Jad", ItemID.TZREKJAD, 25250), JELLIES("Jellies", ItemID.JELLY, - asList("Jelly"), Collections.emptyList()), + Collections.singletonList("Jelly"), Collections.emptyList()), JUNGLE_HORROR("Jungle horrors", ItemID.ENSOULED_HORROR_HEAD), KALPHITE("Kalphite", ItemID.KALPHITE_SOLDIER), KALPHITE_QUEEN("Kalphite Queen", ItemID.KALPHITE_PRINCESS), KILLERWATTS("Killerwatts", ItemID.KILLERWATT), KING_BLACK_DRAGON("King Black Dragon", ItemID.PRINCE_BLACK_DRAGON), KRAKEN("Cave Kraken Boss", ItemID.PET_KRAKEN, - asList("Kraken"), Collections.emptyList()), + Collections.singletonList("Kraken"), Collections.emptyList()), KREEARRA("Kree'arra", ItemID.PET_KREEARRA), KRIL_TSUTSAROTH("K'ril Tsutsaroth", ItemID.PET_KRIL_TSUTSAROTH), KURASK("Kurask", ItemID.KURASK), - ROGUES("Rogues", ItemID.ROGUE_MASK, asList("Rogue"), Collections.emptyList()), + ROGUES("Rogues", ItemID.ROGUE_MASK, Collections.singletonList("Rogue"), Collections.emptyList()), LESSER_DEMONS("Lesser demons", ItemID.LESSER_DEMON_MASK), LIZARDMEN("Lizardmen", ItemID.LIZARDMAN_FANG, - asList("Lizardman"), Collections.emptyList()), + Collections.singletonList("Lizardman"), Collections.emptyList()), LIZARDS("Lizards", ItemID.DESERT_LIZARD, asList("Desert lizard", "Sulphur lizard", "Small lizard", "Lizard"), Collections.emptyList(), 4, ItemID.ICE_COOLER), MAGIC_AXES("Magic axes", ItemID.IRON_BATTLEAXE), MAMMOTHS("Mammoths", ItemID.ATTACKER_HORN, - asList("Mammoth"), Collections.emptyList()), + Collections.singletonList("Mammoth"), Collections.emptyList()), MINIONS_OF_SCABARAS("Minions of scabaras", ItemID.GOLDEN_SCARAB, asList("Scarab swarm", "Locust rider", "Scarab mage"), Collections.emptyList()), MINOTAURS("Minotaurs", ItemID.ENSOULED_MINOTAUR_HEAD), @@ -185,16 +185,16 @@ enum Task MOLANISKS("Molanisks", ItemID.MOLANISK), MONKEYS("Monkeys", ItemID.ENSOULED_MONKEY_HEAD), MOSS_GIANTS("Moss giants", ItemID.HILL_GIANT_CLUB, - asList("Bryophyta"), Collections.emptyList()), + Collections.singletonList("Bryophyta"), Collections.emptyList()), MUTATED_ZYGOMITES("Mutated zygomites", ItemID.MUTATED_ZYGOMITE, - asList("Zygomite"), Collections.emptyList(), 7, ItemID.FUNGICIDE_SPRAY_0), + Collections.singletonList("Zygomite"), Collections.emptyList(), 7, ItemID.FUNGICIDE_SPRAY_0), NECHRYAEL("Nechryael", ItemID.NECHRYAEL, - asList("Nechryarch"), Collections.emptyList()), + Collections.singletonList("Nechryarch"), Collections.emptyList()), OGRES("Ogres", ItemID.ENSOULED_OGRE_HEAD, - asList("Enclave guard"), Collections.emptyList()), + Collections.singletonList("Enclave guard"), Collections.emptyList()), OTHERWORLDLY_BEING("Otherworldly beings", ItemID.GHOSTLY_HOOD), PYREFIENDS("Pyrefiends", ItemID.PYREFIEND, - asList("Flaming pyrelord"), Collections.emptyList()), + Collections.singletonList("Flaming pyrelord"), Collections.emptyList()), RATS("Rats", ItemID.RATS_TAIL), RED_DRAGONS("Red dragons", ItemID.BABY_RED_DRAGON, Collections.emptyList(), asList(NpcID.BABY_DRAGON_244, NpcID.BABY_DRAGON_245, NpcID.BABY_DRAGON_246)), @@ -202,7 +202,7 @@ enum Task RUNE_DRAGONS("Rune dragons", ItemID.RUNE_DRAGON_MASK), SCORPIA("Scorpia", ItemID.SCORPIAS_OFFSPRING), SCORPIONS("Scorpions", ItemID.ENSOULED_SCORPION_HEAD, - asList("Scorpia"), Collections.emptyList()), + Collections.singletonList("Scorpia"), Collections.emptyList()), SARACHNIS("Sarachnis", ItemID.SRARACHA), SEA_SNAKES("Sea snakes", ItemID.SNAKE_CORPSE), SHADES("Shades", ItemID.SHADE_ROBE_TOP, @@ -212,7 +212,7 @@ enum Task SKELETONS("Skeletons", ItemID.SKELETON_GUARD), SMOKE_DEVILS("Smoke devils", ItemID.SMOKE_DEVIL), SPIDERS("Spiders", ItemID.HUGE_SPIDER, - asList("Venenatis"), Collections.emptyList()), + Collections.singletonList("Venenatis"), Collections.emptyList()), SPIRITUAL_CREATURES("Spiritual creatures", ItemID.DRAGON_BOOTS, asList("Spiritual ranger", "Spiritual mage", "Spiritual warrior"), Collections.emptyList()), STEEL_DRAGONS("Steel dragons", ItemID.STEEL_DRAGON), @@ -223,7 +223,7 @@ enum Task TROLLS("Trolls", ItemID.TROLL_GUARD), TUROTH("Turoth", ItemID.TUROTH), TZHAAR("Tzhaar", ItemID.ENSOULED_TZHAAR_HEAD, - asList("Tz-"), Collections.emptyList(), false), + Collections.singletonList("Tz-"), Collections.emptyList(), false), VAMPIRES("Vampires", ItemID.STAKE, asList("Vampyre", "Vyrewatch", "Vampire"), Collections.emptyList()), VENENATIS("Venenatis", ItemID.VENENATIS_SPIDERLING), @@ -232,13 +232,13 @@ enum Task WALL_BEASTS("Wall beasts", ItemID.SWAMP_WALLBEAST), WATERFIENDS("Waterfiends", ItemID.WATER_ORB), WEREWOLVES("Werewolves", ItemID.WOLFBANE, - asList("Werewolf"), Collections.emptyList()), + Collections.singletonList("Werewolf"), Collections.emptyList()), WOLVES("Wolves", ItemID.GREY_WOLF_FUR, - asList("Wolf"), Collections.emptyList()), + Collections.singletonList("Wolf"), Collections.emptyList()), WYRMS("Wyrms", ItemID.WYRM), ZILYANA("Zilyana", ItemID.PET_ZILYANA), ZOMBIES("Zombies", ItemID.ZOMBIE_HEAD, - asList("Undead"), Collections.emptyList()), + Collections.singletonList("Undead"), Collections.emptyList()), ZULRAH("Zulrah", ItemID.PET_SNAKELING), ZUK("TzKal-Zuk", ItemID.TZREKZUK, 101890); // diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java index 3eb5d01b54..038812ab06 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java @@ -96,16 +96,6 @@ public class SlayermusiqPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Override - protected void startUp() throws Exception - { - } - - @Override - protected void shutDown() throws Exception - { - } - @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java index 9b14734ebd..52f8330b8c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java @@ -6,7 +6,7 @@ import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; @ConfigGroup("spawntimer") -public interface SpawnTimerConfig extends Config +public interface SpawnTimerConfig extends Config { @ConfigItem( position = 1, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java index 79b0ed095b..6f76c0cef9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java @@ -65,7 +65,7 @@ public class SpawnTimerPlugin extends Plugin private Color getHighlightColor; @Override - protected void startUp() throws Exception + protected void startUp() { this.getNpcToHighlight = config.getNpcToHighlight(); @@ -77,7 +77,7 @@ public class SpawnTimerPlugin extends Plugin @Override - protected void shutDown() throws Exception + protected void shutDown() { ticks.clear(); highlightedNpcs.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java index f90e7b271e..ba549b479c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java @@ -6,18 +6,22 @@ class thing { private NPC npc; private int tick; + public void setNpc(NPC n) { npc = n; } + NPC getNpc() { return npc; } + public void setTick(int n) { tick = n; } + int getTick() { return tick; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java index d6ae3cf212..2e4009407e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java @@ -47,16 +47,6 @@ public class SpecBarPlugin extends Plugin @Inject private Client client; - @Override - protected void startUp() throws Exception - { - } - - @Override - protected void shutDown() throws Exception - { - } - @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { 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 b752cea058..03e2b9329a 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,7 +33,7 @@ import net.runelite.client.ui.overlay.infobox.Counter; class SpecialCounter extends Counter { - private SpecialWeapon weapon; + private final SpecialWeapon weapon; @Getter(AccessLevel.PACKAGE) private final Map partySpecs = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index b4a0c0a6ec..1efefeeffe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -117,13 +118,13 @@ public class SpellbookPlugin extends Plugin @Inject private SpellbookDragOverlay overlay; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean dragging; - @Getter + @Getter(AccessLevel.PACKAGE) private Widget draggingWidget; - @Getter + @Getter(AccessLevel.PACKAGE) private Point draggingLocation; private ImmutableSet notFilteredSpells; @@ -157,7 +158,7 @@ public class SpellbookPlugin extends Plugin mouseManager.unregisterMouseWheelListener(mouseListener); } -private void updateConfig() + private void updateConfig() { loadFilter(); this.enableMobile = config.enableMobile(); @@ -470,7 +471,7 @@ private void updateConfig() return; } - final Collection gson = GSON.fromJson(cfg, new TypeToken>() {}.getType()); + final Collection gson = GSON.fromJson(cfg, new TypeToken>() {}.getType()); for (final Spell s : gson) { 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 9b3ec478df..b458140527 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 @@ -66,10 +66,10 @@ public interface StatusBarsConfig extends Config } @ConfigItem( - position = 4, - keyName = "leftBarMode", - name = "Left Status Bar", - description = "Configures the left status bar" + position = 4, + keyName = "leftBarMode", + name = "Left Status Bar", + description = "Configures the left status bar" ) default BarMode leftBarMode() { @@ -77,10 +77,10 @@ public interface StatusBarsConfig extends Config } @ConfigItem( - position = 5, - keyName = "rightBarMode", - name = "Right Status Bar", - description = "Configures the right status bar" + position = 5, + keyName = "rightBarMode", + name = "Right Status Bar", + description = "Configures the right status bar" ) default BarMode rightBarMode() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java index efd95ddab5..af35083571 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java @@ -82,7 +82,7 @@ public class StatusBarsPlugin extends Plugin @Inject private SpecialAttackRenderer specialAttackRenderer; - @Getter + @Getter(AccessLevel.PACKAGE) private final Map barRenderers = Maps.newEnumMap(BarMode.class); @Inject @@ -108,7 +108,7 @@ public class StatusBarsPlugin extends Plugin private int hideStatusBarDelay; @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -162,13 +162,13 @@ public class StatusBarsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); barRenderers.clear(); } -@Provides + @Provides StatusBarsConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(StatusBarsConfig.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java index 6c0e831c68..976678f1ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java @@ -100,19 +100,19 @@ public class StatusOrbsPlugin extends Plugin @Inject private Notifier notifier; - @Getter + @Getter(AccessLevel.PACKAGE) private double hitpointsPercentage; - @Getter + @Getter(AccessLevel.PACKAGE) private double specialPercentage; - @Getter + @Getter(AccessLevel.PACKAGE) private double runPercentage; - @Getter + @Getter(AccessLevel.PACKAGE) private double hpPerMs; - @Getter + @Getter(AccessLevel.PACKAGE) private double specPerMs = (double) 1 / (SPEC_REGEN_TICKS * 600); // RegenMeter @@ -124,7 +124,6 @@ public class StatusOrbsPlugin extends Plugin // Run Energy private int lastEnergy = 0; private boolean localPlayerRunningToDestination; - private WorldPoint currPoint; private WorldPoint prevLocalPlayerLocation; private BufferedImage heart; @@ -148,7 +147,7 @@ public class StatusOrbsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -160,7 +159,7 @@ public class StatusOrbsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); localPlayerRunningToDestination = false; @@ -294,7 +293,7 @@ public class StatusOrbsPlugin extends Plugin } int currEnergy = client.getEnergy(); - currPoint = client.getLocalPlayer().getWorldLocation(); + WorldPoint currPoint = client.getLocalPlayer().getWorldLocation(); if (currEnergy == 100 || (prevLocalPlayerLocation != null && currPoint.distanceTo(prevLocalPlayerLocation) > 1) || currEnergy < lastEnergy) { ticksSinceRunRegen = 0; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ItemSortTypes.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ItemSortTypes.java index b9aae24d26..e57b69e66f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ItemSortTypes.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ItemSortTypes.java @@ -1,9 +1,10 @@ package net.runelite.client.plugins.stonedtracker; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public enum ItemSortTypes { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/BossTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/BossTab.java index 12095d028e..5f8313ed16 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/BossTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/BossTab.java @@ -32,11 +32,12 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; -@Getter +@Getter(AccessLevel.PUBLIC) @AllArgsConstructor public enum BossTab { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java index 0cd31a51e4..1857023ed1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.stonedtracker.data; import com.google.common.collect.ImmutableMultimap; import java.util.Collection; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -34,7 +35,7 @@ import net.runelite.api.ItemID; import net.runelite.client.game.ItemManager; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public enum UniqueItem { // "Uniques" which are actually dropped by multiple bosses diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/ItemPanel.java index 4dc15b42bf..11b3d6bb50 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/ItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/ItemPanel.java @@ -36,6 +36,7 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.loottracker.localstorage.LTItemEntry; @@ -44,7 +45,7 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; import net.runelite.client.util.QuantityFormatter; -@Getter +@Getter(AccessLevel.PACKAGE) class ItemPanel extends JPanel { private static final GridBagLayout LAYOUT = new GridBagLayout(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java index a6adf1b402..9c1677eb97 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/LootPanel.java @@ -201,12 +201,12 @@ class LootPanel extends JPanel currentText = "Chests opened:"; loggedText = "Chests logged:"; break; - case "Clue Scroll (Beginner)": - case "Clue Scroll (Easy)": - case "Clue Scroll (Medium)": - case "Clue Scroll (Hard)": - case "Clue Scroll (Elite)": - case "Clue Scroll (Master)": + case "Clue Scroll (Beginner)": + case "Clue Scroll (Easy)": + case "Clue Scroll (Medium)": + case "Clue Scroll (Hard)": + case "Clue Scroll (Elite)": + case "Clue Scroll (Master)": currentText = "Clues completed:"; loggedText = "Clues logged:"; break; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/TextPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/TextPanel.java index 7fff1ca124..4e953e37b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/TextPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/TextPanel.java @@ -33,11 +33,12 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.Border; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.ui.ColorScheme; import net.runelite.client.util.QuantityFormatter; -@Getter +@Getter(AccessLevel.PACKAGE) class TextPanel extends JPanel { private static final GridBagLayout LAYOUT = new GridBagLayout(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/UniqueItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/UniqueItemPanel.java index d0ddf89a8e..90974de6b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/UniqueItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/ui/UniqueItemPanel.java @@ -37,6 +37,7 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.stonedtracker.data.UniqueItem; @@ -45,7 +46,7 @@ import net.runelite.client.util.AsyncBufferedImage; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.QuantityFormatter; -@Getter +@Getter(AccessLevel.PACKAGE) class UniqueItemPanel extends JPanel { private final static float alphaMissing = 0.35f; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java index abf54df0e2..f1b9d1fc4f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java @@ -79,7 +79,7 @@ public class StretchedModePlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { client.setStretchedEnabled(false); client.invalidateStretching(true); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 2bbb88cc0f..69768a681b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -114,8 +114,8 @@ public class SuppliesTrackerPlugin extends Plugin private static final Random random = new Random(); - private static final int[] THROWING_IDS = new int[] {BRONZE_DART, IRON_DART, STEEL_DART, BLACK_DART, MITHRIL_DART, ADAMANT_DART, RUNE_DART, DRAGON_DART, BRONZE_KNIFE, IRON_KNIFE, STEEL_KNIFE, BLACK_KNIFE, MITHRIL_KNIFE, ADAMANT_KNIFE, RUNE_KNIFE, BRONZE_THROWNAXE, IRON_THROWNAXE, STEEL_THROWNAXE, MITHRIL_THROWNAXE, ADAMANT_THROWNAXE, RUNE_THROWNAXE, DRAGON_KNIFE, DRAGON_KNIFE_22812, DRAGON_KNIFE_22814, DRAGON_KNIFEP_22808, DRAGON_KNIFEP_22810, DRAGON_KNIFEP, DRAGON_THROWNAXE, CHINCHOMPA_10033, RED_CHINCHOMPA_10034, BLACK_CHINCHOMPA}; - private static final int[] RUNE_IDS = new int[] {AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE}; + private static final int[] THROWING_IDS = new int[]{BRONZE_DART, IRON_DART, STEEL_DART, BLACK_DART, MITHRIL_DART, ADAMANT_DART, RUNE_DART, DRAGON_DART, BRONZE_KNIFE, IRON_KNIFE, STEEL_KNIFE, BLACK_KNIFE, MITHRIL_KNIFE, ADAMANT_KNIFE, RUNE_KNIFE, BRONZE_THROWNAXE, IRON_THROWNAXE, STEEL_THROWNAXE, MITHRIL_THROWNAXE, ADAMANT_THROWNAXE, RUNE_THROWNAXE, DRAGON_KNIFE, DRAGON_KNIFE_22812, DRAGON_KNIFE_22814, DRAGON_KNIFEP_22808, DRAGON_KNIFEP_22810, DRAGON_KNIFEP, DRAGON_THROWNAXE, CHINCHOMPA_10033, RED_CHINCHOMPA_10034, BLACK_CHINCHOMPA}; + private static final int[] RUNE_IDS = new int[]{AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE}; //Hold Supply Data private static final Map suppliesEntry = new HashMap<>(); @@ -131,7 +131,7 @@ public class SuppliesTrackerPlugin extends Plugin private int mainHand = 0; private SuppliesTrackerPanel panel; private NavigationButton navButton; - private final String[] RAIDS_CONSUMABLES = new String[] {"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; + private final String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; private int attackStyleVarbit = -1; private int ticks = 0; @@ -150,7 +150,7 @@ public class SuppliesTrackerPlugin extends Plugin private Client client; @Override - protected void startUp() throws Exception + protected void startUp() { panel = new SuppliesTrackerPanel(itemManager, this); @@ -174,7 +174,7 @@ public class SuppliesTrackerPlugin extends Plugin clientToolbar.removeNavigation(navButton); } -@Provides + @Provides SuppliesTrackerConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(SuppliesTrackerConfig.class); @@ -289,6 +289,7 @@ public class SuppliesTrackerPlugin extends Plugin if (oldItem.getId() == runeId) { isRune = true; + break; } } if (isRune && (newItem.getId() != oldItem.getId() || newItem.getQuantity() != oldItem.getQuantity())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/Obstacles.java index 5ba66e2747..79bbec3122 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/Obstacles.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/Obstacles.java @@ -27,93 +27,7 @@ package net.runelite.client.plugins.tarnslair; import com.google.common.collect.Sets; import java.util.Set; import static net.runelite.api.NullObjectID.NULL_20575; -import static net.runelite.api.ObjectID.FLOOR_20583; -import static net.runelite.api.ObjectID.FLOOR_20584; -import static net.runelite.api.ObjectID.FLOOR_20628; -import static net.runelite.api.ObjectID.FLOOR_20634; -import static net.runelite.api.ObjectID.FLOOR_20636; -import static net.runelite.api.ObjectID.HANGING_LOG_20571; -import static net.runelite.api.ObjectID.HANGING_LOG_20572; -import static net.runelite.api.ObjectID.HANGING_LOG_20573; -import static net.runelite.api.ObjectID.HANGING_LOG_20574; -import static net.runelite.api.ObjectID.PASSAGEWAY_15770; -import static net.runelite.api.ObjectID.PASSAGEWAY_15771; -import static net.runelite.api.ObjectID.PASSAGEWAY_15772; -import static net.runelite.api.ObjectID.PASSAGEWAY_15773; -import static net.runelite.api.ObjectID.PASSAGEWAY_15774; -import static net.runelite.api.ObjectID.PASSAGEWAY_16129; -import static net.runelite.api.ObjectID.PASSAGEWAY_16130; -import static net.runelite.api.ObjectID.PASSAGEWAY_16131; -import static net.runelite.api.ObjectID.PASSAGEWAY_16132; -import static net.runelite.api.ObjectID.PASSAGEWAY_16133; -import static net.runelite.api.ObjectID.PASSAGEWAY_16134; -import static net.runelite.api.ObjectID.PASSAGEWAY_18307; -import static net.runelite.api.ObjectID.PASSAGEWAY_18308; -import static net.runelite.api.ObjectID.PASSAGEWAY_18309; -import static net.runelite.api.ObjectID.PASSAGEWAY_18310; -import static net.runelite.api.ObjectID.PASSAGEWAY_18311; -import static net.runelite.api.ObjectID.PASSAGEWAY_20488; -import static net.runelite.api.ObjectID.PASSAGEWAY_20489; -import static net.runelite.api.ObjectID.PASSAGEWAY_20490; -import static net.runelite.api.ObjectID.PASSAGEWAY_20491; -import static net.runelite.api.ObjectID.PASSAGEWAY_20492; -import static net.runelite.api.ObjectID.PASSAGEWAY_20493; -import static net.runelite.api.ObjectID.PASSAGEWAY_20495; -import static net.runelite.api.ObjectID.PASSAGEWAY_20497; -import static net.runelite.api.ObjectID.PASSAGEWAY_20498; -import static net.runelite.api.ObjectID.PASSAGEWAY_20499; -import static net.runelite.api.ObjectID.PASSAGEWAY_20500; -import static net.runelite.api.ObjectID.PASSAGEWAY_20501; -import static net.runelite.api.ObjectID.PASSAGEWAY_20502; -import static net.runelite.api.ObjectID.PASSAGEWAY_20503; -import static net.runelite.api.ObjectID.PASSAGEWAY_20504; -import static net.runelite.api.ObjectID.PASSAGEWAY_20505; -import static net.runelite.api.ObjectID.PASSAGEWAY_20506; -import static net.runelite.api.ObjectID.PASSAGEWAY_20507; -import static net.runelite.api.ObjectID.PASSAGEWAY_20509; -import static net.runelite.api.ObjectID.PASSAGEWAY_20510; -import static net.runelite.api.ObjectID.PASSAGEWAY_20511; -import static net.runelite.api.ObjectID.PASSAGEWAY_20512; -import static net.runelite.api.ObjectID.PASSAGEWAY_20513; -import static net.runelite.api.ObjectID.PASSAGEWAY_20514; -import static net.runelite.api.ObjectID.PASSAGEWAY_20515; -import static net.runelite.api.ObjectID.PASSAGEWAY_20516; -import static net.runelite.api.ObjectID.PASSAGEWAY_20517; -import static net.runelite.api.ObjectID.PASSAGEWAY_20518; -import static net.runelite.api.ObjectID.PASSAGEWAY_20519; -import static net.runelite.api.ObjectID.PASSAGEWAY_20520; -import static net.runelite.api.ObjectID.PASSAGEWAY_20521; -import static net.runelite.api.ObjectID.PASSAGEWAY_20522; -import static net.runelite.api.ObjectID.PASSAGEWAY_20523; -import static net.runelite.api.ObjectID.PASSAGEWAY_20524; -import static net.runelite.api.ObjectID.PASSAGEWAY_20525; -import static net.runelite.api.ObjectID.PASSAGEWAY_20526; -import static net.runelite.api.ObjectID.PASSAGEWAY_20527; -import static net.runelite.api.ObjectID.PASSAGEWAY_20528; -import static net.runelite.api.ObjectID.PASSAGEWAY_20529; -import static net.runelite.api.ObjectID.PASSAGEWAY_20530; -import static net.runelite.api.ObjectID.PASSAGEWAY_20531; -import static net.runelite.api.ObjectID.PASSAGEWAY_20532; -import static net.runelite.api.ObjectID.PASSAGEWAY_20533; -import static net.runelite.api.ObjectID.PASSAGEWAY_20534; -import static net.runelite.api.ObjectID.PASSAGEWAY_20535; -import static net.runelite.api.ObjectID.PASSAGEWAY_20536; -import static net.runelite.api.ObjectID.PASSAGEWAY_20537; -import static net.runelite.api.ObjectID.PASSAGEWAY_20538; -import static net.runelite.api.ObjectID.PASSAGEWAY_20539; -import static net.runelite.api.ObjectID.STAIRS_17098; -import static net.runelite.api.ObjectID.STAIRS_17099; -import static net.runelite.api.ObjectID.STAIRS_18973; -import static net.runelite.api.ObjectID.STAIRS_18974; -import static net.runelite.api.ObjectID.WALL_20588; -import static net.runelite.api.ObjectID.WALL_20590; -import static net.runelite.api.ObjectID.WALL_20592; -import static net.runelite.api.ObjectID.WALL_20594; -import static net.runelite.api.ObjectID.WALL_20596; -import static net.runelite.api.ObjectID.WALL_20613; -import static net.runelite.api.ObjectID.WALL_20615; -import static net.runelite.api.ObjectID.WALL_20616; -import static net.runelite.api.ObjectID.WALL_20618; +import static net.runelite.api.ObjectID.*; class Obstacles { @@ -129,11 +43,11 @@ class Obstacles PASSAGEWAY_16132, /*Wall staircase*/ PASSAGEWAY_16133, /*Wall staircase*/ PASSAGEWAY_16134, /*Wall staircase*/ - PASSAGEWAY_18307, /*Wall staircase*/ - PASSAGEWAY_18308, /*Wall staircase*/ - PASSAGEWAY_18309, /*Wall staircase*/ - PASSAGEWAY_18310, /*Wall staircase*/ - PASSAGEWAY_18311, /*Wall staircase*/ + PASSAGEWAY_18307, /*Wall staircase*/ + PASSAGEWAY_18308, /*Wall staircase*/ + PASSAGEWAY_18309, /*Wall staircase*/ + PASSAGEWAY_18310, /*Wall staircase*/ + PASSAGEWAY_18311, /*Wall staircase*/ PASSAGEWAY_20488, /*Wall staircase*/ PASSAGEWAY_20489, /*Wall staircase*/ PASSAGEWAY_20490, /*Wall staircase*/ @@ -187,31 +101,31 @@ class Obstacles STAIRS_17098, /*Floor staircase*/ STAIRS_17099, /*Floor staircase*/ STAIRS_18973, /*Floor staircase*/ - STAIRS_18974 /*Floor staircase*/ + STAIRS_18974 /*Floor staircase*/ ); static final Set WALL_TRAP_IDS = Sets.newHashSet( - WALL_20590, /*Wall spikes*/ - WALL_20592, /*Wall spikes*/ - WALL_20594, /*Wall spikes*/ - WALL_20596, /*Wall spikes*/ - WALL_20588, /*Wall spikes*/ - WALL_20613, /*Wall pusher*/ - WALL_20615, /*Wall pusher*/ - WALL_20616, /*Wall pusher*/ - WALL_20618, /*Wall pusher*/ - HANGING_LOG_20571, /*Hanging log*/ - HANGING_LOG_20572, /*Hanging log*/ - HANGING_LOG_20573, /*Hanging log*/ + WALL_20590, /*Wall spikes*/ + WALL_20592, /*Wall spikes*/ + WALL_20594, /*Wall spikes*/ + WALL_20596, /*Wall spikes*/ + WALL_20588, /*Wall spikes*/ + WALL_20613, /*Wall pusher*/ + WALL_20615, /*Wall pusher*/ + WALL_20616, /*Wall pusher*/ + WALL_20618, /*Wall pusher*/ + HANGING_LOG_20571, /*Hanging log*/ + HANGING_LOG_20572, /*Hanging log*/ + HANGING_LOG_20573, /*Hanging log*/ HANGING_LOG_20574 /*Hanging log*/ ); static final Set FLOOR_TRAP_IDS = Sets.newHashSet( - FLOOR_20583, /*Floor spikes*/ - FLOOR_20584, /*Floor spikes*/ - NULL_20575, /*Floor spikes (visible)*/ - FLOOR_20628, /*Trapdoor*/ - FLOOR_20634, /*Floor button*/ - FLOOR_20636 /*Floor button*/ + FLOOR_20583, /*Floor spikes*/ + FLOOR_20584, /*Floor spikes*/ + NULL_20575, /*Floor spikes (visible)*/ + FLOOR_20628, /*Trapdoor*/ + FLOOR_20634, /*Floor button*/ + FLOOR_20636 /*Floor button*/ ); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java index 5b42a05ced..3d083a4855 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java @@ -85,13 +85,13 @@ public class TarnsLairPlugin extends Plugin private TarnsLairOverlay overlay; @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); staircases.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java index f2a25b57ad..4740a15fea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java @@ -71,13 +71,13 @@ public class TeamCapesPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(overlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); teams.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java index 9f5669f4db..36dee60e62 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java @@ -25,15 +25,15 @@ package net.runelite.client.plugins.tearsofguthix; +import java.awt.Dimension; +import java.awt.Graphics2D; +import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.PanelComponent; -import javax.inject.Inject; -import java.awt.Dimension; -import java.awt.Graphics2D; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java index e539fd4263..54cd40a3f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java @@ -55,25 +55,33 @@ import net.runelite.client.ui.overlay.OverlayManager; ) @Singleton @Slf4j -@Getter +@Getter(AccessLevel.PUBLIC) public class TheatrePlugin extends Plugin { @Inject private Client client; + @Inject private EventBus eventBus; + @Inject private OverlayManager overlayManager; + @Inject private TheatreOverlay overlay; + @Inject private TheatreConfig config; + @Inject private MenuManager menuManager; + @Inject private ItemManager itemManager; + @Inject private ModelOutlineRenderer modelOutline; + private BloatHandler bloatHandler; private MaidenHandler maidenHandler; private NyloHandler nyloHandler; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java index 5429f016e7..abd7933d8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java @@ -23,7 +23,7 @@ class Nylos this.spawnLocation = spawnLocation; } - @Getter + @Getter(AccessLevel.PACKAGE) @AllArgsConstructor enum SpawnLocation { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index fb4c37d4c0..e87e99e37a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -238,7 +238,7 @@ public class NyloHandler extends RoomHandler toHighlight.add(npc); } - catch (Exception ex) + catch (Exception ignored) { } @@ -270,7 +270,7 @@ public class NyloHandler extends RoomHandler graphics.setColor(color); graphics.draw(objectClickbox); } - catch (Exception ex) + catch (Exception ignored) { } @@ -394,7 +394,7 @@ public class NyloHandler extends RoomHandler } } - public void onMenuOptionClicked(MenuOptionClicked event) + private void onMenuOptionClicked(MenuOptionClicked event) { final String option = event.getOption().toLowerCase(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index 40226ac167..13447b917d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -444,7 +444,7 @@ public class NyloPredictor EAST } - public static class Nylocas + static class Nylocas { private final NylocasType type; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/Weapons.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/Weapons.java index 08f6951115..6883fe0840 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/Weapons.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/Weapons.java @@ -6,13 +6,14 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; import net.runelite.client.menus.AbstractComparableEntry; import net.runelite.client.menus.ComparableEntries; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Weapons { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/Chest.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/Chest.java index 9c0f9592f2..ec2b374990 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/Chest.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/Chest.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.thieving; import com.google.common.collect.ImmutableMap; import java.time.Duration; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ObjectID; @@ -57,7 +58,7 @@ enum Chest CHESTS = builder.build(); } - @Getter + @Getter(AccessLevel.PACKAGE) private final Duration respawnTime; private final int[] ids; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java index dece27f927..dd5f912b5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java @@ -111,6 +111,11 @@ public class ThievingOverlay extends Overlay private boolean isThieving() { + if (client.getLocalPlayer() == null) + { + return false; + } + switch (client.getLocalPlayer().getAnimation()) { case THIEVING_STALL: @@ -123,12 +128,11 @@ public class ThievingOverlay extends Overlay private boolean isStunned() { - switch (client.getLocalPlayer().getAnimation()) + if (client.getLocalPlayer() == null) { - case BLOCK_UNARMED: - return true; - default: - return false; + return false; } + + return client.getLocalPlayer().getAnimation() == BLOCK_UNARMED; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java index d411f8e95a..e995d6a8b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java @@ -95,7 +95,7 @@ public class ThievingPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.statTimeout = config.statTimeout(); @@ -111,7 +111,7 @@ public class ThievingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(chestOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java index 3eb4d24736..476dcf1bca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java @@ -68,14 +68,19 @@ public class TickTimersPlugin extends Plugin @Inject private Client client; + @Inject private OverlayManager overlayManager; + @Inject private TimersOverlay timersOverlay; + @Inject private TickTimersConfig config; + @Inject private NPCManager npcManager; + @Getter(AccessLevel.PACKAGE) private Set npcContainer = new HashSet<>(); private boolean validRegion; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java index a984a7e6f7..c6a583e84f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java @@ -81,14 +81,14 @@ public class TileIndicatorsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); overlayManager.add(overlay); } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 6525621837..c7da8e40ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -58,9 +58,9 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; -import net.runelite.api.events.PlayerDeath; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.PlayerDeath; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.StatChanged; import net.runelite.api.events.VarbitChanged; @@ -180,13 +180,13 @@ public class TimersPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { infoBoxManager.removeIf(t -> t instanceof TimerTimer); lastRaidVarb = -1; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java index 2acd2fbe30..660214932e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java @@ -34,6 +34,7 @@ import java.time.ZonedDateTime; import java.util.Date; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.MessageNode; @@ -61,7 +62,7 @@ public class TimestampPlugin extends Plugin @Inject private TimestampConfig config; - @Getter + @Getter(AccessLevel.PACKAGE) private SimpleDateFormat formatter; @Provides @@ -71,14 +72,14 @@ public class TimestampPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateFormatter(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { formatter = null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/Tab.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/Tab.java index dc9a44a0d1..87249940b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/Tab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/Tab.java @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.timetracking; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.ItemID; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum Tab { OVERVIEW("Overview", ItemID.OLD_NOTES), 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 2885be7fe8..799887ff4a 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.TextStyle; import java.time.temporal.ChronoUnit; @@ -43,12 +42,6 @@ public abstract class TabContentPanel extends JPanel public abstract void update(); - @Override - public Dimension getPreferredSize() - { - return super.getPreferredSize(); - } - protected static String getFormattedEstimate(long remainingSeconds, boolean useRelativeTime) { if (useRelativeTime) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPanel.java index 5c33e6d51a..7c468ec8df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPanel.java @@ -38,7 +38,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; -import net.runelite.client.util.AsyncBufferedImage; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.timetracking.clocks.ClockManager; import net.runelite.client.plugins.timetracking.farming.FarmingTracker; @@ -47,6 +46,7 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.PluginPanel; import net.runelite.client.ui.components.materialtabs.MaterialTab; import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; +import net.runelite.client.util.AsyncBufferedImage; class TimeTrackingPanel extends PluginPanel { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java index 4001419582..19768a707c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java @@ -104,7 +104,7 @@ public class TimeTrackingPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { clockManager.loadTimers(); @@ -129,7 +129,7 @@ public class TimeTrackingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { lastTickLocation = null; lastTickPostLogin = false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeablePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeablePanel.java index c01f770063..ee078ceb69 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeablePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeablePanel.java @@ -32,6 +32,7 @@ import java.awt.GridLayout; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Constants; import net.runelite.client.ui.ColorScheme; @@ -39,7 +40,7 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.ThinProgressBar; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; -@Getter +@Getter(AccessLevel.PUBLIC) public class TimeablePanel extends JPanel { private final T timeable; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Clock.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Clock.java index 31300069c8..8a8d5be15e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Clock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Clock.java @@ -25,13 +25,14 @@ package net.runelite.client.plugins.timetracking.clocks; import java.time.Instant; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) @NoArgsConstructor @AllArgsConstructor abstract class Clock diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java index f5a48ce87e..01531a9e5a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java @@ -34,6 +34,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import javax.inject.Inject; import javax.swing.SwingUtilities; import joptsimple.internal.Strings; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.client.Notifier; @@ -53,13 +54,13 @@ public class ClockManager @Inject private Notifier notifier; - @Getter + @Getter(AccessLevel.PUBLIC) private final List timers = new CopyOnWriteArrayList<>(); - @Getter + @Getter(AccessLevel.PUBLIC) private final List stopwatches = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PUBLIC) private ClockTabPanel clockTabPanel; ClockManager() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java index 9b0e2c24cd..4af371926c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java @@ -40,6 +40,7 @@ import javax.swing.SwingConstants; import javax.swing.border.Border; import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.components.FlatTextField; @@ -66,7 +67,7 @@ abstract class ClockPanel extends JPanel private final IconButton startPauseButton; private final FlatTextField displayInput; - @Getter + @Getter(AccessLevel.PACKAGE) private final Clock clock; private final String clockType; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockTabPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockTabPanel.java index fcc460fdf8..79578a3b79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockTabPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockTabPanel.java @@ -40,7 +40,6 @@ import net.runelite.client.plugins.timetracking.TimeTrackingPlugin; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.FontManager; -import net.runelite.client.ui.PluginPanel; import net.runelite.client.ui.components.IconButton; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; import net.runelite.client.util.ImageUtil; @@ -98,13 +97,6 @@ public class ClockTabPanel extends TabContentPanel rebuild(); } - // The max panel width is 225 but the + sign gets cut off at 225 so we set it at 223 - @Override - public Dimension getPreferredSize() - { - return new Dimension(PluginPanel.PANEL_WIDTH - 2, super.getPreferredSize().height); - } - /** * Clears and recreates the components of this panel. * This should be done whenever a clock is added or removed. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Stopwatch.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Stopwatch.java index 5e12f58901..df4efd03d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Stopwatch.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Stopwatch.java @@ -27,12 +27,13 @@ package net.runelite.client.plugins.timetracking.clocks; import java.time.Instant; import java.util.ArrayList; import java.util.List; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) @AllArgsConstructor class Stopwatch extends Clock { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Timer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Timer.java index d4e0de6132..d8b5a67f86 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Timer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/Timer.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.timetracking.clocks; import java.time.Instant; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) @AllArgsConstructor class Timer extends Clock { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/CropState.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/CropState.java index 2d9ffced83..61dab85622 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/CropState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/CropState.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.timetracking.farming; import java.awt.Color; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.client.ui.ColorScheme; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum CropState { HARVESTABLE(ColorScheme.PROGRESS_COMPLETE_COLOR), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingPatch.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingPatch.java index 8c24588917..a7d13486ce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingPatch.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingPatch.java @@ -33,7 +33,7 @@ import net.runelite.api.Varbits; @RequiredArgsConstructor( access = AccessLevel.PACKAGE ) -@Getter +@Getter(AccessLevel.PACKAGE) class FarmingPatch { @Setter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingRegion.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingRegion.java index c768d30c14..041056c7d8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingRegion.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingRegion.java @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.timetracking.farming; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; -@Getter +@Getter(AccessLevel.PACKAGE) public class FarmingRegion { private final String name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java index 276e50a658..dff6f640fe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.timetracking.farming; -import net.runelite.api.vars.Autoweed; import com.google.inject.Inject; import com.google.inject.Singleton; import java.time.Instant; @@ -35,6 +34,7 @@ import javax.annotation.Nullable; import net.runelite.api.Client; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.vars.Autoweed; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.timetracking.SummaryState; @@ -173,7 +173,7 @@ public class FarmingTracker value = Integer.parseInt(parts[0]); unixTime = Long.parseLong(parts[1]); } - catch (NumberFormatException e) + catch (NumberFormatException ignored) { } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java index 51592b5d8b..6360d50586 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java @@ -34,6 +34,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; @@ -42,10 +43,10 @@ import net.runelite.client.plugins.timetracking.Tab; @Singleton class FarmingWorld { - @Getter + @Getter(AccessLevel.PACKAGE) private final ImmutableMap regions; - @Getter + @Getter(AccessLevel.PACKAGE) private Map> tabs = new HashMap<>(); private final Comparator tabSorter = Comparator diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java index 401269d34d..0da756e304 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.timetracking.farming; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.client.plugins.timetracking.Tab; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum PatchImplementation { BELLADONNA(Tab.SPECIAL, "") diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/Produce.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/Produce.java index bcb4e5ab0b..bf9374a5c8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/Produce.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/Produce.java @@ -25,13 +25,14 @@ */ package net.runelite.client.plugins.timetracking.farming; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.ItemID; import net.runelite.api.NullItemID; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum Produce { WEEDS("Weeds", ItemID.WEEDS, 5, 4), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouse.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouse.java index 009a2bd7e6..d04944ba75 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouse.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouse.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.timetracking.hunter; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum BirdHouse { NORMAL("Bird House", ItemID.BIRD_HOUSE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseSpace.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseSpace.java index 635ce2a4e3..f85a3d6a85 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseSpace.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseSpace.java @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.timetracking.hunter; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.VarPlayer; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum BirdHouseSpace { MEADOW_NORTH("Mushroom Meadow (North)", VarPlayer.BIRD_HOUSE_MEADOW_NORTH), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseState.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseState.java index 8e99d92541..492e30cc5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseState.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.timetracking.hunter; import java.awt.Color; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.client.ui.ColorScheme; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum BirdHouseState { SEEDED(ColorScheme.PROGRESS_COMPLETE_COLOR), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java index 1c30f2da58..ea4f542c8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java @@ -61,14 +61,14 @@ public class BirdHouseTracker @Getter(AccessLevel.PACKAGE) private final ConcurrentMap birdHouseData = new ConcurrentHashMap<>(); - @Getter + @Getter(AccessLevel.PUBLIC) private SummaryState summary = SummaryState.UNKNOWN; /** * The time at which all the bird houses will be ready to be dismantled, * or {@code -1} if we have no data about any of the bird house spaces. */ - @Getter + @Getter(AccessLevel.PUBLIC) private long completionTime = -1; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java index a15b8ed750..b3a5839c11 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java @@ -79,7 +79,7 @@ public class TitheFarmPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -88,7 +88,7 @@ public class TitheFarmPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(titheFarmOverlay); } @@ -131,16 +131,12 @@ public class TitheFarmPlugin extends Plugin log.debug("Added plant {}", newPlant); plants.add(newPlant); } - else if (oldPlant == null) - { - return; - } else if (newPlant.getType() == TitheFarmPlantType.EMPTY) { log.debug("Removed plant {}", oldPlant); plants.remove(oldPlant); } - else if (oldPlant.getGameObject().getId() != newPlant.getGameObject().getId()) + else if (oldPlant != null && oldPlant.getGameObject().getId() != newPlant.getGameObject().getId()) { if (oldPlant.getState() != TitheFarmPlantState.WATERED && newPlant.getState() == TitheFarmPlantState.WATERED) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java index e93e32dad1..6398a84b30 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java @@ -87,10 +87,13 @@ public class TMorph extends Plugin @Inject private Client client; + @Inject private TMorphConfig config; + @Inject private EventBus eventBus; + private Map set1; private Map set2; private Map set3; @@ -108,14 +111,14 @@ public class TMorph extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); addSubscriptions(); } @Override - protected void shutDown() throws Exception + protected void shutDown() { eventBus.unregister(this); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index 82415bca9f..311ac7fc5e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -41,8 +41,8 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.HitsplatApplied; -import net.runelite.api.events.PlayerDeath; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.PlayerDeath; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; @@ -52,7 +52,6 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; - @PluginDescriptor( name = "ToB Damage Counter", description = "Gives you an estimation damage on a boss and taken after the fight is done" + @@ -64,12 +63,6 @@ import net.runelite.client.plugins.PluginType; @Singleton public class DamageCounterPlugin extends Plugin { - private int currentWorld = -1; - private int DamageCount = 0; - private int currenthpxp = -1; // checking the current hp xp so be easier to find - private String BossName = null; //to ID the boss to calculate the damage - private int DamageTaken = 0; - private boolean status = true; //default boolean alive = true, dead = false //formatting the number for damage taken and dealt with to look beeter private static final DecimalFormat DAMAGEFORMAT = new DecimalFormat("#,###"); private static final double XP_RATIO = 1.3333; @@ -101,23 +94,19 @@ public class DamageCounterPlugin extends Plugin NpcID.SOTETSEG_8388, NpcID.XARPUS, NpcID.XARPUS_8339, NpcID.XARPUS_8340, NpcID.XARPUS_8341, NpcID.VERZIK_VITUR, NpcID.VERZIK_VITUR_8369, NpcID.VERZIK_VITUR_8370, NpcID.VERZIK_VITUR_8371, NpcID.VERZIK_VITUR_8372, NpcID.VERZIK_VITUR_8373, NpcID.VERZIK_VITUR_8374, NpcID.VERZIK_VITUR_8375}; + private int currentWorld = -1; + private int DamageCount = 0; + private int currenthpxp = -1; // checking the current hp xp so be easier to find + private String BossName = null; //to ID the boss to calculate the damage + private int DamageTaken = 0; + private boolean status = true; //default boolean alive = true, dead = false @Inject private Client client; + @Inject private ChatMessageManager chatMessangerManager; - @Override - protected void startUp() throws Exception - { - } - - - @Override - protected void shutDown() throws Exception - { - } - //every game tick it will go through methods @Subscribe private void onGameTick(GameTick tick) @@ -147,6 +136,7 @@ public class DamageCounterPlugin extends Plugin if (aNPCARRAY == interactingId) { BossName = interactingName; + break; } } } @@ -346,7 +336,7 @@ public class DamageCounterPlugin extends Plugin sendChatMessage(MessageTaken); } - public int getPlayers() + private int getPlayers() { List players = client.getPlayers(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java index 60d1da044f..75b8d4ddeb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.AnimationID; @@ -56,7 +57,7 @@ public class VetionPlugin extends Plugin @Inject private VetionOverlay overlay; - @Getter + @Getter(AccessLevel.PACKAGE) private Map vetions; @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java index b71c317662..3e9d3d0f54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java @@ -67,11 +67,6 @@ public class VirtualLevelsPlugin extends Plugin } - @Override - protected void startUp() throws Exception - { - } - @Override protected void shutDown() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java index f3827fe4b1..027d636c5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java @@ -70,7 +70,7 @@ public class AcidPathOverlay extends Overlay } if (plugin.isIndicateAcidPools() && plugin.getAcidSpots() != null - && !plugin.getAcidSpots().isEmpty()) + && !plugin.getAcidSpots().isEmpty()) { for (WorldPoint acidWorldPoint : plugin.getAcidSpots()) { @@ -80,12 +80,12 @@ public class AcidPathOverlay extends Overlay continue; } OverlayUtil.renderPolygon(graphics, Perspective.getCanvasTilePoly(client, - acidLocalPoint), ACID_SPOTS_COLOR); + acidLocalPoint), ACID_SPOTS_COLOR); } } if (plugin.isIndicateAcidFreePath() && plugin.getAcidFreePath() != null - && !plugin.getAcidFreePath().isEmpty()) + && !plugin.getAcidFreePath().isEmpty()) { for (WorldPoint acidFreeWorldPoint : plugin.getAcidFreePath()) { @@ -96,12 +96,12 @@ public class AcidPathOverlay extends Overlay } OverlayUtil.renderPolygon(graphics, Perspective.getCanvasTilePoly(client, - acidFreeLocalPoint), ACID_FREE_PATH_COLOR); + acidFreeLocalPoint), ACID_FREE_PATH_COLOR); } } if (plugin.isIndicateWooxWalkPath() && plugin.getWooxWalkPath()[0] != null - && plugin.getWooxWalkPath()[1] != null) + && plugin.getWooxWalkPath()[1] != null) { LocalPoint attackLocalPoint = LocalPoint.fromWorld(client, plugin.getWooxWalkPath()[0]); LocalPoint outOfReachLocalPoint = LocalPoint.fromWorld(client, plugin.getWooxWalkPath()[1]); @@ -117,22 +117,22 @@ public class AcidPathOverlay extends Overlay && plugin.getWooxWalkTimer() != -1) { int[] xpointsAttack = { - (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2.0 + 1), - (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth()), - (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth()), - (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2 + 1) + (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2.0 + 1), + (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth()), + (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth()), + (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2 + 1) }; int[] xpointsOutOfReach = { - (int) plugin.getWooxWalkBar().getX(), - (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2.0), - (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2.0), - (int) plugin.getWooxWalkBar().getX() + (int) plugin.getWooxWalkBar().getX(), + (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2.0), + (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getWidth() / 2.0), + (int) plugin.getWooxWalkBar().getX() }; int[] ypointsBoth = { - (int) plugin.getWooxWalkBar().getY(), - (int) plugin.getWooxWalkBar().getY(), - (int) (plugin.getWooxWalkBar().getY() + plugin.getWooxWalkBar().getHeight()), - (int) (plugin.getWooxWalkBar().getY() + plugin.getWooxWalkBar().getHeight()) + (int) plugin.getWooxWalkBar().getY(), + (int) plugin.getWooxWalkBar().getY(), + (int) (plugin.getWooxWalkBar().getY() + plugin.getWooxWalkBar().getHeight()), + (int) (plugin.getWooxWalkBar().getY() + plugin.getWooxWalkBar().getHeight()) }; Polygon wooxWalkAttack = new Polygon(xpointsAttack, ypointsBoth, 4); Polygon wooxWalkOutOfReach = new Polygon(xpointsOutOfReach, ypointsBoth, 4); @@ -153,14 +153,14 @@ public class AcidPathOverlay extends Overlay int progress = (int) Math.round(plugin.getWooxWalkBar().getWidth() * timeScale); int[] xpointsIndicator = { - (int) (plugin.getWooxWalkBar().getX() - plugin.getWooxWalkBar().getHeight() / 2 + progress), - (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getHeight() / 2 + progress), - (int) plugin.getWooxWalkBar().getX() + progress + (int) (plugin.getWooxWalkBar().getX() - plugin.getWooxWalkBar().getHeight() / 2 + progress), + (int) (plugin.getWooxWalkBar().getX() + plugin.getWooxWalkBar().getHeight() / 2 + progress), + (int) plugin.getWooxWalkBar().getX() + progress }; int[] ypointsIndicator = { - (int) (plugin.getWooxWalkBar().getY() - plugin.getWooxWalkBar().getHeight() - BAR_INDICATOR_SPACER), - (int) (plugin.getWooxWalkBar().getY() - plugin.getWooxWalkBar().getHeight() - BAR_INDICATOR_SPACER), - (int) (plugin.getWooxWalkBar().getY() - BAR_INDICATOR_SPACER) + (int) (plugin.getWooxWalkBar().getY() - plugin.getWooxWalkBar().getHeight() - BAR_INDICATOR_SPACER), + (int) (plugin.getWooxWalkBar().getY() - plugin.getWooxWalkBar().getHeight() - BAR_INDICATOR_SPACER), + (int) (plugin.getWooxWalkBar().getY() - BAR_INDICATOR_SPACER) }; Polygon indicator = new Polygon(xpointsIndicator, ypointsIndicator, 3); OverlayUtil.renderPolygon(graphics, indicator, Color.WHITE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java index 7ba833c045..d3a4a0943d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java @@ -80,29 +80,41 @@ public class VorkathPlugin extends Plugin @Inject private Client client; + @Inject private OverlayManager overlayManager; + @Inject private VorkathOverlay overlay; + @Inject private AcidPathOverlay acidPathOverlay; + @Inject private VorkathConfig config; + @Getter(AccessLevel.PACKAGE) private Vorkath vorkath; + @Getter(AccessLevel.PACKAGE) private NPC zombifiedSpawn; + @Getter(AccessLevel.PACKAGE) private List acidSpots = new ArrayList<>(); + @Getter(AccessLevel.PACKAGE) private List acidFreePath = new ArrayList<>(); + @Getter(AccessLevel.PACKAGE) private WorldPoint[] wooxWalkPath = new WorldPoint[2]; + @Getter(AccessLevel.PACKAGE) private long wooxWalkTimer = -1; + @Getter(AccessLevel.PACKAGE) private Rectangle wooxWalkBar; private int lastAcidSpotsSize = 0; + // Config values @Getter(AccessLevel.PACKAGE) private boolean indicateAcidPools; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java index 14c94c2da8..0f8b980d70 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java @@ -97,7 +97,7 @@ public class WarIndicatorPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -106,7 +106,7 @@ public class WarIndicatorPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(warIndicatorOverlay); overlayManager.remove(warIndicatorMiniMapOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java index 04051c049d..6e3ec4863c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersConfig.java @@ -65,7 +65,7 @@ public interface WhaleWatchersConfig extends Config @ConfigItem( position = 5, - keyName = "pneckBreak", + keyName = "pneckBreak", name = "Phoenix Necklace Break Sound", description = "play a sound notification when your phoenix necklace breaks" ) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index 1c9ae5f03d..df4d62cb97 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -60,27 +60,36 @@ import org.apache.commons.lang3.ObjectUtils; @Singleton public class WhaleWatchersPlugin extends Plugin { + private static final String BROKEN_PNECK_MESSAGE = "Your phoenix necklace heals you, but is destroyed in the process."; boolean protectItemOverlay = false; int damageDone = 0; int damageTaken = 0; boolean inCombat = false; - private static final String BROKEN_PNECK_MESSAGE = "Your phoenix necklace heals you, but is destroyed in the process."; + @Inject private Client client; + @Inject private WhaleWatchersConfig config; + @Inject private WhaleWatchersOverlay overlay; + @Inject private WhaleWatchersProtOverlay whaleWatchersProtOverlay; + @Inject private WhaleWatchersSmiteableOverlay whaleWatchersSmiteableOverlay; + @Inject private WhaleWatchersGloryOverlay whaleWatchersGloryOverlay; + @Inject private OverlayManager overlayManager; + @Inject private SoundManager soundManager; + private int tickCountdown = 0; @Getter(AccessLevel.PACKAGE) private boolean displaySmiteOverlay; @@ -112,7 +121,7 @@ public class WhaleWatchersPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -123,7 +132,7 @@ public class WhaleWatchersPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(whaleWatchersProtOverlay); 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 78dea24b8e..78b6113e23 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 @@ -55,6 +55,7 @@ import okhttp3.Callback; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; +import org.jetbrains.annotations.NotNull; @Slf4j public class WikiSearchChatboxTextInput extends ChatboxTextInput @@ -124,13 +125,13 @@ public class WikiSearchChatboxTextInput extends ChatboxTextInput RuneLiteAPI.CLIENT.newCall(req).enqueue(new Callback() { @Override - public void onFailure(Call call, IOException e) + public void onFailure(@NotNull Call call, @NotNull IOException e) { log.warn("error searching wiki", e); } @Override - public void onResponse(Call call, Response response) throws IOException + public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { String body = response.body().string(); try diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java index 294943347b..037e1903ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java @@ -56,6 +56,7 @@ public class WildernessLocationsMapOverlay extends Overlay /** * Draws the names of the wilderness WorldLocations on the World Map + * * @param graphics - Overlay graphics */ private void drawWildLocations(Graphics2D graphics) @@ -126,7 +127,7 @@ public class WildernessLocationsMapOverlay extends Overlay * @param worldPoint WorldPoint to get screen coordinates of * @return Point of screen coordinates of the center of the world point */ - public Point mapWorldPointToGraphicsPoint(WorldPoint worldPoint) + private Point mapWorldPointToGraphicsPoint(WorldPoint worldPoint) { RenderOverview ro = client.getRenderOverview(); @@ -135,7 +136,7 @@ public class WildernessLocationsMapOverlay extends Overlay return null; } - Float pixelsPerTile = ro.getWorldMapZoom(); + float pixelsPerTile = ro.getWorldMapZoom(); Widget map = client.getWidget(WidgetInfo.WORLD_MAP_VIEW); if (map != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index 90ab58d81f..d62adba23a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -50,7 +50,6 @@ import net.runelite.client.util.HotkeyListener; @Singleton public class WildernessLocationsPlugin extends Plugin { - @Inject private Client client; @@ -60,10 +59,10 @@ public class WildernessLocationsPlugin extends Plugin @Inject private WildernessLocationsOverlay overlay = new WildernessLocationsOverlay(this); - @Getter + @Getter(AccessLevel.PACKAGE) private boolean renderLocation; - @Getter + @Getter(AccessLevel.PACKAGE) private String locationString = ""; @Inject @@ -95,13 +94,13 @@ public class WildernessLocationsPlugin extends Plugin private boolean drawOverlay; private boolean pvpWorld; private Keybind keybind; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean worldMapNames; - @Getter + @Getter(AccessLevel.PACKAGE) private Color mapOverlayColor; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean outlineLocations; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean worldMapOverlay; @@ -112,7 +111,7 @@ public class WildernessLocationsPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -145,7 +144,7 @@ public class WildernessLocationsPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(wildernessLocationsMapOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index bc388a4dc1..ee679b0087 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -118,7 +118,7 @@ public class WintertodtPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { this.notifyCondition = config.notifyCondition(); this.damageNotificationColor = config.damageNotificationColor(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java index dfdf86f6f4..fd75fdd546 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java @@ -29,28 +29,8 @@ import java.util.Map; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import static net.runelite.api.AnimationID.WOODCUTTING_3A_AXE; -import static net.runelite.api.AnimationID.WOODCUTTING_ADAMANT; -import static net.runelite.api.AnimationID.WOODCUTTING_BLACK; -import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE; -import static net.runelite.api.AnimationID.WOODCUTTING_CRYSTAL; -import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON; -import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL; -import static net.runelite.api.AnimationID.WOODCUTTING_IRON; -import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; -import static net.runelite.api.AnimationID.WOODCUTTING_RUNE; -import static net.runelite.api.AnimationID.WOODCUTTING_STEEL; -import static net.runelite.api.ItemID.ADAMANT_AXE; -import static net.runelite.api.ItemID.BLACK_AXE; -import static net.runelite.api.ItemID.BRONZE_AXE; -import static net.runelite.api.ItemID.CRYSTAL_AXE; -import static net.runelite.api.ItemID.DRAGON_AXE; -import static net.runelite.api.ItemID.INFERNAL_AXE; -import static net.runelite.api.ItemID.IRON_AXE; -import static net.runelite.api.ItemID.MITHRIL_AXE; -import static net.runelite.api.ItemID.RUNE_AXE; -import static net.runelite.api.ItemID.STEEL_AXE; -import static net.runelite.api.ItemID._3RD_AGE_AXE; +import static net.runelite.api.AnimationID.*; +import static net.runelite.api.ItemID.*; @AllArgsConstructor @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java index d96478f431..3492d21c79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java @@ -103,7 +103,7 @@ public class WoodcuttingPlugin extends Plugin private final Set treeObjects = new HashSet<>(); private int statTimeout; - private boolean showNestNotification; + boolean showNestNotification; @Getter(AccessLevel.PACKAGE) private boolean showWoodcuttingStats; @Getter(AccessLevel.PACKAGE) @@ -122,7 +122,7 @@ public class WoodcuttingPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -131,7 +131,7 @@ public class WoodcuttingPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); overlayManager.remove(treesOverlay); 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 0911abdb55..6360162fff 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 @@ -149,7 +149,7 @@ public class WorldHopperPlugin extends Plugin private net.runelite.api.World quickHopTargetWorld; private int displaySwitcherAttempts = 0; - @Getter + @Getter(AccessLevel.PACKAGE) private int lastWorld; private int favoriteWorld1, favoriteWorld2; @@ -199,7 +199,7 @@ public class WorldHopperPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -240,7 +240,7 @@ public class WorldHopperPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { pingFuture.cancel(true); pingFuture = null; 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 f29ebabefb..ce7839226a 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; @@ -379,10 +379,7 @@ class WorldSwitcherPanel extends PluginPanel private WorldTableRow buildRow(World world, boolean stripe, boolean current, boolean favorite) { WorldTableRow row = new WorldTableRow(world, current, favorite, - world1 -> - { - plugin.hopTo(world1); - }, + plugin::hopTo, (world12, add) -> { if (add) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java index 43e1aaa4b9..7861179407 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java @@ -108,9 +108,7 @@ class WorldTableHeader extends JPanel final JMenuItem refresh = new JMenuItem("Refresh worlds"); refresh.addActionListener(e -> - { - onRefresh.run(); - }); + onRefresh.run()); final JPopupMenu popupMenu = new JPopupMenu(); popupMenu.setBorder(new EmptyBorder(5, 5, 5, 5)); 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 cb740b1984..f1e8dad612 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 @@ -82,7 +82,7 @@ class WorldTableRow extends JPanel private JLabel pingField; private BiConsumer onFavorite; - @Getter + @Getter(AccessLevel.PACKAGE) private final World world; @Getter(AccessLevel.PACKAGE) @@ -91,11 +91,9 @@ class WorldTableRow extends JPanel private int ping; private Color lastBackground; - private boolean current; WorldTableRow(World world, boolean current, boolean favorite, Consumer onSelect, BiConsumer onFavorite) { - this.current = current; this.world = world; this.onFavorite = onFavorite; this.updatedPlayerCount = world.getPlayers(); @@ -203,9 +201,7 @@ class WorldTableRow extends JPanel } favoriteMenuOption.addActionListener(e -> - { - onFavorite.accept(world, !favorite); - }); + onFavorite.accept(world, !favorite)); } void updatePlayerCount(int playerCount) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FairyRingLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FairyRingLocation.java index 25ee1addcd..c5fb7ac05c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FairyRingLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FairyRingLocation.java @@ -25,10 +25,11 @@ */ package net.runelite.client.plugins.worldmap; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; -@Getter +@Getter(AccessLevel.PACKAGE) enum FairyRingLocation { AIR("AIR", new WorldPoint(2699, 3249, 0)), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FarmingPatchLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FarmingPatchLocation.java index eaadd3a5be..6534fa1df7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FarmingPatchLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FarmingPatchLocation.java @@ -25,10 +25,11 @@ */ package net.runelite.client.plugins.worldmap; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; -@Getter +@Getter(AccessLevel.PACKAGE) enum FarmingPatchLocation { ALLOTMENT("Allotment", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java index 4158308d1e..bce8b35aea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java @@ -25,10 +25,11 @@ */ package net.runelite.client.plugins.worldmap; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; -@Getter +@Getter(AccessLevel.PACKAGE) enum MinigameLocation { BARBARIAN_ASSAULT("Barbarian Assault", new WorldPoint(2531, 3569, 0)), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java index 3014e0f0b5..b011533537 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java @@ -25,9 +25,10 @@ */ package net.runelite.client.plugins.worldmap; +import lombok.AccessLevel; import lombok.Getter; -import net.runelite.api.coords.WorldPoint; import net.runelite.api.Quest; +import net.runelite.api.coords.WorldPoint; // Some quests are in the same spot, but they are done in order. If multiple // quests start in the same location, an array of quests is expected. @@ -167,10 +168,10 @@ enum QuestStartLocation WITCHS_HOUSE(Quest.WITCHS_HOUSE, new WorldPoint(2927, 3456, 0)), ZOGRE_FLESH_EATERS(Quest.ZOGRE_FLESH_EATERS, new WorldPoint(2442, 3051, 0)); - @Getter + @Getter(AccessLevel.PACKAGE) private final WorldPoint location; - @Getter + @Getter(AccessLevel.PACKAGE) private final Quest[] quests; QuestStartLocation(Quest[] quests, WorldPoint location) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartPoint.java index 4bd778188c..ca70fd4410 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartPoint.java @@ -25,8 +25,8 @@ */ package net.runelite.client.plugins.worldmap; -import net.runelite.api.coords.WorldPoint; import java.awt.image.BufferedImage; +import net.runelite.api.coords.WorldPoint; import net.runelite.client.ui.overlay.worldmap.WorldMapPoint; class QuestStartPoint extends WorldMapPoint diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RareTreeLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RareTreeLocation.java index 452eef5bc7..4f34aa8cf8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RareTreeLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RareTreeLocation.java @@ -25,10 +25,11 @@ */ package net.runelite.client.plugins.worldmap; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; -@Getter +@Getter(AccessLevel.PACKAGE) enum RareTreeLocation { WILLOW("Willow tree", 30, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RunecraftingAltarLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RunecraftingAltarLocation.java index c2f8319635..49e1604800 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RunecraftingAltarLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RunecraftingAltarLocation.java @@ -25,10 +25,11 @@ */ package net.runelite.client.plugins.worldmap; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; -@Getter +@Getter(AccessLevel.PACKAGE) enum RunecraftingAltarLocation { AIR_ALTAR("Air Altar", 1, new WorldPoint(2985, 3293, 0), "air_altar_icon.png"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java index a5938c3845..88cb4d2204 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java @@ -26,11 +26,12 @@ package net.runelite.client.plugins.worldmap; import java.awt.image.BufferedImage; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; import net.runelite.client.util.ImageUtil; -@Getter +@Getter(AccessLevel.PACKAGE) enum TeleportLocationData { VARROCK(TeleportType.NORMAL_MAGIC, "Varrock", 25, new WorldPoint(3213, 3424, 0), "varrock_teleport_icon.png"), @@ -154,7 +155,7 @@ enum TeleportLocationData OBELISK_50(TeleportType.OTHER, "Obelisk", "50", new WorldPoint(3307, 3916, 0), "obelisk_icon.png"), WILDERNESS_CRABS_TELEPORT(TeleportType.OTHER, "Wilderness crabs teleport", new WorldPoint(3348, 3783, 0), "wilderness_crabs_teleport_icon.png"), CANOE_WILDERNESS(TeleportType.OTHER, "Canoe (No departure)", "35", new WorldPoint(3141, 3796, 0), "transportation_icon.png"), - + // Achievement Diary ARDOUGNE_CLOAK_MONASTERY(TeleportType.OTHER, "Ardougne Cloak", "Monastery", new WorldPoint(2606, 3222, 0), "ardougne_cloak_icon.png"), ARDOUGNE_CLOAK_FARM(TeleportType.OTHER, "Ardougne Cloak", "Farm", new WorldPoint(2673, 3375, 0), "ardougne_cloak_icon.png"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java index a51e8f9c6e..3a23b9d2eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java @@ -25,9 +25,10 @@ */ package net.runelite.client.plugins.worldmap; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) public enum TeleportType { NORMAL_MAGIC(""), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java index b1ea7baf2a..e7851427df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java @@ -27,12 +27,13 @@ */ package net.runelite.client.plugins.worldmap; +import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.coords.WorldPoint; -import javax.annotation.Nullable; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor enum TransportationPointLocation { @@ -42,7 +43,7 @@ enum TransportationPointLocation BRIMHAVEN_TO_ARDOUGNE("Ship to Ardougne / Rimmington", new WorldPoint(2772, 3234, 0)), RIMMINGTON_TO_ARDOUGNE("Ship to Ardougne / Brimhaven", new WorldPoint(2915, 3224, 0)), CATHERBY_TO_KEEP_LE_FAYE("Ship to Keep Le Faye", new WorldPoint(2804, 3421, 0), new WorldPoint(2769, 3402, 0)), - CORSAIR_TO_RIMMINGTON("Ship to Rimmington", new WorldPoint(2577, 2839, 0), new WorldPoint(2909, 3227, 0 )), + CORSAIR_TO_RIMMINGTON("Ship to Rimmington", new WorldPoint(2577, 2839, 0), new WorldPoint(2909, 3227, 0)), DRAGONTOOTH_TO_PHASMATYS("Ship to Port Phasmatys", new WorldPoint(3791, 3561, 0), new WorldPoint(3703, 3487, 0)), DIGSITE_TO_FOSSIL("Ship to Fossil Island", new WorldPoint(3361, 3448, 0), new WorldPoint(3723, 3807, 0)), ENTRANA_TO_PORTSARIM("Ship to Port Sarim", new WorldPoint(2833, 3334, 0), new WorldPoint(3046, 3233, 0)), @@ -75,7 +76,7 @@ enum TransportationPointLocation RELLEKKA_TO_WATERBIRTH("Ship to Waterbirth", new WorldPoint(2618, 3685, 0), new WorldPoint(2549, 3758, 0)), RELLEKKA_TO_WEISS_ICEBERG("Ship to Weiss/Iceberg", new WorldPoint(2707, 3735, 0)), RELLEKKA_TO_UNGAEL("Ship to Ungael", new WorldPoint(2638, 3698, 0), new WorldPoint(2276, 4034, 0)), - RIMMINGTON_TO_CORSAIR_COVE("Ship to Corsair Cove", new WorldPoint(2909, 3227, 0 ), new WorldPoint(2577, 2839, 0)), + RIMMINGTON_TO_CORSAIR_COVE("Ship to Corsair Cove", new WorldPoint(2909, 3227, 0), new WorldPoint(2577, 2839, 0)), WATERBIRTH_TO_RELLEKKA("Ship to Rellekka", new WorldPoint(2549, 3758, 0), new WorldPoint(2618, 3685, 0)), WEISS_TO_RELLEKKA("Ship to Rellekka", new WorldPoint(2847, 3967, 0), new WorldPoint(2707, 3735, 0)), UNGAEL_TO_RELLEKKA("Ship to Rellekka", new WorldPoint(2276, 4034, 0), new WorldPoint(2638, 3698, 0)), 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 d54fc3c912..804dc13ed6 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 @@ -156,7 +156,7 @@ public class WorldMapPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -166,7 +166,7 @@ public class WorldMapPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { worldMapPointManager.removeIf(FairyRingPoint.class::isInstance); worldMapPointManager.removeIf(AgilityShortcutPoint.class::isInstance); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesConfig.java index 5b364552ba..ba8eb1dfd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesConfig.java @@ -43,7 +43,7 @@ public interface XpGlobesConfig extends Config { return true; } - + @ConfigItem( keyName = "showXpLeft", name = "Show XP Left", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java index c64778799d..c8e2eb4fcb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java @@ -266,9 +266,9 @@ public class XpGlobesOverlay extends Overlay int actionsLeft = xpTrackerService.getActionsLeft(mouseOverSkill.getSkill()); if (actionsLeft != Integer.MAX_VALUE) { - String actionsLeftString = decimalFormat.format(actionsLeft); + String actionsLeftString = decimalFormat.format(actionsLeft); - tableComponent.addRow(ColorUtil.prependColorTag(xpActionType.getLabel() + " left:", Color.ORANGE), actionsLeftString); + tableComponent.addRow(ColorUtil.prependColorTag(xpActionType.getLabel() + " left:", Color.ORANGE), actionsLeftString); } } @@ -276,7 +276,7 @@ public class XpGlobesOverlay extends Overlay { int xpLeft = goalXp - mouseOverSkill.getCurrentXp(); String skillXpToLvl = decimalFormat.format(xpLeft); - tableComponent.addRow(ColorUtil.prependColorTag("XP left:", Color.ORANGE), skillXpToLvl); + tableComponent.addRow(ColorUtil.prependColorTag("XP left:", Color.ORANGE), skillXpToLvl); } if (plugin.isShowXpHour()) @@ -285,10 +285,10 @@ public class XpGlobesOverlay extends Overlay if (xpHr != 0) { String xpHrString = decimalFormat.format(xpHr); - tableComponent.addRow(ColorUtil.prependColorTag("XP per hour:", Color.ORANGE), xpHrString); + tableComponent.addRow(ColorUtil.prependColorTag("XP per hour:", Color.ORANGE), xpHrString); } } - + if (plugin.isEnableTimeToLevel()) { String timeLeft = xpTrackerService.getTimeTillGoal(mouseOverSkill.getSkill()); 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 55315996f5..0c9b81f286 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 @@ -107,7 +107,7 @@ public class XpGlobesPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -115,7 +115,7 @@ public class XpGlobesPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(overlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java index 50acc52c02..c73a9c6c12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.xptracker; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) @AllArgsConstructor public enum XpActionType { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java index 1514bf9ff9..0df05e899c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java @@ -238,7 +238,7 @@ class XpInfoBox extends JPanel add(container, BorderLayout.NORTH); } - void setStyle(Style style) + private void setStyle(Style style) { container.removeAll(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java index 887709f54f..68fac3b3a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java @@ -139,15 +139,15 @@ class XpInfoBoxOverlay extends Overlay } final LineComponent xpLineBottom = LineComponent.builder() - .left(bottemLeftStr + ":") - .right(QuantityFormatter.quantityToRSDecimalStack(bottomRightNum, true)) - .build(); + .left(bottemLeftStr + ":") + .right(QuantityFormatter.quantityToRSDecimalStack(bottomRightNum, true)) + .build(); final SplitComponent xpSplit = SplitComponent.builder() - .first(xpLine) - .second(xpLineBottom) - .orientation(ComponentOrientation.VERTICAL) - .build(); + .first(xpLine) + .second(xpLineBottom) + .orientation(ComponentOrientation.VERTICAL) + .build(); final ImageComponent imageComponent = new ImageComponent(icon); final SplitComponent iconXpSplit = SplitComponent.builder() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPauseStateSingle.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPauseStateSingle.java index 9e5cc55622..ce5750650e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPauseStateSingle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPauseStateSingle.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.xptracker; import java.util.EnumSet; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Skill; @@ -33,12 +34,12 @@ import net.runelite.api.Skill; @RequiredArgsConstructor class XpPauseStateSingle { - @Getter + @Getter(AccessLevel.PACKAGE) private final Skill skill; private final Set pauseReasons = EnumSet.noneOf(XpPauseReason.class); - @Getter + @Getter(AccessLevel.PACKAGE) private long lastChangeMillis; - @Getter + @Getter(AccessLevel.PACKAGE) private long xp; boolean isPaused() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java index 2967c370f0..848724ef2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.xptracker; +import java.util.Arrays; import java.util.EnumMap; import java.util.Map; import lombok.NonNull; @@ -149,10 +150,7 @@ class XpState else { // So we have a decent average off the bat, lets populate all values with what we see. - for (int i = 0; i < action.getActionExps().length; i++) - { - action.getActionExps()[i] = actionExp; - } + Arrays.fill(action.getActionExps(), actionExp); action.setActionsHistoryInitialized(true); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java index 608accc239..dfdba537a6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java @@ -25,8 +25,10 @@ */ package net.runelite.client.plugins.xptracker; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -39,11 +41,11 @@ class XpStateSingle private final Skill skill; private final Map actions = new HashMap<>(); - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private long startXp; - @Getter + @Getter(AccessLevel.PACKAGE) private int xpGained = 0; @Setter @@ -170,7 +172,7 @@ class XpStateSingle } - int getXpHr() + private int getXpHr() { return toHourly(xpGained); } @@ -203,10 +205,7 @@ class XpStateSingle { // populate all values in our action history array with this first value that we see // so the average value of our action history starts out as this first value we see - for (int i = 0; i < action.getActionExps().length; i++) - { - action.getActionExps()[i] = actionExp; - } + Arrays.fill(action.getActionExps(), actionExp); action.setActionsHistoryInitialized(true); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java index 4f93e5e32c..cd77056e04 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java @@ -92,7 +92,7 @@ public class XpTrackerPlugin extends Plugin private static final String MENUOP_ADD_CANVAS_TRACKER = "Add to canvas"; private static final String MENUOP_REMOVE_CANVAS_TRACKER = "Remove from canvas"; - static final List COMBAT = ImmutableList.of( + private static final List COMBAT = ImmutableList.of( Skill.ATTACK, Skill.STRENGTH, Skill.DEFENCE, @@ -156,7 +156,7 @@ public class XpTrackerPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { updateConfig(); @@ -179,7 +179,7 @@ public class XpTrackerPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.removeIf(e -> e instanceof XpInfoBoxOverlay); xpState.reset(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java index 40ea51e461..2a3478279b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoOverlay.java @@ -71,7 +71,6 @@ public class ZalcanoOverlay extends Overlay private final ZalcanoUtil util; private final Client client; - @Inject ZalcanoOverlay(final ZalcanoPlugin plugin, final ZalcanoConfig config, final ZalcanoUtil util, final Client client) { @@ -165,7 +164,7 @@ public class ZalcanoOverlay extends Overlay { final Color green = new Color(140, 255, 60); OverlayUtil.renderPolygon(graphics, poly, !util.projectileExists() ? green : Color.RED); - OverlayUtil.renderTextLocation(graphics, glowingRock.getCanvasLocation(), !util.projectileExists() ? util.mine : util.warning, !util.projectileExists() ? green : Color.RED); + OverlayUtil.renderTextLocation(graphics, glowingRock.getCanvasLocation(), !util.projectileExists() ? ZalcanoUtil.mine : ZalcanoUtil.warning, !util.projectileExists() ? green : Color.RED); } } } @@ -220,7 +219,7 @@ public class ZalcanoOverlay extends Overlay private void renderZalcanoMineable(Graphics2D graphics) { - renderZalcanoAOE(graphics, 4, util.mine, Color.GREEN); + renderZalcanoAOE(graphics, 4, ZalcanoUtil.mine, Color.GREEN); } private void renderZalcanoWakeup(Graphics2D graphics) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoUtil.java index ed6a96633f..06117a27ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoUtil.java @@ -56,7 +56,7 @@ public class ZalcanoUtil private final ZalcanoPlugin plugin; static final String mine = "MINE"; - protected static final String warning = "GET BACK"; + static final String warning = "GET BACK"; private static final int ZALCANO_REGION = 12126; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ControlFunction.java b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ControlFunction.java index a5b2522b1c..a6041ae6d6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ControlFunction.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ControlFunction.java @@ -25,10 +25,11 @@ */ package net.runelite.client.plugins.zoom; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum ControlFunction { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java index 36ca67e64f..8934606590 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java @@ -36,7 +36,7 @@ public interface ZoomConfig extends Config int OUTER_LIMIT_MAX = 400; /** * The largest (most zoomed in) value that can be used without the client crashing. - * + *

* Larger values trigger an overflow in the engine's fov to scale code. */ int INNER_ZOOM_LIMIT = 1004; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index 04ee076641..db50e8bc04 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -80,24 +80,34 @@ public class ZulrahPlugin extends Plugin new ZulrahPatternC(), new ZulrahPatternD() }; + @Getter(AccessLevel.PACKAGE) private NPC zulrah; + @Inject private Client client; + @Inject private ZulrahConfig config; + @Inject private OverlayManager overlayManager; + @Inject private SoundManager soundManager; + @Inject private ZulrahCurrentPhaseOverlay currentPhaseOverlay; + @Inject private ZulrahNextPhaseOverlay nextPhaseOverlay; + @Inject private ZulrahPrayerOverlay zulrahPrayerOverlay; + @Inject private ZulrahOverlay zulrahOverlay; + private ZulrahInstance instance; @Provides @@ -107,7 +117,7 @@ public class ZulrahPlugin extends Plugin } @Override - protected void startUp() throws Exception + protected void startUp() { overlayManager.add(currentPhaseOverlay); @@ -117,7 +127,7 @@ public class ZulrahPlugin extends Plugin } @Override - protected void shutDown() throws Exception + protected void shutDown() { overlayManager.remove(currentPhaseOverlay); overlayManager.remove(nextPhaseOverlay); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java index fdc9b2b4b3..db61a78fdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java @@ -69,12 +69,12 @@ public class ZulrahPhase public String toString() { return "ZulrahPhase{" + - "zulrahLocation=" + zulrahLocation + - ", type=" + type + - ", jad=" + jad + - ", standLocation=" + standLocation + - ", prayer=" + prayer + - '}'; + "zulrahLocation=" + zulrahLocation + + ", type=" + type + + ", jad=" + jad + + ", standLocation=" + standLocation + + ", prayer=" + prayer + + '}'; } // world location diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 4be5803fd0..d1ffc85bbf 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -40,7 +40,7 @@ import net.runelite.client.ui.RuneLiteSplashScreen; @Slf4j public class ClientLoader implements Supplier { - private ClientUpdateCheckMode updateCheckMode; + private final ClientUpdateCheckMode updateCheckMode; private Object client = null; public ClientLoader(ClientUpdateCheckMode updateCheckMode) @@ -102,7 +102,7 @@ public class ClientLoader implements Supplier } private static Applet loadRLPlus(final RSConfig config) - throws ClassNotFoundException, InstantiationException, IllegalAccessException + throws ClassNotFoundException, InstantiationException, IllegalAccessException { RuneLiteSplashScreen.stage(.465, "Starting Open Old School RuneScape"); @@ -136,7 +136,7 @@ public class ClientLoader implements Supplier } private static Applet loadVanilla(final RSConfig config) - throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException + throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException { RuneLiteSplashScreen.stage(.465, "Starting Vanilla Old School RuneScape"); @@ -153,7 +153,7 @@ public class ClientLoader implements Supplier } private static Applet loadFromClass(final RSConfig config, final Class clientClass) - throws IllegalAccessException, InstantiationException + throws IllegalAccessException, InstantiationException { final Applet rs = (Applet) clientClass.newInstance(); rs.setStub(new RSAppletStub(config)); diff --git a/runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java b/runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java index 502e72c2c9..2aec1d8505 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java @@ -43,7 +43,7 @@ import okhttp3.HttpUrl; class HostSupplier implements Supplier { private final Random random = new Random(); - private Queue hosts = new ArrayDeque<>(); + private final Queue hosts = new ArrayDeque<>(); @Override public HttpUrl get() @@ -53,7 +53,7 @@ class HostSupplier implements Supplier return hosts.poll(); } - List newHosts = new WorldClient(RuneLiteAPI.CLIENT) + List newHosts = new WorldClient(RuneLiteAPI.CLIENT) .lookupWorlds() .map(WorldResult::getWorlds) .blockingSingle() 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 10f95aa28e..c06507e29c 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 @@ -71,7 +71,6 @@ import net.runelite.api.Constants; import net.runelite.api.GameState; import net.runelite.api.Player; import net.runelite.api.Point; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -84,6 +83,7 @@ import net.runelite.client.config.Keybind; import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.config.WarningOnExit; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.NavigationButtonAdded; import net.runelite.client.events.NavigationButtonRemoved; import net.runelite.client.input.KeyManager; @@ -312,6 +312,7 @@ public class ClientUI /** * Initialize UI. + * * @param runelite runelite instance that will be shut down on exit * @throws Exception exception that can occur during creation of the UI */ diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java index 7d03d05ef3..b91e3deeaa 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java @@ -36,7 +36,7 @@ public class ContainableFrame extends JFrame { ALWAYS, RESIZING, - NEVER; + NEVER } private static final int SCREEN_EDGE_CLOSE_DISTANCE = 40; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java index 5a457aeb10..2699fe0f20 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java @@ -31,8 +31,8 @@ import javax.swing.JList; import javax.swing.ListCellRenderer; import javax.swing.border.EmptyBorder; import lombok.Setter; -import net.runelite.client.ui.ColorScheme; import net.runelite.api.util.Text; +import net.runelite.client.ui.ColorScheme; /** * A custom list renderer to avoid substance's weird coloring. diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/DimmableJPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/DimmableJPanel.java index 1fa204ac9c..58a6fd7e95 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/DimmableJPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/DimmableJPanel.java @@ -73,7 +73,7 @@ public class DimmableJPanel extends JPanel * * @param dimmed */ - public void setDimmed(boolean dimmed) + void setDimmed(boolean dimmed) { this.dimmed = dimmed; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java index 1de2c12093..177ab845da 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java @@ -65,10 +65,9 @@ public class InfoPanel extends JPanel private static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite"); private static final File LOGS_DIR = new File(RUNELITE_DIR, "logs"); - private final Properties properties = new Properties(); - public InfoPanel() { + Properties properties = new Properties(); try (InputStream in = getClass().getResourceAsStream("/open.osrs.properties")) { properties.load(in); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java index 3789fa67b9..3f125d0f60 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java @@ -52,7 +52,7 @@ public class MessagePanel extends JPanel private final JLabel titleLabel = new JLabel("Welcome to OpenOSRS"); private final JLabel messageArea; - private final JLabel barLabel = new JLabel("Doing something important"); + private final JLabel barLabel = new JLabel("Loading..."); private final JProgressBar bar = new JProgressBar(0, 100); @Getter(AccessLevel.NONE) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/MinimumSizedPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/MinimumSizedPanel.java index 87c24770c2..6ff6ba7705 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/MinimumSizedPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/MinimumSizedPanel.java @@ -24,8 +24,8 @@ */ package net.runelite.client.ui.components; -import javax.swing.JPanel; import java.awt.Dimension; +import javax.swing.JPanel; public class MinimumSizedPanel extends JPanel { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RecentColors.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RecentColors.java index b1815703af..6a38e49da5 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RecentColors.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RecentColors.java @@ -35,10 +35,10 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.function.Consumer; import javax.swing.JPanel; +import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import static net.runelite.client.ui.components.colorpicker.RuneliteColorPicker.CONFIG_GROUP; import net.runelite.client.util.ColorUtil; -import net.runelite.api.util.Text; final class RecentColors { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java index aff803450e..9833d9dd39 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java @@ -94,7 +94,7 @@ public class RuneliteColorPicker extends JDialog private Consumer onClose; RuneliteColorPicker(Window parent, Color previousColor, String title, boolean alphaHidden, - final ConfigManager configManager, final ColorPickerManager colorPickerManager) + final ConfigManager configManager, final ColorPickerManager colorPickerManager) { super(parent, "RuneLite Color Picker - " + title, ModalityType.MODELESS); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/shadowlabel/JShadowedLabel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/shadowlabel/JShadowedLabel.java index 79b7200f7b..8132cb3f7e 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/shadowlabel/JShadowedLabel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/shadowlabel/JShadowedLabel.java @@ -71,10 +71,10 @@ public class JShadowedLabel extends JLabel { // Set font rendering properties like the OS's font rendering Toolkit tk = Toolkit.getDefaultToolkit(); - Map desktopHints = (Map)(tk.getDesktopProperty("awt.font.desktophints")); + Map desktopHints = (Map) (tk.getDesktopProperty("awt.font.desktophints")); if (desktopHints != null) { - ((Graphics2D)g).addRenderingHints(desktopHints); + ((Graphics2D) g).addRenderingHints(desktopHints); } super.paint(g); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java index 5791627445..f49f938485 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java @@ -55,7 +55,7 @@ public abstract class Overlay implements LayoutableRenderableEntity plugin = null; } - protected Overlay(Plugin plugin) + protected Overlay(@Nullable Plugin plugin) { this.plugin = plugin; } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 44d0b9290c..10870f73b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -32,9 +32,9 @@ import java.awt.Graphics2D; import java.awt.Paint; import java.awt.Point; import java.awt.Rectangle; -import java.awt.Toolkit; import java.awt.RenderingHints; import java.awt.Stroke; +import java.awt.Toolkit; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.geom.AffineTransform; @@ -46,8 +46,8 @@ import javax.swing.SwingUtilities; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.api.MenuOpcode; import net.runelite.api.MenuEntry; +import net.runelite.api.MenuOpcode; import net.runelite.api.events.BeforeRender; import net.runelite.api.events.ClientTick; import net.runelite.api.events.FocusChanged; @@ -178,7 +178,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener // Set font rendering properties like the OS's font rendering Toolkit tk = Toolkit.getDefaultToolkit(); - Map desktopHints = (Map)(tk.getDesktopProperty("awt.font.desktophints")); + Map desktopHints = (Map) (tk.getDesktopProperty("awt.font.desktophints")); if (desktopHints != null) { graphics.addRenderingHints(desktopHints); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java index 895f394503..87a39ae465 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java @@ -295,8 +295,6 @@ public class OverlayUtil break; case TOP_LEFT: case TOP_CENTER: - result.y += dimension.height + (dimension.height == 0 ? 0 : padding); - break; case CANVAS_TOP_RIGHT: case TOP_RIGHT: result.y += dimension.height + (dimension.height == 0 ? 0 : padding); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java index 5e707064b4..14df56db2c 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java @@ -33,16 +33,7 @@ import java.util.Set; import lombok.AccessLevel; import lombok.Setter; import net.runelite.api.widgets.Widget; -import static net.runelite.api.widgets.WidgetID.BANK_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.BANK_INVENTORY_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.DEPOSIT_BOX_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.EQUIPMENT_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.EQUIPMENT_INVENTORY_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.GRAND_EXCHANGE_INVENTORY_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.GUIDE_PRICES_INVENTORY_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.INVENTORY_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.SEED_VAULT_INVENTORY_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.SHOP_INVENTORY_GROUP_ID; +import static net.runelite.api.widgets.WidgetID.*; import static net.runelite.api.widgets.WidgetInfo.BANK_CONTENT_CONTAINER; import static net.runelite.api.widgets.WidgetInfo.BANK_TAB_CONTAINER; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; @@ -64,7 +55,7 @@ public abstract class WidgetItemOverlay extends Overlay super.setLayer(OverlayLayer.ABOVE_WIDGETS); } - public abstract void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget); + protected abstract void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget); @Override public Dimension render(Graphics2D graphics) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java index 117b021eca..376876e3a5 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java @@ -130,6 +130,7 @@ public class TableComponent implements LayoutableRenderableEntity /** * Returns the width that each column should take up * Based on https://stackoverflow.com/questions/22206825/algorithm-for-calculating-variable-column-widths-for-set-table-width + * * @param metrics * @return int[] of column width */ @@ -325,7 +326,8 @@ public class TableComponent implements LayoutableRenderableEntity /** * Returns the color for the specified table element. * Priority order: cell->row->column->default - * @param row TableRow element + * + * @param row TableRow element * @param colIndex column index */ private Color getCellColor(final TableRow row, final int colIndex) @@ -359,7 +361,8 @@ public class TableComponent implements LayoutableRenderableEntity /** * Returns the alignment for the specified table element. * Priority order: cell->row->column->default - * @param row TableRow element + * + * @param row TableRow element * @param colIndex column index */ private TableAlignment getCellAlignment(final TableRow row, final int colIndex) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java index 92e70c87d8..7b73093358 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java @@ -36,11 +36,11 @@ import java.util.function.Predicate; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.eventbus.EventBus; -import net.runelite.client.util.AsyncBufferedImage; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.util.AsyncBufferedImage; @Singleton @Slf4j diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlay.java index 96c9a52f7d..4c45f032e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlay.java @@ -192,7 +192,7 @@ public class WorldMapOverlay extends Overlay return null; } - Float pixelsPerTile = ro.getWorldMapZoom(); + float pixelsPerTile = ro.getWorldMapZoom(); Widget map = client.getWidget(WidgetInfo.WORLD_MAP_VIEW); if (map != null) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapPoint.java index 878b0125a0..94fc487db9 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapPoint.java @@ -27,10 +27,10 @@ package net.runelite.client.ui.overlay.worldmap; import java.awt.Rectangle; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; +import javax.annotation.Nullable; import lombok.Data; import net.runelite.api.Point; import net.runelite.api.coords.WorldPoint; -import javax.annotation.Nullable; @Data public class WorldMapPoint @@ -66,7 +66,7 @@ public class WorldMapPoint private String tooltip; - public WorldMapPoint(WorldPoint worldPoint, BufferedImage image) + protected WorldMapPoint(WorldPoint worldPoint, BufferedImage image) { this.worldPoint = worldPoint; this.image = image; diff --git a/runelite-client/src/main/java/net/runelite/client/util/Clipboard.java b/runelite-client/src/main/java/net/runelite/client/util/Clipboard.java index 58932ba5ed..37170d0fa6 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/Clipboard.java +++ b/runelite-client/src/main/java/net/runelite/client/util/Clipboard.java @@ -38,7 +38,7 @@ public class Clipboard { Transferable contents = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null); - if (contents == null || ! contents.isDataFlavorSupported(DataFlavor.stringFlavor)) + if (contents == null || !contents.isDataFlavorSupported(DataFlavor.stringFlavor)) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/util/ColorUtil.java b/runelite-client/src/main/java/net/runelite/client/util/ColorUtil.java index 3f23c38f53..56cb75ca7d 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ColorUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ColorUtil.java @@ -77,7 +77,7 @@ public class ColorUtil * Converts a given color to it's hexadecimal equivalent. * * @param color Color to get hexadecimal string from. - * @return Hexadecimal string representing the given color, in the form "#abcdef". + * @return Hexadecimal string representing the given color, in the form "#abcdef". */ public static String toHexColor(final Color color) { diff --git a/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java b/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java index fe8902d663..165425210d 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java @@ -34,6 +34,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import lombok.RequiredArgsConstructor; +import org.jetbrains.annotations.NotNull; /** * Wrapper for ${@link ScheduledExecutorService} that will log all uncaught exceptions as warning to console @@ -53,26 +54,29 @@ public class ExecutorServiceExceptionLogger implements ScheduledExecutorService return CallableExceptionLogger.wrap(command); } + @NotNull @Override - public Future submit(Callable task) + public Future submit(@NotNull Callable task) { return service.submit(monitor(task)); } + @NotNull @Override - public Future submit(Runnable task, T result) + public Future submit(@NotNull Runnable task, T result) { return service.submit(monitor(task), result); } + @NotNull @Override - public Future submit(Runnable task) + public Future submit(@NotNull Runnable task) { return service.submit(monitor(task)); } @Override - public void execute(Runnable command) + public void execute(@NotNull Runnable command) { service.execute(monitor(command)); } @@ -85,6 +89,7 @@ public class ExecutorServiceExceptionLogger implements ScheduledExecutorService service.shutdown(); } + @NotNull @Override public List shutdownNow() { @@ -104,55 +109,62 @@ public class ExecutorServiceExceptionLogger implements ScheduledExecutorService } @Override - public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException + public boolean awaitTermination(long timeout, @NotNull TimeUnit unit) throws InterruptedException { return service.awaitTermination(timeout, unit); } + @NotNull @Override - public List> invokeAll(Collection> tasks) throws InterruptedException + public List> invokeAll(@NotNull Collection> tasks) throws InterruptedException { return service.invokeAll(tasks); } + @NotNull @Override - public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException + public List> invokeAll(@NotNull Collection> tasks, long timeout, @NotNull TimeUnit unit) throws InterruptedException { return service.invokeAll(tasks, timeout, unit); } + @NotNull @Override - public T invokeAny(Collection> tasks) throws InterruptedException, ExecutionException + public T invokeAny(@NotNull Collection> tasks) throws InterruptedException, ExecutionException { return service.invokeAny(tasks); } @Override - public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException + public T invokeAny(@NotNull Collection> tasks, long timeout, @NotNull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { return service.invokeAny(tasks, timeout, unit); } + @NotNull @Override - public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) + public ScheduledFuture schedule(@NotNull Runnable command, long delay, @NotNull TimeUnit unit) { return service.schedule(command, delay, unit); } + @NotNull @Override - public ScheduledFuture schedule(Callable callable, long delay, TimeUnit unit) + public ScheduledFuture schedule(@NotNull Callable callable, long delay, @NotNull TimeUnit unit) { return service.schedule(callable, delay, unit); } + @NotNull @Override - public ScheduledFuture scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) + public ScheduledFuture scheduleAtFixedRate(@NotNull Runnable command, long initialDelay, long period, @NotNull TimeUnit unit) { return service.scheduleAtFixedRate(command, initialDelay, period, unit); } + @NotNull @Override - public ScheduledFuture scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) + public ScheduledFuture scheduleWithFixedDelay(@NotNull Runnable command, long initialDelay, long delay, @NotNull TimeUnit unit) { return service.scheduleWithFixedDelay(command, initialDelay, delay, unit); } diff --git a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java index 19b48eaa4e..dd48a2f0f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java +++ b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java @@ -33,7 +33,6 @@ import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.GameState; -import net.runelite.api.TileItem; import net.runelite.api.InventoryID; import net.runelite.api.ItemContainer; import net.runelite.api.NPC; @@ -41,6 +40,7 @@ import net.runelite.api.Node; import net.runelite.api.Player; import net.runelite.api.Scene; import net.runelite.api.Tile; +import net.runelite.api.TileItem; import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GroundObjectSpawned; diff --git a/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java b/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java index 42688718e0..695a886455 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java +++ b/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java @@ -82,11 +82,11 @@ public abstract class HotkeyListener implements KeyListener } } - public void hotkeyPressed() + protected void hotkeyPressed() { } - public void hotkeyReleased() + protected void hotkeyReleased() { } } diff --git a/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java b/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java index 8c581b2301..ae59587920 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java @@ -416,14 +416,14 @@ public class ImageUtil } /** - * Recolors pixels of the given image with the given color based on a given recolor condition - * predicate. + * Recolors pixels of the given image with the given color based on a given recolor condition + * predicate. * * @param image The image which should have its non-transparent pixels recolored. * @param color The color with which to recolor pixels. * @param recolorCondition The condition on which to recolor pixels with the given color. - * @return The given image with all pixels fulfilling the recolor condition predicate - * set to the given color. + * @return The given image with all pixels fulfilling the recolor condition predicate + * set to the given color. */ public static BufferedImage recolorImage(final BufferedImage image, final Color color, final Predicate recolorCondition) { @@ -672,7 +672,7 @@ public class ImageUtil pixelX += pixelW * tmp; canvasOffset += tmp; } - + client.scaleSprite(canvas, pixels, 0, pixelX, pixelY, canvasIdx, canvasOffset, newW, newH, pixelW, pixelH, oldW); return result; diff --git a/runelite-client/src/main/java/net/runelite/client/util/ItemUtil.java b/runelite-client/src/main/java/net/runelite/client/util/ItemUtil.java index c3cfeb599e..d279b6f087 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ItemUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ItemUtil.java @@ -42,8 +42,9 @@ public class ItemUtil /** * Converts itemArray into a GameItem collection limited to the passed ids * Consolidates all matching Item's qty, by id + * * @param itemArray item array to work on - * @param ids item ids to include in result + * @param ids item ids to include in result * @return Map of GameItem by item id */ public static Map toGameItemMap(Item[] itemArray, @Nullable Set ids) @@ -69,6 +70,7 @@ public class ItemUtil /** * Converts itemArray into a GameItem collection * Consolidates all matching Item's qty, by id + * * @param itemArray item array to work on * @return Map of GameItem by item id */ @@ -79,8 +81,9 @@ public class ItemUtil /** * Checks that the itemArray contains the all of the requested ids + * * @param itemArray item array to work on - * @param ids item ids to check for + * @param ids item ids to check for * @return true if itemArray contains all requested item ids */ public static boolean containsAllItemIds(Item[] itemArray, Set ids) @@ -106,8 +109,9 @@ public class ItemUtil /** * Checks if itemArray contains any item id that also exists in ids + * * @param itemArray item array to work on - * @param ids item ids to check for + * @param ids item ids to check for * @return true if any item in itemArray contains any id from ids */ public static boolean containsAnyItemId(Item[] itemArray, Set ids) @@ -126,8 +130,9 @@ public class ItemUtil /** * Checks if any item id in itemArray matches itemID + * * @param itemArray item array to work on - * @param itemID item id to check for + * @param itemID item id to check for * @return true if any item in itemArray matches itemID */ public static boolean containsItemId(Item[] itemArray, int itemID) @@ -145,8 +150,9 @@ public class ItemUtil /** * Returns null if index is bigger than array otherwise array content. + * * @param itemArray item array to check - * @param index index to grab + * @param index index to grab * @return null if index is bigger than array otherwise array content */ public static Item safeGetItemAtIndex(Item[] itemArray, int index) @@ -161,8 +167,9 @@ public class ItemUtil /** * Returns -1 if index is bigger than array otherwise array contents `id` value + * * @param itemArray item array to check - * @param index index to grab + * @param index index to grab * @return -1 if index is bigger than array otherwise array contents `id` value */ public static Integer safeGetItemIdAtIndex(Item[] itemArray, int index) @@ -178,7 +185,8 @@ public class ItemUtil /** * Checks that the itemArray contains all requestedItems. Must contain >= the requested qty for each id * Uses GameItem to represent the requestedItems since we can't easily create Item instances - * @param itemArray item array to check against + * + * @param itemArray item array to check against * @param requestedItems Collection of GameItems which contain the item id & minimum qty * @return true if contains all requestedItems */ @@ -206,7 +214,8 @@ public class ItemUtil /** * Checks that the itemArray contains all requestedItems. Must contain >= the requested qty for each id * Uses GameItem to represent the requestedItems since we can't easily create Item instances - * @param itemArray item array to check against + * + * @param itemArray item array to check against * @param requestedItems GameItem(s) to request * @return true if contains all requestedItems */ diff --git a/runelite-client/src/main/java/net/runelite/client/util/LinkBrowser.java b/runelite-client/src/main/java/net/runelite/client/util/LinkBrowser.java index 4e27ba15d7..ce1ef1aeac 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/LinkBrowser.java +++ b/runelite-client/src/main/java/net/runelite/client/util/LinkBrowser.java @@ -132,6 +132,7 @@ public class LinkBrowser /** * Tries to open the specified {@code File} with the systems default text editor. If operation fails * an error message is displayed with the option to copy the absolute file path to clipboard. + * * @param file the File instance of the log file * @return did the file open successfully? */ diff --git a/runelite-client/src/main/java/net/runelite/client/util/MenuUtil.java b/runelite-client/src/main/java/net/runelite/client/util/MenuUtil.java index e2f7e548a8..e7b6984a5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MenuUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MenuUtil.java @@ -38,7 +38,7 @@ import net.runelite.api.util.Text; @Slf4j public class MenuUtil { - public static void swap(Client client, MenuEntry entry1, MenuEntry entry2) + private static void swap(Client client, MenuEntry entry1, MenuEntry entry2) { List entries = Arrays.asList(client.getMenuEntries()); @@ -69,7 +69,7 @@ public class MenuUtil } } - public static void swap(Client client, String option1, String option2, String target1, String target2) + private static void swap(Client client, String option1, String option2, String target1, String target2) { MenuEntry entry1 = findOptionTarget(getMenuStream(client), Text.standardize(option1), Text.standardize(target1)); MenuEntry entry2 = findOptionTarget(getMenuStream(client), Text.standardize(option2), Text.standardize(target2)); diff --git a/runelite-client/src/main/java/net/runelite/client/util/QuantityFormatter.java b/runelite-client/src/main/java/net/runelite/client/util/QuantityFormatter.java index beca46c629..b63c739a88 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/QuantityFormatter.java +++ b/runelite-client/src/main/java/net/runelite/client/util/QuantityFormatter.java @@ -77,9 +77,8 @@ public class QuantityFormatter /** * Convert a quantity to a short, comma separated, SI-prefix style string - * + *

* example: {@code 9,450}, {@code 2.14B}, {@code 100K} - * * @param quantity The quantity to convert. * @return a 6 or less character string, possibly with a decimal point, commas or K/M/B suffix @@ -124,10 +123,10 @@ public class QuantityFormatter /** * Convert a quantity to a short SI-prefix style string, possibly with a decimal, * with K after 100,000 and M after 10,000,000 - * + *

* example: {@code 9,450}, {@code 2.1B}, {@code 100K} - * - * @see #quantityToRSDecimalStack(int, boolean) + * + * @see #quantityToRSDecimalStack(int, boolean) */ public static String quantityToRSDecimalStack(int quantity) { @@ -137,7 +136,7 @@ public class QuantityFormatter /** * Convert a quantity to a short SI-prefix style string, possibly with decimals, * with K after 100,000 and M after 10,000,000 - * + *

* example without {@code precise}: {@code 9,450}, {@code 2.1B}, {@code 8.4M} * example with {@code precise}: {@code 9,450}, {@code 2.147B}, {@code 8.32M} * @@ -178,7 +177,7 @@ public class QuantityFormatter /** * Formats a number to be comma delimited. No suffixes are given - * + *

* example: {@code 10,123,351}, {@code 5} */ public static synchronized String formatNumber(final long number) @@ -190,7 +189,7 @@ public class QuantityFormatter /** * Formats a number to be comma delimited. No suffixes are given. Has at * most 3 decimal places - * + *

* example: {@code 10,123,351}, {@code 5.612} */ public static synchronized String formatNumber(double number) diff --git a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java index 43113327ff..4b7b016d97 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java @@ -34,13 +34,13 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; +import static net.runelite.api.util.Text.JAGEX_PRINTABLE_CHAR_MATCHER; import net.runelite.client.account.AccountSession; import net.runelite.client.account.SessionManager; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.eventbus.EventBus; import net.runelite.client.events.PartyChanged; -import static net.runelite.api.util.Text.JAGEX_PRINTABLE_CHAR_MATCHER; import net.runelite.http.api.ws.messages.party.Join; import net.runelite.http.api.ws.messages.party.Part; import net.runelite.http.api.ws.messages.party.PartyChatMessage; @@ -188,7 +188,7 @@ public class PartyService return null; } - public PartyMember getMemberByName(final String name) + private PartyMember getMemberByName(final String name) { for (PartyMember member : members) { diff --git a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java index 8006b5ee1e..f68e7c4173 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java @@ -44,6 +44,7 @@ import okhttp3.Request; import okhttp3.Response; import okhttp3.WebSocket; import okhttp3.WebSocketListener; +import org.jetbrains.annotations.NotNull; @Slf4j @Singleton @@ -147,13 +148,13 @@ public class WSClient extends WebSocketListener implements AutoCloseable } @Override - public void onOpen(WebSocket webSocket, Response response) + public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) { log.info("Websocket {} opened", webSocket); } @Override - public void onMessage(WebSocket webSocket, String text) + public void onMessage(@NotNull WebSocket webSocket, @NotNull String text) { final WebsocketMessage message; @@ -178,14 +179,14 @@ public class WSClient extends WebSocketListener implements AutoCloseable } @Override - public void onClosed(WebSocket webSocket, int code, String reason) + public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) { log.info("Websocket {} closed: {}/{}", webSocket, code, reason); this.webSocket = null; } @Override - public void onFailure(WebSocket webSocket, Throwable t, Response response) + public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, Response response) { log.warn("Error in websocket {}:{}", response, t); this.webSocket = null; diff --git a/runelite-client/src/main/resources/logback.xml b/runelite-client/src/main/resources/logback.xml index d3a5ffbcad..3942b92ca5 100644 --- a/runelite-client/src/main/resources/logback.xml +++ b/runelite-client/src/main/resources/logback.xml @@ -24,35 +24,35 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - - %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + - - ${user.home}/.runelite/logs/client.log + + ${user.home}/.runelite/logs/client.log - - - ${user.home}/.runelite/logs/client_%d{yyyy-MM-dd}.%i.log + + + ${user.home}/.runelite/logs/client_%d{yyyy-MM-dd}.%i.log - - - 10MB - + + + 10MB + - - 30 - + + 30 + - - %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n - - + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + - - - - + + + + \ No newline at end of file diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_crafting.json b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_crafting.json index 963c56f382..c9c2920899 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_crafting.json +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_crafting.json @@ -144,7 +144,6 @@ "name": "Opal Necklace", "xp": 35 }, - { "level": 17, "icon": 1724, diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_magic.json b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_magic.json index 0c53391ba7..7350574862 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_magic.json +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_magic.json @@ -637,7 +637,7 @@ "xp": 67 }, { - "level": 71, + "level": 71, "sprite": 586, "name": "Ourania Teleport", "xp": 69 diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_woodcutting.json b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_woodcutting.json index 29f1cf53c6..cae1bf7201 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_woodcutting.json +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_woodcutting.json @@ -1,6 +1,9 @@ { "bonuses": [ - { "name": "Lumberjack Outfit (+2.5%)", "value": 0.025 } + { + "name": "Lumberjack Outfit (+2.5%)", + "value": 0.025 + } ], "actions": [ { diff --git a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java index 63ca4d6a64..14d291acf8 100644 --- a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java @@ -27,7 +27,6 @@ package net.runelite.client.config; import com.google.inject.Guice; import com.google.inject.testing.fieldbinder.Bind; import com.google.inject.testing.fieldbinder.BoundFieldModule; -import java.io.IOException; import java.time.Instant; import java.util.UUID; import java.util.concurrent.ScheduledExecutorService; @@ -70,7 +69,7 @@ public class ConfigManagerTest } @Test - public void testGetConfig() throws IOException + public void testGetConfig() { AccountSession accountSession = new AccountSession(UUID.randomUUID(), Instant.now()); accountSession.setUsername("test"); @@ -82,7 +81,7 @@ public class ConfigManagerTest } @Test - public void testGetConfigDefault() throws IOException + public void testGetConfigDefault() { AccountSession accountSession = new AccountSession(UUID.randomUUID(), Instant.now()); accountSession.setUsername("test"); @@ -92,7 +91,7 @@ public class ConfigManagerTest } @Test - public void testSetConfig() throws IOException + public void testSetConfig() { AccountSession accountSession = new AccountSession(UUID.randomUUID(), Instant.now()); accountSession.setUsername("test"); @@ -104,7 +103,7 @@ public class ConfigManagerTest } @Test - public void testGetConfigDescriptor() throws IOException + public void testGetConfigDescriptor() { AccountSession accountSession = new AccountSession(UUID.randomUUID(), Instant.now()); accountSession.setUsername("test"); diff --git a/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java b/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java index a07494cd75..0018b2d7bd 100644 --- a/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java +++ b/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java @@ -345,8 +345,6 @@ public class ItemVariationMappingTest ItemVariationMapping.load(); ITEMS_MAP.forEach((key, value) -> - { - assertEquals(value, (Integer) ItemVariationMapping.map(key)); - }); + assertEquals(value, (Integer) ItemVariationMapping.map(key))); } } 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 776da7e33a..6db1801b14 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 @@ -209,6 +209,7 @@ public class PluginManagerTest class TestPlugin extends Plugin { private boolean thisShouldBeTrue = false; + @Subscribe private void doSomething(TestEvent event) { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java index e6daeb70c8..702a040ec4 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java @@ -33,12 +33,12 @@ import net.runelite.api.Client; import net.runelite.api.Skill; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; -import net.runelite.api.events.WidgetHiddenChanged; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.VarbitChanged; +import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.OpenOSRSConfig; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.ui.overlay.OverlayManager; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java index 2846dd1993..d6019ce8f9 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java @@ -37,6 +37,8 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.OpenOSRSConfig; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,8 +47,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.mockito.junit.MockitoJUnitRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; @RunWith(MockitoJUnitRunner.class) public class EmojiPluginTest diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/gpu/template/TemplateTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/gpu/template/TemplateTest.java index 0c35e65d52..4279252ea9 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/gpu/template/TemplateTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/gpu/template/TemplateTest.java @@ -50,13 +50,11 @@ public class TemplateTest { Function func = (String resource) -> { - switch (resource) + if ("file2".equals(resource)) { - case "file2": - return FILE2; - default: - throw new RuntimeException("unknown resource"); + return FILE2; } + throw new RuntimeException("unknown resource"); }; String out = new Template(func).process(FILE1); assertEquals(RESULT, out); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java index 5a7371e45f..dff30ddf14 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java @@ -104,13 +104,13 @@ public class IdleNotifierPluginTest Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); // Mock monster - final String[] monsterActions = new String[] { "Attack", "Examine" }; + final String[] monsterActions = new String[]{"Attack", "Examine"}; final NPCDefinition monsterComp = mock(NPCDefinition.class); when(monsterComp.getActions()).thenReturn(monsterActions); when(monster.getDefinition()).thenReturn(monsterComp); // Mock random event - final String[] randomEventActions = new String[] { "Talk-to", "Dismiss", "Examine" }; + final String[] randomEventActions = new String[]{"Talk-to", "Dismiss", "Examine"}; final NPCDefinition randomEventComp = mock(NPCDefinition.class); when(randomEventComp.getActions()).thenReturn(randomEventActions); when(randomEvent.getDefinition()).thenReturn(randomEventComp); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java index 38dbc28382..b1339691a8 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; public enum MagicMaxHitConfig implements MaxHitConfig { - TRIDENT_SLAYER(new int[] {75, 83, 99}, 0, new Item[] + TRIDENT_SLAYER(new int[]{75, 83, 99}, 0, new Item[] { mockItem(ItemID.SLAYER_HELMET_I), mockItem(ItemID.SARADOMIN_CAPE), @@ -53,9 +53,9 @@ public enum MagicMaxHitConfig implements MaxHitConfig mockItem(ItemID.MYSTIC_GLOVES), mockItem(ItemID.WIZARD_BOOTS), mockItem(ItemID.RING_OF_WEALTH) - }, new int[] {25, 27, 34}), + }, new int[]{25, 27, 34}), - TRIDENT_OF_SEAS(new int[] {75, 83, 99}, 0, new Item[] + TRIDENT_OF_SEAS(new int[]{75, 83, 99}, 0, new Item[] { mockItem(ItemID.MYSTIC_HAT), mockItem(ItemID.SARADOMIN_CAPE), @@ -69,9 +69,9 @@ public enum MagicMaxHitConfig implements MaxHitConfig mockItem(ItemID.MYSTIC_GLOVES), mockItem(ItemID.WIZARD_BOOTS), mockItem(ItemID.RING_OF_WEALTH) - }, new int[] {20, 22, 28}), + }, new int[]{20, 22, 28}), - TRIDENT_OF_SWAMP(new int[] {75, 83, 99}, 0, new Item[] + TRIDENT_OF_SWAMP(new int[]{75, 83, 99}, 0, new Item[] { mockItem(ItemID.MYSTIC_HAT), mockItem(ItemID.SARADOMIN_CAPE), @@ -85,9 +85,9 @@ public enum MagicMaxHitConfig implements MaxHitConfig mockItem(ItemID.MYSTIC_GLOVES), mockItem(ItemID.WIZARD_BOOTS), mockItem(ItemID.RING_OF_WEALTH) - }, new int[] {23, 25, 31}), + }, new int[]{23, 25, 31}), - MAGIC_DART(new int[] {75, 83, 99}, 18, new Item[] + MAGIC_DART(new int[]{75, 83, 99}, 18, new Item[] { mockItem(ItemID.MYSTIC_HAT), mockItem(ItemID.SARADOMIN_CAPE), @@ -101,7 +101,7 @@ public enum MagicMaxHitConfig implements MaxHitConfig mockItem(ItemID.MYSTIC_GLOVES), mockItem(ItemID.WIZARD_BOOTS), mockItem(ItemID.RING_OF_WEALTH) - }, new int[] {17, 18, 19}), + }, new int[]{17, 18, 19}), FIRE_BOLT(75, 8, new Item[] @@ -197,10 +197,10 @@ public enum MagicMaxHitConfig implements MaxHitConfig MagicMaxHitConfig(int magicLevel, int spellId, Item[] equipedItems, int expectedMaxHit) { - this.magicLevels = new int[] {magicLevel}; + this.magicLevels = new int[]{magicLevel}; this.spellId = spellId; this.equipedItems = equipedItems; - this.expectedMaxHits = new int[] {expectedMaxHit}; + this.expectedMaxHits = new int[]{expectedMaxHit}; } MagicMaxHitConfig(int[] magicLevels, int spellId, Item[] equipedItems, int[] expectedMaxHits) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java index 2dc09e06bc..a986dd9390 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.when; public enum MeleeMaxHitConfig implements MaxHitConfig { - DRAGON_SCIMITAR(new int[] {75, 83, 99}, 66, WeaponType.TYPE_9, 1, new Item[] + DRAGON_SCIMITAR(new int[]{75, 83, 99}, 66, WeaponType.TYPE_9, 1, new Item[] { mockItem(ItemID.IRON_FULL_HELM), mockItem(ItemID.BLACK_CAPE), @@ -57,9 +57,9 @@ public enum MeleeMaxHitConfig implements MaxHitConfig mockItem(ItemID.LEATHER_GLOVES), mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING) - }, new int[] {17, 19, 22}), + }, new int[]{17, 19, 22}), - DRAGON_SCIMITAR_DEFENDER(new int[] {75, 83, 99}, 76, WeaponType.TYPE_9, 1, new Item[] + DRAGON_SCIMITAR_DEFENDER(new int[]{75, 83, 99}, 76, WeaponType.TYPE_9, 1, new Item[] { mockItem(ItemID.IRON_FULL_HELM), mockItem(ItemID.BLACK_CAPE), @@ -73,9 +73,9 @@ public enum MeleeMaxHitConfig implements MaxHitConfig mockItem(ItemID.LEATHER_GLOVES), mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING) - }, new int[] {19, 21, 24}), + }, new int[]{19, 21, 24}), - DRAGON_SCIMITAR_COMPLETE(new int[] {75, 83, 99}, 108, WeaponType.TYPE_9, 1, new Item[] + DRAGON_SCIMITAR_COMPLETE(new int[]{75, 83, 99}, 108, WeaponType.TYPE_9, 1, new Item[] { mockItem(ItemID.SLAYER_HELMET), mockItem(ItemID.FIRE_CAPE), @@ -89,9 +89,9 @@ public enum MeleeMaxHitConfig implements MaxHitConfig mockItem(ItemID.BARROWS_GLOVES), mockItem(ItemID.DRAGON_BOOTS), mockItem(ItemID.BERSERKER_RING) - }, new int[] {26, 29, 35}), + }, new int[]{26, 29, 35}), - OBSIDIAN_SET(new int[] {75, 83, 99}, 61, WeaponType.TYPE_17, 2, new Item[] + OBSIDIAN_SET(new int[]{75, 83, 99}, 61, WeaponType.TYPE_17, 2, new Item[] { mockItem(ItemID.OBSIDIAN_HELMET), mockItem(ItemID.OBSIDIAN_CAPE), @@ -105,10 +105,10 @@ public enum MeleeMaxHitConfig implements MaxHitConfig mockItem(ItemID.LEATHER_GLOVES), mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING) - }, new int[] {18, 19, 23}), + }, new int[]{18, 19, 23}), - DHAROK_SET(new int[] {75, 75, 75, 83, 83, 83, 99, 99, 99}, 105, WeaponType.TYPE_1, 1, - new int[][] {{99, 99}, {1, 99}, {32, 75}, {99, 99}, {1, 99}, {32, 75}, {99, 99}, {1, 99}, {32, 75}}, + DHAROK_SET(new int[]{75, 75, 75, 83, 83, 83, 99, 99, 99}, 105, WeaponType.TYPE_1, 1, + new int[][]{{99, 99}, {1, 99}, {32, 75}, {99, 99}, {1, 99}, {32, 75}, {99, 99}, {1, 99}, {32, 75}}, new Item[] { mockItem(ItemID.DHAROKS_HELM_100), @@ -123,9 +123,9 @@ public enum MeleeMaxHitConfig implements MaxHitConfig mockItem(ItemID.LEATHER_GLOVES), mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING) - }, new int[] {23, 45, 30, 25, 49, 33, 29, 57, 38}), + }, new int[]{23, 45, 30, 25, 49, 33, 29, 57, 38}), - VOID_SET(new int[] {75, 83, 99}, 66, WeaponType.TYPE_9, 1, new Item[] + VOID_SET(new int[]{75, 83, 99}, 66, WeaponType.TYPE_9, 1, new Item[] { mockItem(ItemID.VOID_MELEE_HELM), mockItem(ItemID.BLACK_CAPE), @@ -139,7 +139,7 @@ public enum MeleeMaxHitConfig implements MaxHitConfig mockItem(ItemID.VOID_KNIGHT_GLOVES), mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING) - }, new int[] {19, 21, 25}), + }, new int[]{19, 21, 25}), ; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java index 6d975cd7b2..81d7f196e5 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.when; public enum RangeMaxHitConfig implements MaxHitConfig { - MAGIC_SHORTBOW(new int[] {75, 83, 99}, 49, WeaponType.TYPE_3, 1, new Item[] + MAGIC_SHORTBOW(new int[]{75, 83, 99}, 49, WeaponType.TYPE_3, 1, new Item[] { mockItem(ItemID.IRON_FULL_HELM), mockItem(ItemID.BLACK_CAPE), @@ -58,9 +58,9 @@ public enum RangeMaxHitConfig implements MaxHitConfig mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING), mockItem(ItemID.RUNE_ARROW) - }, new int[] {15, 16, 19}), + }, new int[]{15, 16, 19}), - RUNE_CROSSBOW(new int[] {75, 83, 99}, 115, WeaponType.TYPE_5, 0, new Item[] + RUNE_CROSSBOW(new int[]{75, 83, 99}, 115, WeaponType.TYPE_5, 0, new Item[] { mockItem(ItemID.IRON_FULL_HELM), mockItem(ItemID.BLACK_CAPE), @@ -75,9 +75,9 @@ public enum RangeMaxHitConfig implements MaxHitConfig mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING), mockItem(ItemID.RUNITE_BOLTS) - }, new int[] {24, 26, 31}), + }, new int[]{24, 26, 31}), - BLOwPIPE(new int[] {75, 83, 99}, 50, WeaponType.TYPE_19, 1, new Item[] + BLOwPIPE(new int[]{75, 83, 99}, 50, WeaponType.TYPE_19, 1, new Item[] { mockItem(ItemID.IRON_FULL_HELM), mockItem(ItemID.BLACK_CAPE), @@ -91,9 +91,9 @@ public enum RangeMaxHitConfig implements MaxHitConfig mockItem(ItemID.LEATHER_GLOVES), mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING) - }, new int[] {15, 16, 19}), + }, new int[]{15, 16, 19}), - VOID_SET(new int[] {75, 83, 99}, 115, WeaponType.TYPE_5, 1, new Item[] + VOID_SET(new int[]{75, 83, 99}, 115, WeaponType.TYPE_5, 1, new Item[] { mockItem(ItemID.VOID_RANGER_HELM), mockItem(ItemID.BLACK_CAPE), @@ -107,7 +107,7 @@ public enum RangeMaxHitConfig implements MaxHitConfig mockItem(ItemID.VOID_KNIGHT_GLOVES), mockItem(ItemID.LEATHER_BOOTS), mockItem(ItemID.GOLD_RING) - }, new int[] {26, 28, 33}), + }, new int[]{26, 28, 33}), ; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverTest.java index 6a09ff0f71..efd84a3646 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverTest.java @@ -30,109 +30,109 @@ import net.runelite.client.plugins.puzzlesolver.solver.PuzzleState; import net.runelite.client.plugins.puzzlesolver.solver.heuristics.ManhattanDistance; import net.runelite.client.plugins.puzzlesolver.solver.pathfinding.IDAStar; import net.runelite.client.plugins.puzzlesolver.solver.pathfinding.IDAStarMM; -import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Test; public class PuzzleSolverTest { private static final PuzzleState[] START_STATES = - { - new PuzzleState(new int[]{0, 11, 1, 3, 4, 5, 12, 2, 7, 9, 6, 20, 18, 16, 8, 15, 22, 10, 14, 13, 21, -1, 17, 23, 19}), - new PuzzleState(new int[]{0, 2, 7, 3, 4, 10, 5, 12, 1, 9, 6, 17, 8, 14, 19, -1, 16, 21, 11, 13, 15, 20, 22, 18, 23}), - new PuzzleState(new int[]{0, 1, 11, 3, 4, 12, 2, 7, 13, 9, 5, 21, 15, 17, 14, -1, 10, 6, 8, 19, 16, 20, 22, 18, 23}), - new PuzzleState(new int[]{0, 1, 2, 3, 4, 10, 5, 6, 9, 14, 15, -1, 7, 13, 17, 21, 11, 20, 23, 8, 16, 22, 12, 19, 18}), - new PuzzleState(new int[]{0, 1, 2, 3, 4, 5, 6, 8, 22, 18, 10, -1, 7, 17, 9, 20, 11, 12, 21, 14, 16, 15, 23, 13, 19}), - new PuzzleState(new int[]{0, 1, 2, 3, 4, 5, 6, 8, 12, 9, 16, 11, 17, 7, 14, 10, 20, -1, 22, 13, 15, 18, 21, 23, 19}), - new PuzzleState(new int[]{1, 6, 16, 8, 4, 0, 7, 11, 2, 9, 5, 21, 18, 3, 14, 10, 20, -1, 13, 22, 15, 23, 12, 17, 19}), - new PuzzleState(new int[]{0, 1, 2, 4, 8, 6, 16, 11, 7, 3, 5, -1, 12, 14, 9, 15, 10, 17, 13, 18, 20, 21, 22, 23, 19}), - new PuzzleState(new int[]{0, 2, 9, 14, 6, 5, 7, 11, 3, 4, 15, 10, 1, 12, 18, 16, 17, -1, 8, 13, 20, 21, 22, 23, 19}), - new PuzzleState(new int[]{0, 1, 2, 3, 4, 11, 5, 12, 7, 8, 10, 6, 15, 13, 9, 16, 21, -1, 17, 14, 20, 22, 23, 18, 19}), - new PuzzleState(new int[]{5, 0, 1, 2, 4, 10, 6, 3, 8, 9, 12, 13, 7, 14, 19, 15, 11, 16, 17, -1, 20, 21, 22, 18, 23}), - new PuzzleState(new int[]{0, 6, 1, 3, 4, 5, 8, -1, 2, 9, 16, 11, 12, 7, 14, 10, 15, 17, 13, 19, 20, 21, 22, 18, 23}), - new PuzzleState(new int[]{0, 6, 1, 2, 4, 11, 15, 8, 3, 14, 5, 7, 9, 12, 18, 16, 10, 17, 23, 13, 20, 21, 22, -1, 19}), - new PuzzleState(new int[]{0, 1, 7, 2, 4, 5, 3, 12, 8, 9, 15, 6, 18, -1, 13, 11, 10, 22, 17, 23, 16, 21, 20, 19, 14}), - new PuzzleState(new int[]{0, 1, 2, 7, 3, 5, 11, 6, 14, 4, 10, -1, 16, 12, 9, 15, 17, 18, 8, 19, 20, 21, 13, 22, 23}), - new PuzzleState(new int[]{2, 10, 5, 3, 4, -1, 0, 1, 8, 9, 15, 11, 7, 13, 23, 17, 6, 20, 14, 19, 16, 12, 18, 21, 22}), - new PuzzleState(new int[]{0, 1, 2, 8, 9, 5, 6, 7, 3, 4, 10, -1, 14, 23, 18, 21, 11, 16, 12, 19, 15, 20, 17, 13, 22}), - new PuzzleState(new int[]{0, 6, 1, 3, 4, 11, 2, 13, 9, 12, 5, 16, 7, 18, 8, 20, 15, -1, 14, 19, 21, 10, 22, 23, 17}), - new PuzzleState(new int[]{12, 1, 2, 3, 4, 0, 7, 6, 8, 9, 5, 10, 22, 13, 19, 15, 11, 21, 14, 17, 20, 16, 18, -1, 23}), - new PuzzleState(new int[]{0, 2, 11, 3, 4, 5, 1, 6, 8, 9, 15, 10, 13, 14, 19, 7, 12, -1, 17, 18, 20, 21, 16, 22, 23}), - new PuzzleState(new int[]{5, 0, 4, 2, 9, 10, 7, 3, 19, 8, 6, 1, 18, -1, 14, 15, 11, 16, 12, 13, 20, 21, 17, 22, 23}), - new PuzzleState(new int[]{0, 3, 2, 7, 4, 6, 10, 1, 8, 9, 15, 5, 12, 18, 13, -1, 20, 11, 22, 14, 16, 21, 23, 17, 19}), - new PuzzleState(new int[]{1, 2, 4, -1, 9, 0, 5, 7, 3, 14, 10, 6, 8, 13, 19, 15, 11, 18, 12, 22, 20, 16, 21, 23, 17}), - new PuzzleState(new int[]{0, 1, 2, 4, 9, 5, 11, -1, 7, 14, 10, 17, 6, 13, 8, 15, 16, 20, 3, 18, 22, 21, 12, 23, 19}), - new PuzzleState(new int[]{0, 1, 8, 2, 4, 5, 11, 17, 3, 9, 6, 16, 7, 12, 18, 15, 21, -1, 14, 13, 20, 22, 10, 23, 19}), - new PuzzleState(new int[]{5, 0, 2, 3, 4, 1, 8, 6, 7, 9, 11, 12, 16, 13, 14, -1, 22, 20, 17, 19, 21, 10, 15, 18, 23}), - new PuzzleState(new int[]{0, -1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 16, 11, 13, 14, 10, 15, 19, 22, 23, 20, 21, 17, 12, 18}), - new PuzzleState(new int[]{0, 2, 7, -1, 4, 6, 1, 9, 3, 14, 5, 12, 8, 13, 19, 15, 16, 10, 22, 23, 20, 11, 18, 21, 17}), - new PuzzleState(new int[]{7, 5, 13, 1, 12, 0, 2, 4, 3, 9, 10, 6, 8, 17, 14, 15, 11, 16, 18, -1, 20, 21, 22, 23, 19}), - new PuzzleState(new int[]{5, 0, 3, 8, 4, 10, 6, -1, 7, 9, 11, 1, 12, 2, 19, 15, 16, 17, 14, 13, 20, 21, 22, 18, 23}), - new PuzzleState(new int[]{5, 2, 3, 7, 4, 0, 6, 14, 9, 19, 1, 11, 22, 17, 12, 10, 15, -1, 13, 8, 20, 16, 21, 18, 23}), - new PuzzleState(new int[]{0, 1, 3, 4, 9, 5, 6, 2, 7, 14, 10, 13, 17, -1, 8, 15, 11, 16, 12, 18, 20, 21, 22, 23, 19}), - new PuzzleState(new int[]{0, 3, 11, 7, 4, 5, 2, 6, 12, 8, 10, 1, 17, -1, 9, 15, 16, 23, 13, 14, 20, 21, 18, 22, 19}), - new PuzzleState(new int[]{1, 5, 8, 2, 4, -1, 0, 7, 3, 9, 11, 22, 15, 12, 14, 6, 10, 18, 16, 19, 20, 21, 17, 13, 23}), - new PuzzleState(new int[]{7, 12, 11, 4, 9, -1, 0, 8, 10, 2, 6, 1, 16, 3, 14, 5, 15, 17, 13, 19, 20, 21, 22, 18, 23}), - new PuzzleState(new int[]{11, 3, 2, 12, 4, 6, 0, 7, 13, 8, 1, 5, 17, 16, 9, -1, 10, 15, 18, 14, 20, 21, 22, 23, 19}), - new PuzzleState(new int[]{0, 6, 1, 3, 4, 5, 11, 2, 10, 9, 15, 12, 8, 14, 19, 16, 21, -1, 7, 13, 20, 22, 17, 18, 23}), - new PuzzleState(new int[]{0, 1, 2, 3, 4, 6, 10, 7, 8, 9, 5, 16, 11, 14, 17, 20, 13, 18, 12, 22, 21, 15, 23, -1, 19}), - new PuzzleState(new int[]{0, 1, 2, 4, 8, 5, 6, 7, 3, -1, 10, 16, 18, 17, 9, 15, 12, 11, 14, 13, 20, 21, 22, 23, 19}), - new PuzzleState(new int[]{0, 11, 6, 1, 4, 5, 21, 8, 2, 9, 10, 3, 16, -1, 14, 15, 12, 17, 13, 19, 20, 22, 7, 18, 23}), - new PuzzleState(new int[]{0, 6, 1, 2, 4, 11, 10, 3, 13, 9, 5, 7, 8, -1, 23, 15, 16, 22, 18, 14, 20, 21, 12, 17, 19}), - new PuzzleState(new int[]{0, 6, 1, 2, 3, 10, 11, 12, 5, 18, 15, 7, 4, -1, 14, 21, 17, 13, 8, 9, 16, 20, 22, 23, 19}), - new PuzzleState(new int[]{0, 1, 3, 11, 4, 6, 10, 14, 2, 8, 5, -1, 12, 7, 9, 15, 16, 18, 13, 19, 20, 21, 22, 17, 23}), - new PuzzleState(new int[]{1, 5, 2, 3, 4, -1, 0, 7, 14, 8, 11, 6, 13, 9, 23, 10, 12, 15, 19, 17, 20, 21, 16, 22, 18}), - }; + { + new PuzzleState(new int[]{0, 11, 1, 3, 4, 5, 12, 2, 7, 9, 6, 20, 18, 16, 8, 15, 22, 10, 14, 13, 21, -1, 17, 23, 19}), + new PuzzleState(new int[]{0, 2, 7, 3, 4, 10, 5, 12, 1, 9, 6, 17, 8, 14, 19, -1, 16, 21, 11, 13, 15, 20, 22, 18, 23}), + new PuzzleState(new int[]{0, 1, 11, 3, 4, 12, 2, 7, 13, 9, 5, 21, 15, 17, 14, -1, 10, 6, 8, 19, 16, 20, 22, 18, 23}), + new PuzzleState(new int[]{0, 1, 2, 3, 4, 10, 5, 6, 9, 14, 15, -1, 7, 13, 17, 21, 11, 20, 23, 8, 16, 22, 12, 19, 18}), + new PuzzleState(new int[]{0, 1, 2, 3, 4, 5, 6, 8, 22, 18, 10, -1, 7, 17, 9, 20, 11, 12, 21, 14, 16, 15, 23, 13, 19}), + new PuzzleState(new int[]{0, 1, 2, 3, 4, 5, 6, 8, 12, 9, 16, 11, 17, 7, 14, 10, 20, -1, 22, 13, 15, 18, 21, 23, 19}), + new PuzzleState(new int[]{1, 6, 16, 8, 4, 0, 7, 11, 2, 9, 5, 21, 18, 3, 14, 10, 20, -1, 13, 22, 15, 23, 12, 17, 19}), + new PuzzleState(new int[]{0, 1, 2, 4, 8, 6, 16, 11, 7, 3, 5, -1, 12, 14, 9, 15, 10, 17, 13, 18, 20, 21, 22, 23, 19}), + new PuzzleState(new int[]{0, 2, 9, 14, 6, 5, 7, 11, 3, 4, 15, 10, 1, 12, 18, 16, 17, -1, 8, 13, 20, 21, 22, 23, 19}), + new PuzzleState(new int[]{0, 1, 2, 3, 4, 11, 5, 12, 7, 8, 10, 6, 15, 13, 9, 16, 21, -1, 17, 14, 20, 22, 23, 18, 19}), + new PuzzleState(new int[]{5, 0, 1, 2, 4, 10, 6, 3, 8, 9, 12, 13, 7, 14, 19, 15, 11, 16, 17, -1, 20, 21, 22, 18, 23}), + new PuzzleState(new int[]{0, 6, 1, 3, 4, 5, 8, -1, 2, 9, 16, 11, 12, 7, 14, 10, 15, 17, 13, 19, 20, 21, 22, 18, 23}), + new PuzzleState(new int[]{0, 6, 1, 2, 4, 11, 15, 8, 3, 14, 5, 7, 9, 12, 18, 16, 10, 17, 23, 13, 20, 21, 22, -1, 19}), + new PuzzleState(new int[]{0, 1, 7, 2, 4, 5, 3, 12, 8, 9, 15, 6, 18, -1, 13, 11, 10, 22, 17, 23, 16, 21, 20, 19, 14}), + new PuzzleState(new int[]{0, 1, 2, 7, 3, 5, 11, 6, 14, 4, 10, -1, 16, 12, 9, 15, 17, 18, 8, 19, 20, 21, 13, 22, 23}), + new PuzzleState(new int[]{2, 10, 5, 3, 4, -1, 0, 1, 8, 9, 15, 11, 7, 13, 23, 17, 6, 20, 14, 19, 16, 12, 18, 21, 22}), + new PuzzleState(new int[]{0, 1, 2, 8, 9, 5, 6, 7, 3, 4, 10, -1, 14, 23, 18, 21, 11, 16, 12, 19, 15, 20, 17, 13, 22}), + new PuzzleState(new int[]{0, 6, 1, 3, 4, 11, 2, 13, 9, 12, 5, 16, 7, 18, 8, 20, 15, -1, 14, 19, 21, 10, 22, 23, 17}), + new PuzzleState(new int[]{12, 1, 2, 3, 4, 0, 7, 6, 8, 9, 5, 10, 22, 13, 19, 15, 11, 21, 14, 17, 20, 16, 18, -1, 23}), + new PuzzleState(new int[]{0, 2, 11, 3, 4, 5, 1, 6, 8, 9, 15, 10, 13, 14, 19, 7, 12, -1, 17, 18, 20, 21, 16, 22, 23}), + new PuzzleState(new int[]{5, 0, 4, 2, 9, 10, 7, 3, 19, 8, 6, 1, 18, -1, 14, 15, 11, 16, 12, 13, 20, 21, 17, 22, 23}), + new PuzzleState(new int[]{0, 3, 2, 7, 4, 6, 10, 1, 8, 9, 15, 5, 12, 18, 13, -1, 20, 11, 22, 14, 16, 21, 23, 17, 19}), + new PuzzleState(new int[]{1, 2, 4, -1, 9, 0, 5, 7, 3, 14, 10, 6, 8, 13, 19, 15, 11, 18, 12, 22, 20, 16, 21, 23, 17}), + new PuzzleState(new int[]{0, 1, 2, 4, 9, 5, 11, -1, 7, 14, 10, 17, 6, 13, 8, 15, 16, 20, 3, 18, 22, 21, 12, 23, 19}), + new PuzzleState(new int[]{0, 1, 8, 2, 4, 5, 11, 17, 3, 9, 6, 16, 7, 12, 18, 15, 21, -1, 14, 13, 20, 22, 10, 23, 19}), + new PuzzleState(new int[]{5, 0, 2, 3, 4, 1, 8, 6, 7, 9, 11, 12, 16, 13, 14, -1, 22, 20, 17, 19, 21, 10, 15, 18, 23}), + new PuzzleState(new int[]{0, -1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 16, 11, 13, 14, 10, 15, 19, 22, 23, 20, 21, 17, 12, 18}), + new PuzzleState(new int[]{0, 2, 7, -1, 4, 6, 1, 9, 3, 14, 5, 12, 8, 13, 19, 15, 16, 10, 22, 23, 20, 11, 18, 21, 17}), + new PuzzleState(new int[]{7, 5, 13, 1, 12, 0, 2, 4, 3, 9, 10, 6, 8, 17, 14, 15, 11, 16, 18, -1, 20, 21, 22, 23, 19}), + new PuzzleState(new int[]{5, 0, 3, 8, 4, 10, 6, -1, 7, 9, 11, 1, 12, 2, 19, 15, 16, 17, 14, 13, 20, 21, 22, 18, 23}), + new PuzzleState(new int[]{5, 2, 3, 7, 4, 0, 6, 14, 9, 19, 1, 11, 22, 17, 12, 10, 15, -1, 13, 8, 20, 16, 21, 18, 23}), + new PuzzleState(new int[]{0, 1, 3, 4, 9, 5, 6, 2, 7, 14, 10, 13, 17, -1, 8, 15, 11, 16, 12, 18, 20, 21, 22, 23, 19}), + new PuzzleState(new int[]{0, 3, 11, 7, 4, 5, 2, 6, 12, 8, 10, 1, 17, -1, 9, 15, 16, 23, 13, 14, 20, 21, 18, 22, 19}), + new PuzzleState(new int[]{1, 5, 8, 2, 4, -1, 0, 7, 3, 9, 11, 22, 15, 12, 14, 6, 10, 18, 16, 19, 20, 21, 17, 13, 23}), + new PuzzleState(new int[]{7, 12, 11, 4, 9, -1, 0, 8, 10, 2, 6, 1, 16, 3, 14, 5, 15, 17, 13, 19, 20, 21, 22, 18, 23}), + new PuzzleState(new int[]{11, 3, 2, 12, 4, 6, 0, 7, 13, 8, 1, 5, 17, 16, 9, -1, 10, 15, 18, 14, 20, 21, 22, 23, 19}), + new PuzzleState(new int[]{0, 6, 1, 3, 4, 5, 11, 2, 10, 9, 15, 12, 8, 14, 19, 16, 21, -1, 7, 13, 20, 22, 17, 18, 23}), + new PuzzleState(new int[]{0, 1, 2, 3, 4, 6, 10, 7, 8, 9, 5, 16, 11, 14, 17, 20, 13, 18, 12, 22, 21, 15, 23, -1, 19}), + new PuzzleState(new int[]{0, 1, 2, 4, 8, 5, 6, 7, 3, -1, 10, 16, 18, 17, 9, 15, 12, 11, 14, 13, 20, 21, 22, 23, 19}), + new PuzzleState(new int[]{0, 11, 6, 1, 4, 5, 21, 8, 2, 9, 10, 3, 16, -1, 14, 15, 12, 17, 13, 19, 20, 22, 7, 18, 23}), + new PuzzleState(new int[]{0, 6, 1, 2, 4, 11, 10, 3, 13, 9, 5, 7, 8, -1, 23, 15, 16, 22, 18, 14, 20, 21, 12, 17, 19}), + new PuzzleState(new int[]{0, 6, 1, 2, 3, 10, 11, 12, 5, 18, 15, 7, 4, -1, 14, 21, 17, 13, 8, 9, 16, 20, 22, 23, 19}), + new PuzzleState(new int[]{0, 1, 3, 11, 4, 6, 10, 14, 2, 8, 5, -1, 12, 7, 9, 15, 16, 18, 13, 19, 20, 21, 22, 17, 23}), + new PuzzleState(new int[]{1, 5, 2, 3, 4, -1, 0, 7, 14, 8, 11, 6, 13, 9, 23, 10, 12, 15, 19, 17, 20, 21, 16, 22, 18}), + }; private static final PuzzleState[] START_STATES_MM = - { - new PuzzleState(new int[]{0, 5, 1, 3, 4, 15, 2, 8, 10, 9, 22, 16, 11, 6, 14, 7, 21, 23, 12, 18, 20, -1, 17, 13, 19}), - new PuzzleState(new int[]{0, 12, 8, 13, 4, 3, 16, 2, 1, 9, 21, 5, 6, 10, 14, 7, 17, 20, 18, -1, 15, 11, 22, 23, 19}), - new PuzzleState(new int[]{1, 3, 7, 9, 8, 13, 17, 2, 4, 6, 15, 5, 22, 12, 14, 11, 0, 10, 21, -1, 20, 18, 16, 23, 19}), - new PuzzleState(new int[]{5, 2, 16, 14, 4, 3, 0, 8, 9, 11, 15, 6, 17, 19, 7, 1, 10, -1, 23, 18, 20, 12, 21, 13, 22}), - new PuzzleState(new int[]{0, 6, 1, 4, 13, 10, 2, 16, 7, 3, 20, -1, 8, 14, 9, 21, 5, 18, 11, 19, 17, 15, 12, 22, 23}), - new PuzzleState(new int[]{5, 0, 1, 4, 8, 10, 6, 7, 12, 3, 17, 16, 21, 2, 9, 18, 20, 13, 14, 19, 11, -1, 23, 15, 22}), - new PuzzleState(new int[]{1, 9, 2, 13, 17, 5, 7, 8, 3, 22, 6, -1, 16, 12, 4, 15, 18, 0, 23, 14, 10, 21, 11, 20, 19}), - new PuzzleState(new int[]{1, 2, 11, 13, 4, 21, 7, 3, 6, 9, 0, 8, 10, 19, 14, 20, 12, 16, 23, -1, 5, 17, 15, 22, 18}), - new PuzzleState(new int[]{2, 0, 1, 4, 13, 6, 7, 3, 8, 9, 22, 15, 10, 14, 18, 5, 12, -1, 17, 21, 20, 11, 23, 16, 19}), - new PuzzleState(new int[]{0, 1, 2, 8, 3, 6, 12, 22, 9, 7, 11, 21, 13, 4, 14, 5, 10, -1, 18, 19, 20, 15, 16, 23, 17}), - new PuzzleState(new int[]{1, 2, 3, 4, 8, 0, 6, 15, 14, 18, 16, 17, 20, -1, 9, 10, 12, 22, 11, 13, 21, 7, 5, 19, 23}), - new PuzzleState(new int[]{0, 5, 2, 4, 9, 7, 15, 20, 12, 13, 6, -1, 22, 1, 8, 10, 11, 23, 14, 3, 21, 16, 17, 19, 18}), - new PuzzleState(new int[]{0, 1, 9, 6, 13, 5, 18, -1, 4, 2, 15, 12, 3, 17, 7, 16, 10, 8, 23, 14, 20, 21, 19, 11, 22}), - new PuzzleState(new int[]{11, 5, 12, 3, 4, 15, 8, 0, 7, 1, 6, -1, 19, 2, 9, 16, 10, 13, 17, 23, 20, 21, 22, 14, 18}), - new PuzzleState(new int[]{10, 0, 1, 3, 4, 18, 5, 6, 12, 9, 7, 11, 8, -1, 22, 15, 23, 14, 19, 13, 20, 2, 17, 16, 21}), - new PuzzleState(new int[]{19, -1, 6, 2, 4, 0, 21, 10, 3, 9, 1, 15, 17, 8, 14, 11, 13, 22, 7, 18, 16, 12, 5, 23, 20}), - new PuzzleState(new int[]{11, 6, 3, 4, 9, 1, 10, 16, 2, 7, 5, 0, 13, -1, 12, 21, 8, 18, 17, 14, 15, 20, 22, 23, 19}), - new PuzzleState(new int[]{0, 1, 5, 3, 4, -1, 6, 2, 15, 10, 7, 8, 23, 16, 13, 22, 11, 9, 12, 14, 20, 21, 18, 17, 19}), - new PuzzleState(new int[]{10, 0, 1, -1, 2, 6, 5, 4, 13, 9, 16, 17, 12, 8, 19, 20, 15, 7, 21, 11, 22, 18, 14, 23, 3}), - new PuzzleState(new int[]{1, 0, 5, 3, 9, 20, 15, 7, 2, 14, 6, 4, 12, -1, 8, 13, 18, 10, 23, 11, 21, 16, 17, 19, 22}), - new PuzzleState(new int[]{0, 7, 6, 3, 4, 15, 1, 2, 8, 18, 11, 5, 13, -1, 22, 17, 16, 23, 14, 9, 20, 10, 12, 19, 21}), - new PuzzleState(new int[]{5, 7, 0, 2, 9, 10, 1, 11, 3, 4, 16, 22, 8, 14, 17, 15, 20, 12, 13, 6, 21, 23, 19, -1, 18}), - new PuzzleState(new int[]{3, 0, 1, 5, 4, 11, 6, 2, 16, 9, 15, 10, 7, 12, 13, 21, 19, -1, 22, 8, 20, 17, 14, 18, 23}), - new PuzzleState(new int[]{6, 0, 3, 2, 4, 5, 1, 8, 13, 12, 15, 14, 10, 7, 9, -1, 22, 11, 19, 23, 16, 20, 17, 21, 18}), - new PuzzleState(new int[]{11, 5, 6, 8, 9, 0, 21, 16, 4, 3, 17, 18, 2, 7, 1, 15, 10, -1, 22, 14, 20, 19, 13, 12, 23}), - new PuzzleState(new int[]{2, 18, 3, 11, 4, -1, 5, 6, 12, 1, 10, 20, 0, 7, 9, 21, 15, 14, 23, 19, 16, 22, 13, 8, 17}), - new PuzzleState(new int[]{0, 6, 8, 3, 1, 5, 2, 12, 9, 13, 16, 14, 19, 7, 18, 10, 11, -1, 4, 15, 20, 17, 23, 21, 22}), - new PuzzleState(new int[]{1, 16, 10, 4, 3, 0, 15, 2, 9, -1, 8, 5, 23, 12, 6, 21, 18, 14, 13, 11, 20, 22, 7, 19, 17}), - new PuzzleState(new int[]{1, 7, 6, 3, 4, 0, 2, 14, 5, 22, 18, 21, 16, 9, 13, 10, 20, -1, 8, 17, 15, 23, 11, 19, 12}), - new PuzzleState(new int[]{5, 0, 1, 7, 9, 11, 8, 4, 2, 14, 15, 17, 18, -1, 3, 20, 10, 12, 22, 19, 16, 6, 13, 21, 23}), - new PuzzleState(new int[]{5, 0, 6, 14, 7, 13, 15, 1, 3, 10, 20, 9, 17, 4, 2, 11, 12, 8, 19, -1, 21, 16, 22, 18, 23}), - new PuzzleState(new int[]{12, 7, 8, 4, 9, 6, 11, 15, 2, 1, 5, -1, 13, 16, 3, 17, 0, 10, 18, 14, 20, 22, 21, 19, 23}), - new PuzzleState(new int[]{15, 1, 2, 3, 14, -1, 20, 9, 4, 19, 0, 6, 7, 16, 13, 10, 5, 12, 17, 18, 22, 11, 21, 23, 8}), - new PuzzleState(new int[]{0, 1, 17, -1, 14, 6, 4, 2, 3, 16, 10, 18, 13, 19, 9, 7, 5, 8, 21, 22, 11, 20, 15, 12, 23}), - new PuzzleState(new int[]{5, 11, 9, 0, 3, 8, 14, -1, 6, 4, 1, 13, 7, 2, 19, 10, 21, 18, 23, 17, 15, 20, 12, 16, 22}), - new PuzzleState(new int[]{2, 0, 14, -1, 4, 18, 1, 10, 12, 13, 5, 9, 11, 22, 7, 15, 8, 17, 19, 3, 20, 21, 6, 16, 23}), - new PuzzleState(new int[]{0, 1, 13, 9, 2, 6, 8, 22, 3, 4, 12, 16, 10, 7, 19, -1, 5, 11, 14, 17, 15, 20, 21, 18, 23}), - new PuzzleState(new int[]{0, 13, 17, 8, 3, 5, 1, 12, 14, 4, 10, -1, 6, 7, 9, 15, 23, 2, 16, 19, 20, 11, 21, 22, 18}), - new PuzzleState(new int[]{5, 10, 7, 2, 9, 15, 0, -1, 1, 3, 18, 4, 17, 12, 14, 21, 11, 6, 8, 23, 20, 16, 22, 19, 13}), - new PuzzleState(new int[]{0, 3, 1, 2, 4, 10, 5, 7, 8, 9, 11, 6, 21, 13, 12, 20, 17, -1, 14, 19, 22, 18, 15, 16, 23}), - new PuzzleState(new int[]{0, 2, 7, 11, 13, 3, 14, 1, 4, 9, 5, -1, 12, 8, 18, 20, 10, 15, 22, 23, 17, 16, 6, 21, 19}), - new PuzzleState(new int[]{0, 16, 3, 22, 7, 11, 6, -1, 9, 4, 2, 1, 13, 12, 18, 5, 10, 8, 19, 14, 15, 20, 17, 23, 21}), - new PuzzleState(new int[]{0, 13, 5, 12, 3, 2, 10, 4, 6, 8, 1, 21, 19, 14, 9, 17, 23, 22, 16, 11, 15, 7, 20, -1, 18}), - new PuzzleState(new int[]{14, 5, 6, 12, 4, 10, 20, 1, 0, 23, 2, 16, 13, 19, 3, 15, 22, -1, 9, 8, 11, 7, 18, 17, 21}), - new PuzzleState(new int[]{0, 1, 2, 4, 7, 5, 11, -1, 18, 8, 16, 10, 12, 13, 3, 17, 6, 21, 23, 9, 15, 20, 22, 14, 19}), - new PuzzleState(new int[]{1, 6, 7, 3, 4, 5, 17, 0, 22, 12, 10, 15, 8, -1, 14, 11, 13, 16, 18, 19, 20, 2, 21, 9, 23}), - }; + { + new PuzzleState(new int[]{0, 5, 1, 3, 4, 15, 2, 8, 10, 9, 22, 16, 11, 6, 14, 7, 21, 23, 12, 18, 20, -1, 17, 13, 19}), + new PuzzleState(new int[]{0, 12, 8, 13, 4, 3, 16, 2, 1, 9, 21, 5, 6, 10, 14, 7, 17, 20, 18, -1, 15, 11, 22, 23, 19}), + new PuzzleState(new int[]{1, 3, 7, 9, 8, 13, 17, 2, 4, 6, 15, 5, 22, 12, 14, 11, 0, 10, 21, -1, 20, 18, 16, 23, 19}), + new PuzzleState(new int[]{5, 2, 16, 14, 4, 3, 0, 8, 9, 11, 15, 6, 17, 19, 7, 1, 10, -1, 23, 18, 20, 12, 21, 13, 22}), + new PuzzleState(new int[]{0, 6, 1, 4, 13, 10, 2, 16, 7, 3, 20, -1, 8, 14, 9, 21, 5, 18, 11, 19, 17, 15, 12, 22, 23}), + new PuzzleState(new int[]{5, 0, 1, 4, 8, 10, 6, 7, 12, 3, 17, 16, 21, 2, 9, 18, 20, 13, 14, 19, 11, -1, 23, 15, 22}), + new PuzzleState(new int[]{1, 9, 2, 13, 17, 5, 7, 8, 3, 22, 6, -1, 16, 12, 4, 15, 18, 0, 23, 14, 10, 21, 11, 20, 19}), + new PuzzleState(new int[]{1, 2, 11, 13, 4, 21, 7, 3, 6, 9, 0, 8, 10, 19, 14, 20, 12, 16, 23, -1, 5, 17, 15, 22, 18}), + new PuzzleState(new int[]{2, 0, 1, 4, 13, 6, 7, 3, 8, 9, 22, 15, 10, 14, 18, 5, 12, -1, 17, 21, 20, 11, 23, 16, 19}), + new PuzzleState(new int[]{0, 1, 2, 8, 3, 6, 12, 22, 9, 7, 11, 21, 13, 4, 14, 5, 10, -1, 18, 19, 20, 15, 16, 23, 17}), + new PuzzleState(new int[]{1, 2, 3, 4, 8, 0, 6, 15, 14, 18, 16, 17, 20, -1, 9, 10, 12, 22, 11, 13, 21, 7, 5, 19, 23}), + new PuzzleState(new int[]{0, 5, 2, 4, 9, 7, 15, 20, 12, 13, 6, -1, 22, 1, 8, 10, 11, 23, 14, 3, 21, 16, 17, 19, 18}), + new PuzzleState(new int[]{0, 1, 9, 6, 13, 5, 18, -1, 4, 2, 15, 12, 3, 17, 7, 16, 10, 8, 23, 14, 20, 21, 19, 11, 22}), + new PuzzleState(new int[]{11, 5, 12, 3, 4, 15, 8, 0, 7, 1, 6, -1, 19, 2, 9, 16, 10, 13, 17, 23, 20, 21, 22, 14, 18}), + new PuzzleState(new int[]{10, 0, 1, 3, 4, 18, 5, 6, 12, 9, 7, 11, 8, -1, 22, 15, 23, 14, 19, 13, 20, 2, 17, 16, 21}), + new PuzzleState(new int[]{19, -1, 6, 2, 4, 0, 21, 10, 3, 9, 1, 15, 17, 8, 14, 11, 13, 22, 7, 18, 16, 12, 5, 23, 20}), + new PuzzleState(new int[]{11, 6, 3, 4, 9, 1, 10, 16, 2, 7, 5, 0, 13, -1, 12, 21, 8, 18, 17, 14, 15, 20, 22, 23, 19}), + new PuzzleState(new int[]{0, 1, 5, 3, 4, -1, 6, 2, 15, 10, 7, 8, 23, 16, 13, 22, 11, 9, 12, 14, 20, 21, 18, 17, 19}), + new PuzzleState(new int[]{10, 0, 1, -1, 2, 6, 5, 4, 13, 9, 16, 17, 12, 8, 19, 20, 15, 7, 21, 11, 22, 18, 14, 23, 3}), + new PuzzleState(new int[]{1, 0, 5, 3, 9, 20, 15, 7, 2, 14, 6, 4, 12, -1, 8, 13, 18, 10, 23, 11, 21, 16, 17, 19, 22}), + new PuzzleState(new int[]{0, 7, 6, 3, 4, 15, 1, 2, 8, 18, 11, 5, 13, -1, 22, 17, 16, 23, 14, 9, 20, 10, 12, 19, 21}), + new PuzzleState(new int[]{5, 7, 0, 2, 9, 10, 1, 11, 3, 4, 16, 22, 8, 14, 17, 15, 20, 12, 13, 6, 21, 23, 19, -1, 18}), + new PuzzleState(new int[]{3, 0, 1, 5, 4, 11, 6, 2, 16, 9, 15, 10, 7, 12, 13, 21, 19, -1, 22, 8, 20, 17, 14, 18, 23}), + new PuzzleState(new int[]{6, 0, 3, 2, 4, 5, 1, 8, 13, 12, 15, 14, 10, 7, 9, -1, 22, 11, 19, 23, 16, 20, 17, 21, 18}), + new PuzzleState(new int[]{11, 5, 6, 8, 9, 0, 21, 16, 4, 3, 17, 18, 2, 7, 1, 15, 10, -1, 22, 14, 20, 19, 13, 12, 23}), + new PuzzleState(new int[]{2, 18, 3, 11, 4, -1, 5, 6, 12, 1, 10, 20, 0, 7, 9, 21, 15, 14, 23, 19, 16, 22, 13, 8, 17}), + new PuzzleState(new int[]{0, 6, 8, 3, 1, 5, 2, 12, 9, 13, 16, 14, 19, 7, 18, 10, 11, -1, 4, 15, 20, 17, 23, 21, 22}), + new PuzzleState(new int[]{1, 16, 10, 4, 3, 0, 15, 2, 9, -1, 8, 5, 23, 12, 6, 21, 18, 14, 13, 11, 20, 22, 7, 19, 17}), + new PuzzleState(new int[]{1, 7, 6, 3, 4, 0, 2, 14, 5, 22, 18, 21, 16, 9, 13, 10, 20, -1, 8, 17, 15, 23, 11, 19, 12}), + new PuzzleState(new int[]{5, 0, 1, 7, 9, 11, 8, 4, 2, 14, 15, 17, 18, -1, 3, 20, 10, 12, 22, 19, 16, 6, 13, 21, 23}), + new PuzzleState(new int[]{5, 0, 6, 14, 7, 13, 15, 1, 3, 10, 20, 9, 17, 4, 2, 11, 12, 8, 19, -1, 21, 16, 22, 18, 23}), + new PuzzleState(new int[]{12, 7, 8, 4, 9, 6, 11, 15, 2, 1, 5, -1, 13, 16, 3, 17, 0, 10, 18, 14, 20, 22, 21, 19, 23}), + new PuzzleState(new int[]{15, 1, 2, 3, 14, -1, 20, 9, 4, 19, 0, 6, 7, 16, 13, 10, 5, 12, 17, 18, 22, 11, 21, 23, 8}), + new PuzzleState(new int[]{0, 1, 17, -1, 14, 6, 4, 2, 3, 16, 10, 18, 13, 19, 9, 7, 5, 8, 21, 22, 11, 20, 15, 12, 23}), + new PuzzleState(new int[]{5, 11, 9, 0, 3, 8, 14, -1, 6, 4, 1, 13, 7, 2, 19, 10, 21, 18, 23, 17, 15, 20, 12, 16, 22}), + new PuzzleState(new int[]{2, 0, 14, -1, 4, 18, 1, 10, 12, 13, 5, 9, 11, 22, 7, 15, 8, 17, 19, 3, 20, 21, 6, 16, 23}), + new PuzzleState(new int[]{0, 1, 13, 9, 2, 6, 8, 22, 3, 4, 12, 16, 10, 7, 19, -1, 5, 11, 14, 17, 15, 20, 21, 18, 23}), + new PuzzleState(new int[]{0, 13, 17, 8, 3, 5, 1, 12, 14, 4, 10, -1, 6, 7, 9, 15, 23, 2, 16, 19, 20, 11, 21, 22, 18}), + new PuzzleState(new int[]{5, 10, 7, 2, 9, 15, 0, -1, 1, 3, 18, 4, 17, 12, 14, 21, 11, 6, 8, 23, 20, 16, 22, 19, 13}), + new PuzzleState(new int[]{0, 3, 1, 2, 4, 10, 5, 7, 8, 9, 11, 6, 21, 13, 12, 20, 17, -1, 14, 19, 22, 18, 15, 16, 23}), + new PuzzleState(new int[]{0, 2, 7, 11, 13, 3, 14, 1, 4, 9, 5, -1, 12, 8, 18, 20, 10, 15, 22, 23, 17, 16, 6, 21, 19}), + new PuzzleState(new int[]{0, 16, 3, 22, 7, 11, 6, -1, 9, 4, 2, 1, 13, 12, 18, 5, 10, 8, 19, 14, 15, 20, 17, 23, 21}), + new PuzzleState(new int[]{0, 13, 5, 12, 3, 2, 10, 4, 6, 8, 1, 21, 19, 14, 9, 17, 23, 22, 16, 11, 15, 7, 20, -1, 18}), + new PuzzleState(new int[]{14, 5, 6, 12, 4, 10, 20, 1, 0, 23, 2, 16, 13, 19, 3, 15, 22, -1, 9, 8, 11, 7, 18, 17, 21}), + new PuzzleState(new int[]{0, 1, 2, 4, 7, 5, 11, -1, 18, 8, 16, 10, 12, 13, 3, 17, 6, 21, 23, 9, 15, 20, 22, 14, 19}), + new PuzzleState(new int[]{1, 6, 7, 3, 4, 5, 17, 0, 22, 12, 10, 15, 8, -1, 14, 11, 13, 16, 18, 19, 20, 2, 21, 9, 23}), + }; private static final int[] FINISHED_STATE = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, -1}; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPluginTest.java index 9a4a4953e9..3b3df9f784 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPluginTest.java @@ -26,7 +26,7 @@ package net.runelite.client.plugins.reorderprayers; import net.runelite.api.Prayer; import static net.runelite.api.Prayer.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; import org.junit.Test; public class ReorderPrayersPluginTest diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java index b2e5b15173..1d838d8bc5 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java @@ -42,8 +42,8 @@ import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.StatChanged; +import net.runelite.api.events.VarbitChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; @@ -430,7 +430,7 @@ public class SlayerPluginTest } @Test - public void testTaskLookupInvalid() throws IOException + public void testTaskLookupInvalid() { net.runelite.http.api.chat.Task task = new net.runelite.http.api.chat.Task(); task.setTask("task<"); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java index 046b67f9b8..e278553476 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timestamp/TimestampPluginTest.java @@ -32,7 +32,7 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.events.ConfigChanged; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -79,6 +79,6 @@ public class TimestampPluginTest String testOutput = "[2019:04:07:15:03:58:36]"; TimeZone timeZone = TimeZone.getTimeZone("America/New_York"); plugin.getFormatter().setTimeZone(timeZone); - assertTrue(plugin.generateTimestamp(testInput, timeZone.toZoneId()).equals(testOutput)); + assertEquals(plugin.generateTimestamp(testInput, timeZone.toZoneId()), testOutput); } } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/clocks/ClockPanelTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/clocks/ClockPanelTest.java index 09849de72b..fb75827ebe 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/clocks/ClockPanelTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/clocks/ClockPanelTest.java @@ -25,9 +25,9 @@ package net.runelite.client.plugins.timetracking.clocks; import java.time.format.DateTimeParseException; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.junit.Test; public class ClockPanelTest { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/farming/PatchImplementationTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/farming/PatchImplementationTest.java index 6ed2f81f60..51110b0c2f 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/farming/PatchImplementationTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timetracking/farming/PatchImplementationTest.java @@ -26,10 +26,14 @@ package net.runelite.client.plugins.timetracking.farming; import java.util.HashMap; import java.util.Map; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.notNullValue; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ErrorCollector; -import static org.hamcrest.Matchers.*; public class PatchImplementationTest { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/woodcutting/WoodcuttingPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/woodcutting/WoodcuttingPluginTest.java index 721cf0f288..8a9578a855 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/woodcutting/WoodcuttingPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/woodcutting/WoodcuttingPluginTest.java @@ -35,16 +35,15 @@ import net.runelite.api.Client; import net.runelite.api.events.ChatMessage; import net.runelite.client.Notifier; import net.runelite.client.config.OpenOSRSConfig; +import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.OverlayManager; import static org.junit.Assert.assertNotNull; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @@ -87,6 +86,10 @@ public class WoodcuttingPluginTest @Bind OverlayManager overlayManager; + @Mock + @Bind + private ItemManager itemManager; + @Before public void before() { @@ -94,7 +97,6 @@ public class WoodcuttingPluginTest } @Test - @Ignore public void testLogs() { ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", "You get some logs.", "", 0); @@ -103,7 +105,6 @@ public class WoodcuttingPluginTest } @Test - @Ignore public void testOakLogs() { ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", "You get some oak logs.", "", 0); @@ -128,16 +129,15 @@ public class WoodcuttingPluginTest } @Test - @Ignore public void testBirdsNest() { ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", BIRDS_NEST_MESSAGE, "", 0); - when(woodcuttingConfig.showNestNotification()).thenReturn(true); + woodcuttingPlugin.showNestNotification = true; woodcuttingPlugin.onChatMessage(chatMessage); verify(notifier).notify("A bird nest has spawned!"); - when(woodcuttingConfig.showNestNotification()).thenReturn(false); + woodcuttingPlugin.showNestNotification = false; woodcuttingPlugin.onChatMessage(chatMessage); verifyNoMoreInteractions(notifier); } diff --git a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java index 3955f4a101..15081fe93a 100644 --- a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java +++ b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java @@ -28,7 +28,6 @@ package net.runelite.client.rs; import org.junit.Test; /** - * * @author Adam */ public class ClientConfigLoaderTest diff --git a/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayManagerTest.java b/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayManagerTest.java index af1accea5b..37c53b5f34 100644 --- a/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayManagerTest.java @@ -29,13 +29,12 @@ import java.awt.Graphics2D; import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotEquals; import org.junit.Test; public class OverlayManagerTest { - class TestOverlay extends Overlay + static class TestOverlay extends Overlay { TestOverlay(OverlayPosition position, OverlayPriority priority) { @@ -75,11 +74,11 @@ public class OverlayManagerTest Overlay a2 = new OverlayA(); Overlay b = new OverlayB(); // The same instance of the same overlay should be equal - assertTrue(a1.equals(a1)); + assertEquals(a1, a1); // A different instance of the same overlay should not be equal by default - assertFalse(a1.equals(a2)); + assertNotEquals(a1, a2); // A different instance of a different overlay should not be equal - assertFalse(a1.equals(b)); + assertNotEquals(a1, b); } @Test diff --git a/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/table/TableComponentTest.java b/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/table/TableComponentTest.java index a10bd03d80..a5cb12a8c9 100644 --- a/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/table/TableComponentTest.java +++ b/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/table/TableComponentTest.java @@ -25,16 +25,15 @@ package net.runelite.client.ui.overlay.components.table; import java.awt.Color; -import java.awt.image.BufferedImage; -import org.junit.After; import java.awt.Graphics2D; +import java.awt.image.BufferedImage; import java.util.List; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; - public class TableComponentTest { @Mock diff --git a/runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java b/runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java index 0399a3634b..9d5f9d8f75 100644 --- a/runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java +++ b/runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java @@ -50,9 +50,7 @@ public class ColorUtilTest public void colorTag() { COLOR_HEXSTRING_MAP.forEach((color, hex) -> - { - assertEquals("", ColorUtil.colorTag(color)); - }); + assertEquals("", ColorUtil.colorTag(color))); } @Test @@ -81,9 +79,7 @@ public class ColorUtilTest public void toHexColor() { COLOR_HEXSTRING_MAP.forEach((color, hex) -> - { - assertEquals("#" + hex, ColorUtil.toHexColor(color)); - }); + assertEquals("#" + hex, ColorUtil.toHexColor(color))); } @Test @@ -99,9 +95,7 @@ public class ColorUtilTest public void colorToHexCode() { COLOR_HEXSTRING_MAP.forEach((color, hex) -> - { - assertEquals(hex, ColorUtil.colorToHexCode(color)); - }); + assertEquals(hex, ColorUtil.colorToHexCode(color))); } @Test diff --git a/runelite-client/src/test/java/net/runelite/client/util/ImageUtilTest.java b/runelite-client/src/test/java/net/runelite/client/util/ImageUtilTest.java index 829e90368b..e5a6add830 100644 --- a/runelite-client/src/test/java/net/runelite/client/util/ImageUtilTest.java +++ b/runelite-client/src/test/java/net/runelite/client/util/ImageUtilTest.java @@ -130,14 +130,14 @@ public class ImageUtilTest @Test public void grayscaleImage() { - final BufferedImage[] grayscaleColors = new BufferedImage[] { + final BufferedImage[] grayscaleColors = new BufferedImage[]{ oneByOne(WHITE), oneByOne(GRAY), oneByOne(BLACK), oneByOne(BLACK_HALF_TRANSPARENT), oneByOne(BLACK_TRANSPARENT), }; - final BufferedImage[] nonGrayscaleColors = new BufferedImage[] { + final BufferedImage[] nonGrayscaleColors = new BufferedImage[]{ oneByOne(RED), oneByOne(GREEN), oneByOne(BLUE), @@ -173,7 +173,7 @@ public class ImageUtilTest assertEquals(12, stretched.getWidth()); assertEquals(34, stretched.getHeight()); - final BufferedImage[] assertSameAfterResize = new BufferedImage[] { + final BufferedImage[] assertSameAfterResize = new BufferedImage[]{ oneByOne(WHITE), oneByOne(GRAY), oneByOne(BLACK), @@ -327,7 +327,7 @@ public class ImageUtilTest * * @param expected The first {@link BufferedImage} to be compared. * @param actual The second {@link BufferedImage} to be compared. - * @return A boolean indicating whether the given {@link BufferedImage}s are of the same image data. + * @return A boolean indicating whether the given {@link BufferedImage}s are of the same image data. */ private boolean bufferedImagesEqual(final @Nonnull BufferedImage expected, final @Nonnull BufferedImage actual) { @@ -368,7 +368,7 @@ public class ImageUtilTest * Returns whether a {@link BufferedImage} contains only grayscale pixel data. * * @param image The image to be checked. - * @return A boolean indicating whether all of the given image's pixels are grayscale. + * @return A boolean indicating whether all of the given image's pixels are grayscale. */ private boolean isGrayscale(final @Nonnull BufferedImage image) { @@ -394,7 +394,7 @@ public class ImageUtilTest * Creates a {@link BufferedImage} of a 1-by-1px image of the given color. * * @param color The color to use for the image's single pixel. - * @return A {@link BufferedImage} containing a single pixel of the given color. + * @return A {@link BufferedImage} containing a single pixel of the given color. */ private BufferedImage oneByOne(final @Nonnull Color color) { @@ -406,8 +406,8 @@ public class ImageUtilTest * image. * * @param color The color to use for the centered pixel. - * @return A {@link BufferedImage} with completely transparent pixels and one pixel of the - * given color in the center. + * @return A {@link BufferedImage} with completely transparent pixels and one pixel of the + * given color in the center. */ private BufferedImage centeredPixel(final @Nonnull Color color) { @@ -422,7 +422,7 @@ public class ImageUtilTest * @param width The desired width of the color image. * @param height The desired height of the color image. * @param color The desired color of the image. - * @return A {@link BufferedImage} of given dimensions filled with the given color. + * @return A {@link BufferedImage} of given dimensions filled with the given color. */ private BufferedImage solidColor(final int width, final int height, final @Nonnull Color color) {