Spigot: Main group setting. Remove debug messages

Author: Innectic

API/src/main/java/me/innectic/permissify/api/PermissifyConstants.java

@@ -54,6 +54,7 @@ public class PermissifyConstants {
     public static final String PERMISSIFY_PLAYER_GROUP_ADD = "permissify.player.group.add";
     public static final String PERMISSIFY_PLAYER_GROUP_REMOVE = "permissify.player.group.remove";
     public static final String PERMISSIFY_PLAYER_GROUP_LIST = "permissify.player.group.list";
+    public static final String PERMISSIFY_PLAYER_SET_MAIN_GROUP = "permissify.player.group.setmain";
     public static final String PERMISSIFY_FORMAT = "permissify.format";
     public static final String PERMISSIFY_CACHE = "permissify.cache";
 
@@ -74,8 +75,8 @@ public class PermissifyConstants {
     public static final String PERMISSION_REMOVED_PLAYER = PERMISSIFY_PREFIX + "&c&lPermission <PERMISSION> has been removed from <PLAYER>!";
     public static final String PLAYER_ADDED_TO_GROUP = PERMISSIFY_PREFIX + "&c&lAdded <PLAYER> to <GROUP>";
     public static final String PLAYER_REMOVED_FROM_GROUP = PERMISSIFY_PREFIX + "&c&lRemoved <PLAYER> from <GROUP>";
-
     public static final String FORMATTER_SET = PERMISSIFY_PREFIX + "&e&lFormatter <FORMATTER> set!";
+    public static final String MAIN_GROUP_SET = PERMISSIFY_PREFIX + "&e&lSet main group for <PLAYER> to <GROUP>!";
 
     public static final String NOT_ENOUGH_ARGUMENTS_GROUP_CREATE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group create [name] [prefix] [suffix] [chat-color]";
     public static final String NOT_ENOUGH_ARGUMENTS_GROUP_REMOVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group remove [name]";
@@ -90,13 +91,16 @@ public class PermissifyConstants {
     public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player removegroup [group] [player]";
     public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_LIST_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player listgroup [player]";
     public static final String NOT_ENOUGH_ARGUMENTS_SET_FORMAT = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify format [whisper|chat] [format...]";
+    public static final String NOT_ENOUGH_ARGUMENTS_SET_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player setmain [player] [group]";
 
     public static final String INVALID_CHATCOLOR = PERMISSIFY_PREFIX + "&c&lInvalid chat color <COLOR>";
     public static final String INVALID_GROUP = PERMISSIFY_PREFIX + "&c&lInvalid group!";
     public static final String CONSOLE_INVALID_COMMAND = PERMISSIFY_PREFIX + "&c&lOnly one console command available: /permissify superadmin [username]";
     public static final String INVALID_PLAYER = PERMISSIFY_PREFIX + "&c&lInvalid player!";
     public static final String INVALID_ARGUMENT = PERMISSIFY_PREFIX + "&c&lInvalid argument: <ARGUMENT>";
 
+    public static final String PLAYER_NOT_IN_GROUP = PERMISSIFY_PREFIX + "&e&l<PLAYER> isn't in the group <GROUP>!";
+
     public static final String UNABLE_TO_CREATE = PERMISSIFY_PREFIX + "&c&lUnable to create <TYPE>: <REASON>";
     public static final String UNABLE_TO_REMOVE = PERMISSIFY_PREFIX + "&c&lUnable to remove <TYPE>: <REASON>";
     public static final String UNABLE_TO_ADD = PERMISSIFY_PREFIX + "&c&lUnable to add: <REASON>";

API/src/main/java/me/innectic/permissify/api/database/handlers/MySQLHandler.java

@@ -382,16 +382,13 @@ public void updateCache(UUID uuid) {
                 Optional<PermissionGroup> group = cachedGroups.stream().filter(permissionGroup -> permissionGroup .getName().equals(groupName)).findFirst();
                 // Get the group from the database, if we don't have have it already
                 if (!group.isPresent()) {
-                    System.out.println("Not present");
                     PreparedStatement groupStatement = connection.get().prepareStatement("SELECT prefix,suffix,chatcolor FROM groups WHERE name=?");
                     groupStatement.setString(1, groupName);
                     ResultSet groupResults = groupStatement.executeQuery();
                     if (!groupResults.next()) return;
-                    System.out.println("Got results");
                     PermissionGroup permissionGroup = new PermissionGroup(
                             groupName, groupResults.getString("chatcolor"), groupResults.getString("prefix"),
                             groupResults.getString("suffix"));
-                    System.out.println(permissionGroup);
                     groupResults.close();
                     groupStatement.close();
                     PreparedStatement groupPlayersStatement = connection.get().prepareStatement("SELECT uuid,`primary` FROM groupMembers WHERE `group`=?");
@@ -400,7 +397,6 @@ public void updateCache(UUID uuid) {
                     while (groupPlayersResult.next()) {
                         permissionGroup.addPlayer(UUID.fromString(groupPlayersResult.getString("uuid")),
                                 groupPlayersResult.getBoolean("primary"));
-                        System.out.println(permissionGroup.getPlayers());
                     }
                     cachedGroups.add(permissionGroup);
                 }

API/src/main/java/me/innectic/permissify/api/permission/PermissionGroup.java

@@ -72,7 +72,6 @@ public boolean hasPermission(String permission) {
     }
 
     public void addPlayer(UUID uuid, boolean isPrimary) {
-        System.out.println("Current: " + uuid + " - status: " + isPrimary);
         players.put(uuid, isPrimary);
     }
 
@@ -85,8 +84,6 @@ public boolean hasPlayer(UUID uuid) {
     }
 
     public boolean isPrimaryGroup(UUID uuid) {
-        System.out.println(this.players);
-        System.out.println(this.players.get(uuid));
         return players.containsKey(uuid) && players.get(uuid).equals(true);
     }
 

API/src/main/java/me/innectic/permissify/api/util/ChatFormatter.java

@@ -24,14 +24,11 @@ public class ChatFormatter {
      */
     public static String formatChat(UUID uuid, String username, String message) {
         if (!PermissifyAPI.get().isPresent()) return username + ": " + message;
-        System.out.println("A");
         if (!PermissifyAPI.get().get().getDatabaseHandler().isPresent()) return username + ": " + message;
-        System.out.println("b");
         DatabaseHandler handler = PermissifyAPI.get().get().getDatabaseHandler().get();
 
         Optional<PermissionGroup> group = handler.getPrimaryGroup(uuid);
         if (!group.isPresent()) return username + ": " + message;
-        System.out.println("c");
         String formatter = handler.getChatFormat(false);
         String finalGroup = group.get().getPrefix() + " " + group.get().getName() + " " + group.get().getSuffix();
         String color = "&" + group.get().getChatColor();

Spigot/src/main/java/me/innectic/permissify/spigot/commands/PermissifyCommand.java

@@ -103,6 +103,8 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
                         response = plugin.getPlayerCommand().handleListGroups(sender, ArgumentUtil.getRemainingArgs(2, args));
                     } else if (args[1].equalsIgnoreCase("removegroup")) {
                         response = plugin.getPlayerCommand().handleRemovePlayerFromGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
+                    } else if (args[1].equalsIgnoreCase("setmain")) {
+                        response = plugin.getPlayerCommand().handleSetMainGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
                     } else {
                         PermissifyConstants.PERMISSIFY_HELP.forEach(message -> sender.sendMessage(ColorUtil.makeReadable(message)));
                         return;

Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/PlayerCommand.java

@@ -80,6 +80,27 @@ public CommandResponse handleRemovePlayerFromGroup(CommandSender sender, String[
                 .replace("<PLAYER>", targetPlayer.getName()).replace("<GROUP>", group.get().getName()), true);
     }
 
+    public CommandResponse handleSetMainGroup(CommandSender sender, String[] args) {
+        PermissifyMain plugin = PermissifyMain.getInstance();
+        if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
+            return new CommandResponse(PermissifyConstants.UNABLE_TO_SET.replace("<REASON>", "No database handler."), false);
+        if (!sender.hasPermission(PermissifyConstants.PERMISSIFY_PLAYER_SET_MAIN_GROUP))
+            return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
+        if (args.length < 2) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_MAIN_GROUP, false);
+        Player player = Bukkit.getPlayer(args[0]);
+        if (player == null) return new CommandResponse(PermissifyConstants.INVALID_PLAYER, false);
+        Optional<PermissionGroup> group = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().stream()
+                .filter(permissionGroup -> permissionGroup.getName().equals(args[1])).findFirst();
+        if (!group.isPresent()) return new CommandResponse(PermissifyConstants.INVALID_GROUP, false);
+        if (!group.get().getPlayers().containsKey(player.getUniqueId()))
+            return new CommandResponse(PermissifyConstants.PLAYER_NOT_IN_GROUP.replace("<PLAYER>", player.getName()).replace("<GROUP>", group.get().getName()), false);
+        boolean groupSet = plugin.getPermissifyAPI().getDatabaseHandler().get().setPrimaryGroup(group.get(), player.getUniqueId());
+        if (groupSet)
+            return new CommandResponse(PermissifyConstants.MAIN_GROUP_SET.replace("<PLAYER>", player.getName()).replace("<GROUP>", group.get().getName()), false);
+        // Should be pretty much impossible to get here, unless the database isn't connected.
+        return new CommandResponse(PermissifyConstants.PLAYER_NOT_IN_GROUP.replace("<PLAYER>", player.getName()).replace("<GROUP>", group.get().getName()), false);
+    }
+
     public CommandResponse handleAddPermission(CommandSender sender, String[] args) {
         PermissifyMain plugin = PermissifyMain.getInstance();
         if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())