Java16 Sonar Changes - 3

src/main/java/io/github/thebusybiscuit/slimefun4/api/recipes/RecipeType.java

@@ -99,8 +99,8 @@ public class RecipeType implements Keyed {
         this.key = key;
         this.consumer = callback;
 
-        if (item instanceof SlimefunItemStack) {
+        if (item instanceof SlimefunItemStack slimefunItemStack) {
-            this.machine = ((SlimefunItemStack) item).getItemId();
+            this.machine = slimefunItemStack.getItemId();
         } else {
             this.machine = "";
         }
@@ -109,7 +109,7 @@ public class RecipeType implements Keyed {
     public RecipeType(NamespacedKey key, ItemStack item) {
         this.key = key;
         this.item = item;
-        this.machine = item instanceof SlimefunItemStack ? ((SlimefunItemStack) item).getItemId() : "";
+        this.machine = item instanceof SlimefunItemStack slimefunItemStack ? slimefunItemStack.getItemId() : "";
     }
 
     public RecipeType(MinecraftRecipe<?> recipe) {
@@ -124,8 +124,8 @@ public class RecipeType implements Keyed {
         } else {
             SlimefunItem slimefunItem = SlimefunItem.getById(this.machine);
 
-            if (slimefunItem instanceof MultiBlockMachine) {
+            if (slimefunItem instanceof MultiBlockMachine multiBlockMachine) {
-                ((MultiBlockMachine) slimefunItem).addRecipe(recipe, result);
+                multiBlockMachine.addRecipe(recipe, result);
             }
         }
     }
@@ -149,8 +149,8 @@ public class RecipeType implements Keyed {
 
     @Override
     public final boolean equals(Object obj) {
-        if (obj instanceof RecipeType) {
+        if (obj instanceof RecipeType recipeType) {
-            return ((RecipeType) obj).getKey().equals(this.getKey());
+            return recipeType.getKey().equals(this.getKey());
         } else {
             return false;
         }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SubCommand.java

@@ -82,8 +82,8 @@ public abstract class SubCommand {
      */
     @Nonnull
     public String getDescription(@Nonnull CommandSender sender) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
-            return Slimefun.getLocalization().getMessage((Player) sender, getDescription());
+            return Slimefun.getLocalization().getMessage(player, getDescription());
         } else {
             return Slimefun.getLocalization().getMessage(getDescription());
         }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java

@@ -40,7 +40,7 @@ class BackpackCommand extends SubCommand {
 
     @Override
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
             if (sender.hasPermission("slimefun.command.backpack")) {
                 if (args.length != 3) {
                     Slimefun.getLocalization().sendMessage(sender, "messages.usage", true, msg -> msg.replace("%usage%", "/sf backpack <Player> <ID>"));
@@ -71,7 +71,7 @@ class BackpackCommand extends SubCommand {
                     Slimefun.runSync(() -> {
                         ItemStack item = SlimefunItems.RESTORED_BACKPACK.clone();
                         Slimefun.getBackpackListener().setBackpackId(backpackOwner, item, 2, id);
-                        ((Player) sender).getInventory().addItem(item);
+                        player.getInventory().addItem(item);
                         Slimefun.getLocalization().sendMessage(sender, "commands.backpack.restored-backpack-given");
                     });
                 });

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/ChargeCommand.java

@@ -33,14 +33,12 @@ class ChargeCommand extends SubCommand {
 
     @Override
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
             if (sender.hasPermission("slimefun.command.charge")) {
-                Player p = (Player) sender;
+                ItemStack item = player.getInventory().getItemInMainHand();
-                ItemStack item = p.getInventory().getItemInMainHand();
                 SlimefunItem slimefunItem = SlimefunItem.getByItem(item);
 
-                if (slimefunItem instanceof Rechargeable) {
+                if (slimefunItem instanceof Rechargeable rechargeableItem) {
-                    Rechargeable rechargeableItem = (Rechargeable) slimefunItem;
                     rechargeableItem.setItemCharge(item, rechargeableItem.getMaxItemCharge(item));
                     Slimefun.getLocalization().sendMessage(sender, "commands.charge.charge-success", true);
                 } else {

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/CheatCommand.java

@@ -19,9 +19,9 @@ class CheatCommand extends SubCommand {
 
     @Override
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
             if (sender.hasPermission("slimefun.cheat.items")) {
-                SlimefunGuide.openCheatMenu((Player) sender);
+                SlimefunGuide.openCheatMenu(player);
             } else {
                 Slimefun.getLocalization().sendMessage(sender, "messages.no-permission", true);
             }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DebugFishCommand.java

@@ -19,8 +19,8 @@ class DebugFishCommand extends SubCommand {
 
     @Override
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player && sender.hasPermission("slimefun.debugging")) {
+        if (sender instanceof Player player && sender.hasPermission("slimefun.debugging")) {
-            ((Player) sender).getInventory().addItem(SlimefunItems.DEBUG_FISH.clone());
+            player.getInventory().addItem(SlimefunItems.DEBUG_FISH.clone());
         } else {
             Slimefun.getLocalization().sendMessage(sender, "messages.no-permission", true);
         }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/GuideCommand.java

@@ -20,10 +20,10 @@ class GuideCommand extends SubCommand {
 
     @Override
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
             if (sender.hasPermission("slimefun.command.guide")) {
                 SlimefunGuideMode design = SlimefunGuide.getDefaultMode();
-                ((Player) sender).getInventory().addItem(SlimefunGuide.getItem(design).clone());
+                player.getInventory().addItem(SlimefunGuide.getItem(design).clone());
             } else {
                 Slimefun.getLocalization().sendMessage(sender, "messages.no-permission", true);
             }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java

@@ -21,9 +21,9 @@ class OpenGuideCommand extends SubCommand {
     @Override
     @ParametersAreNonnullByDefault
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
             if (sender.hasPermission("slimefun.command.open_guide")) {
-                SlimefunGuide.openGuide((Player) sender, SlimefunGuideMode.SURVIVAL_MODE);
+                SlimefunGuide.openGuide(player, SlimefunGuideMode.SURVIVAL_MODE);
             } else {
                 Slimefun.getLocalization().sendMessage(sender, "messages.no-permission", true);
             }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SearchCommand.java

@@ -23,11 +23,11 @@ class SearchCommand extends SubCommand {
 
     @Override
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
             if (sender.hasPermission("slimefun.command.search")) {
                 if (args.length > 1) {
                     String query = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
-                    PlayerProfile.get((Player) sender, profile -> SlimefunGuide.openSearch(profile, query, SlimefunGuideMode.SURVIVAL_MODE, true));
+                    PlayerProfile.get(player, profile -> SlimefunGuide.openSearch(profile, query, SlimefunGuideMode.SURVIVAL_MODE, true));
                 } else {
                     Slimefun.getLocalization().sendMessage(sender, "messages.usage", true, msg -> msg.replace("%usage%", "/sf search <SearchTerm>"));
                 }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/StatsCommand.java

@@ -35,8 +35,8 @@ class StatsCommand extends SubCommand {
             } else {
                 Slimefun.getLocalization().sendMessage(sender, "messages.no-permission", true);
             }
-        } else if (sender instanceof Player) {
+        } else if (sender instanceof Player player) {
-            PlayerProfile.get((Player) sender, profile -> profile.sendStats(sender));
+            PlayerProfile.get(player, profile -> profile.sendStats(sender));
         } else {
             Slimefun.getLocalization().sendMessage(sender, "messages.only-players", true);
         }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TeleporterCommand.java

@@ -21,18 +21,17 @@ class TeleporterCommand extends SubCommand {
 
     @Override
     public void onExecute(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
             if (sender.hasPermission("slimefun.command.teleporter")) {
                 if (args.length == 1) {
-                    Player p = (Player) sender;
+                    Slimefun.getGPSNetwork().getTeleportationManager().openTeleporterGUI(player, player.getUniqueId(), player.getLocation().getBlock().getRelative(BlockFace.DOWN), 999999999);
-                    Slimefun.getGPSNetwork().getTeleportationManager().openTeleporterGUI(p, p.getUniqueId(), p.getLocation().getBlock().getRelative(BlockFace.DOWN), 999999999);
                 } else if (args.length == 2) {
 
                     @SuppressWarnings("deprecation")
-                    OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
+                    OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(args[1]);
 
-                    if (player.getName() != null) {
+                    if (offlinePlayer.getName() != null) {
-                        Slimefun.getGPSNetwork().getTeleportationManager().openTeleporterGUI((Player) sender, player.getUniqueId(), ((Player) sender).getLocation().getBlock().getRelative(BlockFace.DOWN), 999999999);
+                        Slimefun.getGPSNetwork().getTeleportationManager().openTeleporterGUI(player, offlinePlayer.getUniqueId(), player.getLocation().getBlock().getRelative(BlockFace.DOWN), 999999999);
                     } else {
                         Slimefun.getLocalization().sendMessage(sender, "messages.unknown-player", msg -> msg.replace("%player%", args[1]));
                     }

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TimingsCommand.java

@@ -88,8 +88,8 @@ class TimingsCommand extends SubCommand {
 
     @Nonnull
     private PerformanceInspector inspectorOf(@Nonnull CommandSender sender, boolean verbose) {
-        if (sender instanceof Player) {
+        if (sender instanceof Player player) {
-            return new PlayerPerformanceInspector((Player) sender);
+            return new PlayerPerformanceInspector(player);
         } else {
             return new ConsolePerformanceInspector(sender, verbose);
         }

src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/RainbowTickHandler.java

@@ -76,10 +76,10 @@ public class RainbowTickHandler extends BlockTicker {
         }
 
         for (Material type : materials) {
-            /**
+            /*
-             * This BlockData is purely virtual and only created on startup, it should have
+              This BlockData is purely virtual and only created on startup, it should have
-             * no impact on performance, in fact it should save performance as it preloads
+              no impact on performance, in fact it should save performance as it preloads
-             * the data but also saves heavy calls for other Materials
+              the data but also saves heavy calls for other Materials
              */
             if (type.createBlockData() instanceof GlassPane) {
                 return true;
@@ -92,9 +92,9 @@ public class RainbowTickHandler extends BlockTicker {
     @Override
     public void tick(Block b, SlimefunItem item, Config data) {
         if (b.getType() == Material.AIR) {
-            /**
+            /*
-             * The block was broken, setting the Material now would result in a
+              The block was broken, setting the Material now would result in a
-             * duplication glitch
+              duplication glitch
              */
             return;
         }
@@ -102,12 +102,9 @@ public class RainbowTickHandler extends BlockTicker {
         if (glassPanes) {
             BlockData blockData = b.getBlockData();
 
-            if (blockData instanceof GlassPane) {
+            if (blockData instanceof GlassPane previousData) {
                 BlockData block = material.createBlockData(bd -> {
-                    if (bd instanceof GlassPane) {
+                    if (bd instanceof GlassPane nextData) {
-                        GlassPane previousData = (GlassPane) blockData;
-                        GlassPane nextData = (GlassPane) bd;
-
                         nextData.setWaterlogged(previousData.isWaterlogged());
 
                         for (BlockFace face : previousData.getAllowedFaces()) {

src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java

@@ -94,21 +94,17 @@ public class CargoNet extends AbstractItemNetwork implements HologramOwner {
             return null;
         }
 
-        switch (id) {
+        return switch (id) {
-            case "CARGO_MANAGER":
+            case "CARGO_MANAGER" -> NetworkComponent.REGULATOR;
-                return NetworkComponent.REGULATOR;
+            case "CARGO_NODE" -> NetworkComponent.CONNECTOR;
-            case "CARGO_NODE":
+            case "CARGO_NODE_INPUT",
-                return NetworkComponent.CONNECTOR;
+                "CARGO_NODE_OUTPUT",
-            case "CARGO_NODE_INPUT":
+                "CARGO_NODE_OUTPUT_ADVANCED",
-            case "CARGO_NODE_OUTPUT":
+                "CT_IMPORT_BUS",
-            case "CARGO_NODE_OUTPUT_ADVANCED":
+                "CT_EXPORT_BUS",
-            case "CT_IMPORT_BUS":
+                "CHEST_TERMINAL" -> NetworkComponent.TERMINUS;
-            case "CT_EXPORT_BUS":
+            default -> null;
-            case "CHEST_TERMINAL":
+        };
-                return NetworkComponent.TERMINUS;
-            default:
-                return null;
-        }
     }
 
     @Override
@@ -123,15 +119,10 @@ public class CargoNet extends AbstractItemNetwork implements HologramOwner {
         if (to == NetworkComponent.TERMINUS) {
             String id = BlockStorage.checkID(l);
             switch (id) {
-                case "CARGO_NODE_INPUT":
+                case "CARGO_NODE_INPUT" -> inputNodes.add(l);
-                    inputNodes.add(l);
+                case "CARGO_NODE_OUTPUT",
-                    break;
+                    "CARGO_NODE_OUTPUT_ADVANCED" -> outputNodes.add(l);
-                case "CARGO_NODE_OUTPUT":
+                default -> {}
-                case "CARGO_NODE_OUTPUT_ADVANCED":
-                    outputNodes.add(l);
-                    break;
-                default:
-                    break;
             }
         }
     }