diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java index 2f1a00a..c2659e0 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java @@ -27,6 +27,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.UUID; import java.util.logging.Level; @@ -100,14 +101,14 @@ public class ScoreKeeperPlugin extends JavaPlugin { @Override public void onEnable() { - getCommand("score-get").setExecutor(new ScoreGetCommand(this)); - getCommand("score-add").setExecutor(new ScoreAddCommand(this)); - getCommand("score-subtract").setExecutor(new ScoreSubtractCommand(this)); - getCommand("score-reset").setExecutor(new ScoreResetCommand(this)); - getCommand("score-archive").setExecutor(new ScoreArchiveCommand(this)); - getCommand("score-archive-list").setExecutor(new ScoreArchiveListCommand(this)); - getCommand("score-bucket").setExecutor(new ScoreBucketCommand(this)); - getCommand("score-run").setExecutor(new ScoreRunCommand(this)); + Objects.requireNonNull(getCommand("score-get")).setExecutor(new ScoreGetCommand(this)); + Objects.requireNonNull(getCommand("score-add")).setExecutor(new ScoreAddCommand(this)); + Objects.requireNonNull(getCommand("score-subtract")).setExecutor(new ScoreSubtractCommand(this)); + Objects.requireNonNull(getCommand("score-reset")).setExecutor(new ScoreResetCommand(this)); + Objects.requireNonNull(getCommand("score-archive")).setExecutor(new ScoreArchiveCommand(this)); + Objects.requireNonNull(getCommand("score-archive-list")).setExecutor(new ScoreArchiveListCommand(this)); + Objects.requireNonNull(getCommand("score-bucket")).setExecutor(new ScoreBucketCommand(this)); + Objects.requireNonNull(getCommand("score-run")).setExecutor(new ScoreRunCommand(this)); _buckets.put("points", new ScoreBucket("points", "point", "points", 0)); _bucketScores.put("points", new LinkedHashMap<>()); @@ -249,13 +250,13 @@ public class ScoreKeeperPlugin extends JavaPlugin { requireBucket(bucketId); Map previousBuckets = new LinkedHashMap<>(); for (Player player : getServer().getOnlinePlayers()) { - previousBuckets.put(player.getUniqueId(), getPlayerBucket(player)); + previousBuckets.put(Objects.requireNonNull(player).getUniqueId(), getPlayerBucket(player)); } _defaultBucketId = bucketId; _playerBuckets.clear(); ScoreBucket bucket = requireBucket(bucketId); for (Player player : getServer().getOnlinePlayers()) { - if (!bucketId.equals(previousBuckets.get(player.getUniqueId()))) { + if (!bucketId.equals(previousBuckets.get(Objects.requireNonNull(player).getUniqueId()))) { sendBucketChangeMessage(player, bucket); } } @@ -307,7 +308,7 @@ public class ScoreKeeperPlugin extends JavaPlugin { // region Utiilty Methods public void sendMessage(CommandSender reciever, Component message) { - reciever.sendMessage(_messagePrefix.append(message)); + reciever.sendMessage(_messagePrefix.append(Objects.requireNonNull(message))); } private ScoreBucket requireBucket(String bucketId) { @@ -404,13 +405,13 @@ public class ScoreKeeperPlugin extends JavaPlugin { private void reportHighScoreRunChange( Player player, ScoreBucket bucket, HighScoreRun run, int score) { String message = scoreMessage(player.getName(), bucket, score); - sendMessage(player, Component.text(message)); + sendMessage(player, Component.text(Objects.requireNonNull(message))); List standings = getRankedScores(bucket.getId()); for (int place = 0; place < Math.min(run.topN, standings.size()); place++) { if (standings.get(place).playerId.equals(player.getUniqueId())) { for (Player recipient : getServer().getOnlinePlayers()) { if (recipient != player) { - sendMessage(recipient, Component.text(message)); + sendMessage(recipient, Component.text(Objects.requireNonNull(message))); } } return; @@ -455,7 +456,7 @@ public class ScoreKeeperPlugin extends JavaPlugin { ScoreEntry personalEntry = null; int personalPlace = -1; for (int place = 0; place < standings.size(); place++) { - if (standings.get(place).playerId.equals(player.getUniqueId())) { + if (standings.get(place).playerId.equals(Objects.requireNonNull(player).getUniqueId())) { personalEntry = standings.get(place); personalPlace = place + 1; break; @@ -700,7 +701,7 @@ public class ScoreKeeperPlugin extends JavaPlugin { } String text = scoreMessage(player.getName(), bucket, score); - Component message = Component.text(text); + Component message = Component.text(Objects.requireNonNull(text)); if (reporting == ScoreReporting.PLAYER) { sendMessage(player, message); } else if (reporting == ScoreReporting.GLOBAL) { @@ -710,7 +711,7 @@ public class ScoreKeeperPlugin extends JavaPlugin { } else if (reporting == ScoreReporting.ADMIN) { logInfo(text); for (Player recipient : getServer().getOnlinePlayers()) { - if (recipient.isOp() || recipient.hasPermission("scorekeeper.admin")) { + if (Objects.requireNonNull(recipient).isOp() || recipient.hasPermission("scorekeeper.admin")) { sendMessage(recipient, message); } } diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java index 445f3dd..b405b6a 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java @@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Objects; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -76,7 +78,7 @@ public class ScoreAddCommand implements CommandExecutor { } private void echoError(CommandSender sender, boolean rcon, String string) { - _plugin.sendMessage(sender, Component.text(string).color(NamedTextColor.RED)); + _plugin.sendMessage(sender, Component.text(Objects.requireNonNull(string)).color(NamedTextColor.RED)); } private void echoUsage(CommandSender sender, boolean rcon) { diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java index e84eb94..aa4593f 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java @@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Objects; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -68,7 +70,7 @@ public class ScoreArchiveCommand implements CommandExecutor { } private void sendError(CommandSender sender, String message) { - _plugin.sendMessage(sender, Component.text(message).color(NamedTextColor.RED)); + _plugin.sendMessage(sender, Component.text(Objects.requireNonNull(message)).color(NamedTextColor.RED)); } private void sendUsage(CommandSender sender) { diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreBucketCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreBucketCommand.java index a8b9455..ed43a85 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreBucketCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreBucketCommand.java @@ -24,6 +24,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreReporting; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Objects; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -121,7 +123,7 @@ public class ScoreBucketCommand implements CommandExecutor { } private void sendError(CommandSender sender, String message) { - _plugin.sendMessage(sender, Component.text(message).color(NamedTextColor.RED)); + _plugin.sendMessage(sender, Component.text(Objects.requireNonNull(message)).color(NamedTextColor.RED)); } private void sendUsage(CommandSender sender) { diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java index 9faff01..fec8438 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java @@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Objects; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -84,7 +86,7 @@ public class ScoreGetCommand implements CommandExecutor { } private void echoError(CommandSender sender, boolean rcon, String string) { - _plugin.sendMessage(sender, Component.text(string).color(NamedTextColor.RED)); + _plugin.sendMessage(sender, Component.text(Objects.requireNonNull(string)).color(NamedTextColor.RED)); } private void echoUsage(CommandSender sender, boolean rcon) { diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java index c7c25d5..5b66023 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java @@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Objects; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -62,7 +64,7 @@ public class ScoreResetCommand implements CommandExecutor { } private void echoError(CommandSender sender, boolean rcon, String string) { - _plugin.sendMessage(sender, Component.text(string).color(NamedTextColor.RED)); + _plugin.sendMessage(sender, Component.text(Objects.requireNonNull(string)).color(NamedTextColor.RED)); } private void echoUsage(CommandSender sender, boolean rcon) { diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreRunCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreRunCommand.java index 4cd01e9..9d96dea 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreRunCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreRunCommand.java @@ -18,6 +18,7 @@ along with ScoreKeeper. If not, see . package com.majinnaibu.minecraft.plugins.scorekeeper.commands; import java.time.Duration; +import java.util.Objects; import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; @@ -109,7 +110,7 @@ public class ScoreRunCommand implements CommandExecutor { } private void sendError(CommandSender sender, String message) { - _plugin.sendMessage(sender, Component.text(message).color(NamedTextColor.RED)); + _plugin.sendMessage(sender, Component.text(Objects.requireNonNull(message)).color(NamedTextColor.RED)); } private void sendUsage(CommandSender sender) { diff --git a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java index 93a9992..4da8a33 100644 --- a/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java @@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Objects; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -76,7 +78,7 @@ public class ScoreSubtractCommand implements CommandExecutor { } private void echoError(CommandSender sender, boolean rcon, String string) { - _plugin.sendMessage(sender, Component.text(string).color(NamedTextColor.RED)); + _plugin.sendMessage(sender, Component.text(Objects.requireNonNull(string)).color(NamedTextColor.RED)); } private void echoUsage(CommandSender sender, boolean rcon) {