Small code improvements

Pascalpex · Pascalpex · commit 7954f2fce2b8 · 2025-01-19T21:06:45.000+01:00
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/MessagesFile.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/MessagesFile.java
@@ -66,7 +66,7 @@ public static void load() {
                 config.set("maintenanceOff", "&aYou turned off the maintenance mode");
             }
             if (!config.contains("helpMessage")) {
-                List<String> message = new ArrayList<String>();
+                List<String> message = new ArrayList<>();
                 message.add("&2&l--Help page--");
                 message.add("&6You can find the most important commands at");
                 message.add("&9&l/warp &9&lInfo&r&6. If you have more");
@@ -165,14 +165,14 @@ public static String getMaintenanceOff() {
     }
     public static String getHelpMessage() {
         List<String> messages = (List<String>) config.getList("helpMessage");
-        String message = "";
+        StringBuilder message = new StringBuilder();
         for(int i = 0; i < messages.size(); i++) {
-            message = message + messages.get(i).replace("&", "§");
+            message.append(messages.get(i).replace("&", "§"));
             if(i < messages.size() - 1) {
-                message = message + "\n§r";
+                message.append("\n§r");
             }
         }
-        return message;
+        return message.toString();
     }
     public static String getSpawnSet() {
         String prefix = config.getString("spawnSet");
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/AutosmeltCommand.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/AutosmeltCommand.java
@@ -2,11 +2,13 @@
 
 import de.pascalpex.deepslatemc.Config;
 import de.pascalpex.deepslatemc.MessagesFile;
+import net.kyori.adventure.text.Component;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 
@@ -20,10 +22,9 @@ public AutosmeltCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String label, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, @NotNull String label, String @NotNull [] args) {
         String prefix = MessagesFile.getPrefix() + " ";
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
+        if (sender instanceof Player player) {
             if(label.equalsIgnoreCase("autosmelt")) {
                 if(player.hasPermission("deepslate.autosmelt")) {
                     if (Config.getAutoSmeltWorlds().contains(player.getWorld().getName())) {
@@ -32,9 +33,9 @@ public boolean execute(CommandSender sender, String label, String[] args) {
                                 if (!player.getItemInHand().getItemMeta().hasLore()) {
                                     ItemStack item = player.getItemInHand();
                                     ItemMeta meta = item.getItemMeta();
-                                    ArrayList<String> lore = new ArrayList<>();
-                                    lore.add("Auto Smelt");
-                                    meta.setLore(lore);
+                                    ArrayList<Component> lore = new ArrayList<>();
+                                    lore.add(Component.text("Auto Smelt"));
+                                    meta.lore(lore);
                                     item.setItemMeta(meta);
                                     player.getInventory().setItemInHand(item);
                                     player.sendMessage(prefix + MessagesFile.getAutoSmeltEnchanted());
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/BuildworldCommand.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/BuildworldCommand.java
@@ -7,6 +7,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class BuildworldCommand extends Command {
 
@@ -18,10 +19,9 @@ public BuildworldCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String label, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, @NotNull String label, String @NotNull [] args) {
         String prefix = MessagesFile.getPrefix() + " ";
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
+        if (sender instanceof Player player) {
             if(label.equalsIgnoreCase("setbuildworld")) {
                 if(player.hasPermission("deepslate.setbuildworld")) {
                     World world = player.getLocation().getWorld();
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/ClearchatCommand.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/ClearchatCommand.java
@@ -4,6 +4,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
 
 public class ClearchatCommand extends Command {
     public ClearchatCommand(String name) {
@@ -14,7 +15,7 @@ public ClearchatCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String @NotNull [] args) {
         String prefix = MessagesFile.getPrefix() + " ";
         if (commandLabel.equalsIgnoreCase("cc") || commandLabel.equalsIgnoreCase("clearchat")) {
             if(sender.hasPermission("deepslate.clearchat")) {
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/DeepslateCommand.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/DeepslateCommand.java
@@ -10,6 +10,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.List;
@@ -25,7 +26,7 @@ public DeepslateCommand(String name) {
     }
 
     @Override
-    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
+    public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args, Location location) throws IllegalArgumentException {
         if (args.length == 1) {
             return Stream.of("reload", "version")
                 .filter(arg -> arg.startsWith(args[0].toLowerCase()))
@@ -35,11 +36,10 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String @NotNull [] args) {
         if (commandLabel.equalsIgnoreCase("deepslate")) {
             String prefix = MessagesFile.getPrefix() + " ";
-            if (sender instanceof Player) {
-                Player player = (Player) sender;
+            if (sender instanceof Player player) {
                 if (player.hasPermission("deepslate.command")) {
                     if (args.length == 0) {
                         player.sendMessage(prefix + MessagesFile.getWrongSyntax().replace("%usage%", "/deepslate [reload | version]"));
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/DiscordCommand.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/DiscordCommand.java
@@ -4,6 +4,7 @@
 import de.pascalpex.deepslatemc.MessagesFile;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
 
 public class DiscordCommand extends Command {
 
@@ -14,7 +15,7 @@ public DiscordCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String @NotNull [] args) {
         String prefix = MessagesFile.getPrefix() + " ";
         if (commandLabel.equalsIgnoreCase("dc") || commandLabel.equalsIgnoreCase("discord")) {
             String link = Config.getDiscordLink();
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/HelpCommand.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/HelpCommand.java
@@ -3,6 +3,7 @@
 import de.pascalpex.deepslatemc.MessagesFile;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
 
 public class HelpCommand extends Command {
 
@@ -13,7 +14,7 @@ public HelpCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String label, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String label, String @NotNull [] args) {
         if (label.equalsIgnoreCase("help")) {
             sender.sendMessage(MessagesFile.getHelpMessage());
         }
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/MaintenanceMode.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/MaintenanceMode.java
@@ -5,6 +5,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class MaintenanceMode extends Command {
     public MaintenanceMode(String name) {
@@ -14,10 +15,9 @@ public MaintenanceMode(String name) {
         setPermission("deepslate.maintenance");
     }
 
-    public boolean execute(CommandSender sender, String label, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, @NotNull String label, String @NotNull [] args) {
         String prefix = MessagesFile.getPrefix() + " ";
-        if (sender instanceof Player) {
-            Player player = (Player)sender;
+        if (sender instanceof Player player) {
             if (label.equalsIgnoreCase("maintenance") && player.hasPermission("deepslate.maintenance")) {
                 if (Config.getMaintenanceMode()) {
                     player.sendMessage(prefix + MessagesFile.getMaintenanceOff());
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/SpawnCommand.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/SpawnCommand.java
@@ -6,6 +6,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class SpawnCommand extends Command {
 
@@ -27,10 +28,9 @@ public static void playerJoin(Player player) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String label, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, @NotNull String label, String @NotNull [] args) {
         String prefix = MessagesFile.getPrefix() + " ";
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
+        if (sender instanceof Player player) {
             if (label.equalsIgnoreCase("setspawn")) {
                 if (player.hasPermission("deepslate.setspawn")) {
                     Config.setSpawn(player.getLocation());
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/util/ActionbarUtil.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/util/ActionbarUtil.java
@@ -13,10 +13,6 @@ public class ActionbarUtil {
     private static final Timer timer = new Timer();
     private static TimerTask task;
 
-    public static void sendNow(Player player) {
-        player.sendActionBar(Component.text(title));
-    }
-
     public static void reloadActionbar() {
         if (task != null) {
             task.cancel();
diff --git a/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/util/TablistUtil.java b/deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/util/TablistUtil.java
@@ -32,13 +32,13 @@ public static void reloadTablist() {
         header = "";
         footer = "";
         for (String s : Config.getHeader()) {
-            if (!header.equals("")) {
+            if (!header.isEmpty()) {
                 header += "\n";
             }
             header += s;
         }
         for (String s : Config.getFooter()) {
-            if (!footer.equals("")) {
+            if (!footer.isEmpty()) {
                 footer += "\n";
             }
             footer += s;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static void load() {`
`66`	`66`	`config.set("maintenanceOff", "&aYou turned off the maintenance mode");`
`67`	`67`	`}`
`68`	`68`	`if (!config.contains("helpMessage")) {`
`69`		`- List<String> message = new ArrayList<String>();`
	`69`	`+ List<String> message = new ArrayList<>();`
`70`	`70`	`message.add("&2&l--Help page--");`
`71`	`71`	`message.add("&6You can find the most important commands at");`
`72`	`72`	`message.add("&9&l/warp &9&lInfo&r&6. If you have more");`
`@@ -165,14 +165,14 @@ public static String getMaintenanceOff() {`
`165`	`165`	`}`
`166`	`166`	`public static String getHelpMessage() {`
`167`	`167`	`List<String> messages = (List<String>) config.getList("helpMessage");`
`168`		`- String message = "";`
	`168`	`+ StringBuilder message = new StringBuilder();`
`169`	`169`	`for(int i = 0; i < messages.size(); i++) {`
`170`		`- message = message + messages.get(i).replace("&", "§");`
	`170`	`+ message.append(messages.get(i).replace("&", "§"));`
`171`	`171`	`if(i < messages.size() - 1) {`
`172`		`- message = message + "\n§r";`
	`172`	`+ message.append("\n§r");`
`173`	`173`	`}`
`174`	`174`	`}`
`175`		`- return message;`
	`175`	`+ return message.toString();`
`176`	`176`	`}`
`177`	`177`	`public static String getSpawnSet() {`
`178`	`178`	`String prefix = config.getString("spawnSet");`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import de.pascalpex.deepslatemc.MessagesFile;`
`4`	`4`	`import org.bukkit.command.Command;`
`5`	`5`	`import org.bukkit.command.CommandSender;`
	`6`	`+import org.jetbrains.annotations.NotNull;`
`6`	`7`
`7`	`8`	`public class HelpCommand extends Command {`
`8`	`9`
`@@ -13,7 +14,7 @@ public HelpCommand(String name) {`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`@Override`
`16`		`- public boolean execute(CommandSender sender, String label, String[] args) {`
	`17`	`+ public boolean execute(@NotNull CommandSender sender, String label, String @NotNull [] args) {`
`17`	`18`	`if (label.equalsIgnoreCase("help")) {`
`18`	`19`	`sender.sendMessage(MessagesFile.getHelpMessage());`
`19`	`20`	`}`