Treewide cleanup and use of modern Java features

Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>

Author: calcastor

buildSrc/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.0")
-    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:8.1.0")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.1")
+    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:8.2.1")
     implementation("de.skuzzle.restrictimports:de.skuzzle.restrictimports.gradle.plugin:3.0.0")
 }

buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts

@@ -24,10 +24,11 @@ dependencies {
     implementation("fr.minuskube.inv:smart-invs:1.2.7") { isTransitive = false }
 
     implementation("redis.clients:jedis:3.5.1")
-    implementation("net.kyori:adventure-api:4.25.0")
-    implementation("net.kyori:adventure-text-serializer-plain:4.25.0")
+    implementation("net.kyori:adventure-api:4.26.1")
+    implementation("net.kyori:adventure-text-serializer-plain:4.26.1")
     implementation("net.kyori:adventure-platform-bukkit:4.4.1")
     implementation("org.reflections:reflections:0.10.2")
+    implementation("org.jspecify:jspecify:1.0.0")
 
     compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT")
     compileOnly("tc.oc.pgm:util:0.16-SNAPSHOT")
@@ -61,7 +62,7 @@ spotless {
     ratchetFrom = "origin/dev"
     java {
         removeUnusedImports()
-        palantirJavaFormat("2.83.0").style("GOOGLE").formatJavadoc(true)
+        palantirJavaFormat("2.87.0").style("GOOGLE").formatJavadoc(true)
     }
 }
 

core/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly("dev.pgm.paper:paper-api:1.8_1.21.10-SNAPSHOT")
+    compileOnly("dev.pgm.paper:paper-api:1.8_1.21.11-SNAPSHOT")
     compileOnly("tc.oc.occ:Database:2.0.0-SNAPSHOT")
 
     implementation("org.xerial:sqlite-jdbc:3.51.1.0")
@@ -71,7 +71,7 @@ tasks {
                 mapOf(
                     "name" to name,
                     "description" to description,
-                    "apiVersion" to "1.21.10",
+                    "apiVersion" to "1.21.11",
                     "mainClass" to "dev.pgm.community.Community",
                     "version" to version,
                     "commitHash" to commitHash,

core/src/main/java/dev/pgm/community/CommunityCommand.java

@@ -10,6 +10,7 @@
 import dev.pgm.community.utils.NameUtils;
 import dev.pgm.community.utils.PGMUtils;
 import dev.pgm.community.utils.VisibilityUtils;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -24,7 +25,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import tc.oc.pgm.api.match.Match;
 import tc.oc.pgm.api.player.MatchPlayer;
 import tc.oc.pgm.teams.Team;
@@ -46,15 +47,15 @@ protected CompletableFuture<Optional<UUID>> getTarget(String target, UsersFeatur
     boolean username = NameUtils.isMinecraftName(target);
     if (!username) {
       try {
-        return CompletableFuture.completedFuture(Optional.ofNullable(UUID.fromString(target)));
+        return CompletableFuture.completedFuture(Optional.of(UUID.fromString(target)));
       } catch (IllegalArgumentException e) {
         throw TextException.exception(target + " is not a valid UUID.");
       }
     }
     return service.getStoredId(target);
   }
 
-  public class PlayerSelection {
+  public static class PlayerSelection {
 
     private final Set<Player> players;
     private final Component selectionText;
@@ -77,7 +78,7 @@ public Component getText() {
       Component hover = TextFormatter.list(names, NamedTextColor.GRAY);
       if (getPlayers().size() > names.size()) {
         int leftOver = getPlayers().size() - names.size();
-        hover
+        hover = hover
             .append(text(" plus "))
             .append(text(leftOver, NamedTextColor.YELLOW))
             .append(text(" other player" + (leftOver != 1 ? "s" : "")))
@@ -106,7 +107,7 @@ protected PlayerSelection getPlayers(CommandAudience viewer, String input) {
 
     String[] parts = input.split("=");
 
-    List<Player> allOnline = Bukkit.getOnlinePlayers().stream().collect(Collectors.toList());
+    List<Player> allOnline = new ArrayList<>(Bukkit.getOnlinePlayers());
 
     Set<Player> targets = Sets.newHashSet();
     Component text;
@@ -141,16 +142,14 @@ protected PlayerSelection getPlayers(CommandAudience viewer, String input) {
         // Allow Observers to be selected
         if (teamName.toLowerCase().startsWith("obs")) {
           text = text("Observers", NamedTextColor.AQUA);
-          targets.addAll(match.getObservers().stream()
-              .map(MatchPlayer::getBukkit)
-              .collect(Collectors.toList()));
+          targets.addAll(
+              match.getObservers().stream().map(MatchPlayer::getBukkit).toList());
         } else {
           Team team = teams.bestFuzzyMatch(teamName);
           if (team == null) {
             throw TextException.exception(teamName + " is not a valid team name");
           }
-          targets.addAll(
-              team.getPlayers().stream().map(MatchPlayer::getBukkit).collect(Collectors.toList()));
+          targets.addAll(team.getPlayers().stream().map(MatchPlayer::getBukkit).toList());
           text = text()
               .append(text(team.getNameLegacy(), TextFormatter.convert(team.getColor())))
               .build();
@@ -186,7 +185,7 @@ protected PlayerSelection getPlayers(CommandAudience viewer, String input) {
   }
 
   private int parseInputInt(String input, int def) {
-    int value = def;
+    int value;
     try {
       value = Integer.parseInt(input);
     } catch (NumberFormatException e) {
@@ -234,7 +233,7 @@ protected UUID getOnlineTarget(String target, UsersFeature service) {
       // priority now
       Optional<UUID> cachedId = service.getId(
           target); // If user is online or was online recently, we will have their UUID.
-      if (!cachedId.isPresent()) {
+      if (cachedId.isEmpty()) {
         throw TextException.exception(formatNotFoundMsg(target));
       } else {
         id = cachedId.get();

core/src/main/java/dev/pgm/community/assistance/AssistanceRequest.java

@@ -49,9 +49,9 @@ public RequestType getType() {
     return type;
   }
 
-  public static enum RequestType {
+  public enum RequestType {
     PLAYER_HELP,
-    REPORT;
+    REPORT
   }
 
   @Override

core/src/main/java/dev/pgm/community/assistance/Report.java

@@ -14,7 +14,7 @@ public class Report extends AssistanceRequest implements Comparable<Report> {
    * @param reporterId UUID of reporting player
    * @param reason reason for report
    * @param time time reported
-   * @param name of current server
+   * @param server name of current server
    */
   public Report(UUID reportedId, UUID reporterId, String reason, long time, String server) {
     this(UUID.randomUUID(), reportedId, reporterId, reason, time, server);
@@ -51,8 +51,7 @@ public int compareTo(Report o) {
 
   @Override
   public boolean equals(Object other) {
-    if (!(other instanceof Report)) return false;
-    Report otherReport = (Report) other;
+    if (!(other instanceof Report otherReport)) return false;
     return getId().equals(otherReport.getId());
   }
 }

core/src/main/java/dev/pgm/community/assistance/ReportConfig.java

@@ -39,11 +39,7 @@ public class ReportConfig extends FeatureConfigImpl {
 
   private List<ReportCategory> categories;
 
-  /**
-   * Configuration options related to reports
-   *
-   * @param config
-   */
+  /** Configuration options related to reports */
   public ReportConfig(Configuration config) {
     super(KEY, config);
   }

core/src/main/java/dev/pgm/community/assistance/commands/PlayerHelpCommand.java

@@ -15,8 +15,8 @@
 
 public class PlayerHelpCommand extends CommunityCommand {
 
-  private AssistanceFeature assistance;
-  private ModerationFeature moderation;
+  private final AssistanceFeature assistance;
+  private final ModerationFeature moderation;
 
   public PlayerHelpCommand() {
     this.assistance = Community.get().getFeatures().getReports();

core/src/main/java/dev/pgm/community/assistance/commands/ReportCommands.java

@@ -89,17 +89,14 @@ public void recentReports(
     checkEnabled();
 
     if (player != null) {
-      reports
-          .query(player)
-          .thenAcceptAsync(
-              reports -> {
-                if (reports.isEmpty()) {
-                  audience.sendWarning(
-                      text("No reports found for ").append(text(player, NamedTextColor.AQUA)));
-                  return;
-                }
-                sendReportHistory(audience, reports, page);
-              });
+      reports.query(player).thenAcceptAsync(reports -> {
+        if (reports.isEmpty()) {
+          audience.sendWarning(
+              text("No reports found for ").append(text(player, NamedTextColor.AQUA)));
+          return;
+        }
+        sendReportHistory(audience, reports, page);
+      });
       return;
     }
 
@@ -113,16 +110,15 @@ public void sendReportHistory(CommandAudience audience, Collection<Report> repor
     int pages = (reportData.size() + perPage - 1) / perPage;
     page = Math.max(1, Math.min(page, pages));
 
-    Component pageNum =
-        translatable(
-            "command.simplePageHeader",
-            NamedTextColor.GRAY,
-            text(Integer.toString(page), NamedTextColor.RED),
-            text(Integer.toString(pages), NamedTextColor.RED));
+    Component pageNum = translatable(
+        "command.simplePageHeader",
+        NamedTextColor.GRAY,
+        text(Integer.toString(page), NamedTextColor.RED),
+        text(Integer.toString(pages), NamedTextColor.RED));
 
-    Component header =
-        translatable("moderation.reports.header", NamedTextColor.GRAY, headerResultCount, pageNum)
-            .append(text(" (").append(headerResultCount).append(text(") » ")).append(pageNum));
+    Component header = translatable(
+            "moderation.reports.header", NamedTextColor.GRAY, headerResultCount, pageNum)
+        .append(text(" (").append(headerResultCount).append(text(") » ")).append(pageNum));
 
     Component formattedHeader =
         TextFormatter.horizontalLineHeading(audience.getSender(), header, NamedTextColor.DARK_GRAY);
@@ -132,23 +128,19 @@ public Component format(Report data, int index) {
         Component reporterName = getReportFormatName(data.getSenderId()).join();
         Component reportedName = getReportFormatName(data.getTargetId()).join();
 
-        Component serverName =
-            text("Server ", NamedTextColor.GRAY)
-                .append(text(": ", NamedTextColor.DARK_GRAY))
-                .append(text(data.getServer(), NamedTextColor.AQUA));
+        Component serverName = text("Server ", NamedTextColor.GRAY)
+            .append(text(": ", NamedTextColor.DARK_GRAY))
+            .append(text(data.getServer(), NamedTextColor.AQUA));
 
-        TextComponent.Builder reporter =
-            text()
-                .append(
-                    translatable("moderation.reports.hover", NamedTextColor.GRAY, reporterName));
+        TextComponent.Builder reporter = text()
+            .append(translatable("moderation.reports.hover", NamedTextColor.GRAY, reporterName));
 
         if (!data.getServer().equalsIgnoreCase(Community.get().getServerConfig().getServerId())) {
           reporter.append(newline()).append(serverName);
         }
 
-        Component timeAgo =
-            TemporalComponent.relativePastApproximate(data.getTime())
-                .color(NamedTextColor.DARK_GREEN);
+        Component timeAgo = TemporalComponent.relativePastApproximate(data.getTime())
+            .color(NamedTextColor.DARK_GREEN);
 
         return text()
             .append(timeAgo.hoverEvent(HoverEvent.showText(reporter.build())))
@@ -171,9 +163,7 @@ private CompletableFuture<Component> getReportFormatName(UUID id) {
     return usernames
         .getStoredUsername(id)
         .thenApplyAsync(
-            name -> {
-              return PlayerComponent.player(Bukkit.getPlayer(id), name, NameStyle.FANCY);
-            });
+            name -> PlayerComponent.player(Bukkit.getPlayer(id), name, NameStyle.FANCY));
   }
 
   private void checkEnabled() {

core/src/main/java/dev/pgm/community/assistance/feature/types/AssistanceFeatureCore.java

@@ -47,7 +47,7 @@
 import org.bukkit.configuration.Configuration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import tc.oc.pgm.util.Audience;
 import tc.oc.pgm.util.bukkit.BukkitUtils;
 import tc.oc.pgm.util.named.NameStyle;
@@ -110,7 +110,7 @@ private boolean isPersistent() {
 
   @Override
   public boolean canRequest(UUID uuid) {
-    return isCooldownEnabled() ? cooldown.getIfPresent(uuid) == null : true;
+    return !isCooldownEnabled() || cooldown.getIfPresent(uuid) == null;
   }
 
   @Override
@@ -346,9 +346,9 @@ public void onPunishment(PlayerPunishmentEvent event) {
             .getReporyNotifyTime()
             .minus(Duration.between(r.getTime(), Instant.now()))
             .isNegative())
-        .collect(Collectors.toList());
+        .toList();
     Set<UUID> reporters =
-        relatedReports.stream().map(r -> r.getSenderId()).collect(Collectors.toSet());
+        relatedReports.stream().map(AssistanceRequest::getSenderId).collect(Collectors.toSet());
     for (UUID reporterId : reporters) {
       Player onlineReporter = Bukkit.getPlayer(reporterId);
       if (onlineReporter != null) {