Organization

Author: Innectic

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

@@ -25,8 +25,8 @@
 package me.innectic.permissify.api.database;
 
 import lombok.Getter;
-import me.innectic.permissify.api.group.Permission;
-import me.innectic.permissify.api.group.group.PermissionGroup;
+import me.innectic.permissify.api.permission.Permission;
+import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.api.profile.PermissifyProfile;
 
 import java.util.*;

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

@@ -27,11 +27,10 @@
 import me.innectic.permissify.api.PermissifyAPI;
 import me.innectic.permissify.api.database.ConnectionError;
 import me.innectic.permissify.api.database.DatabaseHandler;
-import me.innectic.permissify.api.group.Permission;
+import me.innectic.permissify.api.permission.Permission;
 import me.innectic.permissify.api.database.ConnectionInformation;
-import me.innectic.permissify.api.group.group.PermissionGroup;
+import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.api.profile.PermissifyProfile;
-import me.innectic.permissify.api.util.FormatterType;
 
 import java.sql.*;
 import java.util.*;

…tic/permissify/api/group/Permission.java …ermissify/api/permission/Permission.javaAPI/src/main/java/me/innectic/permissify/api/group/Permission.java renamed to API/src/main/java/me/innectic/permissify/api/permission/Permission.java API/src/main/java/me/innectic/permissify/api/group/Permission.java renamed to API/src/main/java/me/innectic/permissify/api/permission/Permission.java

@@ -22,14 +22,12 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.api.group;
+package me.innectic.permissify.api.permission;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
-
 /**
  * @author Innectic
  * @since 6/8/2017

…ify/api/group/group/PermissionGroup.java …sify/api/permission/PermissionGroup.javaAPI/src/main/java/me/innectic/permissify/api/group/group/PermissionGroup.java renamed to API/src/main/java/me/innectic/permissify/api/permission/PermissionGroup.java API/src/main/java/me/innectic/permissify/api/group/group/PermissionGroup.java renamed to API/src/main/java/me/innectic/permissify/api/permission/PermissionGroup.java

@@ -22,12 +22,11 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.api.group.group;
+package me.innectic.permissify.api.permission;
 
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import me.innectic.permissify.api.group.Permission;
 
 import java.util.*;
 

API/src/main/java/me/innectic/permissify/api/profile/PermissifyProfile.java

@@ -26,10 +26,9 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import me.innectic.permissify.api.group.Permission;
-import me.innectic.permissify.api.group.group.PermissionGroup;
+import me.innectic.permissify.api.permission.Permission;
+import me.innectic.permissify.api.permission.PermissionGroup;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;

Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java

@@ -27,7 +27,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import me.innectic.permissify.spigot.commands.PermissifyCommand;
-import me.innectic.permissify.spigot.commands.permissify.*;
+import me.innectic.permissify.spigot.commands.subcommand.*;
 import me.innectic.permissify.spigot.events.PlayerJoin;
 import me.innectic.permissify.api.PermissifyAPI;
 import me.innectic.permissify.api.database.handlers.FullHandler;

…ot/commands/permissify/CacheCommand.java …ot/commands/subcommand/CacheCommand.javaSpigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/CacheCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/CacheCommand.java Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/CacheCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/CacheCommand.java

@@ -22,11 +22,11 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.spigot.commands.permissify;
+package me.innectic.permissify.spigot.commands.subcommand;
 
 import me.innectic.permissify.api.PermissifyConstants;
 import me.innectic.permissify.api.database.DatabaseHandler;
-import me.innectic.permissify.api.group.group.PermissionGroup;
+import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.api.util.ArgumentUtil;
 import me.innectic.permissify.spigot.PermissifyMain;
 import me.innectic.permissify.spigot.utils.PermissionUtil;

…ot/commands/permissify/GroupCommand.java …ot/commands/subcommand/GroupCommand.javaSpigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/GroupCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/GroupCommand.java Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/GroupCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/GroupCommand.java

@@ -22,13 +22,13 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.spigot.commands.permissify;
+package me.innectic.permissify.spigot.commands.subcommand;
 
 import me.innectic.permissify.api.database.DatabaseHandler;
 import me.innectic.permissify.spigot.PermissifyMain;
 import me.innectic.permissify.api.PermissifyConstants;
-import me.innectic.permissify.api.group.Permission;
-import me.innectic.permissify.api.group.group.PermissionGroup;
+import me.innectic.permissify.api.permission.Permission;
+import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.api.util.ArgumentUtil;
 import me.innectic.permissify.spigot.utils.ColorUtil;
 import me.innectic.permissify.spigot.utils.PermissionUtil;

…t/commands/permissify/PlayerCommand.java …t/commands/subcommand/PlayerCommand.javaSpigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/PlayerCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/PlayerCommand.java Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/PlayerCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/PlayerCommand.java

@@ -22,12 +22,12 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.spigot.commands.permissify;
+package me.innectic.permissify.spigot.commands.subcommand;
 
 import me.innectic.permissify.spigot.PermissifyMain;
 import me.innectic.permissify.api.PermissifyConstants;
-import me.innectic.permissify.api.group.Permission;
-import me.innectic.permissify.api.group.group.PermissionGroup;
+import me.innectic.permissify.api.permission.Permission;
+import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.spigot.utils.MiscUtil;
 import me.innectic.permissify.spigot.utils.PermissionUtil;
 import org.bukkit.Bukkit;

…/commands/permissify/ProfileCommand.java …/commands/subcommand/ProfileCommand.javaSpigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/ProfileCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/ProfileCommand.java Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/ProfileCommand.java renamed to Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/ProfileCommand.java

@@ -22,7 +22,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
  */
-package me.innectic.permissify.spigot.commands.permissify;
+package me.innectic.permissify.spigot.commands.subcommand;
 
 import me.innectic.permissify.api.PermissifyConstants;
 import me.innectic.permissify.api.database.DatabaseHandler;