Merge pull request #49 from ifydev/feature/group-display-names

Add group display names

Author: Innectic

API/src/main/java/me/innectic/permissify/api/database/DatabaseHandler.java

@@ -136,13 +136,14 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
     /**
      * Create a new permission group.
      *
-     * @param name      the name of the group
-     * @param prefix    the prefix of the name
-     * @param suffix    the suffix of the name
-     * @param chatColor the color of the chat message
-     * @return          if the group was created
-     */
-    public abstract boolean createGroup(String name, String prefix, String suffix, String chatColor);
+     * @param name        the name of the group
+     * @param displayName the display name of the group
+     * @param prefix      the prefix of the name
+     * @param suffix      the suffix of the name
+     * @param chatColor   the color of the chat message
+     * @return            if the group was created
+     */
+    public abstract boolean createGroup(String name, String displayName, String prefix, String suffix, String chatColor);
 
     /**
      * Delete a permission group

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

@@ -113,7 +113,7 @@ public void initialize() {
             groupPermissionsStatement.close();
 
             PreparedStatement groupsStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database +
-                    "groups (name VARCHAR(100) NOT NULL UNIQUE, prefix VARCHAR(100) NOT NULL, suffix VARCHAR(100) NOT NULL, chatcolor VARCHAR(4) NOT NULL, defaultGroup TINYINT NOT NULL, ladder VARCHAR(767))");
+                    "groups (name VARCHAR(100) NOT NULL UNIQUE, displayName VARCHAR(100) NOT NULL UNIQUE, prefix VARCHAR(100) NOT NULL, suffix VARCHAR(100) NOT NULL, chatcolor VARCHAR(4) NOT NULL, defaultGroup TINYINT NOT NULL, ladder VARCHAR(767))");
             groupsStatement.execute();
             groupsStatement.close();
 
@@ -200,7 +200,9 @@ protected void loadGroups() {
             ResultSet groupResults = groupStatement.executeQuery();
             while (groupResults.next()) {
                 String groupName = groupResults.getString("name");
+                String displayName = groupResults.getString("displayName");
                 PermissionGroup group = new PermissionGroup(groupName,
+                        displayName,
                         groupResults.getString("chatcolor"),
                         groupResults.getString("prefix"),
                         groupResults.getString("suffix"), getGroupLadder(groupName).orElse(new DefaultLadder()));
@@ -321,7 +323,7 @@ public void loadProfile(PermissifyProfile profile) {
         }));
         // Create groups
         profile.getGroups().forEach((key, group) -> {
-            createGroup(group.getName(), group.getPrefix(), group.getSuffix(), group.getChatColor());
+            createGroup(group.getName(), group.getDisplayName(), group.getPrefix(), group.getSuffix(), group.getChatColor());
             Optional<PermissionGroup> created = getGroup(group.getName());
             if (!created.isPresent()) {
                 PermissifyAPI.get().ifPresent(api -> api.getLogger().log(Level.WARNING, "Profile group was never created?"));
@@ -471,11 +473,11 @@ public List<Permission> getPermissions(UUID uuid) {
     }
 
     @Override
-    public boolean createGroup(String name, String prefix, String suffix, String chatColor) {
+    public boolean createGroup(String name, String displayName, String prefix, String suffix, String chatColor) {
         // Make sure that this group doesn't already exist
         if (cachedGroups.getOrDefault(name, null) != null) return false;
         // Add the new group to the cache
-        cachedGroups.put(name, new PermissionGroup(name, chatColor, prefix, suffix, new DefaultLadder()));
+        cachedGroups.put(name, new PermissionGroup(name, displayName, chatColor, prefix, suffix, new DefaultLadder()));
 
         Optional<Connection> connection = getConnection();
         if (!connection.isPresent()) {
@@ -647,7 +649,7 @@ public void updateCache(UUID uuid) {
                     ResultSet groupResults = groupStatement.executeQuery();
                     if (!groupResults.next()) return;
                     PermissionGroup permissionGroup = new PermissionGroup(
-                            groupName, groupResults.getString("chatcolor"), groupResults.getString("prefix"),
+                            groupName, groupResults.getString("displayName"), groupResults.getString("chatcolor"), groupResults.getString("prefix"),
                             groupResults.getString("suffix"), getGroupLadder(groupName).orElse(new DefaultLadder()));
                     groupResults.close();
                     groupStatement.close();

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

@@ -31,7 +31,6 @@
 import me.innectic.permissify.api.group.Permission;
 import me.innectic.permissify.api.group.ladder.AbstractLadder;
 
-import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -41,6 +40,7 @@
 @RequiredArgsConstructor
 public class PermissionGroup {
     @Getter private final String name;
+    @Getter private final String displayName;
     @Getter private final String chatColor;
     @Getter private final String prefix;
     @Getter private final String suffix;

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

@@ -61,11 +61,11 @@ public String handleAddGroup(CommandSender sender, String[] args) {
         if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
             return PermissifyConstants.UNABLE_TO_CREATE.replace("<TYPE>", "group").replace("<REASON>", "No database handler.");
 
-        if (args.length < 4) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_GROUP_CREATE;
-        if (!ColorUtil.isValidChatColor(args[3])) return PermissifyConstants.INVALID_CHATCOLOR.replace("<COLOR>", args[3]);
+        if (args.length < 5) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_GROUP_CREATE;
+        if (!ColorUtil.isValidChatColor(args[4])) return PermissifyConstants.INVALID_CHATCOLOR.replace("<COLOR>", args[4]);
 
         // Create the new group
-        boolean created = plugin.getPermissifyAPI().getDatabaseHandler().get().createGroup(args[0], args[1], args[2], args[3]);
+        boolean created = plugin.getPermissifyAPI().getDatabaseHandler().get().createGroup(args[0], args[1], args[2], args[3], args[4]);
         if (created) return PermissifyConstants.GROUP_CREATED.replace("<GROUP>", args[0]);
         return PermissifyConstants.UNABLE_TO_CREATE.replace("<TYPE>", "group").replace("<REASON>", "Unable to connect to database.");
     }