Merge pull request #2787 from BentoBoxWorld/static_code_analysis

Changes to improve code per IntelliJ

Author: tastybento

build.gradle.kts

@@ -283,15 +283,15 @@ tasks.processResources {
     // This allows version info to be read at runtime by the plugin
     filesMatching(listOf("plugin.yml", "config.yml")) {
         filter { line ->
-            line.replace("\${mysql.version}", mysqlVersion)
-                .replace("\${mariadb.version}", mariadbVersion)
-                .replace("\${postgresql.version}", postgresqlVersion)
-                .replace("\${mongodb.version}", mongodbVersion)
-                .replace("\${hikaricp.version}", hikaricpVersion)
-                .replace("\${build.number}", finalBuildNumber)
-                .replace("\${project.version}", project.version.toString())
-                .replace("\${project.description}", project.description ?: "")
-                .replace("\${revision}", project.version.toString())
+            line.replace($$"${mysql.version}", mysqlVersion)
+                .replace($$"${mariadb.version}", mariadbVersion)
+                .replace($$"${postgresql.version}", postgresqlVersion)
+                .replace($$"${mongodb.version}", mongodbVersion)
+                .replace($$"${hikaricp.version}", hikaricpVersion)
+                .replace($$"${build.number}", finalBuildNumber)
+                .replace($$"${project.version}", project.version.toString())
+                .replace($$"${project.description}", project.description ?: "")
+                .replace($$"${revision}", project.version.toString())
         }
     }
 

src/main/java/world/bentobox/bentobox/BStats.java

@@ -157,7 +157,7 @@ private void registerPlayersPerServerChart() {
             int players = this.connectedPlayerSet.size();
             this.connectedPlayerSet.clear();
 
-            if (players <= 0) return "0";
+            if (players == 0) return "0";
             else if (players <= 10) return "1-10";
             else if (players <= 30) return "11-30";
             else if (players <= 50) return "31-50";

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -9,9 +9,7 @@
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.server.ServerCommandEvent;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -151,7 +149,7 @@ public void onEnable(){
         saveConfig();
 
         // Set up click timeout
-        lastClick = new ExpiringMap<Pair<UUID, String>, Boolean>(getSettings().getClickCooldownMs(), TimeUnit.MILLISECONDS);
+        lastClick = new ExpiringMap<>(getSettings().getClickCooldownMs(), TimeUnit.MILLISECONDS);
 
         // Start Database managers
         playersManager = new PlayersManager(this);
@@ -376,18 +374,6 @@ public void onDisable() {
 
     }
 
-    @EventHandler
-    public void onServerStop(ServerCommandEvent e) {
-        /* This is no longer needed as with https://github.com/Multiverse/Multiverse-Core/releases/tag/4.3.12 (or maybe earlier) the issue
-         * is fixed where the generator was not remembered across reboots.
-         */
-        /*
-        if (islandWorldManager != null && (e.getCommand().equalsIgnoreCase("stop") || e.getCommand().equalsIgnoreCase("restart"))) {
-            // Unregister any MV worlds            if () {
-            //islandWorldManager.registerWorldsToMultiverse(false);
-        }*/
-    }
-
     /**
      * Returns the player manager
      * @return the player manager
@@ -675,11 +661,11 @@ public boolean isShutdown() {
      * @return false if they can click and the timeout is started, otherwise true.
      */
     public boolean onTimeout(User user, Panel panel) {
-        if (lastClick.containsKey(new Pair<UUID, String>(user.getUniqueId(), panel.getName()))) {
+        if (lastClick.containsKey(new Pair<>(user.getUniqueId(), panel.getName()))) {
             user.notify("general.errors.slow-down");
             return true;
         }
-        lastClick.put(new Pair<UUID, String>(user.getUniqueId(), panel.getName()), true);
+        lastClick.put(new Pair<>(user.getUniqueId(), panel.getName()), true);
         return false;
     }
 }

src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java

@@ -31,7 +31,7 @@
  * Each addon is loaded with its own {@link AddonClassLoader}, which allows for
  * class isolation and management. This loader also facilitates inter-addon
  * class sharing by coordinating with the {@link AddonsManager}.
- * 
+ * <p>
  * This approach is now rarely used as most addons are now Plugin-based and so are loaded by the server as plugins.
  *
  * @author tastybento, ComminQ

src/main/java/world/bentobox/bentobox/api/addons/package-info.java

@@ -1,15 +1,15 @@
 /**
  * This package contains classes and interfaces related to BentoBox addons.
- * 
+ * <p>
  * Addons are modular extensions that enhance BentoBox functionality. Game-specific
  * addons (e.g., BSkyBlock, AcidIsland) as well as generic addons (e.g., Challenges, Warps)
  * are supported by this system. Developers can create custom addons to introduce
  * new features or gamemodes.
- * 
+ * <p>
  * Since BentoBox was created, server tech has changed and code remapping is done and that
  * is usually only applied when a Plugin is loaded, so developers should use Pladdons
  * which are a wrapper for Addons in a Plugin.
- * 
+ * <p>
  * Key components:
  * - AddonLoader: Manages the lifecycle of addons.
  * - AddonConfig: Handles addon-specific configurations.

src/main/java/world/bentobox/bentobox/api/commands/island/IslandGoCommand.java

@@ -154,7 +154,7 @@ private boolean checkReserved(User user, List<Island> islands) {
 
     @Override
     public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
-        String lastArg = !args.isEmpty() ? args.get(args.size()-1) : "";
+        String lastArg = !args.isEmpty() ? args.getLast() : "";
 
         return Optional.of(Util.tabLimit(new ArrayList<>(getNameIslandMap(user, getWorld()).keySet()), lastArg));
 

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java

@@ -141,7 +141,7 @@ public boolean execute(User user, String label, List<String> args) {
      * - Must be at least member rank
      * For demotion:
      * - Decreases rank but not below member
-     * 
+     * <p>
      * Fires IslandEvent.Reason.RANK_CHANGE on success
      * 
      * @param user command issuer

src/main/java/world/bentobox/bentobox/api/commands/package-info.java

@@ -1,6 +1,6 @@
 /**
  * This package contains classes and handlers for BentoBox commands.
- * 
+ * <p>
  * Commands allow players and administrators to interact with BentoBox, including
  * managing islands, settings, and other in-game features. This package ensures
  * smooth integration and execution of commands within the plugin.
@@ -15,7 +15,7 @@
  * their own custom help if required, but most of the time it is not.
  * </p>
  * @author tastybento
- * 
+ * <p>
  * Key features:
  * - Command registration and parsing.
  * - Support for custom addon-specific commands.

src/main/java/world/bentobox/bentobox/api/configuration/ConfigObject.java

@@ -10,11 +10,6 @@
  */
 public interface ConfigObject extends DataObject {
 
-    @Override
-    default BentoBox getPlugin() {
-        return BentoBox.getInstance();
-    }
-
     /**
      * @return the uniqueId
      */

src/main/java/world/bentobox/bentobox/api/events/package-info.java

@@ -1,10 +1,10 @@
 /**
  * This package defines events used within the BentoBox framework.
- * 
+ * <p>
  * Events are triggered during key gameplay actions, such as island creation,
  * deletion, or player interactions. Developers can use these events to customize
  * behaviors or respond to actions in their addons.
- * 
+ * <p>
  * Key features:
  * - Custom event classes (e.g., IslandCreateEvent, PlayerJoinEvent).
  * - Integration with Bukkit's event system.