More changes

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

Author: calcastor

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

@@ -175,21 +175,18 @@ protected PlayerSelection getPlayers(CommandAudience viewer, String input) {
         // If no permission for multiple, get a random single entry
         Player random = targets.stream().findAny().get();
         targets.clear();
-        if (random != null) {
-          targets.add(random);
-        }
+        targets.add(random);
       }
     }
 
     return new PlayerSelection(targets, text);
   }
 
   private int parseInputInt(String input, int def) {
-    int value;
+    int value = def;
     try {
       value = Integer.parseInt(input);
-    } catch (NumberFormatException e) {
-      value = def;
+    } catch (NumberFormatException ignored) {
     }
     return value;
   }

core/src/main/java/dev/pgm/community/mutations/types/items/BreadMutation.java

@@ -38,7 +38,7 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 import tc.oc.pgm.api.match.Match;
 import tc.oc.pgm.api.player.MatchPlayer;
 import tc.oc.pgm.events.PlayerJoinMatchEvent;
@@ -329,7 +329,7 @@ private Location chooseStartingLocation(Player hitPlayer) {
     return origin;
   }
 
-  @NotNull
+  @NonNull
   private static Location copyLocation(Location origin, int x, int y, int z) {
     Location possibleLocation =
         new Location(origin.getWorld(), origin.getX() + x, origin.getY() + y, origin.getZ() + z);

core/src/main/java/dev/pgm/community/requests/feature/SponsorVotingBookCreator.java

@@ -136,9 +136,9 @@ private Component getVoteMultiplierComponent(int multiplier) {
 
     for (Rank rank : Community.get().getServerConfig().getRanksConfig().getRanks()) {
       Component rankComponent = text()
-          .append(text(rank.getPrefix() + " " + rank.getName(), rank.getTextColor()))
+          .append(text(rank.prefix() + " " + rank.name(), rank.getTextColor()))
           .append(text(" has a ", NamedTextColor.GRAY))
-          .append(text(rank.getVoteMultiplier() + "x", rank.getTextColor(), TextDecoration.BOLD))
+          .append(text(rank.voteMultiplier() + "x", rank.getTextColor(), TextDecoration.BOLD))
           .append(text(" multiplier", NamedTextColor.GRAY))
           .build();
 

core/src/main/java/dev/pgm/community/teleports/TeleportFeatureBase.java

@@ -6,6 +6,7 @@
 import dev.pgm.community.feature.FeatureBase;
 import dev.pgm.community.utils.CommandAudience;
 import dev.pgm.community.utils.Sounds;
+import java.util.Objects;
 import java.util.logging.Logger;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -32,7 +33,8 @@ public TeleportConfig getTeleportConfig() {
   public void teleport(
       CommandAudience sender, Player teleporter, Location target, Component message) {
     boolean involved = sender.isPlayer()
-        && (sender.getPlayer().equals(teleporter) || sender.getPlayer().equals(teleporter));
+        && (Objects.equals(sender.getPlayer(), teleporter)
+            || Objects.equals(sender.getPlayer(), teleporter));
 
     teleporter.teleport(target);
     if (message != null) {
@@ -57,7 +59,8 @@ public void teleport(
       Component targetMsg,
       boolean senderFeedback) {
     boolean involved = sender.isPlayer()
-        && (sender.getPlayer().equals(teleporter) || sender.getPlayer().equals(target));
+        && (Objects.equals(sender.getPlayer(), teleporter)
+            || Objects.equals(sender.getPlayer(), target));
 
     teleporter.teleport(target);
 

core/src/main/java/dev/pgm/community/utils/NameUtils.java

@@ -13,7 +13,7 @@ public static boolean isMinecraftName(String name) {
 
   public static boolean isPlayerId(String uuid) {
     try {
-      UUID playerId = UUID.fromString(uuid);
+      UUID.fromString(uuid);
       return true;
     } catch (IllegalArgumentException e) {
       return false;

core/src/main/java/dev/pgm/community/utils/ranks/RankUtils.java

@@ -3,19 +3,18 @@
 import dev.pgm.community.Community;
 import java.util.List;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class RankUtils {
 
-  @Nullable
-  public static RanksConfig.Rank getHighestLevelRank(Player player) {
+  public static RanksConfig.@Nullable Rank getHighestLevelRank(Player player) {
     List<RanksConfig.Rank> allRanks =
         Community.get().getServerConfig().getRanksConfig().getRanks();
     RanksConfig.Rank highestRank = null;
 
     for (RanksConfig.Rank rank : allRanks) {
-      if (player.hasPermission(rank.getPermission())) {
-        if (highestRank == null || rank.getWeight() > highestRank.getWeight()) {
+      if (player.hasPermission(rank.permission())) {
+        if (highestRank == null || rank.weight() > highestRank.weight()) {
           highestRank = rank;
         }
       }

core/src/main/java/dev/pgm/community/utils/ranks/RanksConfig.java

@@ -40,58 +40,19 @@ public void reload(Configuration config) {
       ranks.add(rank);
     }
 
-    ranks.sort(Comparator.comparingInt(Rank::getWeight));
+    ranks.sort(Comparator.comparingInt(Rank::weight));
   }
 
-  public static class Rank {
-    private final String name;
-    private final String prefix;
-    private final String permission;
-    private final ChatColor color;
-    private final int multiplier;
-    private final int weight;
-
-    public Rank(
-        String name,
-        String prefix,
-        String permission,
-        ChatColor color,
-        int multiplier,
-        int weight) {
-      this.name = name;
-      this.prefix = prefix;
-      this.permission = permission;
-      this.color = color;
-      this.multiplier = multiplier;
-      this.weight = weight;
-    }
-
-    public String getName() {
-      return name;
-    }
-
-    public String getPrefix() {
-      return prefix;
-    }
-
-    public String getPermission() {
-      return permission;
-    }
-
-    public ChatColor getColor() {
-      return color;
-    }
+  public record Rank(
+      String name,
+      String prefix,
+      String permission,
+      ChatColor color,
+      int voteMultiplier,
+      int weight) {
 
     public NamedTextColor getTextColor() {
-      return TextFormatter.convert(getColor());
-    }
-
-    public int getVoteMultiplier() {
-      return multiplier;
-    }
-
-    public int getWeight() {
-      return weight;
+      return TextFormatter.convert(color());
     }
   }
 }