Project: migrate to java 16

Project: add annotation
Flectone · Aug 8, 2023 · 99e5096 · 99e5096
1 parent 818caa6
commit 99e5096
Show file tree

Hide file tree

Showing 81 changed files with 924 additions and 812 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <name>FlectoneChat</name>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>16</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -23,8 +23,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/main/java/net/flectone/commands/CommandAfk.java b/src/main/java/net/flectone/commands/CommandAfk.java
@@ -1,7 +1,7 @@
 package net.flectone.commands;
 
 import net.flectone.Main;
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.entity.FPlayer;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.managers.FPlayerManager;
@@ -19,38 +19,42 @@ public CommandAfk() {
         super.commandName = "afk";
     }
 
-    public static void setAfkFalse(Player player) {
+    public static void setAfkFalse(@NotNull Player player) {
         FPlayer afkPlayer = FPlayerManager.getPlayer(player);
+        if(afkPlayer == null) return;
         afkPlayer.setBlock(player.getLocation().getBlock());
+
         CommandAfk.sendMessage(afkPlayer, false);
     }
 
-    public static void sendMessage(FPlayer afkFPlayer, boolean isAfk) {
-        FCommands fCommands = new FCommands(afkFPlayer.getPlayer(), "afk", "afk", new String[]{});
-        sendMessage(fCommands, isAfk);
+    public static void sendMessage(@NotNull FPlayer afkFPlayer, boolean isAfk) {
+        if(afkFPlayer.getPlayer() == null) return;
+        FCommand fCommand = new FCommand(afkFPlayer.getPlayer(), "afk", "afk", new String[]{});
+        setAfkAndSendMessage(fCommand, isAfk);
     }
 
-    public static void sendMessage(FCommands fCommands, boolean isAfk) {
-        FPlayer fPlayer = fCommands.getFPlayer();
+    private static void setAfkAndSendMessage(@NotNull FCommand fCommand, boolean isAfk) {
+        FPlayer fPlayer = fCommand.getFPlayer();
+        if(fPlayer == null) return;
         fPlayer.setAfk(isAfk);
 
-        String formatString = isAfk ? Main.locale.getFormatString("command.afk.suffix", fPlayer.getPlayer()) : "";
+        String afkSuffix = isAfk
+                ? Main.locale.getFormatString("command.afk.suffix", fPlayer.getPlayer())
+                : "";
 
-        fPlayer.setAfkSuffix(formatString);
+        fPlayer.setAfkSuffix(afkSuffix);
 
-        fCommands.sendMeMessage("command.afk." + isAfk + "-message");
+        fCommand.sendMeMessage("command.afk." + isAfk + "-message");
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
-
-        if (fCommand.isConsoleMessage()) return true;
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
-        if (fCommand.isHaveCD()) return true;
+        if (fCommand.isConsoleMessage() || fCommand.isHaveCD() || fCommand.getFPlayer() == null) return true;
 
-        sendMessage(fCommand, !fCommand.getFPlayer().isAfk());
+        setAfkAndSendMessage(fCommand, !fCommand.getFPlayer().isAfk());
         fCommand.getFPlayer().setDisplayName();
 
         return true;

diff --git a/src/main/java/net/flectone/commands/CommandBall.java b/src/main/java/net/flectone/commands/CommandBall.java
@@ -1,7 +1,7 @@
 package net.flectone.commands;
 
 import net.flectone.Main;
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.utils.ObjectUtil;
 import org.bukkit.command.Command;
@@ -22,13 +22,11 @@ public CommandBall() {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
-        if (fCommand.isInsufficientArgs(1)) return true;
-
-        if (fCommand.isHaveCD()) return true;
-
-        if (fCommand.isMuted()) return true;
+        if (fCommand.isInsufficientArgs(1)
+                || fCommand.isHaveCD()
+                || fCommand.isMuted()) return true;
 
         List<String> answers = Main.locale.getStringList("command.ball.format");
 

diff --git a/src/main/java/net/flectone/commands/CommandBanlist.java b/src/main/java/net/flectone/commands/CommandBanlist.java
@@ -1,7 +1,7 @@
 package net.flectone.commands;
 
 import net.flectone.Main;
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.entity.FPlayer;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.managers.FPlayerManager;
@@ -31,7 +31,7 @@ public CommandBanlist() {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
         Set<FPlayer> bannedPlayers = FPlayerManager.getBannedPlayers();
 
@@ -40,9 +40,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
         int lastPage = (int) Math.ceil((double) bannedPlayers.size() / perPage);
 
         if (strings.length != 0 &&
-                (!StringUtils.isNumeric(strings[0])
-                        || Integer.parseInt(strings[0]) < 1
-                        || Integer.parseInt(strings[0]) > lastPage)) {
+                (!StringUtils.isNumeric(strings[0]) || Integer.parseInt(strings[0]) < 1 || Integer.parseInt(strings[0]) > lastPage)) {
 
             fCommand.sendMeMessage("command.banlist.page-not-exist");
             return true;
@@ -65,11 +63,9 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
         String unbanButton = Main.locale.getFormatString("command.banlist.unban-button", commandSender);
 
         int page = strings.length > 0 ? Math.max(1, Integer.parseInt(strings[0])) : 1;
-
         page = Math.min(lastPage, page);
 
         bannedPlayers.stream().skip((long) (page - 1) * perPage).limit(perPage).forEach(fPlayer -> {
-
             String playerBanFormat = "command.banlist.player-ban";
             if (fPlayer.isPermanentlyBanned()) playerBanFormat += "-permanently";
 
@@ -101,14 +97,14 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             String button = null;
 
             switch (part) {
-                case "<prev-page>":
+                case "<prev-page>" -> {
                     pageNumber--;
                     button = Main.locale.getFormatString("command.banlist.prev-page", commandSender);
-                    break;
-                case "<next-page>":
+                }
+                case "<next-page>" -> {
                     pageNumber++;
                     button = Main.locale.getFormatString("command.banlist.next-page", commandSender);
-                    break;
+                }
             }
 
             TextComponent textComponent = new TextComponent(TextComponent.fromLegacyText(chatColor + part));

diff --git a/src/main/java/net/flectone/commands/CommandBroadcast.java b/src/main/java/net/flectone/commands/CommandBroadcast.java
@@ -1,7 +1,7 @@
 package net.flectone.commands;
 
 import net.flectone.Main;
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.utils.ObjectUtil;
 import org.bukkit.Bukkit;
@@ -23,11 +23,11 @@ public CommandBroadcast() {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
-        if (fCommand.isInsufficientArgs(1)) return true;
-
-        if (fCommand.isHaveCD() || fCommand.isMuted()) return true;
+        if (fCommand.isInsufficientArgs(1)
+                || fCommand.isHaveCD()
+                || fCommand.isMuted()) return true;
 
         String formatString = Main.locale.getString("command.broadcast.message")
                 .replace("<player>", fCommand.getSenderName());

diff --git a/src/main/java/net/flectone/commands/CommandChat.java b/src/main/java/net/flectone/commands/CommandChat.java
@@ -1,7 +1,7 @@
 package net.flectone.commands;
 
 import net.flectone.Main;
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -19,16 +19,16 @@ public CommandChat() {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
-        if (fCommand.isConsoleMessage()) return true;
-
-        if (fCommand.isInsufficientArgs(2)) return true;
+        if (fCommand.isConsoleMessage()
+                || fCommand.isInsufficientArgs(2)) return true;
 
         String chatParam = strings[0].toLowerCase();
         String chat = strings[1].toLowerCase();
 
-        if ((!chatParam.equals("switch") && !chatParam.equals("hide")) || (!chat.equals("local") && !chat.equals("global"))) {
+        if ((!chatParam.equals("switch") && !chatParam.equals("hide"))
+                || (!chat.equals("local") && !chat.equals("global"))) {
             fCommand.sendUsageMessage();
             return true;
         }
@@ -41,9 +41,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             return true;
         }
 
-        if (fCommand.isHaveCD()) return true;
-
-        if (fCommand.isMuted()) return true;
+        if (fCommand.isHaveCD() || fCommand.isMuted() || fCommand.getFPlayer() == null) return true;
 
         String fPlayerChat = isSwitch ? chat : chat.equals("global") ? "onlylocal" : "onlyglobal";
 

diff --git a/src/main/java/net/flectone/commands/CommandChatcolor.java b/src/main/java/net/flectone/commands/CommandChatcolor.java
@@ -1,7 +1,7 @@
 package net.flectone.commands;
 
 import net.flectone.Main;
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.entity.FPlayer;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.managers.FPlayerManager;
@@ -19,13 +19,15 @@ public CommandChatcolor() {
         super.commandName = "chatcolor";
     }
 
+    @NotNull
     public static String[] getDefaultColors() {
         return new String[]{Main.config.getString("color.first"), Main.config.getString("color.second")};
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
+
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
         if (strings.length == 0 || (strings.length == 1 && !strings[0].equalsIgnoreCase("default"))) {
             fCommand.sendUsageMessage();
@@ -36,15 +38,16 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
 
         if (strings.length == 3 && commandSender.hasPermission("flectonechat.chatcolor.other")) {
             fPlayer = FPlayerManager.getPlayerFromName(strings[2]);
-            if (fPlayer == null) {
-                fCommand.sendMeMessage("command.null-player");
-                return true;
-            }
         } else {
             if (fCommand.isConsoleMessage()) return true;
             fPlayer = fCommand.getFPlayer();
         }
 
+        if (fPlayer == null) {
+            fCommand.sendMeMessage("command.null-player");
+            return true;
+        }
+
         if (fCommand.isHaveCD()) return true;
 
         if (strings[0].equalsIgnoreCase("default")) {
@@ -55,11 +58,11 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
         return true;
     }
 
-    private void setColors(FPlayer fPlayer, String[] strings) {
+    private void setColors(@NotNull FPlayer fPlayer, @NotNull String[] strings) {
         fPlayer.setColors(strings[0], strings[1]);
         fPlayer.setUpdated(true);
 
-        if (fPlayer.isOnline()) {
+        if (fPlayer.isOnline() && fPlayer.getPlayer() != null) {
             fPlayer.setDisplayName();
             fPlayer.getPlayer().sendMessage(Main.locale.getFormatString("command.chatcolor.message", fPlayer.getPlayer()));
         }
@@ -77,7 +80,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         } else if (strings.length == 2) {
             isStartsWith(strings[1], "#77d7f7");
             isStartsWith(strings[1], "&f");
-        } else if (strings.length == 3 && commandSender.hasPermission("flectonechat.chatcolor.other")){
+        } else if (strings.length == 3 && commandSender.hasPermission("flectonechat.chatcolor.other")) {
             isOfflinePlayer(strings[2]);
         }
 

diff --git a/src/main/java/net/flectone/commands/CommandClearChat.java b/src/main/java/net/flectone/commands/CommandClearChat.java
@@ -1,6 +1,6 @@
 package net.flectone.commands;
 
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -18,7 +18,7 @@ public CommandClearChat() {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
         if (fCommand.isHaveCD()) return true;
 

diff --git a/src/main/java/net/flectone/commands/CommandFirstOnline.java b/src/main/java/net/flectone/commands/CommandFirstOnline.java
@@ -1,6 +1,6 @@
 package net.flectone.commands;
 
-import net.flectone.misc.commands.FCommands;
+import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.entity.FPlayer;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.managers.FPlayerManager;
@@ -22,7 +22,7 @@ public CommandFirstOnline() {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
-        FCommands fCommand = new FCommands(commandSender, command.getName(), s, strings);
+        FCommand fCommand = new FCommand(commandSender, command.getName(), s, strings);
 
         if (fCommand.isInsufficientArgs(1)) return true;