cleanup

Author: hyperdefined

pom.xml

@@ -111,6 +111,7 @@
             <groupId>lol.hyper</groupId>
             <artifactId>github-release-api</artifactId>
             <version>1.0.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

src/main/java/lol/hyper/anarchystats/commands/CommandInfo.java

@@ -23,6 +23,7 @@
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
 
 public class CommandInfo extends AbstractCommand {
 
@@ -34,7 +35,7 @@ public CommandInfo(String command, AnarchyStats anarchyStats) {
     }
 
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (anarchyStats.config.getBoolean("use-permission-node")) {
             if (!sender.hasPermission(anarchyStats.config.getString("permission-node"))) {
                 sender.sendMessage(ChatColor.RED + "You don't have permission for this command.");

src/main/java/lol/hyper/anarchystats/commands/CommandReload.java

@@ -22,6 +22,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.List;
@@ -35,7 +36,7 @@ public CommandReload(AnarchyStats anarchyStats) {
     }
 
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (args.length == 0) {
             sender.sendMessage(ChatColor.GREEN + "AnarchyStats version "
                     + anarchyStats.getDescription().getVersion() + ". Created by hyperdefined.");
@@ -54,7 +55,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
     }
 
     @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
         return Collections.singletonList("reload");
     }
 }

src/main/java/lol/hyper/anarchystats/tools/AbstractCommand.java

@@ -26,6 +26,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.*;
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -48,22 +49,6 @@ public AbstractCommand(String command) {
         this(command, null, null, null, null);
     }
 
-    public AbstractCommand(String command, String usage) {
-        this(command, usage, null, null, null);
-    }
-
-    public AbstractCommand(String command, String usage, String description) {
-        this(command, usage, description, null, null);
-    }
-
-    public AbstractCommand(String command, String usage, String description, String permissionMessage) {
-        this(command, usage, description, permissionMessage, null);
-    }
-
-    public AbstractCommand(String command, String usage, String description, List<String> aliases) {
-        this(command, usage, description, null, aliases);
-    }
-
     public AbstractCommand(
             String command, String usage, String description, String permissionMessage, List<String> aliases) {
         this.command = command.toLowerCase();
@@ -93,22 +78,22 @@ final CommandMap getCommandMap() {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        } else if (cmap != null) {
+        } else {
             return cmap;
         }
         return getCommandMap();
     }
 
-    public abstract boolean onCommand(CommandSender sender, Command cmd, String label, String[] args);
+    public abstract boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args);
 
-    public List<String> onTabComplete(CommandSender sender, Command cmd, String label, String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
         return null;
     }
 
-    private final class ReflectCommand extends Command {
+    private static final class ReflectCommand extends Command {
         private AbstractCommand exe = null;
 
-        protected ReflectCommand(String command) {
+        private ReflectCommand(String command) {
             super(command);
         }
 
@@ -117,15 +102,15 @@ public void setExecutor(AbstractCommand exe) {
         }
 
         @Override
-        public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+        public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String[] args) {
             if (exe != null) {
                 return exe.onCommand(sender, this, commandLabel, args);
             }
             return false;
         }
 
         @Override
-        public List<String> tabComplete(CommandSender sender, String alais, String[] args) {
+        public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alais, String[] args) {
             if (exe != null) {
                 return exe.onTabComplete(sender, this, alais, args);
             }

src/main/resources/plugin.yml

@@ -12,4 +12,6 @@ permissions:
     description: Allows the usage of /anarchystats reload
 commands:
   anarchystats:
-    usage: /anarchystats
+    usage: /anarchystats
+libraries:
+  - lol.hyper:github-release-api:1.0.1