Static analysis code clean up

Author: tastybento

README.md

@@ -84,14 +84,14 @@ A: It's whatever you want it to be!
 
 ## Installation
 
-0. Install BentoBox and run it on the server at least once to create its data folders.
-1. Place this jar in the addons folder of the BentoBox plugin.
-2. Restart the server.
-3. The addon will create worlds and a data folder and inside the folder will be a config.yml and config files in phases folder.
-4. Stop the server.
-5. Edit config.yml and the .yml config files how you want.
-6. Delete any worlds that were created by default if you made changes that would affect them.
-7. Restart the server.
+1. Install BentoBox and run it on the server at least once to create its data folders.
+2. Place this jar in the addons folder of the BentoBox plugin.
+3. Restart the server.
+4. The addon will create worlds and a data folder and inside the folder will be a config.yml and config files in phases folder.
+5. Stop the server.
+6. Edit config.yml and the .yml config files how you want.
+7. Delete any worlds that were created by default if you made changes that would affect them.
+8. Restart the server.
 
 ## Phase config files
 

src/main/java/world/bentobox/aoneblock/AOneBlock.java

@@ -79,7 +79,7 @@ public class AOneBlock extends GameModeAddon {
             .defaultSetting(false)
             .build();
     /** The listener for the boss bar */
-    private BossBarListener bossBar = new BossBarListener(this);
+    private final BossBarListener bossBar = new BossBarListener(this);
     /**
      * Flag to enable or disable the OneBlock boss bar.
      */

src/main/java/world/bentobox/aoneblock/AOneBlockPlaceholders.java

@@ -82,7 +82,7 @@ private Optional<Island> getUsersIsland(User user) {
                 .filter(is -> user.getUniqueId().equals(is.getOwner())).toList();
         if (ownedIslands.size() == 1) {
             // Replace with the owned island
-            i = ownedIslands.get(0); // pick one
+            i = ownedIslands.getFirst(); // pick one
         }
         // Return what we have found
         return Optional.ofNullable(i);

src/main/java/world/bentobox/aoneblock/commands/admin/AdminSanityCheck.java

@@ -40,7 +40,7 @@ public boolean canExecute(User user, String label, List<String> args) {
         }
         if (args.isEmpty()) return true;
         // Check phase
-        Optional<OneBlockPhase> opPhase = addon.getOneBlockManager().getPhase(args.get(0).toUpperCase());
+        Optional<OneBlockPhase> opPhase = addon.getOneBlockManager().getPhase(args.getFirst().toUpperCase());
         if (opPhase.isEmpty()) {
             user.sendMessage("aoneblock.commands.admin.setchest.unknown-phase");
             return false;

src/main/java/world/bentobox/aoneblock/commands/admin/AdminSetCountCommand.java

@@ -45,7 +45,7 @@ public boolean execute(User user, String label, List<String> args) {
         // Get target player
         UUID targetUUID = getPlayers().getUUID(args.get(0));
         if (targetUUID == null) {
-            user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
+            user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.getFirst());
             return false;
         }
         // Get their island

src/main/java/world/bentobox/aoneblock/commands/island/IslandSetCountCommand.java

@@ -67,11 +67,11 @@ public boolean execute(User user, String label, List<String> args) {
         }
         // Get value
         // Get new range
-        if (!Util.isInteger(args.get(0), true) || Integer.parseInt(args.get(0)) < 0) {
-            user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(0));
+        if (!Util.isInteger(args.getFirst(), true) || Integer.parseInt(args.getFirst()) < 0) {
+            user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.getFirst());
             return false;
         }
-        int count = Integer.parseInt(args.get(0));
+        int count = Integer.parseInt(args.getFirst());
         // Check the value is lower than played so far
         @NonNull
         OneBlockIslands i = addon.getBlockListener().getIsland(island);

src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java

@@ -716,7 +716,7 @@ public void onPlayerInteract(PlayerInteractEvent e) {
             return;
         }
 
-        if (block != null && block.getBlockData() instanceof Brushable bb) {
+        if (block.getBlockData() instanceof Brushable bb) {
             int dusted = bb.getDusted() + 1;
             if (dusted > bb.getMaximumDusted()) {
                 /// === Brushing is FINISHED! ===

src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java

@@ -44,7 +44,7 @@ public BossBarListener(AOneBlock addon) {
         this.addon = addon;
     }
 
-    private AOneBlock addon;
+    private final AOneBlock addon;
 
     // Store a boss bar for each player (using their UUID)
     private final Map<Island, BossBar> islandBossBars = new HashMap<>();
@@ -99,7 +99,7 @@ private void tryToShowActionBar(UUID uuid, Island island) {
         }
         // Default to showing action bar unless it is explicitly turned off
         if (!user.getMetaData(AONEBLOCK_ACTIONBAR).map(MetaDataValue::asBoolean).orElse(true)) {
-            // Do not show a action bar
+            // Do not show an action bar
             return;
         }        
         // Get the progress
@@ -218,7 +218,7 @@ public void onJoin(PlayerJoinEvent e) {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onQuit(PlayerQuitEvent e) {
         // Clean up boss bars
-        islandBossBars.values().stream().forEach(bb -> bb.removePlayer(e.getPlayer()));
+        islandBossBars.values().forEach(bb -> bb.removePlayer(e.getPlayer()));
         islandBossBars.values().removeIf(bb -> bb.getPlayers().isEmpty());
     }
 

src/main/java/world/bentobox/aoneblock/listeners/ItemsAdderListener.java

@@ -7,7 +7,7 @@
 import world.bentobox.aoneblock.AOneBlock;
 
 /**
- * Handles ItemsAdderLoadDataEvent which fired when ItemsAdder loaded it's data or reload it's data
+ * Handles ItemsAdderLoadDataEvent which fired when ItemsAdder loaded its data or reload its data
  *
  * @author Teenkung123
  */

src/main/java/world/bentobox/aoneblock/oneblocks/OneBlocksManager.java

@@ -572,7 +572,7 @@ public NavigableMap<Integer, OneBlockPhase> getBlockProbs() {
     }
 
     /**
-     * Get phase by name. Name should have any spaces converted to underscores. Case
+     * Get phase by name. Name should have any spaces converted to underscores. Case-
      * insensitive.
      *
      * @param name - name to search
@@ -859,7 +859,7 @@ public void getProbs(OneBlockPhase phase) {
     }
 
     /**
-     * Get all the probs for each phases and log to console
+     * Get all the probs for each phase and log to console
      */
     public void getAllProbs() {
         blockProbs.values().forEach(this::getProbs);