From 9809e591adbb4855f18783c0f0c874d86d819ff9 Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 10 Nov 2018 23:16:21 +0000 Subject: [PATCH] Reorganise some packages --- .../luckperms/bukkit/BukkitSenderFactory.java | 2 +- .../luckperms/bukkit/LPBukkitPlugin.java | 34 +++++++++--------- .../BukkitCalculatorFactory.java | 18 +++++----- .../ChildProcessor.java | 6 ++-- .../DefaultsProcessor.java | 4 +-- .../BukkitContextManager.java | 8 ++--- .../WorldCalculator.java | 2 +- .../dummy/DummyPermissibleBase.java | 2 +- .../{model => inject}/dummy/DummyPlugin.java | 2 +- .../permissible/LPPermissible.java | 6 ++-- .../permissible/LPPermissionAttachment.java | 4 +-- .../permissible/MonitoredPermissibleBase.java | 4 +-- .../permissible/PermissibleInjector.java | 4 +-- .../PermissibleMonitoringInjector.java | 2 +- .../server/InjectorDefaultsMap.java | 2 +- .../server/InjectorPermissionMap.java | 2 +- .../server/InjectorSubscriptionMap.java | 2 +- .../server/LPDefaultsMap.java | 4 +-- .../server/LPPermissionMap.java | 2 +- .../server/LPSubscriptionMap.java | 4 +-- .../listeners/BukkitConnectionListener.java | 4 +-- .../bukkit/migration/BukkitUuids.java | 4 +-- .../migration/MigrationBPermissions.java | 6 ++-- .../migration/MigrationGroupManager.java | 8 ++--- .../migration/MigrationPermissionsBukkit.java | 6 ++-- .../migration/MigrationPermissionsEx.java | 6 ++-- .../migration/MigrationPowerfulPerms.java | 6 ++-- .../migration/MigrationZPermissions.java | 6 ++-- .../luckperms/bukkit/vault/VaultChatHook.java | 4 +-- .../bukkit/vault/VaultPermissionHook.java | 4 +-- .../bungee/BungeeSchedulerAdapter.java | 2 +- .../luckperms/bungee/BungeeSenderFactory.java | 2 +- .../luckperms/bungee/LPBungeePlugin.java | 18 +++++----- .../BungeeCalculatorFactory.java | 16 ++++----- .../BackendServerCalculator.java | 2 +- .../BungeeContextManager.java | 6 ++-- .../RedisBungeeCalculator.java | 2 +- .../migration/MigrationBungeePerms.java | 6 ++-- .../lucko/luckperms/common/actionlog/Log.java | 2 +- .../common/api/LuckPermsApiProvider.java | 20 +++++------ .../ApiAbstractManager.java | 2 +- .../ApiActionLogger.java | 3 +- .../ApiConfiguration.java | 4 +-- .../ApiContextManager.java | 5 ++- .../model => implementation}/ApiGroup.java | 4 +-- .../ApiGroupManager.java | 11 +++--- .../model => implementation}/ApiLog.java | 2 +- .../ApiMessagingService.java | 3 +- .../ApiMetaStackFactory.java | 2 +- .../ApiNodeFactory.java | 3 +- .../ApiPermissionHolder.java | 4 +-- .../ApiPlatformInfo.java | 2 +- .../model => implementation}/ApiStorage.java | 6 ++-- .../model => implementation}/ApiTrack.java | 6 ++-- .../ApiTrackManager.java | 7 ++-- .../model => implementation}/ApiUser.java | 4 +-- .../ApiUserManager.java | 11 +++--- .../NoopUuidCache.java | 2 +- .../luckperms/common/backup/Exporter.java | 2 +- .../{buffers => buffer}/BufferedRequest.java | 2 +- .../common/{buffers => buffer}/Cache.java | 2 +- .../{buffers => buffer}/ExpiringCache.java | 2 +- .../Comparison.java | 2 +- .../Constraint.java | 2 +- .../StandardComparison.java | 2 +- .../common/bulkupdate/query/Query.java | 2 +- .../AbstractCachedData.java | 12 +++---- .../CacheMetadata.java | 2 +- .../GroupCachedData.java | 2 +- .../HolderCachedData.java | 6 ++-- .../UserCachedData.java | 2 +- .../type/MetaAccumulator.java | 2 +- .../type/MetaCache.java | 4 +-- .../type/PermissionCache.java | 8 ++--- .../CalculatorFactory.java | 4 +-- .../PermissionCalculator.java | 6 ++-- .../AbstractPermissionProcessor.java | 2 +- .../processor}/MapProcessor.java | 2 +- .../processor}/PermissionProcessor.java | 4 +-- .../processor}/RegexProcessor.java | 2 +- .../processor}/WildcardProcessor.java | 2 +- .../common/command/CommandManager.java | 2 +- .../command/abstraction/MainCommand.java | 2 +- .../abstraction/SharedMainCommand.java | 2 +- .../command/access/ArgumentPermissions.java | 2 +- .../common/command/utils/ArgumentParser.java | 2 +- .../generic/meta/MetaAddChatMeta.java | 4 +-- .../generic/meta/MetaAddTempChatMeta.java | 6 ++-- .../commands/generic/meta/MetaClear.java | 2 +- .../commands/generic/meta/MetaInfo.java | 4 +-- .../generic/meta/MetaRemoveChatMeta.java | 4 +-- .../generic/meta/MetaRemoveTempChatMeta.java | 4 +-- .../common/commands/generic/meta/MetaSet.java | 4 +-- .../generic/meta/MetaSetChatMeta.java | 6 ++-- .../commands/generic/meta/MetaSetTemp.java | 6 ++-- .../generic/meta/MetaSetTempChatMeta.java | 8 ++--- .../commands/generic/meta/MetaUnset.java | 2 +- .../commands/generic/meta/MetaUnsetTemp.java | 2 +- .../commands/generic/other/HolderClear.java | 2 +- .../commands/generic/other/HolderEditor.java | 2 +- .../generic/other/HolderShowTracks.java | 2 +- .../commands/generic/parent/ParentAdd.java | 2 +- .../generic/parent/ParentAddTemp.java | 4 +-- .../commands/generic/parent/ParentClear.java | 2 +- .../generic/parent/ParentClearTrack.java | 2 +- .../commands/generic/parent/ParentInfo.java | 8 ++--- .../commands/generic/parent/ParentRemove.java | 2 +- .../generic/parent/ParentRemoveTemp.java | 2 +- .../commands/generic/parent/ParentSet.java | 2 +- .../generic/parent/ParentSetTrack.java | 2 +- .../parent/UserSwitchPrimaryGroup.java | 2 +- .../generic/permission/PermissionCheck.java | 2 +- .../permission/PermissionCheckInherits.java | 2 +- .../generic/permission/PermissionClear.java | 2 +- .../generic/permission/PermissionInfo.java | 8 ++--- .../generic/permission/PermissionSet.java | 2 +- .../generic/permission/PermissionSetTemp.java | 4 +-- .../generic/permission/PermissionUnset.java | 2 +- .../permission/PermissionUnsetTemp.java | 2 +- .../common/commands/group/CreateGroup.java | 2 +- .../common/commands/group/DeleteGroup.java | 2 +- .../common/commands/group/GroupClone.java | 2 +- .../common/commands/group/GroupInfo.java | 4 +-- .../commands/group/GroupListMembers.java | 12 +++---- .../common/commands/group/GroupRename.java | 2 +- .../commands/group/GroupSetDisplayName.java | 2 +- .../common/commands/group/GroupSetWeight.java | 2 +- .../common/commands/group/ListGroups.java | 2 +- .../common/commands/log/LogGroupHistory.java | 6 ++-- .../common/commands/log/LogNotify.java | 2 +- .../common/commands/log/LogRecent.java | 6 ++-- .../common/commands/log/LogSearch.java | 6 ++-- .../common/commands/log/LogTrackHistory.java | 6 ++-- .../common/commands/log/LogUserHistory.java | 6 ++-- .../migration/MigrationMainCommand.java | 2 +- .../commands/misc/ApplyEditsCommand.java | 4 +-- .../commands/misc/BulkUpdateCommand.java | 8 ++--- .../common/commands/misc/CheckCommand.java | 4 +-- .../common/commands/misc/DebugCommand.java | 18 +++++----- .../common/commands/misc/EditorCommand.java | 2 +- .../common/commands/misc/ExportCommand.java | 2 +- .../common/commands/misc/ImportCommand.java | 2 +- .../common/commands/misc/InfoCommand.java | 4 +-- .../commands/misc/NetworkSyncCommand.java | 2 +- .../commands/misc/ReloadConfigCommand.java | 2 +- .../common/commands/misc/SearchCommand.java | 14 ++++---- .../common/commands/misc/SyncCommand.java | 2 +- .../common/commands/misc/TreeCommand.java | 6 ++-- .../common/commands/misc/VerboseCommand.java | 2 +- .../common/commands/track/CreateTrack.java | 2 +- .../common/commands/track/DeleteTrack.java | 2 +- .../common/commands/track/ListTracks.java | 2 +- .../common/commands/track/TrackAppend.java | 2 +- .../common/commands/track/TrackClear.java | 2 +- .../common/commands/track/TrackClone.java | 2 +- .../common/commands/track/TrackInfo.java | 2 +- .../common/commands/track/TrackInsert.java | 2 +- .../common/commands/track/TrackRemove.java | 2 +- .../common/commands/track/TrackRename.java | 2 +- .../common/commands/user/UserClone.java | 2 +- .../common/commands/user/UserDemote.java | 2 +- .../common/commands/user/UserInfo.java | 6 ++-- .../common/commands/user/UserMainCommand.java | 2 +- .../common/commands/user/UserPromote.java | 2 +- .../common/config/AbstractConfiguration.java | 2 +- .../luckperms/common/config/ConfigKeys.java | 4 +-- .../luckperms/common/config/ContextsFile.java | 4 +-- .../common/config/LuckPermsConfiguration.java | 2 +- .../{contexts => context}/ContextManager.java | 4 +-- .../ContextSetComparator.java | 2 +- .../ContextSetConfigurateSerializer.java | 2 +- .../ContextSetJsonSerializer.java | 2 +- .../{contexts => context}/ContextsCache.java | 4 +-- .../ContextsSupplier.java | 2 +- .../LPStaticContextsCalculator.java | 2 +- .../ProxiedContextCalculator.java | 2 +- .../AssignmentExpression.java | 4 +-- .../AssignmentRule.java | 4 +-- .../dependencies/DependencyManager.java | 2 +- .../luckperms/common/event/EventFactory.java | 4 +-- .../common/event/gen/GeneratedEventSpec.java | 2 +- .../common/locale/message/Message.java | 2 +- .../messaging/InternalMessagingService.java | 2 +- .../messaging/LuckPermsMessagingService.java | 6 ++-- .../message/UserUpdateMessageImpl.java | 2 +- .../common/metastacking/SimpleMetaStack.java | 2 +- .../metastacking/StandardStackElements.java | 4 +-- .../{api => model}/DemotionResults.java | 2 +- .../common/model/DisplayNameCache.java | 2 +- .../lucko/luckperms/common/model/Group.java | 6 ++-- .../lucko/luckperms/common/model/NodeMap.java | 4 +-- .../common/model/PermissionHolder.java | 4 +-- .../{api => model}/PromotionResults.java | 2 +- .../lucko/luckperms/common/model/Track.java | 4 +-- .../me/lucko/luckperms/common/model/User.java | 4 +-- .../luckperms/common/model/WeightCache.java | 2 +- .../manager}/AbstractManager.java | 2 +- .../{managers => model/manager}/Manager.java | 2 +- .../manager}/group/AbstractGroupManager.java | 4 +-- .../manager}/group/GroupManager.java | 4 +-- .../manager}/group/StandardGroupManager.java | 2 +- .../manager}/track/AbstractTrackManager.java | 4 +-- .../manager}/track/StandardTrackManager.java | 2 +- .../manager}/track/TrackManager.java | 4 +-- .../manager}/user/AbstractUserManager.java | 4 +-- .../manager}/user/StandardUserManager.java | 2 +- .../manager}/user/UserHousekeeper.java | 4 +-- .../manager}/user/UserManager.java | 4 +-- .../comparator/NodeWithContextComparator.java | 2 +- .../node/factory/LegacyNodeFactory.java | 2 +- .../common/node/model/ImmutableNode.java | 2 +- .../common/node/model/NodeTypes.java | 4 +-- .../plugin/AbstractLuckPermsPlugin.java | 4 +-- .../common/plugin/LuckPermsPlugin.java | 10 +++--- .../util/AbstractConnectionListener.java | 2 +- .../common/sender/AbstractSender.java | 2 +- .../luckperms/common/sender/DummySender.java | 2 +- .../lucko/luckperms/common/sender/Sender.java | 2 +- .../luckperms/common/storage/Storage.java | 6 ++-- .../common/storage/StorageFactory.java | 2 +- .../implementation/StorageImplementation.java | 2 +- .../file/AbstractConfigurateStorage.java | 6 ++-- .../file/CombinedConfigurateStorage.java | 6 ++-- .../implementation/file/FileActionLogger.java | 4 +-- .../implementation/file/FileUuidCache.java | 2 +- .../implementation/file/FileWatcher.java | 2 +- .../file/SeparatedConfigurateStorage.java | 10 +++--- .../implementation/mongodb/MongoStorage.java | 6 ++-- .../implementation/split/SplitStorage.java | 2 +- .../implementation/sql/SqlStorage.java | 10 +++--- .../luckperms/common/tasks/SyncTask.java | 2 +- .../common/treeview/PermissionRegistry.java | 2 +- .../luckperms/common/treeview/TreeView.java | 4 +-- .../common/{utils => util}/DateParser.java | 2 +- .../{utils => util}/DurationFormatter.java | 2 +- .../common/{utils => util}/ExpiringSet.java | 2 +- .../{utils => util}/ImmutableCollectors.java | 2 +- .../common/{utils => util}/Iterators.java | 2 +- .../common/{utils => util}/MoreFiles.java | 2 +- .../common/{utils => util}/Paginated.java | 2 +- .../common/{utils => util}/PatternCache.java | 2 +- .../common/{utils => util}/Predicates.java | 2 +- .../{utils => util}/ProgressLogger.java | 2 +- .../common/{utils => util}/RepeatingTask.java | 2 +- .../common/{utils => util}/Scripting.java | 2 +- .../{utils => util}/StackTracePrinter.java | 2 +- .../common/{utils => util}/TextUtils.java | 2 +- .../{utils => util}/ThrowingRunnable.java | 2 +- .../common/{utils => util}/Uuids.java | 2 +- .../{utils => util}/gson/GsonProvider.java | 2 +- .../common/{utils => util}/gson/JArray.java | 2 +- .../common/{utils => util}/gson/JElement.java | 2 +- .../common/{utils => util}/gson/JObject.java | 2 +- .../common/verbose/VerboseFilter.java | 2 +- .../common/verbose/VerboseHandler.java | 2 +- .../common/verbose/VerboseListener.java | 10 +++--- .../common/verbose/event/MetaCheckEvent.java | 2 +- .../verbose/event/PermissionCheckEvent.java | 2 +- .../common/verbose/event/VerboseEvent.java | 6 ++-- .../common/web/StandardPastebin.java | 2 +- .../lucko/luckperms/common/web/WebEditor.java | 10 +++--- .../luckperms/nukkit/LPNukkitPlugin.java | 36 +++++++++---------- .../luckperms/nukkit/NukkitSenderFactory.java | 2 +- .../ChildProcessor.java | 6 ++-- .../DefaultsProcessor.java | 6 ++-- .../NukkitCalculatorFactory.java | 18 +++++----- .../NukkitContextManager.java | 8 ++--- .../WorldCalculator.java | 2 +- .../{model => inject}/PermissionDefault.java | 2 +- .../dummy/DummyPermissibleBase.java | 2 +- .../{model => inject}/dummy/DummyPlugin.java | 2 +- .../permissible/LPPermissible.java | 8 ++--- .../permissible/LPPermissionAttachment.java | 4 +-- .../permissible/MonitoredPermissibleBase.java | 4 +-- .../permissible/PermissibleInjector.java | 4 +-- .../PermissibleMonitoringInjector.java | 2 +- .../server/InjectorDefaultsMap.java | 2 +- .../server/InjectorPermissionMap.java | 2 +- .../server/InjectorSubscriptionMap.java | 2 +- .../server/LPDefaultsMap.java | 4 +-- .../server/LPPermissionMap.java | 2 +- .../server/LPSubscriptionMap.java | 2 +- .../listeners/NukkitConnectionListener.java | 4 +-- .../api6/PermissionDescriptionProxy.java | 2 +- .../proxy/api6/PermissionServiceProxy.java | 2 +- .../proxy/api6/SubjectCollectionProxy.java | 2 +- .../service/proxy/api6/SubjectDataProxy.java | 2 +- .../service/proxy/api6/SubjectProxy.java | 6 ++-- .../api7/PermissionDescriptionProxy.java | 2 +- .../proxy/api7/PermissionServiceProxy.java | 2 +- .../proxy/api7/SubjectCollectionProxy.java | 2 +- .../service/proxy/api7/SubjectDataProxy.java | 2 +- .../service/proxy/api7/SubjectProxy.java | 4 +-- .../service/model/LPPermissionService.java | 2 +- .../luckperms/sponge/LPSpongeBootstrap.java | 2 +- .../luckperms/sponge/LPSpongePlugin.java | 22 ++++++------ .../sponge/SpongeSchedulerAdapter.java | 2 +- .../DefaultsProcessor.java | 4 +-- .../FixedDefaultsProcessor.java | 2 +- .../GroupDefaultsProcessor.java | 4 +-- .../SpongeCalculatorFactory.java | 19 +++++----- .../SpongeWildcardProcessor.java | 6 ++-- .../UserDefaultsProcessor.java | 4 +-- .../sponge/commands/OptionClear.java | 2 +- .../luckperms/sponge/commands/OptionInfo.java | 2 +- .../luckperms/sponge/commands/OptionSet.java | 2 +- .../sponge/commands/OptionUnset.java | 2 +- .../luckperms/sponge/commands/ParentAdd.java | 2 +- .../sponge/commands/ParentClear.java | 2 +- .../luckperms/sponge/commands/ParentInfo.java | 2 +- .../sponge/commands/ParentRemove.java | 2 +- .../sponge/commands/PermissionClear.java | 2 +- .../sponge/commands/PermissionInfo.java | 2 +- .../sponge/commands/PermissionSet.java | 2 +- .../sponge/commands/SpongeMainCommand.java | 4 +-- .../SpongeContextManager.java | 8 ++--- .../SpongeProxiedContextCalculator.java | 4 +-- .../WorldCalculator.java | 2 +- .../luckperms/sponge/model/SpongeGroup.java | 2 +- .../luckperms/sponge/model/SpongeUser.java | 2 +- .../manager}/SpongeGroupManager.java | 12 +++---- .../manager}/SpongeUserManager.java | 16 ++++----- .../sponge/service/LuckPermsService.java | 19 +++++----- .../service/{proxy => }/ProxyFactory.java | 2 +- .../LPSubjectDataUpdateEvent.java | 2 +- .../{event => events}/UpdateEventHandler.java | 2 +- .../UpdateEventHandlerImpl.java | 2 +- .../inheritance/SubjectInheritanceGraph.java | 2 +- .../inheritance/SubjectInheritanceGraphs.java | 2 +- .../SimplePermissionDescription.java | 9 ++--- .../calculated/CalculatedSubject.java | 8 ++--- .../CalculatedSubjectCachedData.java} | 26 +++++++------- .../calculated/CalculatedSubjectData.java | 6 ++-- .../calculated/MonitoredSubjectData.java | 2 +- .../permissionholder}/GroupSubject.java | 4 +-- .../PermissionHolderSubject.java} | 22 ++++++------ .../PermissionHolderSubjectData.java} | 10 +++--- .../permissionholder}/UserSubject.java | 4 +-- .../persisted/DefaultsCollection.java | 2 +- .../persisted/PersistedCollection.java | 8 ++--- .../persisted/PersistedSubject.java | 12 +++---- .../persisted/PersistedSubjectData.java | 4 +-- .../persisted/SubjectDataContainer.java | 8 ++--- .../{ => model}/persisted/SubjectStorage.java | 8 ++--- .../luckperms/velocity/LPVelocityPlugin.java | 18 +++++----- .../velocity/VelocitySchedulerAdapter.java | 2 +- .../velocity/VelocitySenderFactory.java | 2 +- .../VelocityCalculatorFactory.java | 16 ++++----- .../BackendServerCalculator.java | 2 +- .../VelocityContextManager.java | 8 ++--- .../service/PlayerPermissionProvider.java | 2 +- 351 files changed, 740 insertions(+), 762 deletions(-) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{calculators => calculator}/BukkitCalculatorFactory.java (82%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{processors => calculator}/ChildProcessor.java (92%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{processors => calculator}/DefaultsProcessor.java (94%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{contexts => context}/BukkitContextManager.java (94%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{contexts => context}/WorldCalculator.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/dummy/DummyPermissibleBase.java (99%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/dummy/DummyPlugin.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/permissible/LPPermissible.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/permissible/LPPermissionAttachment.java (99%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/permissible/MonitoredPermissibleBase.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/permissible/PermissibleInjector.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/permissible/PermissibleMonitoringInjector.java (99%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/server/InjectorDefaultsMap.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/server/InjectorPermissionMap.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/server/InjectorSubscriptionMap.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/server/LPDefaultsMap.java (98%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/server/LPPermissionMap.java (99%) rename bukkit/src/main/java/me/lucko/luckperms/bukkit/{model => inject}/server/LPSubscriptionMap.java (98%) rename bungee/src/main/java/me/lucko/luckperms/bungee/{calculators => calculator}/BungeeCalculatorFactory.java (81%) rename bungee/src/main/java/me/lucko/luckperms/bungee/{contexts => context}/BackendServerCalculator.java (98%) rename bungee/src/main/java/me/lucko/luckperms/bungee/{contexts => context}/BungeeContextManager.java (95%) rename bungee/src/main/java/me/lucko/luckperms/bungee/{contexts => context}/RedisBungeeCalculator.java (97%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/manager => implementation}/ApiAbstractManager.java (96%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/misc => implementation}/ApiActionLogger.java (96%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/misc => implementation}/ApiConfiguration.java (97%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/manager => implementation}/ApiContextManager.java (96%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/model => implementation}/ApiGroup.java (95%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/manager => implementation}/ApiGroupManager.java (92%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/model => implementation}/ApiLog.java (98%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/misc => implementation}/ApiMessagingService.java (94%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/misc => implementation}/ApiMetaStackFactory.java (98%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/misc => implementation}/ApiNodeFactory.java (96%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/model => implementation}/ApiPermissionHolder.java (99%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/misc => implementation}/ApiPlatformInfo.java (97%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/model => implementation}/ApiStorage.java (97%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/model => implementation}/ApiTrack.java (96%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/manager => implementation}/ApiTrackManager.java (94%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/model => implementation}/ApiUser.java (96%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/manager => implementation}/ApiUserManager.java (93%) rename common/src/main/java/me/lucko/luckperms/common/api/{delegates/misc => implementation}/NoopUuidCache.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{buffers => buffer}/BufferedRequest.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{buffers => buffer}/Cache.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{buffers => buffer}/ExpiringCache.java (98%) rename common/src/main/java/me/lucko/luckperms/common/bulkupdate/{comparisons => comparison}/Comparison.java (97%) rename common/src/main/java/me/lucko/luckperms/common/bulkupdate/{comparisons => comparison}/Constraint.java (97%) rename common/src/main/java/me/lucko/luckperms/common/bulkupdate/{comparisons => comparison}/StandardComparison.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/AbstractCachedData.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/CacheMetadata.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/GroupCachedData.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/HolderCachedData.java (94%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/UserCachedData.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/type/MetaAccumulator.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/type/MetaCache.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{caching => cacheddata}/type/PermissionCache.java (94%) rename common/src/main/java/me/lucko/luckperms/common/{calculators => calculator}/CalculatorFactory.java (94%) rename common/src/main/java/me/lucko/luckperms/common/{calculators => calculator}/PermissionCalculator.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{processors => calculator/processor}/AbstractPermissionProcessor.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{processors => calculator/processor}/MapProcessor.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{processors => calculator/processor}/PermissionProcessor.java (94%) rename common/src/main/java/me/lucko/luckperms/common/{processors => calculator/processor}/RegexProcessor.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{processors => calculator/processor}/WildcardProcessor.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/ContextManager.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/ContextSetComparator.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/ContextSetConfigurateSerializer.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/ContextSetJsonSerializer.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/ContextsCache.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/ContextsSupplier.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/LPStaticContextsCalculator.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{contexts => context}/ProxiedContextCalculator.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{assignments => defaultassignments}/AssignmentExpression.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{assignments => defaultassignments}/AssignmentRule.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{api => model}/DemotionResults.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{api => model}/PromotionResults.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/AbstractManager.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/Manager.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/group/AbstractGroupManager.java (95%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/group/GroupManager.java (93%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/group/StandardGroupManager.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/track/AbstractTrackManager.java (92%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/track/StandardTrackManager.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/track/TrackManager.java (92%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/user/AbstractUserManager.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/user/StandardUserManager.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/user/UserHousekeeper.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{managers => model/manager}/user/UserManager.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/DateParser.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/DurationFormatter.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/ExpiringSet.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/ImmutableCollectors.java (99%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/Iterators.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/MoreFiles.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/Paginated.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/PatternCache.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/Predicates.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/ProgressLogger.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/RepeatingTask.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/Scripting.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/StackTracePrinter.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/TextUtils.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/ThrowingRunnable.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/Uuids.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/gson/GsonProvider.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/gson/JArray.java (98%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/gson/JElement.java (96%) rename common/src/main/java/me/lucko/luckperms/common/{utils => util}/gson/JObject.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{processors => calculator}/ChildProcessor.java (92%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{processors => calculator}/DefaultsProcessor.java (92%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{calculators => calculator}/NukkitCalculatorFactory.java (82%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{contexts => context}/NukkitContextManager.java (94%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{contexts => context}/WorldCalculator.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/PermissionDefault.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/dummy/DummyPermissibleBase.java (99%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/dummy/DummyPlugin.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/permissible/LPPermissible.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/permissible/LPPermissionAttachment.java (99%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/permissible/MonitoredPermissibleBase.java (97%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/permissible/PermissibleInjector.java (97%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/permissible/PermissibleMonitoringInjector.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/server/InjectorDefaultsMap.java (99%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/server/InjectorPermissionMap.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/server/InjectorSubscriptionMap.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/server/LPDefaultsMap.java (98%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/server/LPPermissionMap.java (99%) rename nukkit/src/main/java/me/lucko/luckperms/nukkit/{model => inject}/server/LPSubscriptionMap.java (99%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{processors => calculator}/DefaultsProcessor.java (94%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{processors => calculator}/FixedDefaultsProcessor.java (97%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{processors => calculator}/GroupDefaultsProcessor.java (93%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{calculators => calculator}/SpongeCalculatorFactory.java (81%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{processors => calculator}/SpongeWildcardProcessor.java (90%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{processors => calculator}/UserDefaultsProcessor.java (93%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{contexts => context}/SpongeContextManager.java (92%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{contexts => context}/SpongeProxiedContextCalculator.java (95%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{contexts => context}/WorldCalculator.java (98%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{managers => model/manager}/SpongeGroupManager.java (96%) rename sponge/src/main/java/me/lucko/luckperms/sponge/{managers => model/manager}/SpongeUserManager.java (95%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{proxy => }/ProxyFactory.java (98%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{event => events}/LPSubjectDataUpdateEvent.java (98%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{event => events}/UpdateEventHandler.java (97%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{event => events}/UpdateEventHandlerImpl.java (97%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{misc => model}/SimplePermissionDescription.java (90%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/calculated/CalculatedSubject.java (98%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{calculated/SubjectCachedData.java => model/calculated/CalculatedSubjectCachedData.java} (81%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/calculated/CalculatedSubjectData.java (98%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/calculated/MonitoredSubjectData.java (98%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{internal => model/permissionholder}/GroupSubject.java (93%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{internal/HolderSubject.java => model/permissionholder/PermissionHolderSubject.java} (88%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{internal/HolderSubjectData.java => model/permissionholder/PermissionHolderSubjectData.java} (97%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{internal => model/permissionholder}/UserSubject.java (93%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/persisted/DefaultsCollection.java (96%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/persisted/PersistedCollection.java (97%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/persisted/PersistedSubject.java (93%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/persisted/PersistedSubjectData.java (93%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/persisted/SubjectDataContainer.java (97%) rename sponge/src/main/java/me/lucko/luckperms/sponge/service/{ => model}/persisted/SubjectStorage.java (97%) rename velocity/src/main/java/me/lucko/luckperms/velocity/{calculators => calculator}/VelocityCalculatorFactory.java (81%) rename velocity/src/main/java/me/lucko/luckperms/velocity/{contexts => context}/BackendServerCalculator.java (98%) rename velocity/src/main/java/me/lucko/luckperms/velocity/{contexts => context}/VelocityContextManager.java (92%) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java index 5fa375144..a4d1e6a26 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java @@ -32,7 +32,7 @@ import me.lucko.luckperms.bukkit.compat.SpigotJsonMessageHandler; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.SenderFactory; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; import net.kyori.text.serializer.ComponentSerializers; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java index 895cc2542..6cd337031 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -28,36 +28,36 @@ package me.lucko.luckperms.bukkit; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.api.event.user.UserDataRecalculateEvent; -import me.lucko.luckperms.bukkit.calculators.BukkitCalculatorFactory; +import me.lucko.luckperms.bukkit.calculator.BukkitCalculatorFactory; import me.lucko.luckperms.bukkit.compat.LuckPermsBrigadier; -import me.lucko.luckperms.bukkit.contexts.BukkitContextManager; -import me.lucko.luckperms.bukkit.contexts.WorldCalculator; +import me.lucko.luckperms.bukkit.context.BukkitContextManager; +import me.lucko.luckperms.bukkit.context.WorldCalculator; +import me.lucko.luckperms.bukkit.inject.permissible.LPPermissible; +import me.lucko.luckperms.bukkit.inject.permissible.PermissibleInjector; +import me.lucko.luckperms.bukkit.inject.permissible.PermissibleMonitoringInjector; +import me.lucko.luckperms.bukkit.inject.server.InjectorDefaultsMap; +import me.lucko.luckperms.bukkit.inject.server.InjectorPermissionMap; +import me.lucko.luckperms.bukkit.inject.server.InjectorSubscriptionMap; +import me.lucko.luckperms.bukkit.inject.server.LPDefaultsMap; +import me.lucko.luckperms.bukkit.inject.server.LPPermissionMap; +import me.lucko.luckperms.bukkit.inject.server.LPSubscriptionMap; import me.lucko.luckperms.bukkit.listeners.BukkitConnectionListener; import me.lucko.luckperms.bukkit.listeners.BukkitPlatformListener; import me.lucko.luckperms.bukkit.messaging.BukkitMessagingFactory; -import me.lucko.luckperms.bukkit.model.permissible.LPPermissible; -import me.lucko.luckperms.bukkit.model.permissible.PermissibleInjector; -import me.lucko.luckperms.bukkit.model.permissible.PermissibleMonitoringInjector; -import me.lucko.luckperms.bukkit.model.server.InjectorDefaultsMap; -import me.lucko.luckperms.bukkit.model.server.InjectorPermissionMap; -import me.lucko.luckperms.bukkit.model.server.InjectorSubscriptionMap; -import me.lucko.luckperms.bukkit.model.server.LPDefaultsMap; -import me.lucko.luckperms.bukkit.model.server.LPPermissionMap; -import me.lucko.luckperms.bukkit.model.server.LPSubscriptionMap; import me.lucko.luckperms.bukkit.vault.VaultHookManager; import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.api.delegates.model.ApiUser; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.api.implementation.ApiUser; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.dependencies.Dependency; import me.lucko.luckperms.common.event.AbstractEventBus; -import me.lucko.luckperms.common.managers.group.StandardGroupManager; -import me.lucko.luckperms.common.managers.track.StandardTrackManager; -import me.lucko.luckperms.common.managers.user.StandardUserManager; import me.lucko.luckperms.common.messaging.MessagingFactory; import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.group.StandardGroupManager; +import me.lucko.luckperms.common.model.manager.track.StandardTrackManager; +import me.lucko.luckperms.common.model.manager.user.StandardUserManager; import me.lucko.luckperms.common.plugin.AbstractLuckPermsPlugin; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.common.sender.Sender; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/BukkitCalculatorFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java similarity index 82% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/BukkitCalculatorFactory.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java index 670457d44..77220895c 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/BukkitCalculatorFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java @@ -23,24 +23,22 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.calculators; +package me.lucko.luckperms.bukkit.calculator; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LookupSetting; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.bukkit.processors.ChildProcessor; -import me.lucko.luckperms.bukkit.processors.DefaultsProcessor; -import me.lucko.luckperms.common.caching.CacheMetadata; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; +import me.lucko.luckperms.common.calculator.processor.MapProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.RegexProcessor; +import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.HolderType; -import me.lucko.luckperms.common.processors.MapProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; -import me.lucko.luckperms.common.processors.RegexProcessor; -import me.lucko.luckperms.common.processors.WildcardProcessor; public class BukkitCalculatorFactory implements CalculatorFactory { private final LPBukkitPlugin plugin; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/processors/ChildProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java similarity index 92% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/processors/ChildProcessor.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java index 147e33126..3b34141d5 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/processors/ChildProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.processors; +package me.lucko.luckperms.bukkit.calculator; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.common.processors.AbstractPermissionProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import java.util.Collections; import java.util.Map; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/processors/DefaultsProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java similarity index 94% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/processors/DefaultsProcessor.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java index 49fee5d1a..96e5dffa3 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/processors/DefaultsProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.processors; +package me.lucko.luckperms.bukkit.calculator; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.common.processors.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import org.bukkit.permissions.Permission; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/contexts/BukkitContextManager.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java similarity index 94% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/contexts/BukkitContextManager.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java index cfe39bd00..459579e31 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/contexts/BukkitContextManager.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.contexts; +package me.lucko.luckperms.bukkit.context; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -33,9 +33,9 @@ import me.lucko.luckperms.api.LookupSetting; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.contexts.ContextsCache; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.context.ContextsCache; +import me.lucko.luckperms.common.context.ContextsSupplier; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/contexts/WorldCalculator.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/WorldCalculator.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/contexts/WorldCalculator.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/context/WorldCalculator.java index e03f7809c..0ec54ceeb 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/contexts/WorldCalculator.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/WorldCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.contexts; +package me.lucko.luckperms.bukkit.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/dummy/DummyPermissibleBase.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/dummy/DummyPermissibleBase.java similarity index 99% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/dummy/DummyPermissibleBase.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/dummy/DummyPermissibleBase.java index c3e4a7e92..d37be2dbe 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/dummy/DummyPermissibleBase.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/dummy/DummyPermissibleBase.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.dummy; +package me.lucko.luckperms.bukkit.inject.dummy; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/dummy/DummyPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/dummy/DummyPlugin.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/dummy/DummyPlugin.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/dummy/DummyPlugin.java index 92f49456c..280f43f23 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/dummy/DummyPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/dummy/DummyPlugin.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.dummy; +package me.lucko.luckperms.bukkit.inject.dummy; import org.bukkit.Server; import org.bukkit.command.Command; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissible.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissible.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java index be76ec6b2..ee77f5aa4 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissible.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java @@ -23,16 +23,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.permissible; +package me.lucko.luckperms.bukkit.inject.permissible; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.common.model.User; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissionAttachment.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissionAttachment.java similarity index 99% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissionAttachment.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissionAttachment.java index 4beabacf4..3c3fc8810 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissionAttachment.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissionAttachment.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.permissible; +package me.lucko.luckperms.bukkit.inject.permissible; import com.google.common.base.Preconditions; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.bukkit.model.dummy.DummyPlugin; +import me.lucko.luckperms.bukkit.inject.dummy.DummyPlugin; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/MonitoredPermissibleBase.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/MonitoredPermissibleBase.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java index 5685b9e43..e86d67aaa 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/MonitoredPermissibleBase.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.permissible; +package me.lucko.luckperms.bukkit.inject.permissible; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.bukkit.model.dummy.DummyPermissibleBase; +import me.lucko.luckperms.bukkit.inject.dummy.DummyPermissibleBase; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/PermissibleInjector.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/PermissibleInjector.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java index cc1157f60..7687d5f8b 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/PermissibleInjector.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.permissible; +package me.lucko.luckperms.bukkit.inject.permissible; import me.lucko.luckperms.bukkit.compat.CraftBukkitUtil; -import me.lucko.luckperms.bukkit.model.dummy.DummyPermissibleBase; +import me.lucko.luckperms.bukkit.inject.dummy.DummyPermissibleBase; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissibleBase; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/PermissibleMonitoringInjector.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleMonitoringInjector.java similarity index 99% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/PermissibleMonitoringInjector.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleMonitoringInjector.java index d2b97fb81..21a27d6f7 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/PermissibleMonitoringInjector.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleMonitoringInjector.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.permissible; +package me.lucko.luckperms.bukkit.inject.permissible; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.bukkit.compat.CraftBukkitUtil; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorDefaultsMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorDefaultsMap.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorDefaultsMap.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorDefaultsMap.java index 256e7cb08..e74d0173e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorDefaultsMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorDefaultsMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.server; +package me.lucko.luckperms.bukkit.inject.server; import me.lucko.luckperms.bukkit.LPBukkitPlugin; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorPermissionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorPermissionMap.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorPermissionMap.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorPermissionMap.java index 6d4092d89..cac3cd0fd 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorPermissionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorPermissionMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.server; +package me.lucko.luckperms.bukkit.inject.server; import me.lucko.luckperms.bukkit.LPBukkitPlugin; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorSubscriptionMap.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorSubscriptionMap.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorSubscriptionMap.java index de97c0e05..4e6a23e04 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/InjectorSubscriptionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorSubscriptionMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.server; +package me.lucko.luckperms.bukkit.inject.server; import me.lucko.luckperms.bukkit.LPBukkitPlugin; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPDefaultsMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPDefaultsMap.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java index e89b2def4..a5964e4cd 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPDefaultsMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.server; +package me.lucko.luckperms.bukkit.inject.server; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableList; @@ -33,7 +33,7 @@ import com.google.common.collect.Maps; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.common.buffers.Cache; +import me.lucko.luckperms.common.buffer.Cache; import org.bukkit.permissions.Permission; import org.bukkit.plugin.PluginManager; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPPermissionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPPermissionMap.java similarity index 99% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPPermissionMap.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPPermissionMap.java index d3f4bd7c9..ee89a7ee7 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPPermissionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPPermissionMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.server; +package me.lucko.luckperms.bukkit.inject.server; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPSubscriptionMap.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPSubscriptionMap.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPSubscriptionMap.java index ecd9308ac..a266f6f34 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPSubscriptionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPSubscriptionMap.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.bukkit.model.server; +package me.lucko.luckperms.bukkit.inject.server; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java index 27113aef5..dd1eb3aa1 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java @@ -26,8 +26,8 @@ package me.lucko.luckperms.bukkit.listeners; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.bukkit.model.permissible.LPPermissible; -import me.lucko.luckperms.bukkit.model.permissible.PermissibleInjector; +import me.lucko.luckperms.bukkit.inject.permissible.LPPermissible; +import me.lucko.luckperms.bukkit.inject.permissible.PermissibleInjector; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.User; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/BukkitUuids.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/BukkitUuids.java index c94a7da03..f39f327d9 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/BukkitUuids.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/BukkitUuids.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.bukkit.migration; -import me.lucko.luckperms.common.utils.ProgressLogger; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.ProgressLogger; +import me.lucko.luckperms.common.util.Uuids; import org.bukkit.Bukkit; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java index 5a7be19dc..82ff592b3 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java @@ -45,9 +45,9 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.ProgressLogger; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.ProgressLogger; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java index 340fd2df6..94a469902 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java @@ -41,10 +41,10 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.ProgressLogger; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.ProgressLogger; +import me.lucko.luckperms.common.util.Uuids; import org.anjocaido.groupmanager.GlobalGroups; import org.anjocaido.groupmanager.GroupManager; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java index 74825ac60..b04298d98 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsBukkit.java @@ -40,9 +40,9 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.ProgressLogger; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.ProgressLogger; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java index 47d303e14..2fd5c8f80 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java @@ -42,9 +42,9 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.ProgressLogger; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.ProgressLogger; import org.bukkit.Bukkit; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java index 32ad60f0a..76ffb588b 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java @@ -47,9 +47,9 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.StorageType; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.ProgressLogger; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.ProgressLogger; import org.bukkit.Bukkit; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java index 63e4d5c69..07ef6f822 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java @@ -42,9 +42,9 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.ProgressLogger; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.ProgressLogger; import org.bukkit.Bukkit; import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java index 7abca9780..55a9096ed 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java @@ -32,8 +32,8 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; -import me.lucko.luckperms.common.caching.type.MetaCache; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; +import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.Group; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java index 71e740521..8389fb6b0 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java @@ -33,14 +33,14 @@ import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.bukkit.LPBukkitPlugin; -import me.lucko.luckperms.common.caching.type.PermissionCache; +import me.lucko.luckperms.common.cacheddata.type.PermissionCache; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java index bc792d6a5..348b796b4 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; -import me.lucko.luckperms.common.utils.Iterators; +import me.lucko.luckperms.common.util.Iterators; import net.md_5.bungee.api.scheduler.ScheduledTask; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java index 6fcde8c71..27226fb5e 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java @@ -30,7 +30,7 @@ import me.lucko.luckperms.bungee.event.TristateCheckEvent; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.SenderFactory; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; import net.kyori.text.serializer.ComponentSerializers; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java index 0f21454e4..b9c7634d7 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -27,25 +27,25 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LuckPermsApi; -import me.lucko.luckperms.bungee.calculators.BungeeCalculatorFactory; -import me.lucko.luckperms.bungee.contexts.BackendServerCalculator; -import me.lucko.luckperms.bungee.contexts.BungeeContextManager; -import me.lucko.luckperms.bungee.contexts.RedisBungeeCalculator; +import me.lucko.luckperms.bungee.calculator.BungeeCalculatorFactory; +import me.lucko.luckperms.bungee.context.BackendServerCalculator; +import me.lucko.luckperms.bungee.context.BungeeContextManager; +import me.lucko.luckperms.bungee.context.RedisBungeeCalculator; import me.lucko.luckperms.bungee.listeners.BungeeConnectionListener; import me.lucko.luckperms.bungee.listeners.BungeePermissionCheckListener; import me.lucko.luckperms.bungee.messaging.BungeeMessagingFactory; import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter; -import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.dependencies.Dependency; import me.lucko.luckperms.common.event.AbstractEventBus; -import me.lucko.luckperms.common.managers.group.StandardGroupManager; -import me.lucko.luckperms.common.managers.track.StandardTrackManager; -import me.lucko.luckperms.common.managers.user.StandardUserManager; import me.lucko.luckperms.common.messaging.MessagingFactory; import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.group.StandardGroupManager; +import me.lucko.luckperms.common.model.manager.track.StandardTrackManager; +import me.lucko.luckperms.common.model.manager.user.StandardUserManager; import me.lucko.luckperms.common.plugin.AbstractLuckPermsPlugin; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.common.sender.Sender; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/calculators/BungeeCalculatorFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java similarity index 81% rename from bungee/src/main/java/me/lucko/luckperms/bungee/calculators/BungeeCalculatorFactory.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java index bfd2923ca..f75ff5f02 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/calculators/BungeeCalculatorFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java @@ -23,20 +23,20 @@ * SOFTWARE. */ -package me.lucko.luckperms.bungee.calculators; +package me.lucko.luckperms.bungee.calculator; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.bungee.LPBungeePlugin; -import me.lucko.luckperms.common.caching.CacheMetadata; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; +import me.lucko.luckperms.common.calculator.processor.MapProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.RegexProcessor; +import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.processors.MapProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; -import me.lucko.luckperms.common.processors.RegexProcessor; -import me.lucko.luckperms.common.processors.WildcardProcessor; public class BungeeCalculatorFactory implements CalculatorFactory { private final LPBungeePlugin plugin; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BackendServerCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BackendServerCalculator.java similarity index 98% rename from bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BackendServerCalculator.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/context/BackendServerCalculator.java index 11a24d24e..712ce5d10 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BackendServerCalculator.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BackendServerCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bungee.contexts; +package me.lucko.luckperms.bungee.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeeContextManager.java similarity index 95% rename from bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeeContextManager.java index 2aa5ebfaf..c7a10e90d 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeeContextManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bungee.contexts; +package me.lucko.luckperms.bungee.context; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -31,8 +31,8 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.bungee.LPBungeePlugin; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.context.ContextsSupplier; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/RedisBungeeCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java similarity index 97% rename from bungee/src/main/java/me/lucko/luckperms/bungee/contexts/RedisBungeeCalculator.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java index 04772eacb..013018c23 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/RedisBungeeCalculator.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.bungee.contexts; +package me.lucko.luckperms.bungee.context; import com.imaginarycode.minecraft.redisbungee.RedisBungee; import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java b/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java index 8913b27db..88c831390 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java @@ -36,9 +36,9 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.ProgressLogger; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.ProgressLogger; import net.alpenblock.bungeeperms.BungeePerms; import net.alpenblock.bungeeperms.Group; diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java index dc1c18c0b..e5f9e6fbb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.actionlog; import com.google.common.collect.ImmutableSortedSet; import me.lucko.luckperms.api.LogEntry; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import java.util.Comparator; import java.util.SortedSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java b/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java index 91fab3ecb..7ede9ced0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java @@ -40,16 +40,16 @@ import me.lucko.luckperms.api.manager.UserManager; import me.lucko.luckperms.api.messenger.MessengerProvider; import me.lucko.luckperms.api.metastacking.MetaStackFactory; import me.lucko.luckperms.api.platform.PlatformInfo; -import me.lucko.luckperms.common.api.delegates.manager.ApiContextManager; -import me.lucko.luckperms.common.api.delegates.manager.ApiGroupManager; -import me.lucko.luckperms.common.api.delegates.manager.ApiTrackManager; -import me.lucko.luckperms.common.api.delegates.manager.ApiUserManager; -import me.lucko.luckperms.common.api.delegates.misc.ApiActionLogger; -import me.lucko.luckperms.common.api.delegates.misc.ApiMessagingService; -import me.lucko.luckperms.common.api.delegates.misc.ApiMetaStackFactory; -import me.lucko.luckperms.common.api.delegates.misc.ApiNodeFactory; -import me.lucko.luckperms.common.api.delegates.misc.ApiPlatformInfo; -import me.lucko.luckperms.common.api.delegates.misc.NoopUuidCache; +import me.lucko.luckperms.common.api.implementation.ApiActionLogger; +import me.lucko.luckperms.common.api.implementation.ApiContextManager; +import me.lucko.luckperms.common.api.implementation.ApiGroupManager; +import me.lucko.luckperms.common.api.implementation.ApiMessagingService; +import me.lucko.luckperms.common.api.implementation.ApiMetaStackFactory; +import me.lucko.luckperms.common.api.implementation.ApiNodeFactory; +import me.lucko.luckperms.common.api.implementation.ApiPlatformInfo; +import me.lucko.luckperms.common.api.implementation.ApiTrackManager; +import me.lucko.luckperms.common.api.implementation.ApiUserManager; +import me.lucko.luckperms.common.api.implementation.NoopUuidCache; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiAbstractManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiAbstractManager.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiAbstractManager.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiAbstractManager.java index 09fa9b339..351fbe02f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiAbstractManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiAbstractManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.manager; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiActionLogger.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiActionLogger.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java index b69ea22ab..cf09d0374 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiActionLogger.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java @@ -23,13 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.misc; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.ActionLogger; import me.lucko.luckperms.api.Log; import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.common.actionlog.ExtendedLogEntry; -import me.lucko.luckperms.common.api.delegates.model.ApiLog; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiConfiguration.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiConfiguration.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiConfiguration.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiConfiguration.java index 3f7bd4c22..761c2b03b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiConfiguration.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiConfiguration.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.misc; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.LPConfiguration; import me.lucko.luckperms.api.LookupSetting; import me.lucko.luckperms.common.config.ConfigKey; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.config.LuckPermsConfiguration; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiContextManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiContextManager.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java index b5267f4f4..27b12f3dd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiContextManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java @@ -23,15 +23,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.manager; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.User; import me.lucko.luckperms.api.context.ContextCalculator; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.api.context.StaticContextCalculator; -import me.lucko.luckperms.common.api.delegates.model.ApiUser; -import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiGroup.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiGroup.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java index bc79596ee..387363ed7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.model; +package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; @@ -37,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Objects; import java.util.OptionalInt; -public final class ApiGroup extends ApiPermissionHolder implements me.lucko.luckperms.api.Group { +public class ApiGroup extends ApiPermissionHolder implements me.lucko.luckperms.api.Group { public static Group cast(me.lucko.luckperms.api.Group group) { Objects.requireNonNull(group, "group"); Preconditions.checkState(group instanceof ApiGroup, "Illegal instance " + group.getClass() + " cannot be handled by this implementation."); diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiGroupManager.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java index eb4562563..260162934 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiGroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java @@ -23,20 +23,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.manager; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.api.event.cause.DeletionCause; import me.lucko.luckperms.common.api.ApiUtils; -import me.lucko.luckperms.common.api.delegates.model.ApiGroup; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; -import me.lucko.luckperms.common.managers.group.GroupManager; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.model.Group; +import me.lucko.luckperms.common.model.manager.group.GroupManager; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiLog.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiLog.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiLog.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiLog.java index 4e7feb6d2..c5fc522a2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiLog.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiLog.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.model; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.common.actionlog.Log; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMessagingService.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java index 0246482a6..f3bf71f0e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMessagingService.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java @@ -23,11 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.misc; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.MessagingService; import me.lucko.luckperms.api.User; -import me.lucko.luckperms.common.api.delegates.model.ApiUser; import me.lucko.luckperms.common.messaging.InternalMessagingService; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMetaStackFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMetaStackFactory.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java index a673c35a7..01acf67dc 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMetaStackFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.misc; +package me.lucko.luckperms.common.api.implementation; import com.google.common.collect.ImmutableList; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiNodeFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeFactory.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiNodeFactory.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeFactory.java index a48ae79c6..fb53e5812 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiNodeFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeFactory.java @@ -23,12 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.misc; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.ChatMetaType; import me.lucko.luckperms.api.Group; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.common.api.delegates.model.ApiGroup; import me.lucko.luckperms.common.node.factory.NodeFactory; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiPermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiPermissionHolder.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java index 0c03e55e0..822f65cd1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiPermissionHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.model; +package me.lucko.luckperms.common.api.implementation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -51,7 +51,7 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.utils.MetaType; import me.lucko.luckperms.common.node.utils.NodeTools; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiPlatformInfo.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatformInfo.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiPlatformInfo.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatformInfo.java index eed31a10d..8db4648ab 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiPlatformInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatformInfo.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.misc; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.platform.PlatformInfo; import me.lucko.luckperms.api.platform.PlatformType; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiStorage.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiStorage.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiStorage.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiStorage.java index 6b31fb98b..3eeafa3fb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiStorage.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.model; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.Group; import me.lucko.luckperms.api.HeldPermission; @@ -33,8 +33,8 @@ import me.lucko.luckperms.api.Track; import me.lucko.luckperms.api.User; import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.api.event.cause.DeletionCause; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.Storage; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiTrack.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiTrack.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java index cbc99f14a..67f526895 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.model; +package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; @@ -34,14 +34,14 @@ import me.lucko.luckperms.api.PromotionResult; import me.lucko.luckperms.api.User; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.common.model.Track; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; import java.util.Objects; -public final class ApiTrack implements me.lucko.luckperms.api.Track { +public class ApiTrack implements me.lucko.luckperms.api.Track { public static Track cast(me.lucko.luckperms.api.Track track) { Objects.requireNonNull(track, "track"); Preconditions.checkState(track instanceof ApiTrack, "Illegal instance " + track.getClass() + " cannot be handled by this implementation."); diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiTrackManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiTrackManager.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java index 9b67e6e18..435cd12d8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiTrackManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java @@ -23,16 +23,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.manager; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.api.event.cause.DeletionCause; import me.lucko.luckperms.common.api.ApiUtils; -import me.lucko.luckperms.common.api.delegates.model.ApiTrack; -import me.lucko.luckperms.common.managers.track.TrackManager; import me.lucko.luckperms.common.model.Track; +import me.lucko.luckperms.common.model.manager.track.TrackManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiUser.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiUser.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java index 32585861e..24633bf74 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiUser.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.model; +package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; @@ -39,7 +39,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; import java.util.UUID; -public final class ApiUser extends ApiPermissionHolder implements me.lucko.luckperms.api.User { +public class ApiUser extends ApiPermissionHolder implements me.lucko.luckperms.api.User { public static User cast(me.lucko.luckperms.api.User u) { Preconditions.checkState(u instanceof ApiUser, "Illegal instance " + u.getClass() + " cannot be handled by this implementation."); return ((ApiUser) u).getHandle(); diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiUserManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java similarity index 93% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiUserManager.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java index 61ad45e2a..b5c59be6a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiUserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java @@ -23,19 +23,18 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.manager; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.api.PlayerSaveResult; import me.lucko.luckperms.common.api.ApiUtils; -import me.lucko.luckperms.common.api.delegates.model.ApiUser; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; -import me.lucko.luckperms.common.managers.user.UserManager; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; +import me.lucko.luckperms.common.model.manager.user.UserManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/NoopUuidCache.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/NoopUuidCache.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/NoopUuidCache.java rename to common/src/main/java/me/lucko/luckperms/common/api/implementation/NoopUuidCache.java index 35ca7c4ee..012c8735e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/NoopUuidCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/NoopUuidCache.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api.delegates.misc; +package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.api.UuidCache; diff --git a/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java b/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java index 5e19f501f..530381c8e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java +++ b/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.Storage; -import me.lucko.luckperms.common.utils.ProgressLogger; +import me.lucko.luckperms.common.util.ProgressLogger; import java.io.BufferedWriter; import java.io.IOException; diff --git a/common/src/main/java/me/lucko/luckperms/common/buffers/BufferedRequest.java b/common/src/main/java/me/lucko/luckperms/common/buffer/BufferedRequest.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/buffers/BufferedRequest.java rename to common/src/main/java/me/lucko/luckperms/common/buffer/BufferedRequest.java index 1b14fa9ba..ffc839c86 100644 --- a/common/src/main/java/me/lucko/luckperms/common/buffers/BufferedRequest.java +++ b/common/src/main/java/me/lucko/luckperms/common/buffer/BufferedRequest.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.buffers; +package me.lucko.luckperms.common.buffer; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; diff --git a/common/src/main/java/me/lucko/luckperms/common/buffers/Cache.java b/common/src/main/java/me/lucko/luckperms/common/buffer/Cache.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/buffers/Cache.java rename to common/src/main/java/me/lucko/luckperms/common/buffer/Cache.java index 2121802ae..ebf27db18 100644 --- a/common/src/main/java/me/lucko/luckperms/common/buffers/Cache.java +++ b/common/src/main/java/me/lucko/luckperms/common/buffer/Cache.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.buffers; +package me.lucko.luckperms.common.buffer; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/buffers/ExpiringCache.java b/common/src/main/java/me/lucko/luckperms/common/buffer/ExpiringCache.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/buffers/ExpiringCache.java rename to common/src/main/java/me/lucko/luckperms/common/buffer/ExpiringCache.java index b5f296f9b..4e2dfb8e2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/buffers/ExpiringCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/buffer/ExpiringCache.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.buffers; +package me.lucko.luckperms.common.buffer; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Comparison.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Comparison.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Comparison.java rename to common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Comparison.java index 23bf7f735..c05fed3d1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Comparison.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Comparison.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.bulkupdate.comparisons; +package me.lucko.luckperms.common.bulkupdate.comparison; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Constraint.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Constraint.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Constraint.java rename to common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Constraint.java index 0ae3f265c..b913a270b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Constraint.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Constraint.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.bulkupdate.comparisons; +package me.lucko.luckperms.common.bulkupdate.comparison; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/StandardComparison.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/StandardComparison.java rename to common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java index 75883341b..6aa19a302 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/StandardComparison.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.bulkupdate.comparisons; +package me.lucko.luckperms.common.bulkupdate.comparison; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java index bdbf32d63..540cd2009 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java @@ -26,7 +26,7 @@ package me.lucko.luckperms.common.bulkupdate.query; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.node.model.NodeDataContainer; /** diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/AbstractCachedData.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedData.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/caching/AbstractCachedData.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedData.java index ce614088d..f4cc1cc7e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/AbstractCachedData.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedData.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching; +package me.lucko.luckperms.common.cacheddata; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; import com.github.benmanes.caffeine.cache.CacheLoader; @@ -34,11 +34,11 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.FullySatisfiedContexts; import me.lucko.luckperms.api.caching.CachedData; import me.lucko.luckperms.api.caching.MetaContexts; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; -import me.lucko.luckperms.common.caching.type.MetaCache; -import me.lucko.luckperms.common.caching.type.PermissionCache; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; +import me.lucko.luckperms.common.cacheddata.type.MetaCache; +import me.lucko.luckperms.common.cacheddata.type.PermissionCache; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.metastacking.SimpleMetaStack; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/CacheMetadata.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/caching/CacheMetadata.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java index 9c0e92a22..827608b7c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/CacheMetadata.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching; +package me.lucko.luckperms.common.cacheddata; import me.lucko.luckperms.api.caching.CachedDataContainer; import me.lucko.luckperms.api.context.ContextSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/GroupCachedData.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedData.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/caching/GroupCachedData.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedData.java index a0ab48eeb..006bcab73 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/GroupCachedData.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedData.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching; +package me.lucko.luckperms.common.cacheddata; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.caching.GroupData; diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/HolderCachedData.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedData.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/common/caching/HolderCachedData.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedData.java index 33519a338..5775a8b76 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/HolderCachedData.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedData.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching; +package me.lucko.luckperms.common.cacheddata; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.caching.MetaContexts; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.PermissionHolder; diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/UserCachedData.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedData.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/caching/UserCachedData.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedData.java index b591a9f25..5545125d5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/UserCachedData.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedData.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching; +package me.lucko.luckperms.common.cacheddata; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.caching.UserData; diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/type/MetaAccumulator.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaAccumulator.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/caching/type/MetaAccumulator.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaAccumulator.java index 2a7db2387..027bc2b55 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/type/MetaAccumulator.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaAccumulator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching.type; +package me.lucko.luckperms.common.cacheddata.type; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/type/MetaCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/caching/type/MetaCache.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java index 0a7f4471f..76cae529d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/type/MetaCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching.type; +package me.lucko.luckperms.common.cacheddata.type; import com.google.common.collect.ForwardingListMultimap; import com.google.common.collect.ForwardingMap; @@ -36,7 +36,7 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.caching.MetaContexts; import me.lucko.luckperms.api.caching.MetaData; import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.common.caching.CacheMetadata; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.metastacking.MetaStack; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.verbose.VerboseHandler; diff --git a/common/src/main/java/me/lucko/luckperms/common/caching/type/PermissionCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/common/caching/type/PermissionCache.java rename to common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java index a4ca46d2c..650a17a48 100644 --- a/common/src/main/java/me/lucko/luckperms/common/caching/type/PermissionCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.caching.type; +package me.lucko.luckperms.common.cacheddata.type; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.caching.PermissionData; -import me.lucko.luckperms.common.caching.CacheMetadata; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java b/common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java rename to common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java index 7e0904ff8..a7f876cae 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.calculators; +package me.lucko.luckperms.common.calculator; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.common.caching.CacheMetadata; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; /** * Creates a calculator instance given a set of contexts diff --git a/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java rename to common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java index c7790d433..9732120b2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.calculators; +package me.lucko.luckperms.common.calculator; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; @@ -31,9 +31,9 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.common.caching.CacheMetadata; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.processors.PermissionProcessor; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/processors/AbstractPermissionProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractPermissionProcessor.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/processors/AbstractPermissionProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractPermissionProcessor.java index c97d64828..9a3132590 100644 --- a/common/src/main/java/me/lucko/luckperms/common/processors/AbstractPermissionProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractPermissionProcessor.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.processors; +package me.lucko.luckperms.common.calculator.processor; import java.util.Collections; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/processors/MapProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/processors/MapProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java index 5b3467865..a4a281c4d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/processors/MapProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.processors; +package me.lucko.luckperms.common.calculator.processor; import me.lucko.luckperms.api.Tristate; diff --git a/common/src/main/java/me/lucko/luckperms/common/processors/PermissionProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/common/processors/PermissionProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java index 7f4a843a3..ee1845487 100644 --- a/common/src/main/java/me/lucko/luckperms/common/processors/PermissionProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.processors; +package me.lucko.luckperms.common.calculator.processor; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.calculator.PermissionCalculator; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/processors/RegexProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/processors/RegexProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java index 4c305bc25..4fd12b1f6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/processors/RegexProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.processors; +package me.lucko.luckperms.common.calculator.processor; import com.google.common.collect.ImmutableMap; diff --git a/common/src/main/java/me/lucko/luckperms/common/processors/WildcardProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/processors/WildcardProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java index 60dceaf89..3e3d888f6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/processors/WildcardProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.processors; +package me.lucko.luckperms.common.calculator.processor; import com.google.common.collect.ImmutableMap; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java b/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java index e19f4609d..d306e26f2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java @@ -63,7 +63,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/MainCommand.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/MainCommand.java index 8ea3694e3..c68e3b213 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/MainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/MainCommand.java @@ -31,7 +31,7 @@ import me.lucko.luckperms.common.locale.command.LocalizedCommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SharedMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SharedMainCommand.java index 0ca20c451..d985a1ecd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SharedMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SharedMainCommand.java @@ -32,7 +32,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java b/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java index bf3deb3e9..41d97ec02 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.command.access; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.common.caching.type.PermissionCache; +import me.lucko.luckperms.common.cacheddata.type.PermissionCache; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentParser.java b/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentParser.java index 84ee82b1d..31e14e588 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentParser.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentParser.java @@ -34,7 +34,7 @@ import me.lucko.luckperms.common.commands.user.UserMainCommand; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.DateParser; +import me.lucko.luckperms.common.util.DateParser; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddChatMeta.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddChatMeta.java index 81ac28149..97329456f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddChatMeta.java @@ -44,8 +44,8 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddTempChatMeta.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddTempChatMeta.java index fcc684916..95c89d26b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddTempChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddTempChatMeta.java @@ -46,9 +46,9 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaClear.java index 42ab77fcc..86fba13b0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaClear.java @@ -43,7 +43,7 @@ import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.node.utils.MetaType; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaInfo.java index cca5a68ca..cef3dec63 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaInfo.java @@ -43,8 +43,8 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.BuildableComponent; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveChatMeta.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveChatMeta.java index 1f26ea1a3..2a9ee0531 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveChatMeta.java @@ -44,8 +44,8 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveTempChatMeta.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveTempChatMeta.java index af84db242..861243b86 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveTempChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveTempChatMeta.java @@ -44,8 +44,8 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSet.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSet.java index ff62ef11c..e8135ed95 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSet.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSet.java @@ -45,8 +45,8 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetChatMeta.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetChatMeta.java index e8881e815..102276c66 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetChatMeta.java @@ -30,7 +30,7 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.DataMutateResult; import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.common.actionlog.ExtendedLogEntry; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; @@ -47,8 +47,8 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTemp.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTemp.java index 1f803f695..e1bf8902e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTemp.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTemp.java @@ -47,9 +47,9 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTempChatMeta.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTempChatMeta.java index d6609e0f1..0dc809c89 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTempChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTempChatMeta.java @@ -31,7 +31,7 @@ import me.lucko.luckperms.api.TemporaryDataMutateResult; import me.lucko.luckperms.api.TemporaryMergeBehaviour; import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.common.actionlog.ExtendedLogEntry; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; @@ -49,9 +49,9 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnset.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnset.java index 10b093c77..354f6a058 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnset.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnset.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnsetTemp.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnsetTemp.java index 97e776906..9e6ab6fde 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnsetTemp.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnsetTemp.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderClear.java index 1ae7c5cf6..69309274a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderClear.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderEditor.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderEditor.java index 8795fdcff..40118b31e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderEditor.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderEditor.java @@ -39,7 +39,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.web.StandardPastebin; import me.lucko.luckperms.common.web.WebEditor; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderShowTracks.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderShowTracks.java index fb60b7357..8765a6770 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderShowTracks.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderShowTracks.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAdd.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAdd.java index 8ee62633f..ad5f49355 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAdd.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAdd.java @@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAddTemp.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAddTemp.java index d9358de20..2e10409f8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAddTemp.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAddTemp.java @@ -48,8 +48,8 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClear.java index ae09b6018..cdfe2fff3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClear.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClearTrack.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClearTrack.java index 83d2b74dc..94eb25e77 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClearTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClearTrack.java @@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentInfo.java index d5f43513e..47f0df745 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentInfo.java @@ -44,10 +44,10 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.BuildableComponent; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemove.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemove.java index 05c731975..3046df75e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemove.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemove.java @@ -47,7 +47,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemoveTemp.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemoveTemp.java index 2f16c0e98..d63940215 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemoveTemp.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemoveTemp.java @@ -45,7 +45,7 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSet.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSet.java index ad55192dd..9366a1941 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSet.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSet.java @@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSetTrack.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSetTrack.java index 7d3105bc4..35f5a1df2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSetTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSetTrack.java @@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/UserSwitchPrimaryGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/UserSwitchPrimaryGroup.java index aeb2d9a2c..8a8e98b99 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/UserSwitchPrimaryGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/UserSwitchPrimaryGroup.java @@ -47,7 +47,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheck.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheck.java index 60eaf29d3..0f5e022df 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheck.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheck.java @@ -45,7 +45,7 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java index 0fec24c33..ffedefad9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java @@ -44,7 +44,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.utils.InheritanceInfo; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionClear.java index 40244e20c..e1f6311c9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionClear.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java index b18234e64..b5efbaedf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java @@ -44,10 +44,10 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.BuildableComponent; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSet.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSet.java index 2523f66ee..576f6cc0b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSet.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSet.java @@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSetTemp.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSetTemp.java index 8d3201673..9efce9773 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSetTemp.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSetTemp.java @@ -49,8 +49,8 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnset.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnset.java index 04d8c8882..60fb1d580 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnset.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnset.java @@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnsetTemp.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnsetTemp.java index 820140812..47e94fa74 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnsetTemp.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnsetTemp.java @@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java index c0d00a76f..508d9d234 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java @@ -37,7 +37,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java index 59ebce7f7..bc9a57d8f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java @@ -40,7 +40,7 @@ import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupClone.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupClone.java index 74fbb83bc..854157e04 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupClone.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupClone.java @@ -40,7 +40,7 @@ import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java index cb6b4ce38..7972f03fb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java @@ -37,8 +37,8 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Set; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java index 8d4b76160..ce732bea2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java @@ -31,8 +31,8 @@ import com.google.common.collect.Maps; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -50,10 +50,10 @@ import me.lucko.luckperms.common.node.comparator.HeldPermissionComparator; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.BuildableComponent; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupRename.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupRename.java index b8e5e8b9c..98bdeb061 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupRename.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupRename.java @@ -40,7 +40,7 @@ import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetDisplayName.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetDisplayName.java index 29af6e180..bd66461f2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetDisplayName.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetDisplayName.java @@ -43,7 +43,7 @@ import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetWeight.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetWeight.java index eef0cb988..6ef9e01e2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetWeight.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetWeight.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java index 88e45c5ba..24ff66eff 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java index 3f1b9fbbb..0c0ea8830 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java @@ -39,9 +39,9 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Paginated; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Paginated; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogNotify.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogNotify.java index 143cbc09a..91acd2c5f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogNotify.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogNotify.java @@ -38,7 +38,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java index d6c52bb0c..2482b0686 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java @@ -36,9 +36,9 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Paginated; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Paginated; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java index 62030a77e..2c47393d9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java @@ -35,9 +35,9 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Paginated; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Paginated; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java index d20e1c8ae..8978b0e18 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java @@ -39,9 +39,9 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Paginated; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Paginated; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java index 758e46199..46152c275 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java @@ -36,9 +36,9 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Paginated; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Paginated; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java index 1579ec731..546d03a52 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java @@ -36,7 +36,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java index 69e99c93d..c87ac5c90 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java @@ -46,8 +46,8 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.model.NodeDataContainer; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.web.WebEditor; import java.util.HashSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java index e6c97cdd5..7503075c3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java @@ -33,9 +33,9 @@ import me.lucko.luckperms.common.bulkupdate.BulkUpdateBuilder; import me.lucko.luckperms.common.bulkupdate.DataType; import me.lucko.luckperms.common.bulkupdate.action.DeleteAction; import me.lucko.luckperms.common.bulkupdate.action.UpdateAction; -import me.lucko.luckperms.common.bulkupdate.comparisons.Comparison; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; +import me.lucko.luckperms.common.bulkupdate.comparison.Comparison; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.bulkupdate.query.Query; import me.lucko.luckperms.common.bulkupdate.query.QueryField; import me.lucko.luckperms.common.command.CommandResult; @@ -48,7 +48,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.concurrent.ThreadLocalRandom; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java index 924b86616..40fc53b7f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java @@ -39,8 +39,8 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/DebugCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/DebugCommand.java index dbb01fca9..ee21588b5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/DebugCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/DebugCommand.java @@ -32,24 +32,24 @@ import me.lucko.luckperms.api.context.ContextCalculator; import me.lucko.luckperms.api.context.StaticContextCalculator; import me.lucko.luckperms.api.metastacking.MetaStackDefinition; import me.lucko.luckperms.api.metastacking.MetaStackElement; -import me.lucko.luckperms.common.caching.type.MetaCache; -import me.lucko.luckperms.common.caching.type.PermissionCache; +import me.lucko.luckperms.common.cacheddata.type.MetaCache; +import me.lucko.luckperms.common.cacheddata.type.PermissionCache; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; import me.lucko.luckperms.common.command.access.CommandPermission; -import me.lucko.luckperms.common.contexts.ContextSetJsonSerializer; -import me.lucko.luckperms.common.contexts.ProxiedContextCalculator; +import me.lucko.luckperms.common.context.ContextSetJsonSerializer; +import me.lucko.luckperms.common.context.ProxiedContextCalculator; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.processors.PermissionProcessor; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.gson.GsonProvider; -import me.lucko.luckperms.common.utils.gson.JArray; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.gson.GsonProvider; +import me.lucko.luckperms.common.util.gson.JArray; +import me.lucko.luckperms.common.util.gson.JObject; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.web.Pastebin; import me.lucko.luckperms.common.web.StandardPastebin; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java index 9bd2e3ab8..5a8271974 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java @@ -39,7 +39,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.web.StandardPastebin; import me.lucko.luckperms.common.web.WebEditor; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java index b0a49a991..875894307 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java @@ -34,7 +34,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.io.IOException; import java.nio.file.Files; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java index 77b0b80d5..598848b9e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java @@ -34,7 +34,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java index bc45be317..3e5715819 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java @@ -35,8 +35,8 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/NetworkSyncCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/NetworkSyncCommand.java index d809c2b97..eda4d1dba 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/NetworkSyncCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/NetworkSyncCommand.java @@ -34,7 +34,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ReloadConfigCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ReloadConfigCommand.java index 5dfa3c112..d3fcbed8c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ReloadConfigCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ReloadConfigCommand.java @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java index 1d0eca5ef..3c6f472fc 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SearchCommand.java @@ -31,9 +31,9 @@ import com.google.common.collect.Maps; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.common.bulkupdate.comparisons.Comparison; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; +import me.lucko.luckperms.common.bulkupdate.comparison.Comparison; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; @@ -51,10 +51,10 @@ import me.lucko.luckperms.common.node.comparator.HeldPermissionComparator; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Iterators; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Iterators; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.BuildableComponent; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/SyncCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SyncCommand.java index b04cd539e..ae736d772 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/SyncCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SyncCommand.java @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/TreeCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/TreeCommand.java index 04361aab2..d490f70d2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/TreeCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/TreeCommand.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.common.caching.type.PermissionCache; +import me.lucko.luckperms.common.cacheddata.type.PermissionCache; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -37,8 +37,8 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.treeview.TreeView; -import me.lucko.luckperms.common.utils.Predicates; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.Predicates; +import me.lucko.luckperms.common.util.Uuids; import net.kyori.text.Component; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java index 5eda0d116..2043d8b40 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java @@ -36,7 +36,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.verbose.InvalidFilterException; import me.lucko.luckperms.common.verbose.VerboseFilter; import me.lucko.luckperms.common.verbose.VerboseListener; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/CreateTrack.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/CreateTrack.java index eec67699c..892ef0bb7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/CreateTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/CreateTrack.java @@ -37,7 +37,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/DeleteTrack.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/DeleteTrack.java index 574318436..5d99de3c3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/DeleteTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/DeleteTrack.java @@ -39,7 +39,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/ListTracks.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/ListTracks.java index 743fb6b07..2b6cbc0c7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/ListTracks.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/ListTracks.java @@ -34,7 +34,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackAppend.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackAppend.java index 9fc31354e..2d89663d3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackAppend.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackAppend.java @@ -42,7 +42,7 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClear.java index 563449c55..edadd7eb7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClear.java @@ -36,7 +36,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java index 973894d63..d611dab2e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java @@ -38,7 +38,7 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInfo.java index dd85be593..c89df68c8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInfo.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInsert.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInsert.java index c27cf005e..ee7ee8523 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInsert.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackInsert.java @@ -42,7 +42,7 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRemove.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRemove.java index 956bd20c9..4f27a24be 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRemove.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRemove.java @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRename.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRename.java index 415e815c3..d08cf3362 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRename.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRename.java @@ -39,7 +39,7 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserClone.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserClone.java index d7613cb58..cc4be7df4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserClone.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserClone.java @@ -39,7 +39,7 @@ import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserDemote.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserDemote.java index 153f150e8..5a095982e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserDemote.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserDemote.java @@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.function.Predicate; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java index b4de97fc4..7f6860b8e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java @@ -30,7 +30,7 @@ import com.google.common.collect.ListMultimap; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.common.caching.type.MetaCache; +import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; @@ -42,8 +42,8 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserMainCommand.java index 7f28e8f57..a59597051 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserMainCommand.java @@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.UserIdentifier; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.Uuids; import java.util.List; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserPromote.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserPromote.java index 3c606ae03..d5ad23ff0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserPromote.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserPromote.java @@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import java.util.List; import java.util.function.Predicate; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java b/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java index d9b5517cb..25a1e4fb1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.config; -import me.lucko.luckperms.common.api.delegates.misc.ApiConfiguration; +import me.lucko.luckperms.common.api.implementation.ApiConfiguration; import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java index a480df3b8..60e01f9b6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java @@ -34,8 +34,8 @@ import me.lucko.luckperms.api.TemporaryMergeBehaviour; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.api.metastacking.DuplicateRemovalFunction; import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.common.assignments.AssignmentRule; import me.lucko.luckperms.common.command.utils.ArgumentParser; +import me.lucko.luckperms.common.defaultassignments.AssignmentRule; import me.lucko.luckperms.common.graph.TraversalAlgorithm; import me.lucko.luckperms.common.metastacking.SimpleMetaStackDefinition; import me.lucko.luckperms.common.metastacking.StandardStackElements; @@ -46,7 +46,7 @@ import me.lucko.luckperms.common.primarygroup.PrimaryGroupHolder; import me.lucko.luckperms.common.primarygroup.StoredHolder; import me.lucko.luckperms.common.storage.implementation.split.SplitStorageType; import me.lucko.luckperms.common.storage.misc.StorageCredentials; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/ContextsFile.java b/common/src/main/java/me/lucko/luckperms/common/config/ContextsFile.java index 7e2335895..1e08c2276 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/ContextsFile.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/ContextsFile.java @@ -29,8 +29,8 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextSetJsonSerializer; -import me.lucko.luckperms.common.utils.gson.GsonProvider; +import me.lucko.luckperms.common.context.ContextSetJsonSerializer; +import me.lucko.luckperms.common.util.gson.GsonProvider; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/LuckPermsConfiguration.java b/common/src/main/java/me/lucko/luckperms/common/config/LuckPermsConfiguration.java index 8c696eae4..4ede6fdc0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/LuckPermsConfiguration.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/LuckPermsConfiguration.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.config; -import me.lucko.luckperms.common.api.delegates.misc.ApiConfiguration; +import me.lucko.luckperms.common.api.implementation.ApiConfiguration; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; /** diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java rename to common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java index 2f52c18a5..2ea3d6e88 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import com.google.common.collect.ImmutableList; @@ -33,7 +33,7 @@ import me.lucko.luckperms.api.context.ContextCalculator; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.api.context.StaticContextCalculator; -import me.lucko.luckperms.common.buffers.ExpiringCache; +import me.lucko.luckperms.common.buffer.ExpiringCache; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetComparator.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetComparator.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetComparator.java rename to common/src/main/java/me/lucko/luckperms/common/context/ContextSetComparator.java index e593b3dc7..492319180 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetComparator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ImmutableContextSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetConfigurateSerializer.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetConfigurateSerializer.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetConfigurateSerializer.java rename to common/src/main/java/me/lucko/luckperms/common/context/ContextSetConfigurateSerializer.java index 757bb6487..58c2ad437 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetConfigurateSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetConfigurateSerializer.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import com.google.common.base.Preconditions; diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetJsonSerializer.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetJsonSerializer.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetJsonSerializer.java rename to common/src/main/java/me/lucko/luckperms/common/context/ContextSetJsonSerializer.java index 38ad4469c..0ffe89182 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetJsonSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetJsonSerializer.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import com.google.common.base.Preconditions; import com.google.gson.Gson; diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsCache.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextsCache.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/contexts/ContextsCache.java rename to common/src/main/java/me/lucko/luckperms/common/context/ContextsCache.java index 4b1642c84..7cab2c4d3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextsCache.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.buffers.ExpiringCache; +import me.lucko.luckperms.common.buffer.ExpiringCache; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsSupplier.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextsSupplier.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/contexts/ContextsSupplier.java rename to common/src/main/java/me/lucko/luckperms/common/context/ContextsSupplier.java index b87c4d6fc..ce66baa9d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsSupplier.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextsSupplier.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ImmutableContextSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/LPStaticContextsCalculator.java b/common/src/main/java/me/lucko/luckperms/common/context/LPStaticContextsCalculator.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/contexts/LPStaticContextsCalculator.java rename to common/src/main/java/me/lucko/luckperms/common/context/LPStaticContextsCalculator.java index b0cf26e4d..4d88ce9fd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/LPStaticContextsCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/LPStaticContextsCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.MutableContextSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java b/common/src/main/java/me/lucko/luckperms/common/context/ProxiedContextCalculator.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java rename to common/src/main/java/me/lucko/luckperms/common/context/ProxiedContextCalculator.java index f463868f7..a38150c9d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ProxiedContextCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ProxiedContextCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.contexts; +package me.lucko.luckperms.common.context; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentExpression.java b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentExpression.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentExpression.java rename to common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentExpression.java index eb17fe745..c0322f8ba 100644 --- a/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentExpression.java +++ b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentExpression.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.assignments; +package me.lucko.luckperms.common.defaultassignments; import com.google.common.collect.ImmutableList; @@ -33,7 +33,7 @@ import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.LegacyNodeFactory; -import me.lucko.luckperms.common.utils.Scripting; +import me.lucko.luckperms.common.util.Scripting; import java.util.List; import java.util.function.Predicate; diff --git a/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentRule.java b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentRule.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentRule.java rename to common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentRule.java index c467625f7..39a3f2ebe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentRule.java +++ b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentRule.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.assignments; +package me.lucko.luckperms.common.defaultassignments; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.LegacyNodeFactory; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManager.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManager.java index 11a5e819d..ed01a89fe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManager.java @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.dependencies.relocation.Relocation; import me.lucko.luckperms.common.dependencies.relocation.RelocationHandler; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.StorageType; -import me.lucko.luckperms.common.utils.MoreFiles; +import me.lucko.luckperms.common.util.MoreFiles; import java.io.IOException; import java.io.InputStream; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java b/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java index ae36e06e4..54ae9f12c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java @@ -71,8 +71,8 @@ import me.lucko.luckperms.api.event.user.UserLoadEvent; import me.lucko.luckperms.api.event.user.UserLoginProcessEvent; import me.lucko.luckperms.api.event.user.track.UserDemoteEvent; import me.lucko.luckperms.api.event.user.track.UserPromoteEvent; -import me.lucko.luckperms.common.api.delegates.model.ApiPermissionHolder; -import me.lucko.luckperms.common.api.delegates.model.ApiUser; +import me.lucko.luckperms.common.api.implementation.ApiPermissionHolder; +import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.event.gen.GeneratedEventSpec; import me.lucko.luckperms.common.event.model.EntitySourceImpl; import me.lucko.luckperms.common.event.model.SenderEntity; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java index 245a16250..fbf9c9f94 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java @@ -32,7 +32,7 @@ import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.api.event.LuckPermsEvent; import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationHandler; diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java index 382a9cae4..90c8d97dc 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.locale.message; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/InternalMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/messaging/InternalMessagingService.java index 991e73e73..b773fb0e5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/InternalMessagingService.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/InternalMessagingService.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.messaging; import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.messenger.Messenger; import me.lucko.luckperms.api.messenger.MessengerProvider; -import me.lucko.luckperms.common.buffers.BufferedRequest; +import me.lucko.luckperms.common.buffer.BufferedRequest; import me.lucko.luckperms.common.model.User; public interface InternalMessagingService { diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java index 968cb1b1c..19976059d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java @@ -37,15 +37,15 @@ import me.lucko.luckperms.api.messenger.message.type.LogMessage; import me.lucko.luckperms.api.messenger.message.type.UpdateMessage; import me.lucko.luckperms.api.messenger.message.type.UserUpdateMessage; import me.lucko.luckperms.common.actionlog.ExtendedLogEntry; -import me.lucko.luckperms.common.buffers.BufferedRequest; +import me.lucko.luckperms.common.buffer.BufferedRequest; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.messaging.message.LogMessageImpl; import me.lucko.luckperms.common.messaging.message.UpdateMessageImpl; import me.lucko.luckperms.common.messaging.message.UserUpdateMessageImpl; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.gson.GsonProvider; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.gson.GsonProvider; +import me.lucko.luckperms.common.util.gson.JObject; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java index fd5501be4..07afa7151 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java @@ -29,7 +29,7 @@ import com.google.gson.JsonElement; import me.lucko.luckperms.api.messenger.message.type.UserUpdateMessage; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.gson.JObject; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java index 02236355a..9118c8bc0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.metastacking; import me.lucko.luckperms.api.ChatMetaType; import me.lucko.luckperms.api.LocalizedNode; import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import java.util.LinkedList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java index 24e54ed7c..0782ea59a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java @@ -30,8 +30,8 @@ import me.lucko.luckperms.api.LocalizedNode; import me.lucko.luckperms.api.metastacking.MetaStackElement; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.ImmutableCollectors; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.ImmutableCollectors; +import me.lucko.luckperms.common.util.Uuids; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/DemotionResults.java b/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/api/DemotionResults.java rename to common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java index d89be0178..1de198f48 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/DemotionResults.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api; +package me.lucko.luckperms.common.model; import me.lucko.luckperms.api.DemotionResult; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/DisplayNameCache.java b/common/src/main/java/me/lucko/luckperms/common/model/DisplayNameCache.java index be1b90ef2..4068b1751 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/DisplayNameCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/DisplayNameCache.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.common.model; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.nodetype.types.DisplayNameType; -import me.lucko.luckperms.common.buffers.Cache; +import me.lucko.luckperms.common.buffer.Cache; import me.lucko.luckperms.common.config.ConfigKeys; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/Group.java b/common/src/main/java/me/lucko/luckperms/common/model/Group.java index 0b2772001..12d272122 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/Group.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/Group.java @@ -28,9 +28,9 @@ package me.lucko.luckperms.common.model; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.api.nodetype.types.DisplayNameType; -import me.lucko.luckperms.common.api.delegates.model.ApiGroup; -import me.lucko.luckperms.common.buffers.Cache; -import me.lucko.luckperms.common.caching.GroupCachedData; +import me.lucko.luckperms.common.api.implementation.ApiGroup; +import me.lucko.luckperms.common.buffer.Cache; +import me.lucko.luckperms.common.cacheddata.GroupCachedData; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java b/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java index 9b7248ff5..a3b24bb7d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java @@ -36,8 +36,8 @@ import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.StandardNodeEquality; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.buffers.Cache; -import me.lucko.luckperms.common.contexts.ContextSetComparator; +import me.lucko.luckperms.common.buffer.Cache; +import me.lucko.luckperms.common.context.ContextSetComparator; import me.lucko.luckperms.common.node.comparator.NodeComparator; import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.node.model.ImmutableLocalizedNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java index f2bc2d128..d744924f6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java @@ -41,8 +41,8 @@ import me.lucko.luckperms.api.TemporaryMergeBehaviour; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.caching.HolderCachedData; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; +import me.lucko.luckperms.common.cacheddata.HolderCachedData; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.inheritance.InheritanceComparator; import me.lucko.luckperms.common.inheritance.InheritanceGraph; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/PromotionResults.java b/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/api/PromotionResults.java rename to common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java index 598136070..7a2ecd633 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/PromotionResults.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.api; +package me.lucko.luckperms.common.model; import me.lucko.luckperms.api.PromotionResult; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/Track.java b/common/src/main/java/me/lucko/luckperms/common/model/Track.java index 193c7b9ee..6617184cd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/Track.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/Track.java @@ -32,9 +32,7 @@ import me.lucko.luckperms.api.DemotionResult; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.PromotionResult; import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.common.api.DemotionResults; -import me.lucko.luckperms.common.api.PromotionResults; -import me.lucko.luckperms.common.api.delegates.model.ApiTrack; +import me.lucko.luckperms.common.api.implementation.ApiTrack; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/User.java b/common/src/main/java/me/lucko/luckperms/common/model/User.java index 774ce88d6..2dd9e05ec 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/User.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/User.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.common.api.delegates.model.ApiUser; -import me.lucko.luckperms.common.caching.UserCachedData; +import me.lucko.luckperms.common.api.implementation.ApiUser; +import me.lucko.luckperms.common.cacheddata.UserCachedData; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.primarygroup.ContextualHolder; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java b/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java index 7fd322949..44b9fd799 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.model; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.api.nodetype.types.WeightType; -import me.lucko.luckperms.common.buffers.Cache; +import me.lucko.luckperms.common.buffer.Cache; import me.lucko.luckperms.common.config.ConfigKeys; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/AbstractManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/AbstractManager.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/managers/AbstractManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/AbstractManager.java index 9dc3a4ad9..73ac6a387 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/AbstractManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/AbstractManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers; +package me.lucko.luckperms.common.model.manager; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/Manager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/Manager.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/managers/Manager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/Manager.java index eb6d227bb..99bdc89de 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/Manager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/Manager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers; +package me.lucko.luckperms.common.model.manager; import me.lucko.luckperms.common.model.Identifiable; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/group/AbstractGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/group/AbstractGroupManager.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/common/managers/group/AbstractGroupManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/group/AbstractGroupManager.java index 32b695f33..b462fa3da 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/group/AbstractGroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/group/AbstractGroupManager.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.group; +package me.lucko.luckperms.common.model.manager.group; -import me.lucko.luckperms.common.managers.AbstractManager; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; +import me.lucko.luckperms.common.model.manager.AbstractManager; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/group/GroupManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/group/GroupManager.java similarity index 93% rename from common/src/main/java/me/lucko/luckperms/common/managers/group/GroupManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/group/GroupManager.java index 8c6f01c48..8d91608f7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/group/GroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/group/GroupManager.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.group; +package me.lucko.luckperms.common.model.manager.group; -import me.lucko.luckperms.common.managers.Manager; import me.lucko.luckperms.common.model.Group; +import me.lucko.luckperms.common.model.manager.Manager; public interface GroupManager extends Manager { diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/group/StandardGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/group/StandardGroupManager.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/managers/group/StandardGroupManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/group/StandardGroupManager.java index 7aa020b2e..834e41a9b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/group/StandardGroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/group/StandardGroupManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.group; +package me.lucko.luckperms.common.model.manager.group; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/track/AbstractTrackManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/track/AbstractTrackManager.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/common/managers/track/AbstractTrackManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/track/AbstractTrackManager.java index 65ff15a61..f6cff287f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/track/AbstractTrackManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/track/AbstractTrackManager.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.track; +package me.lucko.luckperms.common.model.manager.track; -import me.lucko.luckperms.common.managers.AbstractManager; import me.lucko.luckperms.common.model.Track; +import me.lucko.luckperms.common.model.manager.AbstractManager; public abstract class AbstractTrackManager extends AbstractManager implements TrackManager { diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/track/StandardTrackManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/track/StandardTrackManager.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/managers/track/StandardTrackManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/track/StandardTrackManager.java index 1a982902d..769e48a08 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/track/StandardTrackManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/track/StandardTrackManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.track; +package me.lucko.luckperms.common.model.manager.track; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/track/TrackManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/track/TrackManager.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/common/managers/track/TrackManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/track/TrackManager.java index 97b04c129..744818cf7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/track/TrackManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/track/TrackManager.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.track; +package me.lucko.luckperms.common.model.manager.track; -import me.lucko.luckperms.common.managers.Manager; import me.lucko.luckperms.common.model.Track; +import me.lucko.luckperms.common.model.manager.Manager; public interface TrackManager extends Manager { diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/user/AbstractUserManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/managers/user/AbstractUserManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java index 303109f4d..29ef3f445 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/user/AbstractUserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java @@ -23,15 +23,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.user; +package me.lucko.luckperms.common.model.manager.user; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.managers.AbstractManager; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; +import me.lucko.luckperms.common.model.manager.AbstractManager; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/user/StandardUserManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/StandardUserManager.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/managers/user/StandardUserManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/user/StandardUserManager.java index fb744fdce..cf52b2fed 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/user/StandardUserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/StandardUserManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.user; +package me.lucko.luckperms.common.model.manager.user; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/user/UserHousekeeper.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserHousekeeper.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/managers/user/UserHousekeeper.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserHousekeeper.java index 1ce8316b0..aeb2493b0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/user/UserHousekeeper.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserHousekeeper.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.user; +package me.lucko.luckperms.common.model.manager.user; import me.lucko.luckperms.common.model.UserIdentifier; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.ExpiringSet; +import me.lucko.luckperms.common.util.ExpiringSet; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/user/UserManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserManager.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/managers/user/UserManager.java rename to common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserManager.java index 47ca755b7..901d67b98 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/user/UserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserManager.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.managers.user; +package me.lucko.luckperms.common.model.manager.user; -import me.lucko.luckperms.common.managers.Manager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; +import me.lucko.luckperms.common.model.manager.Manager; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeWithContextComparator.java b/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeWithContextComparator.java index 8dfaf3c9b..f3e9a0965 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeWithContextComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeWithContextComparator.java @@ -26,7 +26,7 @@ package me.lucko.luckperms.common.node.comparator; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.common.contexts.ContextSetComparator; +import me.lucko.luckperms.common.context.ContextSetComparator; import java.util.Comparator; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/factory/LegacyNodeFactory.java b/common/src/main/java/me/lucko/luckperms/common/node/factory/LegacyNodeFactory.java index b13264ac6..865eaae2b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/factory/LegacyNodeFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/factory/LegacyNodeFactory.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.node.factory; import com.google.common.base.Splitter; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.common.utils.PatternCache; +import me.lucko.luckperms.common.util.PatternCache; import java.util.Iterator; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/model/ImmutableNode.java b/common/src/main/java/me/lucko/luckperms/common/node/model/ImmutableNode.java index 267e832ea..06f897c67 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/model/ImmutableNode.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/model/ImmutableNode.java @@ -36,9 +36,9 @@ import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.api.nodetype.NodeType; import me.lucko.luckperms.api.nodetype.NodeTypeKey; import me.lucko.luckperms.api.nodetype.types.RegexType; +import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.node.factory.NodeBuilder; import me.lucko.luckperms.common.node.utils.ShorthandParser; -import me.lucko.luckperms.common.processors.WildcardProcessor; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/model/NodeTypes.java b/common/src/main/java/me/lucko/luckperms/common/node/model/NodeTypes.java index 4490deef2..9fc6476f8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/model/NodeTypes.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/model/NodeTypes.java @@ -37,9 +37,9 @@ import me.lucko.luckperms.api.nodetype.types.PrefixType; import me.lucko.luckperms.api.nodetype.types.RegexType; import me.lucko.luckperms.api.nodetype.types.SuffixType; import me.lucko.luckperms.api.nodetype.types.WeightType; -import me.lucko.luckperms.common.buffers.Cache; +import me.lucko.luckperms.common.buffer.Cache; import me.lucko.luckperms.common.node.factory.LegacyNodeFactory; -import me.lucko.luckperms.common.utils.PatternCache; +import me.lucko.luckperms.common.util.PatternCache; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java b/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java index 2e52bf7dc..e55c45ef2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java +++ b/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java @@ -29,12 +29,12 @@ import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.common.actionlog.LogDispatcher; import me.lucko.luckperms.common.api.ApiRegistrationUtil; import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.config.AbstractConfiguration; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.config.LuckPermsConfiguration; import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter; -import me.lucko.luckperms.common.contexts.LPStaticContextsCalculator; +import me.lucko.luckperms.common.context.LPStaticContextsCalculator; import me.lucko.luckperms.common.dependencies.Dependency; import me.lucko.luckperms.common.dependencies.DependencyManager; import me.lucko.luckperms.common.event.AbstractEventBus; diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java b/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java index 872fc9c3c..6dd7c091b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java +++ b/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java @@ -28,22 +28,22 @@ package me.lucko.luckperms.common.plugin; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.common.actionlog.LogDispatcher; import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.config.LuckPermsConfiguration; -import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.dependencies.DependencyManager; import me.lucko.luckperms.common.event.EventFactory; import me.lucko.luckperms.common.inheritance.InheritanceHandler; import me.lucko.luckperms.common.locale.LocaleManager; -import me.lucko.luckperms.common.managers.group.GroupManager; -import me.lucko.luckperms.common.managers.track.TrackManager; -import me.lucko.luckperms.common.managers.user.UserManager; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.group.GroupManager; +import me.lucko.luckperms.common.model.manager.track.TrackManager; +import me.lucko.luckperms.common.model.manager.user.UserManager; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/util/AbstractConnectionListener.java b/common/src/main/java/me/lucko/luckperms/common/plugin/util/AbstractConnectionListener.java index 4ac0f21f0..dd59782f1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/plugin/util/AbstractConnectionListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/plugin/util/AbstractConnectionListener.java @@ -27,8 +27,8 @@ package me.lucko.luckperms.common.plugin.util; import me.lucko.luckperms.api.PlayerSaveResult; import me.lucko.luckperms.api.platform.PlatformType; -import me.lucko.luckperms.common.assignments.AssignmentRule; import me.lucko.luckperms.common.config.ConfigKeys; +import me.lucko.luckperms.common.defaultassignments.AssignmentRule; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; diff --git a/common/src/main/java/me/lucko/luckperms/common/sender/AbstractSender.java b/common/src/main/java/me/lucko/luckperms/common/sender/AbstractSender.java index 2d1f2b22b..88090edd5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/sender/AbstractSender.java +++ b/common/src/main/java/me/lucko/luckperms/common/sender/AbstractSender.java @@ -29,7 +29,7 @@ import com.google.common.base.Splitter; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; diff --git a/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java b/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java index bb54cfae6..53c1c6f52 100644 --- a/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java +++ b/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.sender; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; diff --git a/common/src/main/java/me/lucko/luckperms/common/sender/Sender.java b/common/src/main/java/me/lucko/luckperms/common/sender/Sender.java index 213874dfa..ae4fa9edd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/sender/Sender.java +++ b/common/src/main/java/me/lucko/luckperms/common/sender/Sender.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.sender; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.access.CommandPermission; -import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import net.kyori.text.Component; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java index 1d991ae57..8369e16bd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java @@ -33,15 +33,15 @@ import me.lucko.luckperms.api.PlayerSaveResult; import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.api.event.cause.DeletionCause; import me.lucko.luckperms.common.actionlog.Log; -import me.lucko.luckperms.common.api.delegates.model.ApiStorage; +import me.lucko.luckperms.common.api.implementation.ApiStorage; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.implementation.StorageImplementation; -import me.lucko.luckperms.common.utils.ThrowingRunnable; +import me.lucko.luckperms.common.util.ThrowingRunnable; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java index 4b1419f94..eb7b3b8b2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java @@ -47,7 +47,7 @@ import me.lucko.luckperms.common.storage.implementation.sql.connection.file.SQLi import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.MariaDbConnectionFactory; import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.MySqlConnectionFactory; import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.PostgreConnectionFactory; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import java.util.Map; import java.util.Set; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java index 5c374fb50..79d02248e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java @@ -30,7 +30,7 @@ import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.PlayerSaveResult; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java index c81cd791d..c704259ee 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java @@ -36,7 +36,7 @@ import me.lucko.luckperms.api.PlayerSaveResult; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; -import me.lucko.luckperms.common.contexts.ContextSetConfigurateSerializer; +import me.lucko.luckperms.common.context.ContextSetConfigurateSerializer; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.model.Track; @@ -50,8 +50,8 @@ import me.lucko.luckperms.common.storage.implementation.StorageImplementation; import me.lucko.luckperms.common.storage.implementation.file.loader.ConfigurateLoader; import me.lucko.luckperms.common.storage.implementation.file.loader.JsonLoader; import me.lucko.luckperms.common.storage.implementation.file.loader.YamlLoader; -import me.lucko.luckperms.common.utils.ImmutableCollectors; -import me.lucko.luckperms.common.utils.MoreFiles; +import me.lucko.luckperms.common.util.ImmutableCollectors; +import me.lucko.luckperms.common.util.MoreFiles; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.SimpleConfigurationNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java index 178434baa..a4cbf2d75 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java @@ -27,9 +27,9 @@ package me.lucko.luckperms.common.storage.implementation.file; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.managers.group.GroupManager; -import me.lucko.luckperms.common.managers.track.TrackManager; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.model.manager.group.GroupManager; +import me.lucko.luckperms.common.model.manager.track.TrackManager; import me.lucko.luckperms.common.node.model.NodeDataContainer; import me.lucko.luckperms.common.node.model.NodeHeldPermission; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java index dc6ed077e..bdd3b9e8a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java @@ -33,9 +33,9 @@ import com.google.gson.stream.JsonWriter; import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LogEntryJsonSerializer; -import me.lucko.luckperms.common.buffers.BufferedRequest; +import me.lucko.luckperms.common.buffer.BufferedRequest; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.gson.GsonProvider; +import me.lucko.luckperms.common.util.gson.GsonProvider; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java index 2def72a4b..fa90e05d3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java @@ -32,7 +32,7 @@ import com.google.common.collect.SetMultimap; import me.lucko.luckperms.api.PlayerSaveResult; import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.Uuids; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileWatcher.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileWatcher.java index abfe9017a..58ef3ef87 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileWatcher.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileWatcher.java @@ -26,7 +26,7 @@ package me.lucko.luckperms.common.storage.implementation.file; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.utils.Iterators; +import me.lucko.luckperms.common.util.Iterators; import java.io.IOException; import java.nio.file.Path; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java index 4836698a1..d0bd6346f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java @@ -27,16 +27,16 @@ package me.lucko.luckperms.common.storage.implementation.file; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.managers.group.GroupManager; -import me.lucko.luckperms.common.managers.track.TrackManager; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.group.GroupManager; +import me.lucko.luckperms.common.model.manager.track.TrackManager; import me.lucko.luckperms.common.node.model.NodeDataContainer; import me.lucko.luckperms.common.node.model.NodeHeldPermission; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.implementation.file.loader.ConfigurateLoader; -import me.lucko.luckperms.common.utils.MoreFiles; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.util.MoreFiles; +import me.lucko.luckperms.common.util.Uuids; import ninja.leaping.configurate.ConfigurationNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java index bd59d354d..822f44e27 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java @@ -47,14 +47,14 @@ import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.common.actionlog.ExtendedLogEntry; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.managers.group.GroupManager; -import me.lucko.luckperms.common.managers.track.TrackManager; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; +import me.lucko.luckperms.common.model.manager.group.GroupManager; +import me.lucko.luckperms.common.model.manager.track.TrackManager; import me.lucko.luckperms.common.node.factory.LegacyNodeFactory; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeDataContainer; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java index b77e026b9..34522ff59 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java @@ -32,7 +32,7 @@ import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.PlayerSaveResult; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java index 23b992ccd..183bfeda5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java @@ -36,15 +36,15 @@ import me.lucko.luckperms.common.actionlog.ExtendedLogEntry; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.contexts.ContextSetJsonSerializer; -import me.lucko.luckperms.common.managers.group.GroupManager; -import me.lucko.luckperms.common.managers.track.TrackManager; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.context.ContextSetJsonSerializer; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; +import me.lucko.luckperms.common.model.manager.group.GroupManager; +import me.lucko.luckperms.common.model.manager.track.TrackManager; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeDataContainer; import me.lucko.luckperms.common.node.model.NodeHeldPermission; @@ -54,7 +54,7 @@ import me.lucko.luckperms.common.storage.implementation.sql.connection.Connectio import me.lucko.luckperms.common.storage.implementation.sql.connection.file.SQLiteConnectionFactory; import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.PostgreConnectionFactory; import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; -import me.lucko.luckperms.common.utils.gson.GsonProvider; +import me.lucko.luckperms.common.util.gson.GsonProvider; import java.io.BufferedReader; import java.io.InputStream; diff --git a/common/src/main/java/me/lucko/luckperms/common/tasks/SyncTask.java b/common/src/main/java/me/lucko/luckperms/common/tasks/SyncTask.java index 3c6b8db64..079302ab0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/tasks/SyncTask.java +++ b/common/src/main/java/me/lucko/luckperms/common/tasks/SyncTask.java @@ -26,7 +26,7 @@ package me.lucko.luckperms.common.tasks; import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.common.buffers.BufferedRequest; +import me.lucko.luckperms.common.buffer.BufferedRequest; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java b/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java index 154becf20..8c6730a92 100644 --- a/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java +++ b/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.treeview; import com.google.common.base.Splitter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; -import me.lucko.luckperms.common.utils.RepeatingTask; +import me.lucko.luckperms.common.util.RepeatingTask; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java index 18882bf8c..1407c47e3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java +++ b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java @@ -28,10 +28,10 @@ package me.lucko.luckperms.common.treeview; import com.google.common.base.Splitter; import com.google.gson.JsonObject; -import me.lucko.luckperms.common.caching.type.PermissionCache; +import me.lucko.luckperms.common.cacheddata.type.PermissionCache; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.gson.JObject; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.web.StandardPastebin; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/DateParser.java b/common/src/main/java/me/lucko/luckperms/common/util/DateParser.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/utils/DateParser.java rename to common/src/main/java/me/lucko/luckperms/common/util/DateParser.java index 74754c061..a3a72bfec 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/DateParser.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/DateParser.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/DurationFormatter.java b/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/utils/DurationFormatter.java rename to common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java index 051b42a1f..e287e21a2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/DurationFormatter.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/ExpiringSet.java b/common/src/main/java/me/lucko/luckperms/common/util/ExpiringSet.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/ExpiringSet.java rename to common/src/main/java/me/lucko/luckperms/common/util/ExpiringSet.java index 33baf38fe..8c8401030 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/ExpiringSet.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/ExpiringSet.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/ImmutableCollectors.java b/common/src/main/java/me/lucko/luckperms/common/util/ImmutableCollectors.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/utils/ImmutableCollectors.java rename to common/src/main/java/me/lucko/luckperms/common/util/ImmutableCollectors.java index 5df1bc70d..67395d397 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/ImmutableCollectors.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/ImmutableCollectors.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/Iterators.java b/common/src/main/java/me/lucko/luckperms/common/util/Iterators.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/Iterators.java rename to common/src/main/java/me/lucko/luckperms/common/util/Iterators.java index d118b47fe..83576bbc1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/Iterators.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/Iterators.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/MoreFiles.java b/common/src/main/java/me/lucko/luckperms/common/util/MoreFiles.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/MoreFiles.java rename to common/src/main/java/me/lucko/luckperms/common/util/MoreFiles.java index a5cc5a800..b964a5acd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/MoreFiles.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/MoreFiles.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import java.io.IOException; import java.nio.file.Files; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/Paginated.java b/common/src/main/java/me/lucko/luckperms/common/util/Paginated.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/Paginated.java rename to common/src/main/java/me/lucko/luckperms/common/util/Paginated.java index 7348bc015..4508c5fe3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/Paginated.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/Paginated.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import com.google.common.collect.ImmutableList; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/PatternCache.java b/common/src/main/java/me/lucko/luckperms/common/util/PatternCache.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/PatternCache.java rename to common/src/main/java/me/lucko/luckperms/common/util/PatternCache.java index 921fc0223..9cc2d291e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/PatternCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/PatternCache.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/Predicates.java b/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/Predicates.java rename to common/src/main/java/me/lucko/luckperms/common/util/Predicates.java index d679e3cc7..c6b9290c6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/Predicates.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import com.google.common.collect.Range; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/ProgressLogger.java b/common/src/main/java/me/lucko/luckperms/common/util/ProgressLogger.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/ProgressLogger.java rename to common/src/main/java/me/lucko/luckperms/common/util/ProgressLogger.java index 6e3da22a7..740be15bd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/ProgressLogger.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/ProgressLogger.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.sender.Sender; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/RepeatingTask.java b/common/src/main/java/me/lucko/luckperms/common/util/RepeatingTask.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/utils/RepeatingTask.java rename to common/src/main/java/me/lucko/luckperms/common/util/RepeatingTask.java index e6154b8c9..f8a81730e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/RepeatingTask.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/RepeatingTask.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/Scripting.java b/common/src/main/java/me/lucko/luckperms/common/util/Scripting.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/utils/Scripting.java rename to common/src/main/java/me/lucko/luckperms/common/util/Scripting.java index 96b63633f..bdefaf3e4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/Scripting.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/Scripting.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/StackTracePrinter.java b/common/src/main/java/me/lucko/luckperms/common/util/StackTracePrinter.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/StackTracePrinter.java rename to common/src/main/java/me/lucko/luckperms/common/util/StackTracePrinter.java index f8492f40c..642246730 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/StackTracePrinter.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/StackTracePrinter.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import java.util.function.Consumer; import java.util.function.Predicate; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/TextUtils.java b/common/src/main/java/me/lucko/luckperms/common/util/TextUtils.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/TextUtils.java rename to common/src/main/java/me/lucko/luckperms/common/util/TextUtils.java index 22f2989b3..f7e7b6fba 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/TextUtils.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/TextUtils.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import net.kyori.text.Component; import net.kyori.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/ThrowingRunnable.java b/common/src/main/java/me/lucko/luckperms/common/util/ThrowingRunnable.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/utils/ThrowingRunnable.java rename to common/src/main/java/me/lucko/luckperms/common/util/ThrowingRunnable.java index 478d9c8d4..d7def3576 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/ThrowingRunnable.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/ThrowingRunnable.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; public interface ThrowingRunnable { diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/Uuids.java b/common/src/main/java/me/lucko/luckperms/common/util/Uuids.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/Uuids.java rename to common/src/main/java/me/lucko/luckperms/common/util/Uuids.java index e68f76f81..216365df5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/Uuids.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/Uuids.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils; +package me.lucko.luckperms.common.util; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/gson/GsonProvider.java b/common/src/main/java/me/lucko/luckperms/common/util/gson/GsonProvider.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/utils/gson/GsonProvider.java rename to common/src/main/java/me/lucko/luckperms/common/util/gson/GsonProvider.java index a85f29ca6..606d16590 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/gson/GsonProvider.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/gson/GsonProvider.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils.gson; +package me.lucko.luckperms.common.util.gson; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/gson/JArray.java b/common/src/main/java/me/lucko/luckperms/common/util/gson/JArray.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/gson/JArray.java rename to common/src/main/java/me/lucko/luckperms/common/util/gson/JArray.java index 1aec11bb0..730c2d661 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/gson/JArray.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/gson/JArray.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils.gson; +package me.lucko.luckperms.common.util.gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/gson/JElement.java b/common/src/main/java/me/lucko/luckperms/common/util/gson/JElement.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/common/utils/gson/JElement.java rename to common/src/main/java/me/lucko/luckperms/common/util/gson/JElement.java index 7056c3b9e..40978eb71 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/gson/JElement.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/gson/JElement.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils.gson; +package me.lucko.luckperms.common.util.gson; import com.google.gson.JsonElement; diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/gson/JObject.java b/common/src/main/java/me/lucko/luckperms/common/util/gson/JObject.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/common/utils/gson/JObject.java rename to common/src/main/java/me/lucko/luckperms/common/util/gson/JObject.java index 507417340..5dba44c56 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/gson/JObject.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/gson/JObject.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.utils.gson; +package me.lucko.luckperms.common.util.gson; import com.google.gson.JsonElement; import com.google.gson.JsonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java index d69cf6036..b8d79990e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.common.verbose; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.common.utils.Scripting; +import me.lucko.luckperms.common.util.Scripting; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.verbose.event.VerboseEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java index 441eac625..95d80ade2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java @@ -29,7 +29,7 @@ import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.RepeatingTask; +import me.lucko.luckperms.common.util.RepeatingTask; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.verbose.event.VerboseEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java index dbdc3c1ad..3ec9e5422 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java @@ -32,11 +32,11 @@ import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.MessageUtils; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.DurationFormatter; -import me.lucko.luckperms.common.utils.StackTracePrinter; -import me.lucko.luckperms.common.utils.TextUtils; -import me.lucko.luckperms.common.utils.gson.JArray; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.DurationFormatter; +import me.lucko.luckperms.common.util.StackTracePrinter; +import me.lucko.luckperms.common.util.TextUtils; +import me.lucko.luckperms.common.util.gson.JArray; +import me.lucko.luckperms.common.util.gson.JObject; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.verbose.event.VerboseEvent; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java b/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java index 3db2fdcb3..0beba16e0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java @@ -26,7 +26,7 @@ package me.lucko.luckperms.common.verbose.event; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.gson.JObject; public class MetaCheckEvent extends VerboseEvent { diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java b/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java index 31c031b57..81bad164d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.common.verbose.event; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.gson.JObject; public class PermissionCheckEvent extends VerboseEvent { diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java b/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java index 31507bc97..592fd4600 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java @@ -28,9 +28,9 @@ package me.lucko.luckperms.common.verbose.event; import com.google.gson.JsonObject; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.utils.StackTracePrinter; -import me.lucko.luckperms.common.utils.gson.JArray; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.StackTracePrinter; +import me.lucko.luckperms.common.util.gson.JArray; +import me.lucko.luckperms.common.util.gson.JObject; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/web/StandardPastebin.java b/common/src/main/java/me/lucko/luckperms/common/web/StandardPastebin.java index befc0c0f7..05d16fdab 100644 --- a/common/src/main/java/me/lucko/luckperms/common/web/StandardPastebin.java +++ b/common/src/main/java/me/lucko/luckperms/common/web/StandardPastebin.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.web; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.lucko.luckperms.common.utils.gson.GsonProvider; +import me.lucko.luckperms.common.util.gson.GsonProvider; import okhttp3.MediaType; import okhttp3.Request; diff --git a/common/src/main/java/me/lucko/luckperms/common/web/WebEditor.java b/common/src/main/java/me/lucko/luckperms/common/web/WebEditor.java index c68d55557..9e3499fa6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/web/WebEditor.java +++ b/common/src/main/java/me/lucko/luckperms/common/web/WebEditor.java @@ -31,7 +31,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextSetJsonSerializer; +import me.lucko.luckperms.common.context.ContextSetJsonSerializer; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; @@ -39,10 +39,10 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.model.NodeDataContainer; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Uuids; -import me.lucko.luckperms.common.utils.gson.GsonProvider; -import me.lucko.luckperms.common.utils.gson.JArray; -import me.lucko.luckperms.common.utils.gson.JObject; +import me.lucko.luckperms.common.util.Uuids; +import me.lucko.luckperms.common.util.gson.GsonProvider; +import me.lucko.luckperms.common.util.gson.JArray; +import me.lucko.luckperms.common.util.gson.JObject; import okhttp3.Request; import okhttp3.Response; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java index 994b0f9ed..ad7ddbf3f 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java @@ -29,38 +29,38 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.api.event.user.UserDataRecalculateEvent; import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.api.delegates.model.ApiUser; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.api.implementation.ApiUser; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.dependencies.Dependency; import me.lucko.luckperms.common.event.AbstractEventBus; -import me.lucko.luckperms.common.managers.group.StandardGroupManager; -import me.lucko.luckperms.common.managers.track.StandardTrackManager; -import me.lucko.luckperms.common.managers.user.StandardUserManager; import me.lucko.luckperms.common.messaging.MessagingFactory; import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.group.StandardGroupManager; +import me.lucko.luckperms.common.model.manager.track.StandardTrackManager; +import me.lucko.luckperms.common.model.manager.user.StandardUserManager; import me.lucko.luckperms.common.plugin.AbstractLuckPermsPlugin; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.tasks.CacheHousekeepingTask; import me.lucko.luckperms.common.tasks.ExpireTemporaryTask; -import me.lucko.luckperms.nukkit.calculators.NukkitCalculatorFactory; -import me.lucko.luckperms.nukkit.contexts.NukkitContextManager; -import me.lucko.luckperms.nukkit.contexts.WorldCalculator; +import me.lucko.luckperms.nukkit.calculator.NukkitCalculatorFactory; +import me.lucko.luckperms.nukkit.context.NukkitContextManager; +import me.lucko.luckperms.nukkit.context.WorldCalculator; +import me.lucko.luckperms.nukkit.inject.PermissionDefault; +import me.lucko.luckperms.nukkit.inject.permissible.LPPermissible; +import me.lucko.luckperms.nukkit.inject.permissible.PermissibleInjector; +import me.lucko.luckperms.nukkit.inject.permissible.PermissibleMonitoringInjector; +import me.lucko.luckperms.nukkit.inject.server.InjectorDefaultsMap; +import me.lucko.luckperms.nukkit.inject.server.InjectorPermissionMap; +import me.lucko.luckperms.nukkit.inject.server.InjectorSubscriptionMap; +import me.lucko.luckperms.nukkit.inject.server.LPDefaultsMap; +import me.lucko.luckperms.nukkit.inject.server.LPPermissionMap; +import me.lucko.luckperms.nukkit.inject.server.LPSubscriptionMap; import me.lucko.luckperms.nukkit.listeners.NukkitConnectionListener; import me.lucko.luckperms.nukkit.listeners.NukkitPlatformListener; -import me.lucko.luckperms.nukkit.model.PermissionDefault; -import me.lucko.luckperms.nukkit.model.permissible.LPPermissible; -import me.lucko.luckperms.nukkit.model.permissible.PermissibleInjector; -import me.lucko.luckperms.nukkit.model.permissible.PermissibleMonitoringInjector; -import me.lucko.luckperms.nukkit.model.server.InjectorDefaultsMap; -import me.lucko.luckperms.nukkit.model.server.InjectorPermissionMap; -import me.lucko.luckperms.nukkit.model.server.InjectorSubscriptionMap; -import me.lucko.luckperms.nukkit.model.server.LPDefaultsMap; -import me.lucko.luckperms.nukkit.model.server.LPPermissionMap; -import me.lucko.luckperms.nukkit.model.server.LPSubscriptionMap; import cn.nukkit.Player; import cn.nukkit.command.PluginCommand; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java index 065fe4879..24dd93afc 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java @@ -29,7 +29,7 @@ import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.SenderFactory; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/processors/ChildProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java similarity index 92% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/processors/ChildProcessor.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java index 9e2a658ad..e76e2088b 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/processors/ChildProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.processors; +package me.lucko.luckperms.nukkit.calculator; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.common.processors.AbstractPermissionProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import java.util.Collections; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/processors/DefaultsProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java similarity index 92% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/processors/DefaultsProcessor.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java index 423191c5c..7cf740f89 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/processors/DefaultsProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.processors; +package me.lucko.luckperms.nukkit.calculator; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.common.processors.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.nukkit.LPNukkitPlugin; -import me.lucko.luckperms.nukkit.model.PermissionDefault; +import me.lucko.luckperms.nukkit.inject.PermissionDefault; /** * Permission Processor for Nukkits "default" permission system. diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculators/NukkitCalculatorFactory.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/NukkitCalculatorFactory.java similarity index 82% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/calculators/NukkitCalculatorFactory.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/NukkitCalculatorFactory.java index ccbf7fba7..48548e94e 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculators/NukkitCalculatorFactory.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/NukkitCalculatorFactory.java @@ -23,24 +23,22 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.calculators; +package me.lucko.luckperms.nukkit.calculator; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LookupSetting; -import me.lucko.luckperms.common.caching.CacheMetadata; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; +import me.lucko.luckperms.common.calculator.processor.MapProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.RegexProcessor; +import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.HolderType; -import me.lucko.luckperms.common.processors.MapProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; -import me.lucko.luckperms.common.processors.RegexProcessor; -import me.lucko.luckperms.common.processors.WildcardProcessor; import me.lucko.luckperms.nukkit.LPNukkitPlugin; -import me.lucko.luckperms.nukkit.processors.ChildProcessor; -import me.lucko.luckperms.nukkit.processors.DefaultsProcessor; public class NukkitCalculatorFactory implements CalculatorFactory { private final LPNukkitPlugin plugin; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/contexts/NukkitContextManager.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java similarity index 94% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/contexts/NukkitContextManager.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java index d5ac71a4b..11cbe90a2 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/contexts/NukkitContextManager.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.contexts; +package me.lucko.luckperms.nukkit.context; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -32,9 +32,9 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LookupSetting; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.contexts.ContextsCache; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.context.ContextsCache; +import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import cn.nukkit.Player; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/contexts/WorldCalculator.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/WorldCalculator.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/contexts/WorldCalculator.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/context/WorldCalculator.java index 42572889c..34d5e1c42 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/contexts/WorldCalculator.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/WorldCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.contexts; +package me.lucko.luckperms.nukkit.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/PermissionDefault.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/PermissionDefault.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java index 1ba3eb956..da0a42d49 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/PermissionDefault.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model; +package me.lucko.luckperms.nukkit.inject; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/dummy/DummyPermissibleBase.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/dummy/DummyPermissibleBase.java similarity index 99% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/dummy/DummyPermissibleBase.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/dummy/DummyPermissibleBase.java index 82fb09e7a..f9c3c4b44 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/dummy/DummyPermissibleBase.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/dummy/DummyPermissibleBase.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.dummy; +package me.lucko.luckperms.nukkit.inject.dummy; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/dummy/DummyPlugin.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/dummy/DummyPlugin.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/dummy/DummyPlugin.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/dummy/DummyPlugin.java index e5e1fc97f..d4c1d9c96 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/dummy/DummyPlugin.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/dummy/DummyPlugin.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.dummy; +package me.lucko.luckperms.nukkit.inject.dummy; import cn.nukkit.Server; import cn.nukkit.command.Command; import cn.nukkit.command.CommandSender; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissible.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissible.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java index 493312885..b2548e1a9 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissible.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java @@ -23,18 +23,18 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.permissible; +package me.lucko.luckperms.nukkit.inject.permissible; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.common.model.User; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.nukkit.LPNukkitPlugin; -import me.lucko.luckperms.nukkit.model.PermissionDefault; +import me.lucko.luckperms.nukkit.inject.PermissionDefault; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissionAttachment.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java similarity index 99% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissionAttachment.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java index e26d8e25d..340f7bcb7 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissionAttachment.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.permissible; +package me.lucko.luckperms.nukkit.inject.permissible; import com.google.common.base.Preconditions; @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.ImmutableTransientNode; import me.lucko.luckperms.common.node.utils.NodeTools; -import me.lucko.luckperms.nukkit.model.dummy.DummyPlugin; +import me.lucko.luckperms.nukkit.inject.dummy.DummyPlugin; import cn.nukkit.permission.Permission; import cn.nukkit.permission.PermissionAttachment; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/MonitoredPermissibleBase.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java similarity index 97% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/MonitoredPermissibleBase.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java index 11e4240ac..57a82e74b 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/MonitoredPermissibleBase.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.permissible; +package me.lucko.luckperms.nukkit.inject.permissible; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; -import me.lucko.luckperms.nukkit.model.dummy.DummyPermissibleBase; +import me.lucko.luckperms.nukkit.inject.dummy.DummyPermissibleBase; import cn.nukkit.permission.PermissibleBase; import cn.nukkit.permission.Permission; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/PermissibleInjector.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleInjector.java similarity index 97% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/PermissibleInjector.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleInjector.java index 27df5a6b5..2ff184763 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/PermissibleInjector.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleInjector.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.permissible; +package me.lucko.luckperms.nukkit.inject.permissible; -import me.lucko.luckperms.nukkit.model.dummy.DummyPermissibleBase; +import me.lucko.luckperms.nukkit.inject.dummy.DummyPermissibleBase; import cn.nukkit.Player; import cn.nukkit.permission.PermissibleBase; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/PermissibleMonitoringInjector.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleMonitoringInjector.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/PermissibleMonitoringInjector.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleMonitoringInjector.java index 5e6b1890a..b89f2a307 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/PermissibleMonitoringInjector.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleMonitoringInjector.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.permissible; +package me.lucko.luckperms.nukkit.inject.permissible; import me.lucko.luckperms.nukkit.LPNukkitPlugin; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorDefaultsMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorDefaultsMap.java similarity index 99% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorDefaultsMap.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorDefaultsMap.java index 7224ec9f8..e66eb4e26 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorDefaultsMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorDefaultsMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.server; +package me.lucko.luckperms.nukkit.inject.server; import com.google.common.collect.ImmutableMap; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorPermissionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorPermissionMap.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorPermissionMap.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorPermissionMap.java index 7ee037713..1a0270358 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorPermissionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorPermissionMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.server; +package me.lucko.luckperms.nukkit.inject.server; import me.lucko.luckperms.nukkit.LPNukkitPlugin; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorSubscriptionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorSubscriptionMap.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorSubscriptionMap.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorSubscriptionMap.java index 5062a53b0..a7736d343 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/InjectorSubscriptionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorSubscriptionMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.server; +package me.lucko.luckperms.nukkit.inject.server; import me.lucko.luckperms.nukkit.LPNukkitPlugin; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPDefaultsMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java similarity index 98% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPDefaultsMap.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java index b8bea8119..edff5b79f 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPDefaultsMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.server; +package me.lucko.luckperms.nukkit.inject.server; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.common.buffers.Cache; +import me.lucko.luckperms.common.buffer.Cache; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPPermissionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPPermissionMap.java similarity index 99% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPPermissionMap.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPPermissionMap.java index 4d0e70352..642b20576 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPPermissionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPPermissionMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.server; +package me.lucko.luckperms.nukkit.inject.server; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPSubscriptionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPSubscriptionMap.java similarity index 99% rename from nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPSubscriptionMap.java rename to nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPSubscriptionMap.java index 6804c92ac..e24e67b01 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPSubscriptionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPSubscriptionMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.nukkit.model.server; +package me.lucko.luckperms.nukkit.inject.server; import com.google.common.collect.Sets; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java index 4fb54381f..d1cf98ec5 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java @@ -30,8 +30,8 @@ import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.nukkit.LPNukkitPlugin; -import me.lucko.luckperms.nukkit.model.permissible.LPPermissible; -import me.lucko.luckperms.nukkit.model.permissible.PermissibleInjector; +import me.lucko.luckperms.nukkit.inject.permissible.LPPermissible; +import me.lucko.luckperms.nukkit.inject.permissible.PermissibleInjector; import cn.nukkit.Player; import cn.nukkit.event.EventHandler; diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java index 017d52ce4..1fab75050 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.proxy.api6; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java index 7a0f9cde5..65999263e 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.proxy.api6; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java index d179932bb..1fbab2085 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.proxy.api6; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java index cbfd3aa85..82588d82a 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.proxy.api6; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java index eab7d4126..d910c00ee 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java @@ -26,9 +26,9 @@ package me.lucko.luckperms.sponge.service.proxy.api6; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.contexts.ContextsSupplier; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.context.ContextsSupplier; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java index e0997fd3e..02f39c0ed 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.proxy.api7; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java index 098e63065..1feb9b4f6 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.sponge.service.proxy.api7; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java index e8de01622..826e16aa5 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.proxy.api7; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java index ee77b3303..97c52f089 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.proxy.api7; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java index 87988113e..fd1e48e9f 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java @@ -26,8 +26,8 @@ package me.lucko.luckperms.sponge.service.proxy.api7; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java index 3b111543f..62eb48913 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.sponge.service.reference.SubjectReferenceFactory; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java index be8c4727e..cd16164fb 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java @@ -34,7 +34,7 @@ import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.plugin.logging.Slf4jPluginLogger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; -import me.lucko.luckperms.common.utils.MoreFiles; +import me.lucko.luckperms.common.util.MoreFiles; import org.slf4j.Logger; import org.spongepowered.api.Game; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java index 305c93fa0..db7f185a4 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java @@ -28,38 +28,38 @@ package me.lucko.luckperms.sponge; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter; -import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.dependencies.Dependency; import me.lucko.luckperms.common.event.AbstractEventBus; -import me.lucko.luckperms.common.managers.track.StandardTrackManager; import me.lucko.luckperms.common.messaging.MessagingFactory; import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.track.StandardTrackManager; import me.lucko.luckperms.common.plugin.AbstractLuckPermsPlugin; import me.lucko.luckperms.common.sender.DummySender; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.tasks.CacheHousekeepingTask; import me.lucko.luckperms.common.tasks.ExpireTemporaryTask; import me.lucko.luckperms.common.treeview.PermissionRegistry; -import me.lucko.luckperms.common.utils.MoreFiles; -import me.lucko.luckperms.sponge.calculators.SpongeCalculatorFactory; +import me.lucko.luckperms.common.util.MoreFiles; +import me.lucko.luckperms.sponge.calculator.SpongeCalculatorFactory; import me.lucko.luckperms.sponge.commands.SpongeMainCommand; -import me.lucko.luckperms.sponge.contexts.SpongeContextManager; -import me.lucko.luckperms.sponge.contexts.WorldCalculator; +import me.lucko.luckperms.sponge.context.SpongeContextManager; +import me.lucko.luckperms.sponge.context.WorldCalculator; import me.lucko.luckperms.sponge.listeners.SpongeConnectionListener; import me.lucko.luckperms.sponge.listeners.SpongePlatformListener; -import me.lucko.luckperms.sponge.managers.SpongeGroupManager; -import me.lucko.luckperms.sponge.managers.SpongeUserManager; import me.lucko.luckperms.sponge.messaging.SpongeMessagingFactory; +import me.lucko.luckperms.sponge.model.manager.SpongeGroupManager; +import me.lucko.luckperms.sponge.model.manager.SpongeUserManager; import me.lucko.luckperms.sponge.service.LuckPermsService; -import me.lucko.luckperms.sponge.service.event.UpdateEventHandler; +import me.lucko.luckperms.sponge.service.events.UpdateEventHandler; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; -import me.lucko.luckperms.sponge.service.persisted.PersistedCollection; +import me.lucko.luckperms.sponge.service.model.persisted.PersistedCollection; import me.lucko.luckperms.sponge.tasks.ServiceCacheHousekeepingTask; import org.spongepowered.api.service.permission.PermissionDescription; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java index 51db536c4..f0cefdf95 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.sponge; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; -import me.lucko.luckperms.common.utils.Iterators; +import me.lucko.luckperms.common.util.Iterators; import org.spongepowered.api.scheduler.Scheduler; import org.spongepowered.api.scheduler.SpongeExecutorService; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/DefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java similarity index 94% rename from sponge/src/main/java/me/lucko/luckperms/sponge/processors/DefaultsProcessor.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java index 07a19916a..59c48c213 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/DefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.processors; +package me.lucko.luckperms.sponge.calculator; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.processors.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/FixedDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedDefaultsProcessor.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/sponge/processors/FixedDefaultsProcessor.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedDefaultsProcessor.java index ac4e754a1..2ae56eaca 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/FixedDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedDefaultsProcessor.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.processors; +package me.lucko.luckperms.sponge.calculator; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.sponge.service.model.LPPermissionService; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/GroupDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupDefaultsProcessor.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/sponge/processors/GroupDefaultsProcessor.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupDefaultsProcessor.java index 7173bed5b..826c93bd1 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/GroupDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupDefaultsProcessor.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.processors; +package me.lucko.luckperms.sponge.calculator; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.processors.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeCalculatorFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeCalculatorFactory.java similarity index 81% rename from sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeCalculatorFactory.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeCalculatorFactory.java index 5c4bc6ad6..a0f5934f0 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeCalculatorFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeCalculatorFactory.java @@ -23,23 +23,20 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.calculators; +package me.lucko.luckperms.sponge.calculator; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.common.caching.CacheMetadata; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; +import me.lucko.luckperms.common.calculator.processor.MapProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.RegexProcessor; +import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.processors.MapProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; -import me.lucko.luckperms.common.processors.RegexProcessor; -import me.lucko.luckperms.common.processors.WildcardProcessor; import me.lucko.luckperms.sponge.LPSpongePlugin; -import me.lucko.luckperms.sponge.processors.GroupDefaultsProcessor; -import me.lucko.luckperms.sponge.processors.SpongeWildcardProcessor; -import me.lucko.luckperms.sponge.processors.UserDefaultsProcessor; public class SpongeCalculatorFactory implements CalculatorFactory { private final LPSpongePlugin plugin; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/SpongeWildcardProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java similarity index 90% rename from sponge/src/main/java/me/lucko/luckperms/sponge/processors/SpongeWildcardProcessor.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java index 58be38c5f..5f3297771 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/SpongeWildcardProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.processors; +package me.lucko.luckperms.sponge.calculator; import me.lucko.luckperms.api.Tristate; +import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.node.model.ImmutableNode; -import me.lucko.luckperms.common.processors.AbstractPermissionProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; public class SpongeWildcardProcessor extends AbstractPermissionProcessor implements PermissionProcessor { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/UserDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserDefaultsProcessor.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/sponge/processors/UserDefaultsProcessor.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserDefaultsProcessor.java index c3a0ae333..27d0bf828 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/processors/UserDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserDefaultsProcessor.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.processors; +package me.lucko.luckperms.sponge.calculator; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.processors.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionClear.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionClear.java index c1c64e97d..430f44391 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionClear.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionClear.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionInfo.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionInfo.java index 5854982e5..16f3fc23d 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionInfo.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionInfo.java @@ -37,7 +37,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionSet.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionSet.java index afadd69b9..8a7fc8b8b 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionSet.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionSet.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionUnset.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionUnset.java index 7f98c800d..c0eb9e8d0 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionUnset.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionUnset.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentAdd.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentAdd.java index f0ea829d4..ab807fb3d 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentAdd.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentAdd.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentClear.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentClear.java index ef9dc1c37..f815b180b 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentClear.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentClear.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentInfo.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentInfo.java index 92ff30646..649dabe4b 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentInfo.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentInfo.java @@ -37,7 +37,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentRemove.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentRemove.java index b846182ee..020e118be 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentRemove.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentRemove.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionClear.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionClear.java index adc9f2aab..a54be84ad 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionClear.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionClear.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionInfo.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionInfo.java index f8afd7354..880bb68e1 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionInfo.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionInfo.java @@ -37,7 +37,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java index 4ea211e99..3506bcdbb 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java @@ -37,7 +37,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java index 85e7bec6d..fec466a57 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java @@ -38,8 +38,8 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.utils.ImmutableCollectors; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.ImmutableCollectors; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeContextManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeContextManager.java similarity index 92% rename from sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeContextManager.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeContextManager.java index f1f69e310..16065b311 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeContextManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeContextManager.java @@ -23,16 +23,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.contexts; +package me.lucko.luckperms.sponge.context; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.contexts.ContextsCache; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.context.ContextsCache; +import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.sponge.LPSpongePlugin; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeProxiedContextCalculator.java similarity index 95% rename from sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeProxiedContextCalculator.java index 73daf2913..c3b6c194a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeProxiedContextCalculator.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.contexts; +package me.lucko.luckperms.sponge.context; import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.common.contexts.ProxiedContextCalculator; +import me.lucko.luckperms.common.context.ProxiedContextCalculator; import me.lucko.luckperms.sponge.service.context.DelegatingMutableContextSet; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/WorldCalculator.java similarity index 98% rename from sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/context/WorldCalculator.java index d2e41c541..827c9c6ac 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/WorldCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.contexts; +package me.lucko.luckperms.sponge.context; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java index f433bb21e..58fc4d0f7 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.sponge.model; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.sponge.LPSpongePlugin; -import me.lucko.luckperms.sponge.service.internal.GroupSubject; +import me.lucko.luckperms.sponge.service.model.permissionholder.GroupSubject; public class SpongeGroup extends Group implements SpongePermissionHolder { private final GroupSubject spongeData; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java index 7a5098b13..f99e709e0 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java @@ -27,8 +27,8 @@ package me.lucko.luckperms.sponge.model; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.sponge.LPSpongePlugin; -import me.lucko.luckperms.sponge.service.internal.UserSubject; import me.lucko.luckperms.sponge.service.model.LPSubject; +import me.lucko.luckperms.sponge.service.model.permissionholder.UserSubject; import java.util.UUID; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeGroupManager.java similarity index 96% rename from sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeGroupManager.java index 824f01806..18e641aa4 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeGroupManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.managers; +package me.lucko.luckperms.sponge.model.manager; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -36,18 +36,18 @@ import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; -import me.lucko.luckperms.common.managers.group.AbstractGroupManager; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; +import me.lucko.luckperms.common.model.manager.group.AbstractGroupManager; import me.lucko.luckperms.common.storage.misc.DataConstraints; -import me.lucko.luckperms.common.utils.ImmutableCollectors; +import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.model.SpongeGroup; import me.lucko.luckperms.sponge.service.LuckPermsService; +import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.SubjectCollection; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeUserManager.java similarity index 95% rename from sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeUserManager.java index 8feda8797..bf2fa831f 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeUserManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.managers; +package me.lucko.luckperms.sponge.model.manager; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -35,20 +35,20 @@ import com.google.common.collect.Maps; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint; -import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison; -import me.lucko.luckperms.common.managers.user.AbstractUserManager; -import me.lucko.luckperms.common.managers.user.UserHousekeeper; +import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; +import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.model.UserIdentifier; -import me.lucko.luckperms.common.utils.ImmutableCollectors; -import me.lucko.luckperms.common.utils.Uuids; +import me.lucko.luckperms.common.model.manager.user.AbstractUserManager; +import me.lucko.luckperms.common.model.manager.user.UserHousekeeper; +import me.lucko.luckperms.common.util.ImmutableCollectors; +import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.model.SpongeUser; import me.lucko.luckperms.sponge.service.LuckPermsService; +import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.SubjectCollection; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java index 6c167be98..69b7632ea 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java @@ -30,22 +30,21 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.LPSpongePlugin; -import me.lucko.luckperms.sponge.contexts.SpongeProxiedContextCalculator; -import me.lucko.luckperms.sponge.managers.SpongeGroupManager; -import me.lucko.luckperms.sponge.managers.SpongeUserManager; -import me.lucko.luckperms.sponge.service.misc.SimplePermissionDescription; +import me.lucko.luckperms.sponge.context.SpongeProxiedContextCalculator; +import me.lucko.luckperms.sponge.model.manager.SpongeGroupManager; +import me.lucko.luckperms.sponge.model.manager.SpongeUserManager; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.persisted.DefaultsCollection; -import me.lucko.luckperms.sponge.service.persisted.PersistedCollection; -import me.lucko.luckperms.sponge.service.persisted.SubjectStorage; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; +import me.lucko.luckperms.sponge.service.model.SimplePermissionDescription; +import me.lucko.luckperms.sponge.service.model.persisted.DefaultsCollection; +import me.lucko.luckperms.sponge.service.model.persisted.PersistedCollection; +import me.lucko.luckperms.sponge.service.model.persisted.SubjectStorage; import me.lucko.luckperms.sponge.service.reference.SubjectReferenceFactory; import org.spongepowered.api.plugin.PluginContainer; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/proxy/ProxyFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java similarity index 98% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/proxy/ProxyFactory.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java index f4860fff6..170118bac 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/proxy/ProxyFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.proxy; +package me.lucko.luckperms.sponge.service; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/event/LPSubjectDataUpdateEvent.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/events/LPSubjectDataUpdateEvent.java similarity index 98% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/event/LPSubjectDataUpdateEvent.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/events/LPSubjectDataUpdateEvent.java index e7fc9b0c6..b2aaa353c 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/event/LPSubjectDataUpdateEvent.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/events/LPSubjectDataUpdateEvent.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.event; +package me.lucko.luckperms.sponge.service.events; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.service.model.LPSubjectData; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/event/UpdateEventHandler.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/events/UpdateEventHandler.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/event/UpdateEventHandler.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/events/UpdateEventHandler.java index 648bc8e26..35829861f 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/event/UpdateEventHandler.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/events/UpdateEventHandler.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.event; +package me.lucko.luckperms.sponge.service.events; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.service.model.LPSubjectData; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/event/UpdateEventHandlerImpl.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/events/UpdateEventHandlerImpl.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/event/UpdateEventHandlerImpl.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/events/UpdateEventHandlerImpl.java index bae7aa203..8fc39ef63 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/event/UpdateEventHandlerImpl.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/events/UpdateEventHandlerImpl.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.event; +package me.lucko.luckperms.sponge.service.events; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.service.model.LPSubjectData; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraph.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraph.java index c328ef2cf..0b88ddff8 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraph.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraph.java @@ -26,7 +26,7 @@ package me.lucko.luckperms.sponge.service.inheritance; import me.lucko.luckperms.common.graph.Graph; -import me.lucko.luckperms.sponge.service.calculated.CalculatedSubject; +import me.lucko.luckperms.sponge.service.model.calculated.CalculatedSubject; /** * A {@link Graph} which represents an "inheritance tree" for subjects. diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraphs.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraphs.java index 95fb7a060..984e2f628 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraphs.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/inheritance/SubjectInheritanceGraphs.java @@ -26,7 +26,7 @@ package me.lucko.luckperms.sponge.service.inheritance; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.sponge.service.calculated.CalculatedSubject; +import me.lucko.luckperms.sponge.service.model.calculated.CalculatedSubject; import java.util.stream.Collectors; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/misc/SimplePermissionDescription.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java similarity index 90% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/misc/SimplePermissionDescription.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java index 9350dd1f8..231d651c3 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/misc/SimplePermissionDescription.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java @@ -23,14 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.misc; +package me.lucko.luckperms.sponge.service.model; -import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; -import me.lucko.luckperms.sponge.service.model.LPPermissionService; -import me.lucko.luckperms.sponge.service.model.LPSubject; -import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; -import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; +import me.lucko.luckperms.sponge.service.ProxyFactory; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.api.plugin.PluginContainer; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/CalculatedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java similarity index 98% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/CalculatedSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java index dd9c4e0d5..32e13e719 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/CalculatedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.calculated; +package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; @@ -31,7 +31,7 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.graph.TraversalAlgorithm; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; @@ -49,11 +49,11 @@ import java.util.Set; public abstract class CalculatedSubject implements LPSubject { private final LPSpongePlugin plugin; - private final SubjectCachedData cachedData; + private final CalculatedSubjectCachedData cachedData; protected CalculatedSubject(LPSpongePlugin plugin) { this.plugin = plugin; - this.cachedData = new SubjectCachedData(this, plugin); + this.cachedData = new CalculatedSubjectCachedData(this, plugin); } @Override diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/SubjectCachedData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedData.java similarity index 81% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/SubjectCachedData.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedData.java index b395539ea..8f1b1786c 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/SubjectCachedData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedData.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.calculated; +package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; @@ -31,23 +31,23 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.caching.MetaContexts; import me.lucko.luckperms.api.metastacking.DuplicateRemovalFunction; import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.common.caching.AbstractCachedData; -import me.lucko.luckperms.common.caching.CacheMetadata; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.AbstractCachedData; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; +import me.lucko.luckperms.common.calculator.processor.MapProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.metastacking.SimpleMetaStackDefinition; import me.lucko.luckperms.common.metastacking.StandardStackElements; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.processors.MapProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; -import me.lucko.luckperms.common.processors.WildcardProcessor; -import me.lucko.luckperms.sponge.processors.FixedDefaultsProcessor; -import me.lucko.luckperms.sponge.processors.SpongeWildcardProcessor; +import me.lucko.luckperms.sponge.calculator.FixedDefaultsProcessor; +import me.lucko.luckperms.sponge.calculator.SpongeWildcardProcessor; import java.util.Map; -public class SubjectCachedData extends AbstractCachedData implements CalculatorFactory { +public class CalculatedSubjectCachedData extends AbstractCachedData implements CalculatorFactory { private static final MetaStackDefinition DEFAULT_META_STACK = new SimpleMetaStackDefinition( ImmutableList.of(StandardStackElements.HIGHEST), DuplicateRemovalFunction.RETAIN_ALL, @@ -56,7 +56,7 @@ public class SubjectCachedData extends AbstractCachedData implements CalculatorF private final CalculatedSubject subject; - SubjectCachedData(CalculatedSubject subject, LuckPermsPlugin plugin) { + CalculatedSubjectCachedData(CalculatedSubject subject, LuckPermsPlugin plugin) { super(plugin); this.subject = subject; } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/CalculatedSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectData.java similarity index 98% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/CalculatedSubjectData.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectData.java index c5c31ef7d..89f2549cc 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/CalculatedSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectData.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.calculated; +package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -31,13 +31,13 @@ import com.google.common.collect.ImmutableMap; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextSetComparator; +import me.lucko.luckperms.common.context.ContextSetComparator; import me.lucko.luckperms.common.model.NodeMapType; +import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; import org.spongepowered.api.service.permission.SubjectData; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/MonitoredSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/MonitoredSubjectData.java similarity index 98% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/MonitoredSubjectData.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/MonitoredSubjectData.java index a00b6e6d3..d070fc5e4 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/MonitoredSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/MonitoredSubjectData.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.calculated; +package me.lucko.luckperms.sponge.service.model.calculated; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/GroupSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/GroupSubject.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/GroupSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/GroupSubject.java index 44e462903..e70d68dbc 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/GroupSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/GroupSubject.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.internal; +package me.lucko.luckperms.sponge.service.model.permissionholder; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.model.SpongeGroup; @@ -37,7 +37,7 @@ import java.util.Optional; /** * Implements {@link LPSubject} for a {@link SpongeGroup}. */ -public class GroupSubject extends HolderSubject implements LPSubject { +public class GroupSubject extends PermissionHolderSubject implements LPSubject { public GroupSubject(LPSpongePlugin plugin, SpongeGroup parent) { super(plugin, parent); } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/HolderSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java similarity index 88% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/HolderSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java index 71c267b76..8e9bbfe79 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/HolderSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.internal; +package me.lucko.luckperms.sponge.service.model.permissionholder; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.caching.type.MetaCache; +import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.graph.TraversalAlgorithm; import me.lucko.luckperms.common.inheritance.InheritanceGraph; import me.lucko.luckperms.common.model.Group; @@ -43,9 +43,9 @@ import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.model.SpongeGroup; import me.lucko.luckperms.sponge.service.LuckPermsService; +import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; @@ -55,20 +55,20 @@ import java.util.Optional; /** * Implements {@link LPSubject} for a {@link PermissionHolder}. */ -public abstract class HolderSubject implements LPSubject { +public abstract class PermissionHolderSubject implements LPSubject { protected final T parent; protected final LPSpongePlugin plugin; - private final HolderSubjectData subjectData; - private final HolderSubjectData transientSubjectData; + private final PermissionHolderSubjectData subjectData; + private final PermissionHolderSubjectData transientSubjectData; private Subject spongeSubject = null; - HolderSubject(LPSpongePlugin plugin, T parent) { + PermissionHolderSubject(LPSpongePlugin plugin, T parent) { this.parent = parent; this.plugin = plugin; - this.subjectData = new HolderSubjectData(plugin.getService(), NodeMapType.ENDURING, parent, this); - this.transientSubjectData = new HolderSubjectData(plugin.getService(), NodeMapType.TRANSIENT, parent, this); + this.subjectData = new PermissionHolderSubjectData(plugin.getService(), NodeMapType.ENDURING, parent, this); + this.transientSubjectData = new PermissionHolderSubjectData(plugin.getService(), NodeMapType.TRANSIENT, parent, this); } public void fireUpdateEvent() { @@ -99,12 +99,12 @@ public abstract class HolderSubject implements LPSub } @Override - public HolderSubjectData getSubjectData() { + public PermissionHolderSubjectData getSubjectData() { return this.subjectData; } @Override - public HolderSubjectData getTransientSubjectData() { + public PermissionHolderSubjectData getTransientSubjectData() { return this.transientSubjectData; } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/HolderSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubjectData.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/HolderSubjectData.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubjectData.java index 7ce0c94e0..f2385e5d1 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/HolderSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubjectData.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.internal; +package me.lucko.luckperms.sponge.service.model.permissionholder; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -34,7 +34,7 @@ import me.lucko.luckperms.api.DataMutateResult; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.caching.type.MetaAccumulator; +import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.model.PermissionHolder; @@ -42,10 +42,10 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.model.NodeTypes; import me.lucko.luckperms.sponge.service.LuckPermsService; +import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.SubjectData; @@ -59,14 +59,14 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.stream.Stream; -public class HolderSubjectData implements LPSubjectData { +public class PermissionHolderSubjectData implements LPSubjectData { private final LuckPermsService service; private final NodeMapType type; private final PermissionHolder holder; private final LPSubject parentSubject; - public HolderSubjectData(LuckPermsService service, NodeMapType type, PermissionHolder holder, LPSubject parentSubject) { + public PermissionHolderSubjectData(LuckPermsService service, NodeMapType type, PermissionHolder holder, LPSubject parentSubject) { this.type = type; this.service = service; this.holder = holder; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/UserSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/UserSubject.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/UserSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/UserSubject.java index b9076929d..c34b5d782 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/internal/UserSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/UserSubject.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.internal; +package me.lucko.luckperms.sponge.service.model.permissionholder; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.model.SpongeUser; @@ -40,7 +40,7 @@ import java.util.function.Function; /** * Implements {@link LPSubject} for a {@link SpongeUser}. */ -public final class UserSubject extends HolderSubject implements LPSubject { +public final class UserSubject extends PermissionHolderSubject implements LPSubject { public UserSubject(LPSpongePlugin plugin, SpongeUser parent) { super(plugin, parent); } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/DefaultsCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/DefaultsCollection.java similarity index 96% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/DefaultsCollection.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/DefaultsCollection.java index ab2a8d7cf..234360d2a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/DefaultsCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/DefaultsCollection.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.persisted; +package me.lucko.luckperms.sponge.service.model.persisted; import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.model.LPSubject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedCollection.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedCollection.java index ed0e727c4..0b3844bf6 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedCollection.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.persisted; +package me.lucko.luckperms.sponge.service.model.persisted; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -34,13 +34,13 @@ import com.google.common.collect.ImmutableSet; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.utils.ImmutableCollectors; -import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.util.ImmutableCollectors; +import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.LuckPermsService; +import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; import org.spongepowered.api.service.permission.SubjectCollection; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubject.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubject.java index 4a485aa32..69103f8ab 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubject.java @@ -23,18 +23,18 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.persisted; +package me.lucko.luckperms.sponge.service.model.persisted; -import me.lucko.luckperms.common.buffers.BufferedRequest; +import me.lucko.luckperms.common.buffer.BufferedRequest; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.sponge.service.LuckPermsService; -import me.lucko.luckperms.sponge.service.calculated.CalculatedSubject; -import me.lucko.luckperms.sponge.service.calculated.CalculatedSubjectData; -import me.lucko.luckperms.sponge.service.calculated.MonitoredSubjectData; +import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectData; -import me.lucko.luckperms.sponge.service.proxy.ProxyFactory; +import me.lucko.luckperms.sponge.service.model.calculated.CalculatedSubject; +import me.lucko.luckperms.sponge.service.model.calculated.CalculatedSubjectData; +import me.lucko.luckperms.sponge.service.model.calculated.MonitoredSubjectData; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubjectData.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubjectData.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubjectData.java index 842aef2a5..bea2fe24e 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubjectData.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.persisted; +package me.lucko.luckperms.sponge.service.model.persisted; import me.lucko.luckperms.common.model.NodeMapType; import me.lucko.luckperms.sponge.service.LuckPermsService; -import me.lucko.luckperms.sponge.service.calculated.MonitoredSubjectData; +import me.lucko.luckperms.sponge.service.model.calculated.MonitoredSubjectData; /** * Extension of CalculatedSubjectData which persists data when modified diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectDataContainer.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectDataContainer.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectDataContainer.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectDataContainer.java index dfd67774a..de067f6dd 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectDataContainer.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectDataContainer.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.persisted; +package me.lucko.luckperms.sponge.service.model.persisted; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -33,12 +33,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextSetComparator; -import me.lucko.luckperms.common.contexts.ContextSetJsonSerializer; -import me.lucko.luckperms.sponge.service.calculated.CalculatedSubjectData; +import me.lucko.luckperms.common.context.ContextSetComparator; +import me.lucko.luckperms.common.context.ContextSetJsonSerializer; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; +import me.lucko.luckperms.sponge.service.model.calculated.CalculatedSubjectData; import java.util.ArrayList; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectStorage.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectStorage.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectStorage.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectStorage.java index 65d34ab7b..a16f4513a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectStorage.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectStorage.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.persisted; +package me.lucko.luckperms.sponge.service.model.persisted; import com.google.common.collect.ImmutableSet; import com.google.gson.JsonObject; -import me.lucko.luckperms.common.utils.ImmutableCollectors; -import me.lucko.luckperms.common.utils.MoreFiles; -import me.lucko.luckperms.common.utils.gson.GsonProvider; +import me.lucko.luckperms.common.util.ImmutableCollectors; +import me.lucko.luckperms.common.util.MoreFiles; +import me.lucko.luckperms.common.util.gson.GsonProvider; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import java.io.BufferedReader; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java index 9837c0984..5c4e96939 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java @@ -30,26 +30,26 @@ import com.velocitypowered.api.proxy.Player; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter; -import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.dependencies.Dependency; import me.lucko.luckperms.common.event.AbstractEventBus; -import me.lucko.luckperms.common.managers.group.StandardGroupManager; -import me.lucko.luckperms.common.managers.track.StandardTrackManager; -import me.lucko.luckperms.common.managers.user.StandardUserManager; import me.lucko.luckperms.common.messaging.MessagingFactory; import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.group.StandardGroupManager; +import me.lucko.luckperms.common.model.manager.track.StandardTrackManager; +import me.lucko.luckperms.common.model.manager.user.StandardUserManager; import me.lucko.luckperms.common.plugin.AbstractLuckPermsPlugin; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.tasks.CacheHousekeepingTask; import me.lucko.luckperms.common.tasks.ExpireTemporaryTask; -import me.lucko.luckperms.common.utils.MoreFiles; -import me.lucko.luckperms.velocity.calculators.VelocityCalculatorFactory; -import me.lucko.luckperms.velocity.contexts.BackendServerCalculator; -import me.lucko.luckperms.velocity.contexts.VelocityContextManager; +import me.lucko.luckperms.common.util.MoreFiles; +import me.lucko.luckperms.velocity.calculator.VelocityCalculatorFactory; +import me.lucko.luckperms.velocity.context.BackendServerCalculator; +import me.lucko.luckperms.velocity.context.VelocityContextManager; import me.lucko.luckperms.velocity.listeners.MonitoringPermissionCheckListener; import me.lucko.luckperms.velocity.listeners.VelocityConnectionListener; import me.lucko.luckperms.velocity.messaging.VelocityMessagingFactory; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java index f64b410fb..f19ea13a5 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java @@ -29,7 +29,7 @@ import com.velocitypowered.api.scheduler.ScheduledTask; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; -import me.lucko.luckperms.common.utils.Iterators; +import me.lucko.luckperms.common.util.Iterators; import java.util.Collections; import java.util.Set; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java index fbb81f56d..c931794a6 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java @@ -32,7 +32,7 @@ import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.SenderFactory; -import me.lucko.luckperms.common.utils.TextUtils; +import me.lucko.luckperms.common.util.TextUtils; import me.lucko.luckperms.velocity.service.CompatibilityUtil; import net.kyori.text.Component; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/calculators/VelocityCalculatorFactory.java b/velocity/src/main/java/me/lucko/luckperms/velocity/calculator/VelocityCalculatorFactory.java similarity index 81% rename from velocity/src/main/java/me/lucko/luckperms/velocity/calculators/VelocityCalculatorFactory.java rename to velocity/src/main/java/me/lucko/luckperms/velocity/calculator/VelocityCalculatorFactory.java index 5b192c856..c84b8dca5 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/calculators/VelocityCalculatorFactory.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/calculator/VelocityCalculatorFactory.java @@ -23,19 +23,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.velocity.calculators; +package me.lucko.luckperms.velocity.calculator; import com.google.common.collect.ImmutableList; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.common.caching.CacheMetadata; -import me.lucko.luckperms.common.calculators.CalculatorFactory; -import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.cacheddata.CacheMetadata; +import me.lucko.luckperms.common.calculator.CalculatorFactory; +import me.lucko.luckperms.common.calculator.PermissionCalculator; +import me.lucko.luckperms.common.calculator.processor.MapProcessor; +import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; +import me.lucko.luckperms.common.calculator.processor.RegexProcessor; +import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.processors.MapProcessor; -import me.lucko.luckperms.common.processors.PermissionProcessor; -import me.lucko.luckperms.common.processors.RegexProcessor; -import me.lucko.luckperms.common.processors.WildcardProcessor; import me.lucko.luckperms.velocity.LPVelocityPlugin; public class VelocityCalculatorFactory implements CalculatorFactory { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/contexts/BackendServerCalculator.java b/velocity/src/main/java/me/lucko/luckperms/velocity/context/BackendServerCalculator.java similarity index 98% rename from velocity/src/main/java/me/lucko/luckperms/velocity/contexts/BackendServerCalculator.java rename to velocity/src/main/java/me/lucko/luckperms/velocity/context/BackendServerCalculator.java index ac523eaca..4cd52cebf 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/contexts/BackendServerCalculator.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/context/BackendServerCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.velocity.contexts; +package me.lucko.luckperms.velocity.context; import com.velocitypowered.api.proxy.Player; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/contexts/VelocityContextManager.java b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityContextManager.java similarity index 92% rename from velocity/src/main/java/me/lucko/luckperms/velocity/contexts/VelocityContextManager.java rename to velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityContextManager.java index 226168955..a13ed8556 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/contexts/VelocityContextManager.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityContextManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.velocity.contexts; +package me.lucko.luckperms.velocity.context; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -31,9 +31,9 @@ import com.velocitypowered.api.proxy.Player; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.common.contexts.ContextManager; -import me.lucko.luckperms.common.contexts.ContextsCache; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextManager; +import me.lucko.luckperms.common.context.ContextsCache; +import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.velocity.LPVelocityPlugin; import java.util.concurrent.TimeUnit; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java index 62e34facc..bedc0dd1f 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java @@ -32,7 +32,7 @@ import com.velocitypowered.api.permission.PermissionSubject; import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; -import me.lucko.luckperms.common.contexts.ContextsSupplier; +import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent;