Merge pull request #67 from ifydev/rel/1.0.1

Release 1.0.1

Author: Innectic

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

@@ -36,7 +36,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Optional;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -75,9 +74,6 @@ public void initialize(HandlerType type, Optional<ConnectionInformation> connect
         databaseHandler.ifPresent(handler -> {
             handler.initialize();
             handler.reload(new ArrayList<>());
-            boolean connected = handler.connect();
-            if (connected) logger.info("Connected to the database.");
-            else logger.log(Level.SEVERE, "Unable to connect to the database.");
         });
         logger.info("Registering modules...");
         moduleLoader.loadModules(plugin);

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

@@ -56,9 +56,8 @@ 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_PLAYER_SET_MAIN_GROUP = "permissify.player.group.primarygroup";
     public static final String PERMISSIFY_GROUP_DEFAULT = "permissify.group.default";
-    public static final String PERMISSIFY_FORMAT = "permissify.format";
     public static final String PERMISSIFY_CACHE = "permissify.cache";
     public static final String PERMISSIFY_ADMIN = "permissify.admin";
     public static final String PERMISSIFY_PROFILE = "permissify.profile";
@@ -72,6 +71,7 @@ public class PermissifyConstants {
     public static final String PLAYER_GROUP_LIST = PERMISSIFY_PREFIX + "&e&lGroups for <PLAYER>: <GROUPS>";
     public static final String CACHE_PURGED = PERMISSIFY_PREFIX + "&e&lCache has been purged!";
     public static final String CACHE_INFORMATION = PERMISSIFY_PREFIX + "&e&lCached groups: <GROUPS>, cached permissions: <PERMISSIONS>, default group: <DEFAULT>";
+    public static final String PRIMARY_GROUP_TEMPLATE = PERMISSIFY_PREFIX + "&e&lCurrent primary group: <GROUP>";
 
     public static final String PERMISSION_ADDED_GROUP = PERMISSIFY_PREFIX + "&e&lPermission <PERMISSION> has been added to <GROUP>!";
     public static final String PERMISSION_REMOVED_GROUP = PERMISSIFY_PREFIX + "&e&lPermission <PERMISSION> has been removed from <GROUP>!";
@@ -84,12 +84,14 @@ public class PermissifyConstants {
     public static final String MAIN_GROUP_SET = PERMISSIFY_PREFIX + "&e&lSet main group for <PLAYER> to <GROUP>!";
     public static final String PLAYER_ALREADY_HAS_PERMISSION = PERMISSIFY_PREFIX + "&c&lPlayer <PLAYER> already has permission <PERMISSION>";
     public static final String PLAYER_DOES_NOT_HAVE_PERMISSION = PERMISSIFY_PREFIX + "&c&lPlayer <PLAYER> does not have permission <PERMISSION>";
+    public static final String ALREADY_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&l<GROUP> is already the main group!";
+    public static final String GROUP_ALREADY_EXISTS = PERMISSIFY_PREFIX + "&c&l<GROUP> already exists!";
 
     public static final String EMPTY_DEFAULT_GROUP_NAME = "&c&lNONE";
     public static final String DEFAULT_GROUP_RESPONSE = PERMISSIFY_PREFIX + "&e&lThe current default group is '<GROUP>&e&l'.";
     public static final String DEFAULT_GROUP_SET = PERMISSIFY_PREFIX + "&e&lThe default group has been set to '<GROUP>&e&l'.";
 
-    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_CREATE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group create [name] [display_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]";
     public static final String NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_ADD = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group addpermission [group] [permission]";
     public static final String NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_REMOVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group removepermission [group] [permission]";
@@ -101,10 +103,11 @@ public class PermissifyConstants {
     public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_ADD_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player addgroup [player] [group]";
     public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player removegroup [player] [group]";
     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_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player setmain [player] [group]";
+    public static final String NOT_ENOUGH_ARGUMENTS_SET_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player primarygroup <player> [group]";
     public static final String NOT_ENOUGH_ARGUMENTS_PROFILE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile [save|load] [profile]";
     public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_SAVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile save [fileName]";
     public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_LOAD = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile load [source]";
+    public static final String NOT_ENOUGH_ARGUMENTS_SUPERADMIN = PERMISSIFY_PREFIX + "&c&l/Not enough arguments! &e&l/permissify superadmin <grant|remove> <player>";
 
     public static final String PROFILE_SAVED = PERMISSIFY_PREFIX + "&e&lSaved profile '<PROFILE>'.";
     public static final String PROFILE_NOT_SAVED = PERMISSIFY_PREFIX + "&c&lUnable to save profile '<PROFILE>'";
@@ -131,24 +134,25 @@ public class PermissifyConstants {
 
     public static final List<List<String>> PERMISSIFY_HELP_PAGES = new ArrayList<>(Arrays.asList(Arrays.asList(
             "&a&l/permissify help [page]",
-            "&a&l/permissify superadmin [player] - &c&lWARNING: &e&lSUPERADMIN GIVES PERMISSION FOR EVERYTHING!",
+            "&a&l/permissify superadmin grant <player> - &c&lWARNING: &e&lSUPERADMIN GIVES PERMISSION FOR EVERYTHING!",
+            "&a&l/permissify superadmin remove <player>",
             "&a&l/permissify cache",
             "&a&l/permissify cache purge",
-            "&a&l/permissify group create [name] [prefix] [suffix] [chatcolor]",
-            "&a&l/permissify group remove [name]",
-            "&a&l/permissify group addpermission [group] [permissions...] [(optional) lifespan]",
-            "&a&l/permissify group removepermission [group] [permissions...]"
+            "&a&l/permissify group create <name> <display_name> <prefix> <suffix> <chatcolor>",
+            "&a&l/permissify group remove <name>",
+            "&a&l/permissify group addpermission <group> <permissions...> [lifespan]",
+            "&a&l/permissify group removepermission <group> <permissions...>"
     ), Arrays.asList(
-            "&a&l/permissify group listpermissions [group]",
+            "&a&l/permissify group listpermissions <group>",
             "&a&l/permissify group list",
-            "&a&l/permissify player addpermission [permission] [player]",
-            "&a&l/permissify player removepermission [permission] [player]",
-            "&a&l/permissify player addgroup [player] [group]",
-            "&a&l/permissify player listpermissions [player]",
-            "&a&l/permissify player listgroups [player]",
-            "&a&l/permissify player removegroup [player] [group]",
-            "&a&l/permissify player setmain [player] [group]",
-            "&a&l/permissify group default [group?]"
+            "&a&l/permissify player addpermission <permission> <player>",
+            "&a&l/permissify player removepermission <permission> <player>",
+            "&a&l/permissify player addgroup <player> <group>",
+            "&a&l/permissify player listpermissions <player>",
+            "&a&l/permissify player listgroups <player>",
+            "&a&l/permissify player removegroup <player> <group>",
+            "&a&l/permissify player primarygroup <player> [group]",
+            "&a&l/permissify group default [group]"
     )));
 
     // Error response

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

@@ -25,9 +25,11 @@
 package me.innectic.permissify.api.database;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import me.innectic.permissify.api.permission.Permission;
 import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.api.profile.PermissifyProfile;
+import me.innectic.permissify.api.util.Tristate;
 
 import java.util.*;
 
@@ -37,30 +39,20 @@
  *
  * The base database type.
  */
+@RequiredArgsConstructor
 public abstract class DatabaseHandler {
 
     @Getter protected Map<UUID, List<Permission>> cachedPermissions = new HashMap<>();
     @Getter protected Map<String, PermissionGroup> cachedGroups = new HashMap<>();
     @Getter protected Optional<PermissionGroup> defaultGroup = Optional.empty();
-    @Getter protected final Optional<ConnectionInformation> connectionInformation;
+    @Getter protected final ConnectionInformation connectionInformation;
     @Getter protected List<UUID> superAdmins = new ArrayList<>();
 
-    public DatabaseHandler(ConnectionInformation connectionInformation) {
-        this.connectionInformation = Optional.ofNullable(connectionInformation);
-    }
-
     /**
      * Initialize the database handler
      */
     public abstract void initialize();
 
-    /**
-     * Connect to the database
-     *
-     * @return if the connection was successful or not
-     */
-    public abstract boolean connect();
-
     /**
      * Clear the handler's cache and reload all needed values.
      *
@@ -142,14 +134,14 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      * @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);
+    public abstract Tristate createGroup(String name, String displayName, String prefix, String suffix, String chatColor);
 
     /**
      * Delete a permission group
      *
      * @param name the name of the group
      */
-    public abstract boolean deleteGroup(String name);
+    public abstract Tristate deleteGroup(String name);
 
     /**
      * Get the permission group from name.
@@ -166,7 +158,7 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      * @param group the group to add them to
      * @return if they were added
      */
-    public abstract boolean addPlayerToGroup(UUID uuid, PermissionGroup group);
+    public abstract Tristate addPlayerToGroup(UUID uuid, PermissionGroup group);
 
     /**
      * Remove a player from a group.
@@ -175,7 +167,7 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      * @param group the group to remove from
      * @return if the player was removed
      */
-    public abstract boolean removePlayerFromGroup(UUID uuid, PermissionGroup group);
+    public abstract Tristate removePlayerFromGroup(UUID uuid, PermissionGroup group);
 
     /**
      * Get all permissions groups.
@@ -198,7 +190,7 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      * @param group the group to set as the primary
      * @param uuid  the uuid of the player to set the primary of
      */
-    public abstract boolean setPrimaryGroup(PermissionGroup group, UUID uuid);
+    public abstract Tristate setPrimaryGroup(PermissionGroup group, UUID uuid);
 
     /**
      * Get the primary group of a player.