maj/ScoreKeeper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes @NonNull warnings.
Some checks failed
Java CI with Gradle / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Tom Hicks
2026-09-27 01:36:06 -07:00
parent 714609e5b0
commit ddef725da5
8 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java
View File

@@ -27,6 +27,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
@@ -100,14 +101,14 @@ public class ScoreKeeperPlugin extends JavaPlugin {
@Override @Override
public void onEnable() { public void onEnable() {
getCommand("score-get").setExecutor(new ScoreGetCommand(this)); Objects.requireNonNull(getCommand("score-get")).setExecutor(new ScoreGetCommand(this));
getCommand("score-add").setExecutor(new ScoreAddCommand(this)); Objects.requireNonNull(getCommand("score-add")).setExecutor(new ScoreAddCommand(this));
getCommand("score-subtract").setExecutor(new ScoreSubtractCommand(this)); Objects.requireNonNull(getCommand("score-subtract")).setExecutor(new ScoreSubtractCommand(this));
getCommand("score-reset").setExecutor(new ScoreResetCommand(this)); Objects.requireNonNull(getCommand("score-reset")).setExecutor(new ScoreResetCommand(this));
getCommand("score-archive").setExecutor(new ScoreArchiveCommand(this)); Objects.requireNonNull(getCommand("score-archive")).setExecutor(new ScoreArchiveCommand(this));
getCommand("score-archive-list").setExecutor(new ScoreArchiveListCommand(this)); Objects.requireNonNull(getCommand("score-archive-list")).setExecutor(new ScoreArchiveListCommand(this));
getCommand("score-bucket").setExecutor(new ScoreBucketCommand(this)); Objects.requireNonNull(getCommand("score-bucket")).setExecutor(new ScoreBucketCommand(this));
getCommand("score-run").setExecutor(new ScoreRunCommand(this)); Objects.requireNonNull(getCommand("score-run")).setExecutor(new ScoreRunCommand(this));
_buckets.put("points", new ScoreBucket("points", "point", "points", 0)); _buckets.put("points", new ScoreBucket("points", "point", "points", 0));
_bucketScores.put("points", new LinkedHashMap<>()); _bucketScores.put("points", new LinkedHashMap<>());
@@ -249,13 +250,13 @@ public class ScoreKeeperPlugin extends JavaPlugin {
requireBucket(bucketId); requireBucket(bucketId);
Map<UUID, String> previousBuckets = new LinkedHashMap<>(); Map<UUID, String> previousBuckets = new LinkedHashMap<>();
for (Player player : getServer().getOnlinePlayers()) { for (Player player : getServer().getOnlinePlayers()) {
previousBuckets.put(player.getUniqueId(), getPlayerBucket(player)); previousBuckets.put(Objects.requireNonNull(player).getUniqueId(), getPlayerBucket(player));
} }
_defaultBucketId = bucketId; _defaultBucketId = bucketId;
_playerBuckets.clear(); _playerBuckets.clear();
ScoreBucket bucket = requireBucket(bucketId); ScoreBucket bucket = requireBucket(bucketId);
for (Player player : getServer().getOnlinePlayers()) { for (Player player : getServer().getOnlinePlayers()) {
if (!bucketId.equals(previousBuckets.get(player.getUniqueId()))) { if (!bucketId.equals(previousBuckets.get(Objects.requireNonNull(player).getUniqueId()))) {
sendBucketChangeMessage(player, bucket); sendBucketChangeMessage(player, bucket);
} }
} }
@@ -307,7 +308,7 @@ public class ScoreKeeperPlugin extends JavaPlugin {
// region Utiilty Methods // region Utiilty Methods
public void sendMessage(CommandSender reciever, Component message) { public void sendMessage(CommandSender reciever, Component message) {
reciever.sendMessage(_messagePrefix.append(message)); reciever.sendMessage(_messagePrefix.append(Objects.requireNonNull(message)));
} }
private ScoreBucket requireBucket(String bucketId) { private ScoreBucket requireBucket(String bucketId) {
@@ -404,13 +405,13 @@ public class ScoreKeeperPlugin extends JavaPlugin {
private void reportHighScoreRunChange( private void reportHighScoreRunChange(
Player player, ScoreBucket bucket, HighScoreRun run, int score) { Player player, ScoreBucket bucket, HighScoreRun run, int score) {
String message = scoreMessage(player.getName(), bucket, score); String message = scoreMessage(player.getName(), bucket, score);
sendMessage(player, Component.text(message)); sendMessage(player, Component.text(Objects.requireNonNull(message)));
List<ScoreEntry> standings = getRankedScores(bucket.getId()); List<ScoreEntry> standings = getRankedScores(bucket.getId());
for (int place = 0; place < Math.min(run.topN, standings.size()); place++) { for (int place = 0; place < Math.min(run.topN, standings.size()); place++) {
if (standings.get(place).playerId.equals(player.getUniqueId())) { if (standings.get(place).playerId.equals(player.getUniqueId())) {
for (Player recipient : getServer().getOnlinePlayers()) { for (Player recipient : getServer().getOnlinePlayers()) {
if (recipient != player) { if (recipient != player) {
sendMessage(recipient, Component.text(message)); sendMessage(recipient, Component.text(Objects.requireNonNull(message)));
} }
} }
return; return;
@@ -455,7 +456,7 @@ public class ScoreKeeperPlugin extends JavaPlugin {
ScoreEntry personalEntry = null; ScoreEntry personalEntry = null;
int personalPlace = -1; int personalPlace = -1;
for (int place = 0; place < standings.size(); place++) { 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); personalEntry = standings.get(place);
personalPlace = place + 1; personalPlace = place + 1;
break; break;
@@ -700,7 +701,7 @@ public class ScoreKeeperPlugin extends JavaPlugin {
} }
String text = scoreMessage(player.getName(), bucket, score); String text = scoreMessage(player.getName(), bucket, score);
Component message = Component.text(text); Component message = Component.text(Objects.requireNonNull(text));
if (reporting == ScoreReporting.PLAYER) { if (reporting == ScoreReporting.PLAYER) {
sendMessage(player, message); sendMessage(player, message);
} else if (reporting == ScoreReporting.GLOBAL) { } else if (reporting == ScoreReporting.GLOBAL) {
@@ -710,7 +711,7 @@ public class ScoreKeeperPlugin extends JavaPlugin {
} else if (reporting == ScoreReporting.ADMIN) { } else if (reporting == ScoreReporting.ADMIN) {
logInfo(text); logInfo(text);
for (Player recipient : getServer().getOnlinePlayers()) { for (Player recipient : getServer().getOnlinePlayers()) {
if (recipient.isOp() || recipient.hasPermission("scorekeeper.admin")) { if (Objects.requireNonNull(recipient).isOp() || recipient.hasPermission("scorekeeper.admin")) {
sendMessage(recipient, message); sendMessage(recipient, message);
} }
} }

4
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java
View File

@@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import java.util.Objects;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -76,7 +78,7 @@ public class ScoreAddCommand implements CommandExecutor {
} }
private void echoError(CommandSender sender, boolean rcon, String string) { 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) { private void echoUsage(CommandSender sender, boolean rcon) {

4
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java
View File

@@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import java.util.Objects;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -68,7 +70,7 @@ public class ScoreArchiveCommand implements CommandExecutor {
} }
private void sendError(CommandSender sender, String message) { 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) { private void sendUsage(CommandSender sender) {

4
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreBucketCommand.java
View File

@@ -24,6 +24,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreReporting;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import java.util.Objects;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -121,7 +123,7 @@ public class ScoreBucketCommand implements CommandExecutor {
} }
private void sendError(CommandSender sender, String message) { 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) { private void sendUsage(CommandSender sender) {

4
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java
View File

@@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import java.util.Objects;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -84,7 +86,7 @@ public class ScoreGetCommand implements CommandExecutor {
} }
private void echoError(CommandSender sender, boolean rcon, String string) { 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) { private void echoUsage(CommandSender sender, boolean rcon) {

4
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java
View File

@@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import java.util.Objects;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -62,7 +64,7 @@ public class ScoreResetCommand implements CommandExecutor {
} }
private void echoError(CommandSender sender, boolean rcon, String string) { 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) { private void echoUsage(CommandSender sender, boolean rcon) {

3
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreRunCommand.java
View File

@@ -18,6 +18,7 @@ along with ScoreKeeper. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
package com.majinnaibu.minecraft.plugins.scorekeeper.commands; package com.majinnaibu.minecraft.plugins.scorekeeper.commands;
import java.time.Duration; import java.time.Duration;
import java.util.Objects;
import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
@@ -109,7 +110,7 @@ public class ScoreRunCommand implements CommandExecutor {
} }
private void sendError(CommandSender sender, String message) { 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) { private void sendUsage(CommandSender sender) {

4
src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java
View File

@@ -22,6 +22,8 @@ import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import java.util.Objects;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -76,7 +78,7 @@ public class ScoreSubtractCommand implements CommandExecutor {
} }
private void echoError(CommandSender sender, boolean rcon, String string) { 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) { private void echoUsage(CommandSender sender, boolean rcon) {