From 4d67c6115ef3c5316bb69cc5bb27a2065a869d4c Mon Sep 17 00:00:00 2001 From: Seth Date: Sat, 17 Feb 2018 16:08:38 -0600 Subject: [PATCH] Remove @Nullable Client annotations A check was added for plugins not to be loaded when loading vanilla thus the client is always non-null. Plugins loaded with vanilla don't use client. --- .../runelite/client/plugins/agilityplugin/AgilityOverlay.java | 3 +-- .../net/runelite/client/plugins/boosts/BoostsOverlay.java | 3 +-- .../client/plugins/cluescrolls/ClueScrollOverlay.java | 3 +-- .../net/runelite/client/plugins/devtools/DevToolsOverlay.java | 3 +-- .../net/runelite/client/plugins/devtools/DevToolsPanel.java | 4 ++-- .../runelite/client/plugins/fightcave/FightCaveOverlay.java | 3 +-- .../client/plugins/grounditems/GroundItemsOverlay.java | 3 +-- .../java/net/runelite/client/plugins/hunter/TrapOverlay.java | 3 +-- .../client/plugins/mousehighlight/MouseHighlightOverlay.java | 3 +-- .../client/plugins/opponentinfo/OpponentInfoOverlay.java | 3 +-- .../runelite/client/plugins/prayflick/PrayerFlickOverlay.java | 3 +-- .../net/runelite/client/plugins/specorb/SpecOrbOverlay.java | 3 +-- .../net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java | 3 +-- 13 files changed, 14 insertions(+), 26 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java index a336482376..98b1fcd4ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java @@ -28,7 +28,6 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.geom.Area; -import javax.annotation.Nullable; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -46,7 +45,7 @@ public class AgilityOverlay extends Overlay private final AgilityPlugin plugin; @Inject - public AgilityOverlay(@Nullable Client client, AgilityPlugin plugin) + public AgilityOverlay(Client client, AgilityPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java index 532b274f1a..6e38b663de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java @@ -28,7 +28,6 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; -import javax.annotation.Nullable; import javax.inject.Inject; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -60,7 +59,7 @@ class BoostsOverlay extends Overlay private PanelComponent panelComponent; @Inject - BoostsOverlay(@Nullable Client client, BoostsConfig config, InfoBoxManager infoBoxManager) + BoostsOverlay(Client client, BoostsConfig config, InfoBoxManager infoBoxManager) { setPosition(OverlayPosition.TOP_LEFT); setPriority(OverlayPriority.MED); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java index 9d9cf62e3b..d95c3a49f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java @@ -31,7 +31,6 @@ import java.awt.Graphics2D; import java.awt.Point; import java.time.Duration; import java.time.Instant; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.ItemComposition; @@ -50,7 +49,7 @@ public class ClueScrollOverlay extends Overlay Instant clueTimeout; @Inject - public ClueScrollOverlay(@Nullable Client client) + public ClueScrollOverlay(Client client) { setPosition(OverlayPosition.TOP_LEFT); this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java index 8b4e0eb7f0..6e8a52b5ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java @@ -36,7 +36,6 @@ import java.awt.Polygon; import java.awt.Rectangle; import java.awt.geom.Rectangle2D; import java.util.List; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Actor; import net.runelite.api.Client; @@ -83,7 +82,7 @@ public class DevToolsOverlay extends Overlay private final DevToolsPlugin plugin; @Inject - public DevToolsOverlay(@Nullable Client client, DevToolsPlugin plugin) + public DevToolsOverlay(Client client, DevToolsPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ALWAYS_ON_TOP); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java index e7cce80a55..7e47fa66b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java @@ -25,6 +25,7 @@ */ package net.runelite.client.plugins.devtools; + import static net.runelite.api.widgets.WidgetInfo.TO_CHILD; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import java.awt.BorderLayout; @@ -33,7 +34,6 @@ import java.awt.GridLayout; import java.io.IOException; import java.util.Collection; import java.util.concurrent.ExecutionException; -import javax.annotation.Nullable; import javax.imageio.ImageIO; import javax.inject.Inject; import javax.swing.ImageIcon; @@ -86,7 +86,7 @@ public class DevToolsPanel extends PluginPanel private final SettingsTracker settingsTracker; @Inject - public DevToolsPanel(@Nullable Client client, DevToolsPlugin plugin) + public DevToolsPanel(Client client, DevToolsPlugin plugin) { super(); this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java index 225ee456a2..2ddaf85f9b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java @@ -31,7 +31,6 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.ImagePanelComponent; -import javax.annotation.Nullable; import javax.imageio.ImageIO; import javax.inject.Inject; import java.awt.Dimension; @@ -51,7 +50,7 @@ public class FightCaveOverlay extends Overlay private BufferedImage protectFromMissilesImg; @Inject - FightCaveOverlay(@Nullable Client client, FightCavePlugin plugin) + FightCaveOverlay(Client client, FightCavePlugin plugin) { setPosition(OverlayPosition.BOTTOM_RIGHT); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index f025c077c3..1b60c1b158 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -36,7 +36,6 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Item; @@ -88,7 +87,7 @@ public class GroundItemsOverlay extends Overlay private ItemManager itemManager; @Inject - public GroundItemsOverlay(@Nullable Client client, GroundItemsConfig config) + public GroundItemsOverlay(Client client, GroundItemsConfig config) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java index fa163fd9ed..ce428edf4b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java @@ -30,7 +30,6 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; import java.awt.geom.Arc2D; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; @@ -69,7 +68,7 @@ public class TrapOverlay extends Overlay private Color colorTrans, colorTransBorder; @Inject - TrapOverlay(@Nullable Client client, HunterPlugin plugin, HunterConfig config) + TrapOverlay(Client client, HunterPlugin plugin, HunterConfig config) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); 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 aa628217d1..8ec5f3b990 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.mousehighlight; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.MenuEntry; @@ -42,7 +41,7 @@ class MouseHighlightOverlay extends Overlay private final Client client; @Inject - MouseHighlightOverlay(@Nullable Client client, TooltipManager tooltipManager) + MouseHighlightOverlay(Client client, TooltipManager tooltipManager) { setPosition(OverlayPosition.DYNAMIC); this.client = client; 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 a4ab4e1c97..cc37735a54 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 @@ -34,7 +34,6 @@ import java.text.DecimalFormat; import java.time.Duration; import java.time.Instant; import java.util.Map; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Actor; import net.runelite.api.Client; @@ -68,7 +67,7 @@ class OpponentInfoOverlay extends Overlay private Map oppInfoHealth = OpponentInfoPlugin.loadNpcHealth(); @Inject - OpponentInfoOverlay(@Nullable Client client) + OpponentInfoOverlay(Client client) { setPosition(OverlayPosition.TOP_LEFT); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java index 486254a12c..d47a5e0d3f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java @@ -31,7 +31,6 @@ import java.awt.Point; import java.awt.geom.Rectangle2D; import java.time.Duration; import java.time.Instant; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Prayer; @@ -48,7 +47,7 @@ public class PrayerFlickOverlay extends Overlay private Instant startOfLastTick = Instant.now(); @Inject - public PrayerFlickOverlay(@Nullable Client client) + public PrayerFlickOverlay(Client client) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java index ae90adf41f..9781541151 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.specorb; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import javax.annotation.Nullable; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Point; @@ -66,7 +65,7 @@ public class SpecOrbOverlay extends Overlay private int tickCounter = 0; @Inject - public SpecOrbOverlay(@Nullable Client client, SpecOrbPlugin plugin) + public SpecOrbOverlay(Client client, SpecOrbPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); 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 e60edb01fc..7b6220c074 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 @@ -34,7 +34,6 @@ import java.awt.geom.Ellipse2D; import java.awt.image.BufferedImage; import java.text.DecimalFormat; import java.util.List; -import javax.annotation.Nullable; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -73,7 +72,7 @@ public class XpGlobesOverlay extends Overlay private static final int TOOLTIP_RECT_SIZE_X = 150; @Inject - public XpGlobesOverlay(@Nullable Client client, XpGlobesPlugin plugin, XpGlobesConfig config) + public XpGlobesOverlay(Client client, XpGlobesPlugin plugin, XpGlobesConfig config) { setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGH);