diff --git a/src/main/java/net/pingex/dcf/commands/audit/AuditManager.java b/src/main/java/net/pingex/dcf/commands/audit/AuditManager.java index cc4bffa..3b2327a 100644 --- a/src/main/java/net/pingex/dcf/commands/audit/AuditManager.java +++ b/src/main/java/net/pingex/dcf/commands/audit/AuditManager.java @@ -3,7 +3,7 @@ package net.pingex.dcf.commands.audit; import net.pingex.dcf.commands.Context; import net.pingex.dcf.commands.audit.basic.EnabledCheck; import net.pingex.dcf.commands.audit.basic.ScopeCheck; -import net.pingex.dcf.permissions.PermissionCheck; +import net.pingex.dcf.commands.permissions.PermissionCheck; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.*; diff --git a/src/main/java/net/pingex/dcf/permissions/DefaultPermissionOption.java b/src/main/java/net/pingex/dcf/commands/permissions/DefaultPermissionOption.java similarity index 97% rename from src/main/java/net/pingex/dcf/permissions/DefaultPermissionOption.java rename to src/main/java/net/pingex/dcf/commands/permissions/DefaultPermissionOption.java index 939b3cf..cadda29 100644 --- a/src/main/java/net/pingex/dcf/permissions/DefaultPermissionOption.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/DefaultPermissionOption.java @@ -1,4 +1,4 @@ -package net.pingex.dcf.permissions; +package net.pingex.dcf.commands.permissions; import net.pingex.dcf.commands.Context; import net.pingex.dcf.commands.options.ICommandOption; diff --git a/src/main/java/net/pingex/dcf/permissions/DefaultPermissionsProvider.java b/src/main/java/net/pingex/dcf/commands/permissions/DefaultPermissionsProvider.java similarity index 98% rename from src/main/java/net/pingex/dcf/permissions/DefaultPermissionsProvider.java rename to src/main/java/net/pingex/dcf/commands/permissions/DefaultPermissionsProvider.java index 703c944..2fe4bf5 100644 --- a/src/main/java/net/pingex/dcf/permissions/DefaultPermissionsProvider.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/DefaultPermissionsProvider.java @@ -1,4 +1,4 @@ -package net.pingex.dcf.permissions; +package net.pingex.dcf.commands.permissions; import net.pingex.dcf.commands.Command; import net.pingex.dcf.core.Configuration; diff --git a/src/main/java/net/pingex/dcf/permissions/ICommandPermissionsProvider.java b/src/main/java/net/pingex/dcf/commands/permissions/ICommandPermissionsProvider.java similarity index 97% rename from src/main/java/net/pingex/dcf/permissions/ICommandPermissionsProvider.java rename to src/main/java/net/pingex/dcf/commands/permissions/ICommandPermissionsProvider.java index fb959d3..cd8a701 100644 --- a/src/main/java/net/pingex/dcf/permissions/ICommandPermissionsProvider.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/ICommandPermissionsProvider.java @@ -1,4 +1,4 @@ -package net.pingex.dcf.permissions; +package net.pingex.dcf.commands.permissions; import net.pingex.dcf.commands.Command; import sx.blah.discord.handle.obj.IGuild; diff --git a/src/main/java/net/pingex/dcf/permissions/PermissionCheck.java b/src/main/java/net/pingex/dcf/commands/permissions/PermissionCheck.java similarity index 87% rename from src/main/java/net/pingex/dcf/permissions/PermissionCheck.java rename to src/main/java/net/pingex/dcf/commands/permissions/PermissionCheck.java index b07f3a8..4f51070 100644 --- a/src/main/java/net/pingex/dcf/permissions/PermissionCheck.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/PermissionCheck.java @@ -1,12 +1,12 @@ -package net.pingex.dcf.permissions; +package net.pingex.dcf.commands.permissions; import net.pingex.dcf.commands.Context; import net.pingex.dcf.commands.audit.AuditResult; import net.pingex.dcf.commands.audit.IAuditComponentProvider; -import net.pingex.dcf.permissions.audit.DefaultPermissionCheck; -import net.pingex.dcf.permissions.audit.UserGlobalCheck; -import net.pingex.dcf.permissions.audit.UserGuildCheck; -import net.pingex.dcf.permissions.audit.UserGuildRoleCheck; +import net.pingex.dcf.commands.permissions.audit.DefaultPermissionCheck; +import net.pingex.dcf.commands.permissions.audit.UserGlobalCheck; +import net.pingex.dcf.commands.permissions.audit.UserGuildCheck; +import net.pingex.dcf.commands.permissions.audit.UserGuildRoleCheck; import java.util.Arrays; import java.util.Comparator; import java.util.Set; diff --git a/src/main/java/net/pingex/dcf/permissions/audit/DefaultPermissionCheck.java b/src/main/java/net/pingex/dcf/commands/permissions/audit/DefaultPermissionCheck.java similarity index 91% rename from src/main/java/net/pingex/dcf/permissions/audit/DefaultPermissionCheck.java rename to src/main/java/net/pingex/dcf/commands/permissions/audit/DefaultPermissionCheck.java index bcac043..02b8d2f 100644 --- a/src/main/java/net/pingex/dcf/permissions/audit/DefaultPermissionCheck.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/audit/DefaultPermissionCheck.java @@ -1,10 +1,10 @@ -package net.pingex.dcf.permissions.audit; +package net.pingex.dcf.commands.permissions.audit; import net.pingex.dcf.commands.Context; import net.pingex.dcf.commands.audit.AuditResult; import net.pingex.dcf.commands.audit.IAuditComponentProvider; import net.pingex.dcf.commands.options.ICommandOption; -import net.pingex.dcf.permissions.DefaultPermissionOption; +import net.pingex.dcf.commands.permissions.DefaultPermissionOption; import java.util.Optional; /** diff --git a/src/main/java/net/pingex/dcf/permissions/audit/UserGlobalCheck.java b/src/main/java/net/pingex/dcf/commands/permissions/audit/UserGlobalCheck.java similarity index 91% rename from src/main/java/net/pingex/dcf/permissions/audit/UserGlobalCheck.java rename to src/main/java/net/pingex/dcf/commands/permissions/audit/UserGlobalCheck.java index 7e5c217..719ea33 100644 --- a/src/main/java/net/pingex/dcf/permissions/audit/UserGlobalCheck.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/audit/UserGlobalCheck.java @@ -1,9 +1,9 @@ -package net.pingex.dcf.permissions.audit; +package net.pingex.dcf.commands.permissions.audit; import net.pingex.dcf.commands.Context; import net.pingex.dcf.commands.audit.AuditResult; import net.pingex.dcf.commands.audit.IAuditComponentProvider; -import net.pingex.dcf.permissions.ICommandPermissionsProvider; +import net.pingex.dcf.commands.permissions.ICommandPermissionsProvider; /** * This class checks permission against a rule defined for a specific user globally. diff --git a/src/main/java/net/pingex/dcf/permissions/audit/UserGuildCheck.java b/src/main/java/net/pingex/dcf/commands/permissions/audit/UserGuildCheck.java similarity index 92% rename from src/main/java/net/pingex/dcf/permissions/audit/UserGuildCheck.java rename to src/main/java/net/pingex/dcf/commands/permissions/audit/UserGuildCheck.java index 34c2522..2e1f568 100644 --- a/src/main/java/net/pingex/dcf/permissions/audit/UserGuildCheck.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/audit/UserGuildCheck.java @@ -1,9 +1,9 @@ -package net.pingex.dcf.permissions.audit; +package net.pingex.dcf.commands.permissions.audit; import net.pingex.dcf.commands.Context; import net.pingex.dcf.commands.audit.AuditResult; import net.pingex.dcf.commands.audit.IAuditComponentProvider; -import net.pingex.dcf.permissions.ICommandPermissionsProvider; +import net.pingex.dcf.commands.permissions.ICommandPermissionsProvider; /** * This class checks permission against a rule defined for a specific user in a specific guild. diff --git a/src/main/java/net/pingex/dcf/permissions/audit/UserGuildRoleCheck.java b/src/main/java/net/pingex/dcf/commands/permissions/audit/UserGuildRoleCheck.java similarity index 93% rename from src/main/java/net/pingex/dcf/permissions/audit/UserGuildRoleCheck.java rename to src/main/java/net/pingex/dcf/commands/permissions/audit/UserGuildRoleCheck.java index c9e03dd..73e6c76 100644 --- a/src/main/java/net/pingex/dcf/permissions/audit/UserGuildRoleCheck.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/audit/UserGuildRoleCheck.java @@ -1,9 +1,9 @@ -package net.pingex.dcf.permissions.audit; +package net.pingex.dcf.commands.permissions.audit; import net.pingex.dcf.commands.Context; import net.pingex.dcf.commands.audit.AuditResult; import net.pingex.dcf.commands.audit.IAuditComponentProvider; -import net.pingex.dcf.permissions.ICommandPermissionsProvider; +import net.pingex.dcf.commands.permissions.ICommandPermissionsProvider; import sx.blah.discord.handle.obj.IRole; /** diff --git a/src/main/java/net/pingex/dcf/permissions/audit/package-info.java b/src/main/java/net/pingex/dcf/commands/permissions/audit/package-info.java similarity index 57% rename from src/main/java/net/pingex/dcf/permissions/audit/package-info.java rename to src/main/java/net/pingex/dcf/commands/permissions/audit/package-info.java index b459e53..f2e1c72 100644 --- a/src/main/java/net/pingex/dcf/permissions/audit/package-info.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/audit/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all sub-checks for PermissionCheck. */ -package net.pingex.dcf.permissions.audit; \ No newline at end of file +package net.pingex.dcf.commands.permissions.audit; \ No newline at end of file diff --git a/src/main/java/net/pingex/dcf/permissions/package-info.java b/src/main/java/net/pingex/dcf/commands/permissions/package-info.java similarity index 71% rename from src/main/java/net/pingex/dcf/permissions/package-info.java rename to src/main/java/net/pingex/dcf/commands/permissions/package-info.java index 62042a9..809b35f 100644 --- a/src/main/java/net/pingex/dcf/permissions/package-info.java +++ b/src/main/java/net/pingex/dcf/commands/permissions/package-info.java @@ -1,4 +1,4 @@ /** * This package contains everything related to permissions and the ability for an user to run something. */ -package net.pingex.dcf.permissions; \ No newline at end of file +package net.pingex.dcf.commands.permissions; \ No newline at end of file