Add player utils; minor fixups (#15)

* Add player utils; minor fixups

* Make the requested changes

Author: aakatz3

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 group = 'com.dumbdogdiner'
 
-version = '1.4.6'
+version = '1.5.0'
 
 
 configurations {

src/main/java/com/dumbdogdiner/stickyapi/bukkit/command/AsyncCommand.java

@@ -32,6 +32,7 @@
 import org.bukkit.command.TabCompleter;
 
 import com.dumbdogdiner.stickyapi.StickyAPI;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 
@@ -187,9 +188,9 @@ public void setTabCompleter(TabCompleter completer) {
      * @throws IllegalArgumentException if sender, alias, or args is null
      */
     @Override
-    public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args)
+    public java.util.@NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args)
             throws CommandException, IllegalArgumentException {
-        if (sender == null || alias == null || args == null)
+        if (args == null)
             throw new NullPointerException("arguments to tabComplete cannot be null");
 
         List<String> completions = null;

src/main/java/com/dumbdogdiner/stickyapi/bukkit/player/PlayerUtils.java

@@ -0,0 +1,77 @@
+package com.dumbdogdiner.stickyapi.bukkit.player;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+
+import java.util.*;
+
+import static com.dumbdogdiner.stickyapi.common.util.NumberUtil.intHelper;
+
+@SuppressWarnings("unused")
+public class PlayerUtils {
+    public static class Names {
+        public static List<String> getOnlinePlayers() {
+            ArrayList<String> playerNames = new ArrayList<>();
+
+            Bukkit.getOnlinePlayers().forEach(player -> {
+                playerNames.remove(player.getName());
+            });
+
+            return playerNames;
+        }
+
+        public static List<String> getOfflinePlayers() {
+            List<String> playerNames = getAllPlayers();
+
+            Bukkit.getOnlinePlayers().forEach(player -> {
+                playerNames.remove(player.getName());
+            });
+            return playerNames;
+        }
+
+        public static List<String> getAllPlayers() {
+            ArrayList<String> allPlayerNames = new ArrayList<>();
+            OfflinePlayer [] offlinePlayers = Bukkit.getServer().getOfflinePlayers();
+            Arrays.sort(offlinePlayers, new OfflinePlayerSeenComparator());
+
+            for (OfflinePlayer player : offlinePlayers) {
+                allPlayerNames.add(player.getName());
+            }
+            return allPlayerNames;
+        }
+    }
+
+    public static class OfflinePlayerSeenComparator implements Comparator<OfflinePlayer> {
+
+        /**
+         * Bigger number means seen more recently, which means we want it earlier in the list, so return -1
+         * if o1 has a bigger number, we should return a negative number
+         * if o2 has a bigger number, we should return a positive number
+         * Check the following, in order, break on non-tie:
+         * lastSeen, lastLogin, firstLogin, compare names as strings
+         * if still a tie just return 0
+         * @param o1 The first {@link org.bukkit.OfflinePlayer}
+         * @param o2 The second {@link org.bukkit.OfflinePlayer}
+         * @return An integer representing if o1 is less than, equal to, or greater than o2
+         */
+        @Override
+        public int compare(OfflinePlayer o1, OfflinePlayer o2) {
+
+
+            long [] diffs = new long[] {
+                    o2.getLastSeen() - o1.getLastSeen(),
+                    o2.getLastLogin() - o1.getLastLogin(),
+                    o2.getFirstPlayed() - o1.getFirstPlayed()
+            };
+
+            for(long diff : diffs) {
+                if (diff != 0) {
+                    return intHelper(diff);
+                }
+            }
+            return Objects.requireNonNull(o1.getName()).compareTo(Objects.requireNonNull(o2.getName()));
+        }
+
+
+    }
+}

src/main/java/com/dumbdogdiner/stickyapi/bukkit/util/StartupUtil.java

@@ -38,7 +38,10 @@ public static boolean setupConfig(JavaPlugin plugin) {
         try {
             if (!plugin.getDataFolder().exists()) {
                 plugin.getLogger().info("Error: No folder was found! Creating...");
-                plugin.getDataFolder().mkdirs();
+                if(!plugin.getDataFolder().mkdirs()){
+                    plugin.getLogger().info("Error: Couldn't create the folder somehow??");
+                    return false;
+                }
                 plugin.saveDefaultConfig();
                 plugin.saveConfig();
                 plugin.getLogger().info("The folder was created successfully!");
@@ -60,7 +63,7 @@ public static boolean setupConfig(JavaPlugin plugin) {
     public static LocaleProvider setupLocale(JavaPlugin plugin, LocaleProvider localeProvider) {
         localeProvider = new LocaleProvider(new File(plugin.getDataFolder(), "locale"));
         int loadedLocales = localeProvider.loadAllLocales();
-        Boolean localeEnabled = localeProvider.setDefaultLocale("messages.en_us");
+        boolean localeEnabled = localeProvider.setDefaultLocale("messages.en_us");
 
         if (!localeEnabled) {
             plugin.getLogger()

src/main/java/com/dumbdogdiner/stickyapi/common/arguments/Arguments.java

@@ -86,7 +86,7 @@ public Arguments optionalFlag(String name, String flag) {
             return this;
         }
 
-        debug.print("Found flag at position " + String.valueOf(index) + " - new args size = " + unparsedArgs.size());
+        debug.print("Found flag at position " + index + " - new args size = " + unparsedArgs.size());
 
         parsedArgs.put(name, unparsedArgs.get(index));
         unparsedArgs.remove(index);
@@ -215,8 +215,9 @@ public Arguments optionalSentence(String name, int length) {
         String concatenated = String.join(" ", Arrays.copyOfRange(unparsedArgs.toArray(new String[unparsedArgs.size()]), position, end));
         parsedArgs.put(name, concatenated);
 
-        for (int s = position; s != end; s++)
-            unparsedArgs.remove(position);
+        if (end > position) {
+            unparsedArgs.subList(position, end).clear();
+        }
 
         debug.print("Found sentence of length " + String.valueOf(length) + " - new args size = " + String.valueOf(unparsedArgs.size()));
 

src/main/java/com/dumbdogdiner/stickyapi/common/util/NumberUtil.java

@@ -83,4 +83,26 @@ public static int getRandomNumber(int min, int max) {
             throw new IllegalArgumentException("Min may not be greater than max!");
 	    return (int) ((Math.random() * (max - min)) + min);
 	}
+
+    /**
+     * Try to return long as an int, capped at int max and int min
+     * @param l The long to convert
+     * @return Returns the long as a capped int
+     */
+    public static int intHelper(long l){
+        try {
+            return Math.toIntExact(l);
+        } catch (ArithmeticException ae){
+            switch(Long.compare(l, 0)){
+                case 1:
+                    return Integer.MAX_VALUE;
+                case 0:
+                    return 0;
+                case -1:
+                    return Integer.MIN_VALUE;
+                default:
+                    throw new ArithmeticException(); // Somehow Long.compare is broken?? This should be impossible
+            }
+        }
+    }
 }