From dbf76ce8de7d75f0015b75cbba9dd268fc448cb9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:08:02 +0200 Subject: [PATCH 01/23] chatbox: Merge duplicate branch --- .../net/runelite/client/game/chatbox/ChatboxTextInput.java | 3 --- 1 file changed, 3 deletions(-) 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 79ca18a124..f4d806343c 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 @@ -722,9 +722,6 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse newPos++; break; case KeyEvent.VK_UP: - ev.consume(); - newPos = getLineOffset.applyAsInt(code); - break; case KeyEvent.VK_DOWN: ev.consume(); newPos = getLineOffset.applyAsInt(code); From 115f21962087efae7670c8de2817490ca0b733fa Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:08:55 +0200 Subject: [PATCH 02/23] game: Remove redundant modifier for enum constructor --- .../src/main/java/net/runelite/client/game/Sound.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/Sound.java b/runelite-client/src/main/java/net/runelite/client/game/Sound.java index aeeddd8b34..cad967e08b 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/Sound.java +++ b/runelite-client/src/main/java/net/runelite/client/game/Sound.java @@ -23,7 +23,7 @@ public enum Sound private String filePath; private int id; - private Sound(int id, String filePath) + Sound(int id, String filePath) { this.id = id; this.filePath = filePath; From a784b9559a8b075e9f06eac6ab6096c8f28a9144 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:09:22 +0200 Subject: [PATCH 03/23] game: Access levels --- .../main/java/net/runelite/client/game/SpriteManager.java | 2 +- .../java/net/runelite/client/game/chatbox/ChatboxInput.java | 6 +++--- .../net/runelite/client/game/chatbox/ChatboxTextInput.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index 3a4cc667e7..b9a6de5272 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -54,7 +54,7 @@ public class SpriteManager @Inject private ClientThread clientThread; - public Cache cache = CacheBuilder.newBuilder() + private Cache cache = CacheBuilder.newBuilder() .maximumSize(128L) .expireAfterAccess(1, TimeUnit.HOURS) .build(); diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java index bdd7c10dda..f29b01dbc5 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java @@ -27,13 +27,13 @@ package net.runelite.client.game.chatbox; /** * A modal input that lives in the chatbox panel. */ -public abstract class ChatboxInput +abstract class ChatboxInput { - protected void open() + void open() { } - protected void close() + void 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 f4d806343c..82973cecb1 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 @@ -156,12 +156,12 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse return this; } - public ChatboxTextInput cursorAt(int index) + private ChatboxTextInput cursorAt(int index) { return cursorAt(index, index); } - public ChatboxTextInput cursorAt(int indexA, int indexB) + private ChatboxTextInput cursorAt(int indexA, int indexB) { if (indexA < 0) { From decfd24a7bf057fc094f13f90fd83eab25256510 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:09:35 +0200 Subject: [PATCH 04/23] game: Final fields --- .../src/main/java/net/runelite/client/game/Sound.java | 4 ++-- .../src/main/java/net/runelite/client/game/SpriteManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/Sound.java b/runelite-client/src/main/java/net/runelite/client/game/Sound.java index cad967e08b..e9cb20dfaf 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/Sound.java +++ b/runelite-client/src/main/java/net/runelite/client/game/Sound.java @@ -20,8 +20,8 @@ public enum Sound RESTORED_SPECIAL_ATTACK(16, "net/runelite/client/game/sounds/restorespec.wav"), IDLE(17, "net/runelite/client/game/sounds/idle.wav"); - private String filePath; - private int id; + private final String filePath; + private final int id; Sound(int id, String filePath) { diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index b9a6de5272..1b4ca5159e 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -54,7 +54,7 @@ public class SpriteManager @Inject private ClientThread clientThread; - private Cache cache = CacheBuilder.newBuilder() + private final Cache cache = CacheBuilder.newBuilder() .maximumSize(128L) .expireAfterAccess(1, TimeUnit.HOURS) .build(); From ec324351552e85bdb058bf8a04eaa96fb6ab620a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:10:08 +0200 Subject: [PATCH 05/23] game: Replace statement with expression --- .../java/net/runelite/client/game/SpriteManager.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index 1b4ca5159e..df81112d27 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -110,12 +110,8 @@ public class SpriteManager public void addSpriteTo(JButton c, int archive, int file) { getSpriteAsync(archive, file, img -> - { SwingUtilities.invokeLater(() -> - { - c.setIcon(new ImageIcon(img)); - }); - }); + c.setIcon(new ImageIcon(img)))); } /** @@ -124,12 +120,8 @@ public class SpriteManager public void addSpriteTo(JLabel c, int archive, int file) { getSpriteAsync(archive, file, img -> - { SwingUtilities.invokeLater(() -> - { - c.setIcon(new ImageIcon(img)); - }); - }); + c.setIcon(new ImageIcon(img)))); } public void addSpriteOverrides(SpriteOverride[] add) From 1ad623d0379f8048ac2c21e04e16fdae6f58d841 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:11:02 +0200 Subject: [PATCH 06/23] game: @Notnull --- .../main/java/net/runelite/client/game/HiscoreLoader.java | 3 ++- .../main/java/net/runelite/client/game/ItemManager.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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 36b6024e35..dbe603dc8d 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 @@ -36,6 +36,7 @@ import static net.runelite.client.game.HiscoreManager.NONE; import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreResult; +import org.jetbrains.annotations.NotNull; @Slf4j class HiscoreLoader extends CacheLoader @@ -50,7 +51,7 @@ class HiscoreLoader extends CacheLoader() { @Override - public AsyncBufferedImage load(ImageKey key) throws Exception + public AsyncBufferedImage load(@NotNull ImageKey key) throws Exception { return loadImage(key.itemId, key.itemQuantity, key.stackable); } @@ -291,7 +292,7 @@ public class ItemManager .build(new CacheLoader() { @Override - public ItemDefinition load(Integer key) throws Exception + public ItemDefinition load(@NotNull Integer key) throws Exception { return client.getItemDefinition(key); } @@ -303,7 +304,7 @@ public class ItemManager .build(new CacheLoader() { @Override - public BufferedImage load(OutlineKey key) throws Exception + public BufferedImage load(@NotNull OutlineKey key) throws Exception { return loadItemOutline(key.itemId, key.itemQuantity, key.outlineColor); } From 0ba21e14242c9b60eccc290295c302e6a3c50ba6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:11:25 +0200 Subject: [PATCH 07/23] game: Remove redundant initializer --- .../main/java/net/runelite/client/game/SkillIconManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java index 03c78617b1..fd17ad0f7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java @@ -40,7 +40,7 @@ public class SkillIconManager public BufferedImage getSkillImage(Skill skill, boolean small) { int skillIdx = skill.ordinal() + (small ? Skill.values().length : 0); - BufferedImage skillImage = null; + BufferedImage skillImage; if (imgCache[skillIdx] != null) { From 65203897cb6acbb95e7e2373e3e78d581af31bb1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:13:29 +0200 Subject: [PATCH 08/23] chat: Remove redundant initializer --- .../main/java/net/runelite/client/chat/ChatMessageManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 da4c222fd6..c571282a00 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -115,7 +115,7 @@ public class ChatMessageManager boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; Color usernameColor = null; - Color senderColor = null; + Color senderColor; switch (chatMessageType) { From c082febf11c606eae30edd467a2964fc53ae4c74 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:14:08 +0200 Subject: [PATCH 09/23] callback: Final field --- .../main/java/net/runelite/client/callback/ClientThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java index a1e3880a39..bbe3ae3f0d 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java @@ -36,7 +36,7 @@ import net.runelite.api.Client; @Slf4j public class ClientThread { - private ConcurrentLinkedQueue invokes = new ConcurrentLinkedQueue<>(); + private final ConcurrentLinkedQueue invokes = new ConcurrentLinkedQueue<>(); @Inject private Client client; From 1fa5f695832561e1fe6e79c70a10386ad75c3741 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:15:26 +0200 Subject: [PATCH 10/23] discord: Access level --- .../main/java/net/runelite/client/discord/DiscordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java index 8ff303b6d0..091c479ac6 100644 --- a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java +++ b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java @@ -49,7 +49,7 @@ import net.runelite.discord.DiscordUser; public class DiscordService implements AutoCloseable { private final EventBus eventBus; - public final RuneLiteProperties runeLiteProperties; + private final RuneLiteProperties runeLiteProperties; private final ScheduledExecutorService executorService; private final DiscordRPC discordRPC; From 6c6ad3ffa5606901a9634b82bed1a756d48d3ae0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:17:11 +0200 Subject: [PATCH 11/23] EventBus: Annotate ovverride --- .../java/net/runelite/client/util/DeferredEventBus.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java index 183fce738b..70e79cbe67 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java @@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.client.eventbus.EventBus; +import org.jetbrains.annotations.NotNull; @Singleton public class DeferredEventBus extends EventBus @@ -43,19 +44,19 @@ public class DeferredEventBus extends EventBus } @Override - public void register(Object object) + public void register(@NotNull Object object) { eventBus.register(object); } @Override - public void unregister(Object object) + public void unregister(@NotNull Object object) { eventBus.unregister(object); } @Override - public void post(Object object) + public void post(@NotNull Object object) { pendingEvents.add(object); } From 330d3d9cd50c5b00de85a434fadb71451f86ff60 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:22:52 +0200 Subject: [PATCH 12/23] util: Final fields --- .../java/net/runelite/client/util/MiscUtils.java | 12 ++++++------ .../net/runelite/client/util/WildernessLocation.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java index c44767d4a5..a5c50a374b 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java @@ -8,13 +8,13 @@ import net.runelite.api.coords.WorldPoint; public class MiscUtils { - private static int[] abovePointsX = {2944, 3392, 3392, 2944}; - private static int[] abovePointsY = {3523, 3523, 3971, 3971}; - private static int[] belowPointsX = {2944, 2944, 3264, 3264}; - private static int[] belowPointsY = {9918, 10360, 10360, 9918}; + private static final int[] abovePointsX = {2944, 3392, 3392, 2944}; + private static final int[] abovePointsY = {3523, 3523, 3971, 3971}; + private static final int[] belowPointsX = {2944, 2944, 3264, 3264}; + private static final int[] belowPointsY = {9918, 10360, 10360, 9918}; - private static Polygon abovePoly = new Polygon(abovePointsX, abovePointsY, abovePointsX.length); - private static Polygon belowPoly = new Polygon(belowPointsX, belowPointsY, belowPointsX.length); + private static final Polygon abovePoly = new Polygon(abovePointsX, abovePointsY, abovePointsX.length); + private static final Polygon belowPoly = new Polygon(belowPointsX, belowPointsY, belowPointsX.length); //test replacement so private for now private static boolean inWildy(WorldPoint point) diff --git a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java index 4757c875f0..facf742088 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java @@ -79,10 +79,10 @@ public enum WildernessLocation public static class Location { - public int x; - public int y; - public int width; - public int height; + public final int x; + public final int y; + public final int width; + public final int height; Location(int x, int y, int x1, int y1) { From 33a6824ca66cf818e137378dcfd8ce5a155d01c1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:23:31 +0200 Subject: [PATCH 13/23] util: Access levels --- .../main/java/net/runelite/client/util/PvPUtil.java | 2 +- .../main/java/net/runelite/client/util/RefUtils.java | 6 +++--- .../main/java/net/runelite/client/util/SwingUtil.java | 6 +++--- .../net/runelite/client/util/WildernessLocation.java | 10 +++++----- .../net/runelite/client/util/ping/IcmpEchoReply.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java b/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java index 53672490ac..a91de1c7cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java @@ -36,7 +36,7 @@ public class PvPUtil * @param point the point in the world to get the wilderness level for * @return the int representing the wilderness level */ - public static int getWildernessLevelFrom(WorldPoint point) + private static int getWildernessLevelFrom(WorldPoint point) { int y = point.getY(); diff --git a/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java b/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java index 5c4e5d08f3..0d5afbf564 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java @@ -30,12 +30,12 @@ import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.MethodNode; -public class RefUtils implements Opcodes +class RefUtils implements Opcodes { private static final String TYPE_PREFIX = "us/runelitepl/mixinprocessor/annotations/"; - public static boolean isReturn(int opcode, boolean checkType) + private static boolean isReturn(int opcode, boolean checkType) { return (opcode == RETURN && !checkType) || opcode == IRETURN || opcode == LRETURN || opcode == DRETURN || opcode == ARETURN || opcode == FRETURN; @@ -76,7 +76,7 @@ public class RefUtils implements Opcodes return false; } - public static String makeAnnotationDesc(String annot) + private static String makeAnnotationDesc(String annot) { return "L" + TYPE_PREFIX + annot + ";"; } diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java index 021de4dc10..ff62937bc8 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java @@ -76,7 +76,7 @@ public class SwingUtil * Sets some sensible defaults for swing. * IMPORTANT! Needs to be called before main frame creation */ - public static void setupDefaults() + private static void setupDefaults() { // Force heavy-weight popups/tooltips. // Prevents them from being obscured by the game applet. @@ -117,7 +117,7 @@ public class SwingUtil * * @param laf the swing look and feel */ - public static void setTheme(@Nonnull final LookAndFeel laf) + private static void setTheme(@Nonnull final LookAndFeel laf) { try { @@ -135,7 +135,7 @@ public class SwingUtil * * @param font the new font to use */ - public static void setFont(@Nonnull final Font font) + private static void setFont(@Nonnull final Font font) { final FontUIResource f = new FontUIResource(font); final Enumeration keys = UIManager.getDefaults().keys(); diff --git a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java index facf742088..4bf7b3e4a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java @@ -77,12 +77,12 @@ public enum WildernessLocation this.worldArea = new WorldArea(location.x, location.y, location.width, location.height, plane); } - public static class Location + static class Location { - public final int x; - public final int y; - public final int width; - public final int height; + final int x; + final int y; + final int width; + final int height; Location(int x, int y, int x1, int y1) { diff --git a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java index 2756320990..0e4af9137e 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java @@ -30,7 +30,7 @@ import com.sun.jna.platform.win32.WinDef; import java.util.Arrays; import java.util.List; -public class IcmpEchoReply extends Structure +class IcmpEchoReply extends Structure { private static final int IP_OPTION_INFO_SIZE = 1 + 1 + 1 + 1 + (Pointer.SIZE == 8 ? 12 : 4); // on 64bit vms add 4 byte padding public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Pointer.SIZE + IP_OPTION_INFO_SIZE; From d0b69a41d695929f49f9e174c0a0a53da6ff7a8b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:24:21 +0200 Subject: [PATCH 14/23] deferredeventbus: Null check --- .../main/java/net/runelite/client/util/DeferredEventBus.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java index 70e79cbe67..4ac1941d7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java @@ -67,7 +67,10 @@ public class DeferredEventBus extends EventBus while (size-- > 0) { Object object = pendingEvents.poll(); - eventBus.post(object); + if (object != null) + { + eventBus.post(object); + } } } } From 647829a4e6f035efe86eb5bd289576ecc94d8282 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:26:41 +0200 Subject: [PATCH 15/23] util: Merge nested if statements --- .../src/main/java/net/runelite/client/util/MiscUtils.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java index a5c50a374b..647a411cdf 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java @@ -50,12 +50,9 @@ public class MiscUtils //v underground //v above ground int wildernessLevel = clamp(y > 6400 ? ((y - 9920) / 8) + 1 : ((y - 3520) / 8) + 1, 0, 56); - if (point.getPlane() > 0) + if (point.getPlane() > 0 && y < 9920) { - if (y < 9920) - { - wildernessLevel = 0; - } + wildernessLevel = 0; } if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.HIGH_RISK)) From 31df0c45527c5159f81841440b2637bcedcb51ab Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:27:28 +0200 Subject: [PATCH 16/23] rs: Final field --- .../src/main/java/net/runelite/client/rs/ClientLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1024da016f..9a660fe58d 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 lombok.extern.slf4j.Slf4j; public class ClientLoader { private final ClientConfigLoader clientConfigLoader; - private ClientUpdateCheckMode updateCheckMode; + private final ClientUpdateCheckMode updateCheckMode; public static boolean useLocalInjected = false; @Inject From 727660fd4936919102c3a8b3a195df3b4e871290 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:28:46 +0200 Subject: [PATCH 17/23] rs: Move this catch to its own catch --- .../net/runelite/client/rs/ClientLoader.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 9a660fe58d..e39b76716d 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 @@ -69,14 +69,16 @@ public class ClientLoader return null; } } - catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException e) + catch (IOException | InstantiationException | IllegalAccessException e) { - if (e instanceof ClassNotFoundException) - { - log.error("Unable to load client - class not found. This means you" - + " are not running RuneLite with Maven as the injected client" - + " is not in your classpath."); - } + log.error("Error loading RS!", e); + return null; + } + catch (ClassNotFoundException e) + { + log.error("Unable to load client - class not found. This means you" + + " are not running RuneLite with Maven as the injected client" + + " is not in your classpath."); log.error("Error loading RS!", e); return null; From 6c85d64fe91f6da20ff1b12b2776b42d486e156c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:07:09 +0200 Subject: [PATCH 18/23] api: Simplify if statements --- .../src/main/java/net/runelite/api/Point.java | 6 +----- .../java/net/runelite/api/coords/WorldArea.java | 7 ++----- .../java/net/runelite/api/coords/WorldPoint.java | 16 ++++++---------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Point.java b/runelite-api/src/main/java/net/runelite/api/Point.java index 1c97a43666..a4aa342983 100644 --- a/runelite-api/src/main/java/net/runelite/api/Point.java +++ b/runelite-api/src/main/java/net/runelite/api/Point.java @@ -104,10 +104,6 @@ public class Point { return false; } - if (this.y != other.y) - { - return false; - } - return true; + return this.y == other.y; } } diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java index 7156045eb8..0b39214143 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java @@ -427,11 +427,8 @@ public class WorldArea } if (height == 1) { - if ((collisionDataFlags[checkX - dx][checkY] & yFlags) != 0 && - extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane()))) - { - return false; - } + return (collisionDataFlags[checkX - dx][checkY] & yFlags) == 0 || + !extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane())); } } diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java index fb1291273a..2882367c36 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java @@ -370,16 +370,12 @@ public class WorldPoint */ public static boolean isInZone(WorldPoint lowerBound, WorldPoint upperBound, WorldPoint userLocation) { - if (userLocation.getX() < lowerBound.getX() - || userLocation.getX() > upperBound.getX() - || userLocation.getY() < lowerBound.getY() - || userLocation.getY() > upperBound.getY() - || userLocation.getPlane() < lowerBound.getPlane() - || userLocation.getPlane() > upperBound.getPlane()) - { - return false; - } - return true; + return userLocation.getX() >= lowerBound.getX() + && userLocation.getX() <= upperBound.getX() + && userLocation.getY() >= lowerBound.getY() + && userLocation.getY() <= upperBound.getY() + && userLocation.getPlane() >= lowerBound.getPlane() + && userLocation.getPlane() <= upperBound.getPlane(); } /** From 1846c72f7ebecf6aa5659799960243d513533456 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:08:00 +0200 Subject: [PATCH 19/23] api: Inline vars --- .../main/java/net/runelite/api/Perspective.java | 14 ++++---------- .../main/java/net/runelite/api/model/Jarvis.java | 3 +-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java index 5c1955f249..4c08e65bf1 100644 --- a/runelite-api/src/main/java/net/runelite/api/Perspective.java +++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java @@ -317,12 +317,6 @@ public class Perspective final int neX = localLocation.getX() + (size * LOCAL_TILE_SIZE / 2); final int neY = localLocation.getY() + (size * LOCAL_TILE_SIZE / 2); - final int seX = swX; - final int seY = neY; - - final int nwX = neX; - final int nwY = swY; - final byte[][][] tileSettings = client.getTileSettings(); final int sceneX = localLocation.getSceneX(); @@ -340,14 +334,14 @@ public class Perspective } final int swHeight = getHeight(client, swX, swY, tilePlane); - final int nwHeight = getHeight(client, nwX, nwY, tilePlane); + final int nwHeight = getHeight(client, neX, swY, tilePlane); final int neHeight = getHeight(client, neX, neY, tilePlane); - final int seHeight = getHeight(client, seX, seY, tilePlane); + final int seHeight = getHeight(client, swX, neY, tilePlane); Point p1 = localToCanvas(client, swX, swY, swHeight); - Point p2 = localToCanvas(client, nwX, nwY, nwHeight); + Point p2 = localToCanvas(client, neX, swY, nwHeight); Point p3 = localToCanvas(client, neX, neY, neHeight); - Point p4 = localToCanvas(client, seX, seY, seHeight); + Point p4 = localToCanvas(client, swX, neY, seHeight); if (p1 == null || p2 == null || p3 == null || p4 == null) { diff --git a/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java b/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java index d71fe38b51..5435470c37 100644 --- a/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java +++ b/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java @@ -125,8 +125,7 @@ public class Jarvis private static long crossProduct(Point p, Point q, Point r) { - long val = (long)(q.getY() - p.getY()) * (r.getX() - q.getX()) + return (long)(q.getY() - p.getY()) * (r.getX() - q.getX()) - (long)(q.getX() - p.getX()) * (r.getY() - q.getY()); - return val; } } From 352e3311de57d6494f9f83624bc5d160736932bc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:10:18 +0200 Subject: [PATCH 20/23] api: Null checks --- .../main/java/net/runelite/api/coords/WorldArea.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java index 0b39214143..7a12a730fd 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java @@ -271,8 +271,16 @@ public class WorldArea LocalPoint lp = LocalPoint.fromWorld(client, x, y); - int startX = lp.getSceneX() + dx; - int startY = lp.getSceneY() + dy; + int startX = 0; + if (lp != null) + { + startX = lp.getSceneX() + dx; + } + int startY = 0; + if (lp != null) + { + startY = lp.getSceneY() + dy; + } int checkX = startX + (dx > 0 ? width - 1 : 0); int checkY = startY + (dy > 0 ? height - 1 : 0); int endX = startX + width - 1; From 10d4a94f76e2a8ddcce5c04f3f4466c84f9f5695 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:11:23 +0200 Subject: [PATCH 21/23] api: Interface instead of type --- runelite-api/src/main/java/net/runelite/api/Client.java | 3 ++- .../src/main/java/net/runelite/mixins/RSClientMixin.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index f19fdea2e3..b8c3ea9630 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -30,6 +30,7 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import javax.annotation.Nullable; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; @@ -1677,7 +1678,7 @@ public interface Client extends GameShell /** * Set spells excluded from above hiding */ - void setUnhiddenCasts(HashSet casts); + void setUnhiddenCasts(Set casts); /** * Sorts the current menu entries in the same way the client does this. diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index c00cc189ad..849ec90fbc 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -25,6 +25,7 @@ package net.runelite.mixins; import java.util.HashSet; +import java.util.Set; import net.runelite.api.ChatMessageType; import net.runelite.api.ClanMember; import net.runelite.api.EnumDefinition; @@ -207,7 +208,7 @@ public abstract class RSClientMixin implements RSClient private static boolean hideFriendCastOptions = false; @Inject - private static HashSet unhiddenCasts = new HashSet(); + private static Set unhiddenCasts = new HashSet(); @Inject @Override @@ -225,7 +226,7 @@ public abstract class RSClientMixin implements RSClient @Inject @Override - public void setUnhiddenCasts(HashSet casts) + public void setUnhiddenCasts(Set casts) { unhiddenCasts = casts; } From ba6d4967517c0525347c5c1ce2c030bc10bafe46 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:51:19 +0200 Subject: [PATCH 22/23] client: Remove unused import --- runelite-api/src/main/java/net/runelite/api/Client.java | 1 - 1 file changed, 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index b8c3ea9630..ab4ee7f15b 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -27,7 +27,6 @@ package net.runelite.api; import java.awt.Canvas; import java.awt.Dimension; import java.util.EnumSet; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; From 0fd80701c9b4ab5f67a2282df455444acd62e163 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 21:06:02 +0200 Subject: [PATCH 23/23] travis: BUILD MAYBE!!??