Removed deprecated APF code usage

Plan/src/main/java/com/djrapitops/plan/PlanSponge.java

@@ -22,7 +22,7 @@ import org.spongepowered.api.plugin.Plugin;
 import java.io.File;
 import java.io.InputStream;
 
-@Plugin(id = "plan", name = "Plan", version = "4.2.0")
+@Plugin(id = "plan", name = "Plan", version = "4.2.0", description = "Player Analytics Plugin by Rsl1122", authors = {"Rsl1122"})
 public class PlanSponge extends SpongePlugin implements PlanPlugin {
 
     @Inject
@@ -90,7 +90,6 @@ public class PlanSponge extends SpongePlugin implements PlanPlugin {
         return PlanColorScheme.create();
     }
 
-
     @Override
     public void onReload() {
 

Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java

@@ -9,7 +9,7 @@ import com.djrapitops.plan.system.settings.locale.Msg;
 import com.djrapitops.plugin.command.CommandNode;
 import com.djrapitops.plugin.command.CommandType;
 import com.djrapitops.plugin.command.TreeCmdNode;
-import com.djrapitops.plugin.command.defaultcmds.StatusCommandNode;
+import com.djrapitops.plugin.command.defaultcmds.StatusCommand;
 
 /**
  * TreeCommand for the /plan command, and all subcommands.
@@ -48,7 +48,7 @@ public class PlanBungeeCommand extends TreeCmdNode {
                         new ManageConDebugCommand(),
                         new BungeeSetupToggleCommand(),
                         new ReloadCommand(plugin),
-                        new StatusCommandNode<>(plugin, Permissions.MANAGE.getPermission(), plugin.getColorScheme()),
+                        new StatusCommand<>(plugin, Permissions.MANAGE.getPermission(), plugin.getColorScheme()),
                 }
         );
     }

Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java

@@ -9,7 +9,7 @@ import com.djrapitops.plan.system.settings.locale.Msg;
 import com.djrapitops.plugin.command.CommandNode;
 import com.djrapitops.plugin.command.CommandType;
 import com.djrapitops.plugin.command.TreeCmdNode;
-import com.djrapitops.plugin.command.defaultcmds.StatusCommandNode;
+import com.djrapitops.plugin.command.defaultcmds.StatusCommand;
 
 /**
  * TreeCommand for the /plan command, and all SubCommands.
@@ -45,7 +45,7 @@ public class PlanCommand extends TreeCmdNode {
                         new InfoCommand(plugin),
                         new ReloadCommand(plugin),
                         new ManageCommand(plugin, this),
-                        new StatusCommandNode<>(plugin, Permissions.MANAGE.getPermission(), plugin.getColorScheme()),
+                        new StatusCommand<>(plugin, Permissions.MANAGE.getPermission(), plugin.getColorScheme()),
                         (Settings.DEV_MODE.isTrue() ? new DevCommand() : null)
                 }
         );

Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java

@@ -20,7 +20,9 @@ import com.djrapitops.plugin.command.ISender;
 public class DevCommand extends CommandNode {
 
     public DevCommand() {
-        super("dev", CommandType.PLAYER_OR_ARGS, "plan.*", "Test Plugin functions not testable with unit tests.", "<feature to test>");
+        super("dev", "plan.*", CommandType.PLAYER_OR_ARGS);
+        setShortHelp("Test Plugin functions not testable with unit tests.");
+        setArguments("<feature>");
     }
 
     @Override

Plan/src/main/java/com/djrapitops/plan/command/commands/ListServersCommand.java

@@ -25,11 +25,8 @@ public class ListServersCommand extends CommandNode {
     private final PlanPlugin plugin;
 
     public ListServersCommand(PlanPlugin plugin) {
-        super("servers, serverlist, listservers, sl",
+        super("servers|serverlist|listservers|sl|ls", Permissions.MANAGE.getPermission(), CommandType.CONSOLE);
-                CommandType.CONSOLE,
+        setShortHelp("List servers in the network");
-                Permissions.MANAGE.getPermission(),
-                "List servers in the network",
-                "");
 
         this.plugin = plugin;
     }

Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java

@@ -27,7 +27,8 @@ public class ManageCommand extends TreeCmdNode {
                         new ManageMoveCommand(),
                         new ManageBackupCommand(),
                         new ManageRestoreCommand(plugin),
-                        new ManageHotswapCommand(plugin),
+                        new ManageRemoveCommand(),
+                        new ManageHotSwapCommand(plugin),
                         new ManageClearCommand(plugin),
                 },
                 new CommandNode[]{

Plan/src/main/java/com/djrapitops/plan/command/commands/NetworkCommand.java

@@ -17,8 +17,7 @@ import com.djrapitops.plugin.command.ISender;
 public class NetworkCommand extends CommandNode {
 
     public NetworkCommand() {
-        super("network|n|netw",
+        super("network|n|netw", Permissions.ANALYZE.getPermission(), CommandType.CONSOLE);
-                Permissions.ANALYZE.getPermission(), CommandType.CONSOLE);
         setShortHelp("View the network page");
     }
 

Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java

@@ -32,11 +32,10 @@ import java.util.Arrays;
 public class RegisterCommand extends CommandNode {
 
     public RegisterCommand() {
-        super("register",
+        // No Permission Requirement
-                CommandType.PLAYER_OR_ARGS,
+        super("register", "", CommandType.PLAYER_OR_ARGS);
-                "", // No Permission Requirement
+        setShortHelp(Locale.get(Msg.CMD_USG_WEB_REGISTER).toString());
-                Locale.get(Msg.CMD_USG_WEB_REGISTER).toString(),
+        setArguments("<password>", "[name]", "[lvl]");
-                "<password> [name] [lvl]");
         setInDepthHelp(Locale.get(Msg.CMD_HELP_WEB_REGISTER).toArray());
         if (Check.isBukkitAvailable()) {
             setupFilter();

Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java

@@ -25,11 +25,9 @@ import java.util.List;
 public class SearchCommand extends CommandNode {
 
     public SearchCommand() {
-        super("search",
+        super("search", Permissions.SEARCH.getPermission(), CommandType.PLAYER_OR_ARGS);
-                CommandType.PLAYER_OR_ARGS,
+        setShortHelp(Locale.get(Msg.CMD_USG_SEARCH).toString());
-                Permissions.SEARCH.getPermission(),
+        setArguments("<text>");
-                Locale.get(Msg.CMD_USG_SEARCH).toString(),
-                "<text>");
         setInDepthHelp(Locale.get(Msg.CMD_HELP_SEARCH).toArray());
     }
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java

@@ -25,11 +25,9 @@ import com.djrapitops.plugin.utilities.Verify;
 public class ManageBackupCommand extends CommandNode {
 
     public ManageBackupCommand() {
-        super("backup",
+        super("backup", Permissions.MANAGE.getPermission(), CommandType.CONSOLE);
-                CommandType.CONSOLE,
+        setShortHelp(Locale.get(Msg.CMD_USG_MANAGE_BACKUP).toString());
-                Permissions.MANAGE.getPermission(),
+        setArguments("<DB>");
-                Locale.get(Msg.CMD_USG_MANAGE_BACKUP).toString(),
-                "<DB>");
 
     }
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java

@@ -32,12 +32,9 @@ public class ManageClearCommand extends CommandNode {
     private final Plan plugin;
 
     public ManageClearCommand(Plan plugin) {
-        super("clear",
+        super("clear", Permissions.MANAGE.getPermission(), CommandType.PLAYER_OR_ARGS);
-                CommandType.PLAYER_OR_ARGS,
+        setShortHelp(Locale.get(Msg.CMD_USG_MANAGE_CLEAR).toString());
-                Permissions.MANAGE.getPermission(),
+        setArguments("<DB>", "[-a]");
-                Locale.get(Msg.CMD_USG_MANAGE_CLEAR).toString(),
-                "<DB> [-a]");
-
         setInDepthHelp(Locale.get(Msg.CMD_HELP_MANAGE_CLEAR).toArray());
         this.plugin = plugin;
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java

@@ -31,11 +31,8 @@ public class ManageConDebugCommand extends CommandNode {
     private final ColorScheme cs;
 
     public ManageConDebugCommand() {
-        super("con",
+        super("con", Permissions.MANAGE.getPermission(), CommandType.ALL);
-                CommandType.ALL,
+        setShortHelp("Debug Bukkit-Bungee Connections");
-                Permissions.MANAGE.getPermission(),
-                "Debug Bukkit-Bungee Connections",
-                "");
         cs = PlanPlugin.getInstance().getColorScheme();
     }
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java

@@ -20,11 +20,9 @@ public class ManageDisableCommand extends CommandNode {
      * Class Constructor.
      */
     public ManageDisableCommand() {
-        super("disable",
+        super("disable", Permissions.MANAGE.getPermission(), CommandType.PLAYER_OR_ARGS);
-                CommandType.PLAYER_OR_ARGS,
+        setShortHelp("Disable a feature temporarily");
-                Permissions.MANAGE.getPermission(),
+        setArguments("<feature>");
-                "Disable a feature temporarily",
-                "<feature>");
     }
 
     @Override

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotSwapCommand.java

@@ -21,16 +21,14 @@ import com.djrapitops.plugin.utilities.Verify;
  * @author Rsl1122
  * @since 2.3.0
  */
-public class ManageHotswapCommand extends CommandNode {
+public class ManageHotSwapCommand extends CommandNode {
 
     private final Plan plugin;
 
-    public ManageHotswapCommand(Plan plugin) {
+    public ManageHotSwapCommand(Plan plugin) {
-        super("hotswap",
+        super("hotswap", Permissions.MANAGE.getPermission(), CommandType.PLAYER_OR_ARGS);
-                CommandType.PLAYER_OR_ARGS,
+        setShortHelp(Locale.get(Msg.CMD_USG_MANAGE_HOTSWAP).toString());
-                Permissions.MANAGE.getPermission(),
+        setArguments("<DB>");
-                Locale.get(Msg.CMD_USG_MANAGE_HOTSWAP).toString(),
-                "<DB>");
         setInDepthHelp(Locale.get(Msg.CMD_HELP_MANAGE_HOTSWAP).toArray());
         this.plugin = plugin;
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java

@@ -23,11 +23,9 @@ import java.util.Arrays;
 public class ManageImportCommand extends CommandNode {
 
     public ManageImportCommand() {
-        super("import",
+        super("import", Permissions.MANAGE.getPermission(), CommandType.CONSOLE);
-                CommandType.CONSOLE,
+        setShortHelp(Locale.get(Msg.CMD_USG_MANAGE_IMPORT).toString());
-                Permissions.MANAGE.getPermission(),
+        setArguments("<plugin>/list", "[import args]");
-                Locale.get(Msg.CMD_USG_MANAGE_IMPORT).toString(),
-                "<plugin>/list [import args]");
         setInDepthHelp(Locale.get(Msg.CMD_HELP_MANAGE_IMPORT).toArray());
     }
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java

@@ -26,11 +26,9 @@ import com.djrapitops.plugin.utilities.Verify;
 public class ManageMoveCommand extends CommandNode {
 
     public ManageMoveCommand() {
-        super("move",
+        super("move", Permissions.MANAGE.getPermission(), CommandType.PLAYER_OR_ARGS);
-                CommandType.PLAYER_OR_ARGS,
+        setShortHelp(Locale.get(Msg.CMD_USG_MANAGE_MOVE).toString());
-                Permissions.MANAGE.getPermission(),
+        setArguments("<fromDB>", "<toDB>", "[-a]");
-                Locale.get(Msg.CMD_USG_MANAGE_MOVE).toString(),
-                "<fromDB> <toDB> [-a]");
     }
 
     @Override

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java

@@ -1,8 +1,6 @@
 package com.djrapitops.plan.command.commands.manage;
 
 import com.djrapitops.plan.api.exceptions.database.DBException;
-import com.djrapitops.plan.data.container.Session;
-import com.djrapitops.plan.system.cache.SessionCache;
 import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.settings.Permissions;
 import com.djrapitops.plan.system.settings.locale.Locale;
@@ -11,49 +9,39 @@ import com.djrapitops.plan.utilities.Condition;
 import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plan.utilities.uuid.UUIDUtility;
 import com.djrapitops.plugin.api.utility.log.Log;
+import com.djrapitops.plugin.command.CommandNode;
 import com.djrapitops.plugin.command.CommandType;
 import com.djrapitops.plugin.command.ISender;
-import com.djrapitops.plugin.command.SubCommand;
 import com.djrapitops.plugin.task.AbsRunnable;
 import com.djrapitops.plugin.task.RunnableFactory;
 import com.djrapitops.plugin.utilities.Verify;
-import org.bukkit.entity.Player;
 
 import java.util.UUID;
 
-import static org.bukkit.Bukkit.getPlayer;
-
 /**
  * This manage subcommand is used to remove a single player's data from the
  * database.
  *
  * @author Rsl1122
  */
-public class ManageRemoveCommand extends SubCommand {
+public class ManageRemoveCommand extends CommandNode {
 
     public ManageRemoveCommand() {
-        super("remove",
+        super("remove|delete", Permissions.MANAGE.getPermission(), CommandType.PLAYER_OR_ARGS);
-                CommandType.PLAYER_OR_ARGS,
+        setShortHelp(Locale.get(Msg.CMD_USG_MANAGE_REMOVE).toString());
-                Permissions.MANAGE.getPermission(),
+        setArguments("<player>", "[-a]");
-                Locale.get(Msg.CMD_USG_MANAGE_REMOVE).toString(),
+        setInDepthHelp(Locale.get(Msg.CMD_HELP_MANAGE_REMOVE).toArray());
-                "<player> [-a]");
     }
 
     @Override
-    public String[] addHelp() {
+    public void onCommand(ISender sender, String commandLabel, String[] args) {
-        return Locale.get(Msg.CMD_HELP_MANAGE_REMOVE).toArray();
-    }
-
-    @Override
-    public boolean onCommand(ISender sender, String commandLabel, String[] args) {
         if (!Condition.isTrue(args.length >= 1, Locale.get(Msg.CMD_FAIL_REQ_ONE_ARG).toString(), sender)) {
-            return true;
+            return;
         }
 
         String playerName = MiscUtils.getPlayerName(args, sender, Permissions.MANAGE);
 
         runRemoveTask(playerName, sender, args);
-        return true;
     }
 
     private void runRemoveTask(String playerName, ISender sender, String[] args) {
@@ -83,11 +71,6 @@ public class ManageRemoveCommand extends SubCommand {
 
                     database.remove().player(uuid);
 
-                    Player player = getPlayer(uuid);
-                    if (player != null) {
-                        SessionCache.getActiveSessions().remove(uuid);
-                        SessionCache.getInstance().cacheSession(uuid, new Session(MiscUtils.getTime(), player.getWorld().getName(), player.getGameMode().name()));
-                    }
                     sender.sendMessage(Locale.get(Msg.MANAGE_INFO_REMOVE_SUCCESS).parse(playerName, Database.getActive().getConfigName()));
                 } catch (DBException e) {
                     Log.toLog(this.getClass(), e);

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java

@@ -18,6 +18,7 @@ import com.djrapitops.plugin.task.RunnableFactory;
 import com.djrapitops.plugin.utilities.Verify;
 
 import java.io.File;
+import java.util.Arrays;
 
 /**
  * This manage SubCommand is used to restore a backup.db file in the
@@ -30,18 +31,16 @@ public class ManageRestoreCommand extends CommandNode {
     private final Plan plugin;
 
     public ManageRestoreCommand(Plan plugin) {
-        super("restore",
+        super("restore", Permissions.MANAGE.getPermission(), CommandType.CONSOLE);
-                CommandType.CONSOLE,
+        setShortHelp(Locale.get(Msg.CMD_USG_MANAGE_RESTORE).toString());
-                Permissions.MANAGE.getPermission(),
+        setArguments("<Filename.db>", "<dbTo>", "[-a]");
-                Locale.get(Msg.CMD_USG_MANAGE_RESTORE).toString(),
-                "<Filename.db> <dbTo> [-a]");
 
         this.plugin = plugin;
     }
 
     @Override
     public void onCommand(ISender sender, String commandLabel, String[] args) {
-        if (!Condition.isTrue(args.length >= 2, Locale.get(Msg.CMD_FAIL_REQ_ARGS).parse(this.getArguments()), sender)) {
+        if (!Condition.isTrue(args.length >= 2, Locale.get(Msg.CMD_FAIL_REQ_ARGS).parse(Arrays.toString(this.getArguments())), sender)) {
             return;
         }
 

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java

@@ -23,11 +23,9 @@ import com.djrapitops.plugin.command.ISender;
 public class ManageSetupCommand extends CommandNode {
 
     public ManageSetupCommand() {
-        super("setup",
+        super("setup", Permissions.MANAGE.getPermission(), CommandType.PLAYER_OR_ARGS);
-                CommandType.PLAYER_OR_ARGS,
+        setShortHelp("Set-Up Bungee connection");
-                Permissions.MANAGE.getPermission(),
+        setArguments("<BungeeAddress>");
-                "Set-Up Bungee connection",
-                "<BungeeAddress>");
         setInDepthHelp(Locale.get(Msg.CMD_HELP_MANAGE_HOTSWAP).toArray());
     }