ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove unnecessary null checks for game client

Browse Source 
Remove unnecessary null checks for game client from plugins, as now
client is always not null in all of them, since in the case of it being
null the plugins are not even started.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2017-12-29 17:34:36 +01:00
parent 6c2e827d4a
commit 0d8870e7da
21 changed files with 24 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.client.plugins.attackindicator; package net.runelite.client.plugins.attackindicator;
import static net.runelite.client.plugins.attackindicator.AttackStyle.CASTING;
import static net.runelite.client.plugins.attackindicator.AttackStyle.DEFENSIVE_CASTING;
import static net.runelite.client.plugins.attackindicator.AttackStyle.OTHER;
import com.google.common.collect.HashBasedTable; import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table; import com.google.common.collect.Table;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
@@ -32,7 +35,6 @@ import com.google.inject.Provides;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -45,7 +47,6 @@ import net.runelite.client.events.ConfigChanged;
import net.runelite.client.events.VarbitChanged; import net.runelite.client.events.VarbitChanged;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import static net.runelite.client.plugins.attackindicator.AttackStyle.*;
import net.runelite.client.task.Schedule; import net.runelite.client.task.Schedule;
@PluginDescriptor( @PluginDescriptor(
@@ -63,7 +64,6 @@ public class AttackIndicatorPlugin extends Plugin
private final Table<WeaponType, WidgetInfo, Boolean> widgetsToHide = HashBasedTable.create(); private final Table<WeaponType, WidgetInfo, Boolean> widgetsToHide = HashBasedTable.create();
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

2
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
View File

@@ -31,7 +31,6 @@ import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
@@ -69,7 +68,6 @@ public class ChatCommandsPlugin extends Plugin
private final HiscoreClient hiscoreClient = new HiscoreClient(); private final HiscoreClient hiscoreClient = new HiscoreClient();
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

2
runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
View File

@@ -39,7 +39,6 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -77,7 +76,6 @@ public class ClanChatPlugin extends Plugin
private int modIconsLength; private int modIconsLength;
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

2
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -30,7 +30,6 @@ import com.google.inject.Binder;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
@@ -47,7 +46,6 @@ import net.runelite.client.task.Schedule;
public class ClueScrollPlugin extends Plugin public class ClueScrollPlugin extends Plugin
{ {
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

4
runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
View File

@@ -27,7 +27,6 @@ package net.runelite.client.plugins.combatlevel;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Experience; import net.runelite.api.Experience;
@@ -48,7 +47,6 @@ public class CombatLevelPlugin extends Plugin
private final DecimalFormat decimalFormat = new DecimalFormat("#.###"); private final DecimalFormat decimalFormat = new DecimalFormat("#.###");
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject
@@ -66,7 +64,7 @@ public class CombatLevelPlugin extends Plugin
) )
public void updateCombatLevel() public void updateCombatLevel()
{ {
if (client == null || client.getGameState() != GameState.LOGGED_IN) if (client.getGameState() != GameState.LOGGED_IN)
{ {
return; return;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
View File

@@ -63,7 +63,7 @@ public class FightCaveOverlay extends Overlay
public Dimension render(Graphics2D graphics, Point parent) public Dimension render(Graphics2D graphics, Point parent)
{ {
JadAttack attack = plugin.getAttack(); JadAttack attack = plugin.getAttack();
if (attack == null || client == null || client.isPrayerActive(attack.getPrayer())) if (attack == null || client.isPrayerActive(attack.getPrayer()))
{ {
return null; return null;
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
View File

@@ -27,7 +27,6 @@ package net.runelite.client.plugins.fightcave;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
@@ -47,7 +46,6 @@ import net.runelite.client.util.QueryRunner;
public class FightCavePlugin extends Plugin public class FightCavePlugin extends Plugin
{ {
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject
@@ -85,7 +83,7 @@ public class FightCavePlugin extends Plugin
) )
public void update() public void update()
{ {
if (!config.enabled() || client == null || client.getGameState() != GameState.LOGGED_IN) if (!config.enabled() || client.getGameState() != GameState.LOGGED_IN)
{ {
return; return;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
View File

@@ -93,7 +93,6 @@ import com.google.inject.Provides;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Actor; import net.runelite.api.Actor;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -121,7 +120,6 @@ public class IdleNotifierPlugin extends Plugin
ClientUI gui; ClientUI gui;
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

2
runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java
View File

@@ -26,7 +26,6 @@ package net.runelite.client.plugins.rememberusername;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Provides; import com.google.inject.Provides;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
@@ -41,7 +40,6 @@ import net.runelite.client.plugins.PluginDescriptor;
public class RememberUsernamePlugin extends Plugin public class RememberUsernamePlugin extends Plugin
{ {
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

6
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.slayer; package net.runelite.client.plugins.slayer;
import static net.runelite.api.Skill.SLAYER;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Provides; import com.google.inject.Provides;
@@ -33,13 +34,11 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import static net.runelite.api.Skill.SLAYER;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
@@ -73,7 +72,6 @@ public class SlayerPlugin extends Plugin
private static final Pattern REWARD_POINTS = Pattern.compile("Reward points: (\\d*)"); private static final Pattern REWARD_POINTS = Pattern.compile("Reward points: (\\d*)");
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject
@@ -146,7 +144,7 @@ public class SlayerPlugin extends Plugin
) )
public void scheduledChecks() public void scheduledChecks()
{ {
if (!config.enabled() || client == null) if (!config.enabled())
{ {
return; return;
} }

21
runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java
View File

@@ -26,6 +26,14 @@ package net.runelite.client.plugins.teamcapes;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.time.temporal.ChronoUnit;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.Player; import net.runelite.api.Player;
@@ -35,23 +43,12 @@ import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.task.Schedule; import net.runelite.client.task.Schedule;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import javax.annotation.Nullable;
import javax.inject.Inject;
import java.time.temporal.ChronoUnit;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@PluginDescriptor( @PluginDescriptor(
name = "Team capes plugin" name = "Team capes plugin"
) )
public class TeamCapesPlugin extends Plugin public class TeamCapesPlugin extends Plugin
{ {
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject
@@ -86,7 +83,7 @@ public class TeamCapesPlugin extends Plugin
) )
public void update() public void update()
{ {
if (!config.enabled() || client == null || client.getGameState() != GameState.LOGGED_IN) if (!config.enabled() || client.getGameState() != GameState.LOGGED_IN)
{ {
return; return;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/volcanicmine/VolcanicMineOverlay.java
View File

@@ -79,7 +79,7 @@ public class VolcanicMineOverlay extends Overlay
@Override @Override
public Dimension render(Graphics2D graphics, java.awt.Point point) public Dimension render(Graphics2D graphics, java.awt.Point point)
{ {
if (client == null || !plugin.getInside() || !config.enabled()) if (!plugin.getInside() || !config.enabled())
{ {
return null; return null;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/volcanicmine/VolcanicMinePlugin.java
View File

@@ -39,7 +39,6 @@ import java.util.Map.Entry;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
@@ -83,7 +82,6 @@ public class VolcanicMinePlugin extends Plugin
private static final Pattern coltagPattern = Pattern.compile("((<col=([0-f]){6}>)|(<\\/col>))"); private static final Pattern coltagPattern = Pattern.compile("((<col=([0-f]){6}>)|(<\\/col>))");
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

2
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
View File

@@ -31,7 +31,6 @@ import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Experience; import net.runelite.api.Experience;
@@ -55,7 +54,6 @@ public class XpGlobesPlugin extends Plugin
private final List<XpGlobe> xpGlobes = new ArrayList<>(); private final List<XpGlobe> xpGlobes = new ArrayList<>();
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

10
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java
View File

@@ -24,10 +24,6 @@
*/ */
package net.runelite.client.plugins.xptracker; package net.runelite.client.plugins.xptracker;
import net.runelite.api.Client;
import net.runelite.api.Skill;
import net.runelite.client.ui.PluginPanel;
import javax.imageio.ImageIO;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
import java.io.IOException; import java.io.IOException;
@@ -35,13 +31,16 @@ import java.text.NumberFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.Skill;
import net.runelite.client.ui.PluginPanel;
@Slf4j @Slf4j
public class XpPanel extends PluginPanel public class XpPanel extends PluginPanel
@@ -50,7 +49,6 @@ public class XpPanel extends PluginPanel
private final XpTrackerPlugin xpTracker; private final XpTrackerPlugin xpTracker;
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

2
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
View File

@@ -35,7 +35,6 @@ import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.ClientUI;
import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.NavigationButton;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.task.Schedule; import net.runelite.client.task.Schedule;
@@ -51,7 +50,6 @@ public class XpTrackerPlugin extends Plugin
ClientUI ui; ClientUI ui;
@Inject @Inject
@Nullable
Client client; Client client;
private NavigationButton navButton; private NavigationButton navButton;

2
runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
View File

@@ -29,7 +29,6 @@ import java.io.IOException;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -50,7 +49,6 @@ public class XteaPlugin extends Plugin
private final Set<Integer> sentRegions = new HashSet<>(); private final Set<Integer> sentRegions = new HashSet<>();
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject

4
runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
View File

@@ -31,7 +31,6 @@ import com.google.inject.Provides;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -66,7 +65,6 @@ public class ZulrahPlugin extends Plugin
QueryRunner queryRunner; QueryRunner queryRunner;
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject
@@ -118,7 +116,7 @@ public class ZulrahPlugin extends Plugin
) )
public void update() public void update()
{ {
if (!config.enabled() || client == null || client.getGameState() != GameState.LOGGED_IN) if (!config.enabled() || client.getGameState() != GameState.LOGGED_IN)
{ {
return; return;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java
View File

@@ -60,7 +60,7 @@ public class ZulrahPrayerOverlay extends Overlay
{ {
ZulrahInstance instance = plugin.getInstance(); ZulrahInstance instance = plugin.getInstance();
if (client == null || instance == null) if (instance == null)
{ {
return null; return null;
} }

2
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/PanelComponent.java
View File

@@ -33,7 +33,6 @@ import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Nullable;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
@@ -61,7 +60,6 @@ public class PanelComponent implements RenderableEntity
} }
@Setter @Setter
@Nullable
private String title; private String title;
@Setter @Setter

1
runelite-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ExamplePlugin.java
View File

@@ -27,7 +27,6 @@ public class ExamplePlugin extends Plugin
private static final Logger logger = LoggerFactory.getLogger(ExamplePlugin.class); private static final Logger logger = LoggerFactory.getLogger(ExamplePlugin.class);
@Inject @Inject
@Nullable
Client client; Client client;
@Inject @Inject