From b286faa1c58fb14f5a9019dcdb8cb6a7454639d3 Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 26 Aug 2019 18:00:02 +0100 Subject: [PATCH] Change API package to net.luckperms --- api/build.gradle | 1 + .../luckperms/api/LuckPerms.java | 38 ++++----- .../luckperms/api/LuckPermsProvider.java | 2 +- .../luckperms/api/actionlog/Action.java | 4 +- .../luckperms/api/actionlog/ActionLog.java | 2 +- .../luckperms/api/actionlog/ActionLogger.java | 4 +- .../luckperms/api/cacheddata/CachedData.java | 4 +- .../api/cacheddata/CachedDataManager.java | 6 +- .../api/cacheddata/CachedMetaData.java | 4 +- .../api/cacheddata/CachedPermissionData.java | 4 +- .../luckperms/api/context/Context.java | 2 +- .../api/context/ContextCalculator.java | 2 +- .../api/context/ContextConsumer.java | 2 +- .../luckperms/api/context/ContextManager.java | 8 +- .../luckperms/api/context/ContextSet.java | 2 +- .../api/context/ContextSetFactory.java | 2 +- .../api/context/DefaultContextKeys.java | 2 +- .../api/context/ImmutableContextSet.java | 4 +- .../api/context/MutableContextSet.java | 4 +- .../api/context/StaticContextCalculator.java | 2 +- .../luckperms/api/event/Cancellable.java | 2 +- .../luckperms/api/event/EventBus.java | 2 +- .../api/event/EventSubscription.java | 2 +- .../luckperms/api/event/LuckPermsEvent.java | 4 +- .../luckperms/api/event/Param.java | 2 +- .../luckperms/api/event/Sourced.java | 4 +- .../api/event/cause/CreationCause.java | 2 +- .../api/event/cause/DeletionCause.java | 2 +- .../api/event/group/GroupCacheLoadEvent.java | 10 +-- .../api/event/group/GroupCreateEvent.java | 10 +-- .../group/GroupDataRecalculateEvent.java | 10 +-- .../api/event/group/GroupDeleteEvent.java | 10 +-- .../api/event/group/GroupLoadAllEvent.java | 4 +- .../api/event/group/GroupLoadEvent.java | 8 +- .../api/event/log/LogBroadcastEvent.java | 10 +-- .../api/event/log/LogNetworkPublishEvent.java | 10 +-- .../api/event/log/LogNotifyEvent.java | 12 +-- .../api/event/log/LogPublishEvent.java | 10 +-- .../api/event/log/LogReceiveEvent.java | 8 +- .../api/event/node/NodeAddEvent.java | 6 +- .../api/event/node/NodeClearEvent.java | 2 +- .../api/event/node/NodeMutateEvent.java | 16 ++-- .../api/event/node/NodeRemoveEvent.java | 6 +- .../api/event/player/PlayerDataSaveEvent.java | 10 +-- .../event/player/PlayerLoginProcessEvent.java | 10 +-- .../api/event/source/EntitySource.java | 4 +- .../luckperms/api/event/source/Source.java | 4 +- .../api/event/sync/ConfigReloadEvent.java | 4 +- .../api/event/sync/PostSyncEvent.java | 4 +- .../api/event/sync/PreNetworkSyncEvent.java | 8 +- .../api/event/sync/PreSyncEvent.java | 6 +- .../api/event/track/TrackCreateEvent.java | 10 +-- .../api/event/track/TrackDeleteEvent.java | 8 +- .../api/event/track/TrackLoadAllEvent.java | 4 +- .../api/event/track/TrackLoadEvent.java | 8 +- .../track/mutate/TrackAddGroupEvent.java | 4 +- .../event/track/mutate/TrackClearEvent.java | 2 +- .../event/track/mutate/TrackMutateEvent.java | 8 +- .../track/mutate/TrackRemoveGroupEvent.java | 4 +- .../api/event/user/UserCacheLoadEvent.java | 10 +-- .../event/user/UserDataRecalculateEvent.java | 10 +-- .../api/event/user/UserFirstLoginEvent.java | 6 +- .../api/event/user/UserLoadEvent.java | 8 +- .../api/event/user/track/TrackAction.java | 2 +- .../api/event/user/track/UserDemoteEvent.java | 2 +- .../event/user/track/UserPromoteEvent.java | 2 +- .../api/event/user/track/UserTrackEvent.java | 12 +-- .../api/messaging/MessagingService.java | 6 +- .../messenger/IncomingMessageConsumer.java | 6 +- .../luckperms/api/messenger/Messenger.java | 6 +- .../api/messenger/MessengerProvider.java | 4 +- .../api/messenger/message/Message.java | 4 +- .../messenger/message/OutgoingMessage.java | 4 +- .../message/type/ActionLogMessage.java | 6 +- .../messenger/message/type/UpdateMessage.java | 4 +- .../message/type/UserUpdateMessage.java | 4 +- .../DuplicateRemovalFunction.java | 2 +- .../api/metastacking/MetaStackDefinition.java | 4 +- .../api/metastacking/MetaStackElement.java | 6 +- .../api/metastacking/MetaStackFactory.java | 2 +- .../luckperms/api/model/DataMutateResult.java | 6 +- .../luckperms/api/model/DataType.java | 2 +- .../luckperms/api/model/PermissionHolder.java | 30 +++---- .../luckperms/api/model/PlayerSaveResult.java | 4 +- .../api/model/TemporaryDataMutateResult.java | 6 +- .../api/model/TemporaryMergeBehaviour.java | 4 +- .../luckperms/api/model/group/Group.java | 6 +- .../api/model/group/GroupManager.java | 4 +- .../luckperms/api/model/user/User.java | 6 +- .../luckperms/api/model/user/UserManager.java | 6 +- .../luckperms/api/node/ChatMetaType.java | 4 +- .../luckperms/api/node/HeldNode.java | 4 +- .../luckperms/api/node/Node.java | 26 +++--- .../luckperms/api/node/NodeBuilder.java | 6 +- .../api/node/NodeBuilderRegistry.java | 18 ++-- .../api/node/NodeEqualityPredicate.java | 2 +- .../luckperms/api/node/NodeType.java | 20 ++--- .../luckperms/api/node/ScopedNode.java | 2 +- .../luckperms/api/node/SimpleNodeType.java | 2 +- .../luckperms/api/node/Tristate.java | 2 +- .../api/node/metadata/NodeMetadataKey.java | 2 +- .../node/metadata/SimpleNodeMetadataKey.java | 2 +- .../types/InheritanceOriginMetadata.java | 8 +- .../api/node/types/ChatMetaNode.java | 8 +- .../api/node/types/DisplayNameNode.java | 12 +-- .../api/node/types/InheritanceNode.java | 14 +-- .../luckperms/api/node/types/MetaNode.java | 12 +-- .../api/node/types/PermissionNode.java | 12 +-- .../luckperms/api/node/types/PrefixNode.java | 8 +- .../api/node/types/RegexPermissionNode.java | 12 +-- .../luckperms/api/node/types/SuffixNode.java | 8 +- .../luckperms/api/node/types/WeightNode.java | 12 +-- .../luckperms/api/platform/Platform.java | 2 +- .../api/platform/PlatformEntity.java | 2 +- .../api/platform/PluginMetadata.java | 2 +- .../api/query/DefaultQueryOptions.java | 4 +- .../luckperms/api/query/Flag.java | 2 +- .../luckperms/api/query/OptionKey.java | 2 +- .../luckperms/api/query/QueryMode.java | 2 +- .../luckperms/api/query/QueryOptions.java | 8 +- .../api/query/dataorder/DataQueryOrder.java | 6 +- .../dataorder/DataQueryOrderFunction.java | 8 +- .../luckperms/api/track/DemotionResult.java | 6 +- .../luckperms/api/track/PromotionResult.java | 6 +- .../luckperms/api/track/Track.java | 10 +-- .../luckperms/api/track/TrackManager.java | 2 +- .../luckperms/api/util/Result.java | 2 +- bukkit-legacy/build.gradle | 1 + .../luckperms/bukkit/BukkitSenderFactory.java | 2 +- .../luckperms/bukkit/LPBukkitBootstrap.java | 3 +- .../luckperms/bukkit/LPBukkitPlugin.java | 7 +- .../calculator/BukkitCalculatorFactory.java | 3 +- .../bukkit/calculator/ChildProcessor.java | 3 +- .../bukkit/calculator/DefaultsProcessor.java | 3 +- .../bukkit/context/BukkitContextManager.java | 7 +- .../bukkit/context/WorldCalculator.java | 7 +- .../inject/permissible/LPPermissible.java | 3 +- .../permissible/LPPermissionAttachment.java | 7 +- .../permissible/MonitoredPermissibleBase.java | 5 +- .../bukkit/inject/server/LPDefaultsMap.java | 3 +- .../messaging/BukkitMessagingFactory.java | 7 +- .../bukkit/messaging/LilyPadMessenger.java | 7 +- .../messaging/PluginMessageMessenger.java | 7 +- .../migration/MigrationBPermissions.java | 9 +- .../migration/MigrationGroupManager.java | 11 +-- .../migration/MigrationPermissionsBukkit.java | 7 +- .../migration/MigrationPermissionsEx.java | 7 +- .../migration/MigrationPowerfulPerms.java | 9 +- .../migration/MigrationZPermissions.java | 11 +-- .../bukkit/vault/LuckPermsVaultChat.java | 16 ++-- .../vault/LuckPermsVaultPermission.java | 18 ++-- .../luckperms/bungee/BungeeSenderFactory.java | 2 +- .../luckperms/bungee/LPBungeeBootstrap.java | 2 +- .../luckperms/bungee/LPBungeePlugin.java | 4 +- .../calculator/BungeeCalculatorFactory.java | 3 +- .../context/BackendServerCalculator.java | 6 +- .../bungee/context/BungeeContextManager.java | 4 +- .../bungee/context/RedisBungeeCalculator.java | 4 +- .../bungee/event/TristateCheckEvent.java | 3 +- .../BungeePermissionCheckListener.java | 4 +- .../messaging/BungeeMessagingFactory.java | 7 +- .../messaging/PluginMessageMessenger.java | 6 +- .../messaging/RedisBungeeMessenger.java | 6 +- .../migration/MigrationBungeePerms.java | 6 +- common/build.gradle | 2 +- .../actionlog/ActionJsonSerializer.java | 3 +- .../lucko/luckperms/common/actionlog/Log.java | 3 +- .../common/actionlog/LogDispatcher.java | 5 +- .../common/actionlog/LoggedAction.java | 9 +- .../common/api/ApiRegistrationUtil.java | 4 +- .../common/api/LuckPermsApiProvider.java | 27 +++--- .../api/implementation/ApiActionLog.java | 5 +- .../api/implementation/ApiActionLogger.java | 7 +- .../api/implementation/ApiContextManager.java | 15 ++-- .../implementation/ApiContextSetFactory.java | 7 +- .../common/api/implementation/ApiGroup.java | 7 +- .../api/implementation/ApiGroupManager.java | 23 ++--- .../implementation/ApiMessagingService.java | 5 +- .../implementation/ApiMetaStackFactory.java | 9 +- .../ApiNodeBuilderRegistry.java | 21 ++--- .../implementation/ApiPermissionHolder.java | 27 +++--- .../api/implementation/ApiPlatform.java | 5 +- .../common/api/implementation/ApiTrack.java | 17 ++-- .../api/implementation/ApiTrackManager.java | 21 ++--- .../common/api/implementation/ApiUser.java | 11 +-- .../api/implementation/ApiUserManager.java | 21 ++--- .../luckperms/common/backup/Exporter.java | 5 +- .../cacheddata/AbstractCachedDataManager.java | 13 +-- .../common/cacheddata/CacheMetadata.java | 5 +- .../cacheddata/GroupCachedDataManager.java | 5 +- .../cacheddata/HolderCachedDataManager.java | 7 +- .../cacheddata/UserCachedDataManager.java | 5 +- .../cacheddata/type/MetaAccumulator.java | 11 +-- .../common/cacheddata/type/MetaCache.java | 7 +- .../cacheddata/type/PermissionCache.java | 7 +- .../common/calculator/CalculatorFactory.java | 3 +- .../calculator/PermissionCalculator.java | 3 +- .../calculator/processor/MapProcessor.java | 3 +- .../calculator/processor/RegexProcessor.java | 7 +- .../processor/WildcardProcessor.java | 3 +- .../calculator/result/TristateResult.java | 3 +- .../common/command/CommandManager.java | 2 +- .../command/access/ArgumentPermissions.java | 9 +- .../common/command/utils/ArgumentParser.java | 9 +- .../common/command/utils/MessageUtils.java | 9 +- .../commands/generic/meta/CommandMeta.java | 3 +- .../generic/meta/MetaAddChatMeta.java | 8 +- .../generic/meta/MetaAddTempChatMeta.java | 12 +-- .../commands/generic/meta/MetaClear.java | 7 +- .../commands/generic/meta/MetaInfo.java | 16 ++-- .../generic/meta/MetaRemoveChatMeta.java | 8 +- .../generic/meta/MetaRemoveTempChatMeta.java | 8 +- .../common/commands/generic/meta/MetaSet.java | 10 +-- .../generic/meta/MetaSetChatMeta.java | 10 +-- .../commands/generic/meta/MetaSetTemp.java | 12 +-- .../generic/meta/MetaSetTempChatMeta.java | 14 +-- .../commands/generic/meta/MetaUnset.java | 7 +- .../commands/generic/meta/MetaUnsetTemp.java | 7 +- .../commands/generic/other/HolderClear.java | 5 +- .../commands/generic/other/HolderEditor.java | 2 +- .../generic/other/HolderShowTracks.java | 7 +- .../commands/generic/parent/ParentAdd.java | 7 +- .../generic/parent/ParentAddTemp.java | 11 +-- .../commands/generic/parent/ParentClear.java | 3 +- .../generic/parent/ParentClearTrack.java | 7 +- .../commands/generic/parent/ParentInfo.java | 4 +- .../commands/generic/parent/ParentRemove.java | 7 +- .../generic/parent/ParentRemoveTemp.java | 7 +- .../commands/generic/parent/ParentSet.java | 5 +- .../generic/parent/ParentSetTrack.java | 7 +- .../parent/UserSwitchPrimaryGroup.java | 9 +- .../generic/permission/PermissionCheck.java | 9 +- .../permission/PermissionCheckInherits.java | 5 +- .../generic/permission/PermissionClear.java | 7 +- .../generic/permission/PermissionInfo.java | 4 +- .../generic/permission/PermissionSet.java | 11 +-- .../generic/permission/PermissionSetTemp.java | 15 ++-- .../generic/permission/PermissionUnset.java | 11 +-- .../permission/PermissionUnsetTemp.java | 11 +-- .../common/commands/group/CreateGroup.java | 5 +- .../common/commands/group/DeleteGroup.java | 5 +- .../common/commands/group/GroupClone.java | 5 +- .../common/commands/group/GroupInfo.java | 5 +- .../commands/group/GroupListMembers.java | 6 +- .../common/commands/group/GroupRename.java | 7 +- .../commands/group/GroupSetDisplayName.java | 7 +- .../common/commands/group/GroupSetWeight.java | 5 +- .../common/commands/log/LogGroupHistory.java | 3 +- .../common/commands/log/LogNotify.java | 7 +- .../common/commands/log/LogRecent.java | 3 +- .../common/commands/log/LogSearch.java | 3 +- .../common/commands/log/LogTrackHistory.java | 3 +- .../common/commands/log/LogUserHistory.java | 3 +- .../commands/migration/MigrationUtils.java | 7 +- .../commands/misc/ApplyEditsCommand.java | 11 +-- .../common/commands/misc/CheckCommand.java | 3 +- .../common/commands/misc/DebugCommand.java | 12 +-- .../common/commands/misc/InfoCommand.java | 3 +- .../common/commands/misc/SearchCommand.java | 4 +- .../common/commands/track/CreateTrack.java | 5 +- .../common/commands/track/DeleteTrack.java | 5 +- .../common/commands/track/TrackAppend.java | 3 +- .../common/commands/track/TrackClone.java | 3 +- .../common/commands/track/TrackInsert.java | 3 +- .../common/commands/track/TrackRemove.java | 3 +- .../common/commands/track/TrackRename.java | 5 +- .../common/commands/user/UserClone.java | 3 +- .../common/commands/user/UserDemote.java | 5 +- .../common/commands/user/UserInfo.java | 9 +- .../common/commands/user/UserPromote.java | 5 +- .../luckperms/common/config/ConfigKeys.java | 13 +-- .../luckperms/common/config/ContextsFile.java | 3 +- .../common/context/ContextManager.java | 9 +- .../common/context/ContextSetComparator.java | 6 +- .../ContextSetConfigurateSerializer.java | 6 +- .../context/ContextSetJsonSerializer.java | 6 +- .../context/LPStaticContextsCalculator.java | 7 +- .../context/ProxiedContextCalculator.java | 2 +- .../common/context/QueryOptionsCache.java | 5 +- .../common/context/QueryOptionsSupplier.java | 4 +- .../contextset/AbstractContextSet.java | 2 +- .../context/contextset/ContextImpl.java | 2 +- .../contextset/ImmutableContextSetImpl.java | 8 +- .../contextset/MutableContextSetImpl.java | 8 +- .../AssignmentExpression.java | 9 +- .../defaultassignments/AssignmentRule.java | 7 +- .../dependencies/DependencyRegistry.java | 3 +- .../common/event/AbstractEventBus.java | 6 +- .../luckperms/common/event/EventFactory.java | 85 ++++++++++--------- .../event/LuckPermsEventSubscription.java | 5 +- .../common/event/gen/GeneratedEventSpec.java | 7 +- .../common/event/model/EntitySourceImpl.java | 4 +- .../event/model/SenderPlatformEntity.java | 3 +- .../common/event/model/UnknownSource.java | 2 +- .../common/inheritance/InheritanceGraph.java | 9 +- .../inheritance/InheritanceHandler.java | 3 +- .../common/inheritance/ResolvedGroup.java | 3 +- .../messaging/InternalMessagingService.java | 7 +- .../messaging/LuckPermsMessagingService.java | 17 ++-- .../common/messaging/MessagingFactory.java | 7 +- .../messaging/message/AbstractMessage.java | 4 +- .../message/ActionLogMessageImpl.java | 5 +- .../messaging/message/UpdateMessageImpl.java | 3 +- .../message/UserUpdateMessageImpl.java | 3 +- .../messaging/redis/RedisMessenger.java | 7 +- .../messaging/sql/AbstractSqlMessenger.java | 6 +- .../common/messaging/sql/SqlMessenger.java | 3 +- .../metastacking/FluentMetaStackElement.java | 6 +- .../common/metastacking/MetaStack.java | 6 +- .../common/metastacking/MetaStackEntry.java | 4 +- .../common/metastacking/SimpleMetaStack.java | 7 +- .../SimpleMetaStackDefinition.java | 6 +- .../metastacking/SimpleMetaStackEntry.java | 6 +- .../metastacking/StandardStackElements.java | 9 +- .../common/model/DemotionResults.java | 2 +- .../common/model/DisplayNameCache.java | 5 +- .../lucko/luckperms/common/model/Group.java | 7 +- .../lucko/luckperms/common/model/NodeMap.java | 15 ++-- .../common/model/PermissionHolder.java | 33 +++---- .../model/PermissionHolderIdentifier.java | 2 +- .../common/model/PromotionResults.java | 2 +- .../lucko/luckperms/common/model/Track.java | 17 ++-- .../me/lucko/luckperms/common/model/User.java | 3 +- .../luckperms/common/model/WeightCache.java | 7 +- .../manager/user/AbstractUserManager.java | 11 +-- .../luckperms/common/node/AbstractNode.java | 17 ++-- .../common/node/AbstractNodeBuilder.java | 12 +-- .../comparator/HeldPermissionComparator.java | 2 +- .../node/comparator/NodeComparator.java | 4 +- .../comparator/NodeWithContextComparator.java | 3 +- .../common/node/factory/NodeFactory.java | 17 ++-- .../common/node/factory/NodeTypes.java | 25 +++--- .../common/node/model/HeldNodeImpl.java | 4 +- .../common/node/model/InheritanceOrigin.java | 2 +- .../common/node/model/NodeDataContainer.java | 11 +-- .../common/node/types/DisplayName.java | 7 +- .../common/node/types/Inheritance.java | 9 +- .../luckperms/common/node/types/Meta.java | 7 +- .../common/node/types/Permission.java | 9 +- .../luckperms/common/node/types/Prefix.java | 9 +- .../common/node/types/RegexPermission.java | 7 +- .../luckperms/common/node/types/Suffix.java | 9 +- .../luckperms/common/node/types/Weight.java | 7 +- .../common/node/utils/InheritanceInfo.java | 6 +- .../common/node/utils/NodeTools.java | 4 +- .../plugin/AbstractLuckPermsPlugin.java | 3 +- .../common/plugin/LuckPermsPlugin.java | 3 +- .../plugin/bootstrap/LuckPermsBootstrap.java | 3 +- .../util/AbstractConnectionListener.java | 7 +- .../AllParentsByWeightHolder.java | 3 +- .../common/primarygroup/ContextualHolder.java | 3 +- .../primarygroup/ParentsByWeightHolder.java | 5 +- .../luckperms/common/query/FlagUtils.java | 2 +- .../common/query/QueryOptionsBuilderImpl.java | 12 +-- .../common/query/QueryOptionsImpl.java | 12 +-- .../common/sender/AbstractSender.java | 2 +- .../luckperms/common/sender/DummySender.java | 2 +- .../lucko/luckperms/common/sender/Sender.java | 6 +- .../common/sender/SenderFactory.java | 2 +- .../luckperms/common/storage/Storage.java | 11 +-- .../implementation/StorageImplementation.java | 7 +- .../file/AbstractConfigurateStorage.java | 21 ++--- .../file/CombinedConfigurateStorage.java | 3 +- .../implementation/file/FileActionLogger.java | 3 +- .../implementation/file/FileUuidCache.java | 3 +- .../file/SeparatedConfigurateStorage.java | 3 +- .../implementation/mongodb/MongoStorage.java | 19 +++-- .../implementation/split/SplitStorage.java | 7 +- .../implementation/sql/SqlStorage.java | 11 +-- .../storage/misc/PlayerSaveResultImpl.java | 2 +- .../luckperms/common/tasks/SyncTask.java | 3 +- .../common/verbose/VerboseHandler.java | 3 +- .../common/verbose/VerboseListener.java | 4 +- .../common/verbose/event/MetaCheckEvent.java | 3 +- .../verbose/event/PermissionCheckEvent.java | 3 +- .../common/verbose/event/VerboseEvent.java | 7 +- .../lucko/luckperms/common/web/WebEditor.java | 5 +- .../luckperms/nukkit/LPNukkitBootstrap.java | 3 +- .../luckperms/nukkit/LPNukkitPlugin.java | 7 +- .../luckperms/nukkit/NukkitSenderFactory.java | 2 +- .../nukkit/calculator/ChildProcessor.java | 3 +- .../nukkit/calculator/DefaultsProcessor.java | 3 +- .../calculator/NukkitCalculatorFactory.java | 3 +- .../nukkit/context/NukkitContextManager.java | 7 +- .../nukkit/context/WorldCalculator.java | 7 +- .../inject/permissible/LPPermissible.java | 3 +- .../permissible/LPPermissionAttachment.java | 9 +- .../permissible/MonitoredPermissibleBase.java | 5 +- .../nukkit/inject/server/LPDefaultsMap.java | 3 +- settings.gradle | 6 +- .../proxy/api6/DescriptionBuilder.java | 5 +- .../service/proxy/api6/SubjectProxy.java | 3 +- .../proxy/api7/DescriptionBuilder.java | 5 +- .../service/proxy/api7/SubjectProxy.java | 3 +- .../sponge/service/CompatibilityUtil.java | 7 +- .../service/context/DelegatingContextSet.java | 2 +- .../DelegatingImmutableContextSet.java | 6 +- .../context/DelegatingMutableContextSet.java | 7 +- .../sponge/service/model/LPSubject.java | 6 +- .../service/model/LPSubjectCollection.java | 4 +- .../sponge/service/model/LPSubjectData.java | 6 +- .../sponge/service/model/ProxiedSubject.java | 2 +- .../luckperms/sponge/LPSpongeBootstrap.java | 4 +- .../luckperms/sponge/LPSpongePlugin.java | 5 +- .../luckperms/sponge/SpongeSenderFactory.java | 2 +- .../sponge/calculator/DefaultsProcessor.java | 5 +- .../calculator/FixedDefaultsProcessor.java | 3 +- .../calculator/GroupDefaultsProcessor.java | 3 +- .../calculator/SpongeCalculatorFactory.java | 3 +- .../calculator/SpongeWildcardProcessor.java | 3 +- .../calculator/UserDefaultsProcessor.java | 3 +- .../sponge/commands/OptionClear.java | 3 +- .../luckperms/sponge/commands/OptionInfo.java | 3 +- .../luckperms/sponge/commands/OptionSet.java | 3 +- .../sponge/commands/OptionUnset.java | 3 +- .../luckperms/sponge/commands/ParentAdd.java | 3 +- .../sponge/commands/ParentClear.java | 3 +- .../luckperms/sponge/commands/ParentInfo.java | 3 +- .../sponge/commands/ParentRemove.java | 3 +- .../sponge/commands/PermissionClear.java | 3 +- .../sponge/commands/PermissionInfo.java | 3 +- .../sponge/commands/PermissionSet.java | 5 +- .../sponge/commands/SpongeCommandUtils.java | 5 +- .../sponge/context/SpongeContextManager.java | 5 +- .../SpongeProxiedContextCalculator.java | 3 +- .../sponge/context/WorldCalculator.java | 7 +- .../messaging/PluginMessageMessenger.java | 7 +- .../messaging/SpongeMessagingFactory.java | 7 +- .../model/manager/SpongeGroupManager.java | 9 +- .../model/manager/SpongeUserManager.java | 7 +- .../sponge/service/ProxyFactory.java | 3 +- .../inheritance/SubjectInheritanceGraph.java | 3 +- .../model/calculated/CalculatedSubject.java | 7 +- .../CalculatedSubjectCachedDataManager.java | 9 +- .../calculated/CalculatedSubjectData.java | 9 +- .../calculated/MonitoredSubjectData.java | 7 +- .../PermissionHolderSubject.java | 9 +- .../PermissionHolderSubjectData.java | 23 ++--- .../model/persisted/PersistedCollection.java | 5 +- .../model/persisted/PersistedSubject.java | 3 +- .../model/persisted/PersistedSubjectData.java | 3 +- .../model/persisted/SubjectDataContainer.java | 3 +- .../velocity/LPVelocityBootstrap.java | 3 +- .../luckperms/velocity/LPVelocityPlugin.java | 5 +- .../velocity/VelocitySenderFactory.java | 2 +- .../calculator/VelocityCalculatorFactory.java | 3 +- .../context/BackendServerCalculator.java | 7 +- .../context/VelocityContextManager.java | 5 +- .../MonitoringPermissionCheckListener.java | 5 +- .../messaging/PluginMessageMessenger.java | 7 +- .../messaging/VelocityMessagingFactory.java | 7 +- .../velocity/service/CompatibilityUtil.java | 2 +- 452 files changed, 1603 insertions(+), 1366 deletions(-) rename api/src/main/java/{me/lucko => net}/luckperms/api/LuckPerms.java (86%) rename api/src/main/java/{me/lucko => net}/luckperms/api/LuckPermsProvider.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/actionlog/Action.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/actionlog/ActionLog.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/actionlog/ActionLogger.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/cacheddata/CachedData.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/cacheddata/CachedDataManager.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/cacheddata/CachedMetaData.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/cacheddata/CachedPermissionData.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/Context.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/ContextCalculator.java (99%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/ContextConsumer.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/ContextManager.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/ContextSet.java (99%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/ContextSetFactory.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/DefaultContextKeys.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/ImmutableContextSet.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/MutableContextSet.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/context/StaticContextCalculator.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/Cancellable.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/EventBus.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/EventSubscription.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/LuckPermsEvent.java (95%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/Param.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/Sourced.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/cause/CreationCause.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/cause/DeletionCause.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/group/GroupCacheLoadEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/group/GroupCreateEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/group/GroupDataRecalculateEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/group/GroupDeleteEvent.java (89%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/group/GroupLoadAllEvent.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/group/GroupLoadEvent.java (89%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/log/LogBroadcastEvent.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/log/LogNetworkPublishEvent.java (88%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/log/LogNotifyEvent.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/log/LogPublishEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/log/LogReceiveEvent.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/node/NodeAddEvent.java (92%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/node/NodeClearEvent.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/node/NodeMutateEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/node/NodeRemoveEvent.java (92%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/player/PlayerDataSaveEvent.java (88%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/player/PlayerLoginProcessEvent.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/source/EntitySource.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/source/Source.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/sync/ConfigReloadEvent.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/sync/PostSyncEvent.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/sync/PreNetworkSyncEvent.java (89%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/sync/PreSyncEvent.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/TrackCreateEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/TrackDeleteEvent.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/TrackLoadAllEvent.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/TrackLoadEvent.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/mutate/TrackAddGroupEvent.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/mutate/TrackClearEvent.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/mutate/TrackMutateEvent.java (91%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/UserCacheLoadEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/UserDataRecalculateEvent.java (87%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/UserFirstLoginEvent.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/UserLoadEvent.java (89%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/track/TrackAction.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/track/UserDemoteEvent.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/track/UserPromoteEvent.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/event/user/track/UserTrackEvent.java (89%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messaging/MessagingService.java (95%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/IncomingMessageConsumer.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/Messenger.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/MessengerProvider.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/message/Message.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/message/OutgoingMessage.java (95%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/message/type/ActionLogMessage.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/message/type/UpdateMessage.java (92%) rename api/src/main/java/{me/lucko => net}/luckperms/api/messenger/message/type/UserUpdateMessage.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/metastacking/DuplicateRemovalFunction.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/metastacking/MetaStackDefinition.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/metastacking/MetaStackElement.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/metastacking/MetaStackFactory.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/DataMutateResult.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/DataType.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/PermissionHolder.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/PlayerSaveResult.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/TemporaryDataMutateResult.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/TemporaryMergeBehaviour.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/group/Group.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/group/GroupManager.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/user/User.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/model/user/UserManager.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/ChatMetaType.java (95%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/HeldNode.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/Node.java (91%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/NodeBuilder.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/NodeBuilderRegistry.java (86%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/NodeEqualityPredicate.java (99%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/NodeType.java (91%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/ScopedNode.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/SimpleNodeType.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/Tristate.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/metadata/NodeMetadataKey.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/metadata/SimpleNodeMetadataKey.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java (91%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/ChatMetaNode.java (92%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/DisplayNameNode.java (90%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/InheritanceNode.java (91%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/MetaNode.java (91%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/PermissionNode.java (92%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/PrefixNode.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/RegexPermissionNode.java (92%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/SuffixNode.java (93%) rename api/src/main/java/{me/lucko => net}/luckperms/api/node/types/WeightNode.java (89%) rename api/src/main/java/{me/lucko => net}/luckperms/api/platform/Platform.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/platform/PlatformEntity.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/platform/PluginMetadata.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/query/DefaultQueryOptions.java (94%) rename api/src/main/java/{me/lucko => net}/luckperms/api/query/Flag.java (98%) rename api/src/main/java/{me/lucko => net}/luckperms/api/query/OptionKey.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/query/QueryMode.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/query/QueryOptions.java (97%) rename api/src/main/java/{me/lucko => net}/luckperms/api/query/dataorder/DataQueryOrder.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/query/dataorder/DataQueryOrderFunction.java (91%) rename api/src/main/java/{me/lucko => net}/luckperms/api/track/DemotionResult.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/track/PromotionResult.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/track/Track.java (96%) rename api/src/main/java/{me/lucko => net}/luckperms/api/track/TrackManager.java (99%) rename api/src/main/java/{me/lucko => net}/luckperms/api/util/Result.java (97%) diff --git a/api/build.gradle b/api/build.gradle index d15207a4c..579e61c1a 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,3 +1,4 @@ +group = 'net.luckperms' project.version = '5.0' dependencies { diff --git a/api/src/main/java/me/lucko/luckperms/api/LuckPerms.java b/api/src/main/java/net/luckperms/api/LuckPerms.java similarity index 86% rename from api/src/main/java/me/lucko/luckperms/api/LuckPerms.java rename to api/src/main/java/net/luckperms/api/LuckPerms.java index e5d511c01..7c9003b34 100644 --- a/api/src/main/java/me/lucko/luckperms/api/LuckPerms.java +++ b/api/src/main/java/net/luckperms/api/LuckPerms.java @@ -23,26 +23,26 @@ * SOFTWARE. */ -package me.lucko.luckperms.api; +package net.luckperms.api; -import me.lucko.luckperms.api.actionlog.ActionLogger; -import me.lucko.luckperms.api.context.ContextCalculator; -import me.lucko.luckperms.api.context.ContextManager; -import me.lucko.luckperms.api.event.EventBus; -import me.lucko.luckperms.api.messaging.MessagingService; -import me.lucko.luckperms.api.messenger.MessengerProvider; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.api.metastacking.MetaStackElement; -import me.lucko.luckperms.api.metastacking.MetaStackFactory; -import me.lucko.luckperms.api.model.group.Group; -import me.lucko.luckperms.api.model.group.GroupManager; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.model.user.UserManager; -import me.lucko.luckperms.api.node.NodeBuilderRegistry; -import me.lucko.luckperms.api.platform.Platform; -import me.lucko.luckperms.api.platform.PluginMetadata; -import me.lucko.luckperms.api.track.Track; -import me.lucko.luckperms.api.track.TrackManager; +import net.luckperms.api.actionlog.ActionLogger; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextManager; +import net.luckperms.api.event.EventBus; +import net.luckperms.api.messaging.MessagingService; +import net.luckperms.api.messenger.MessengerProvider; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.metastacking.MetaStackFactory; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.model.group.GroupManager; +import net.luckperms.api.model.user.User; +import net.luckperms.api.model.user.UserManager; +import net.luckperms.api.node.NodeBuilderRegistry; +import net.luckperms.api.platform.Platform; +import net.luckperms.api.platform.PluginMetadata; +import net.luckperms.api.track.Track; +import net.luckperms.api.track.TrackManager; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/LuckPermsProvider.java b/api/src/main/java/net/luckperms/api/LuckPermsProvider.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/LuckPermsProvider.java rename to api/src/main/java/net/luckperms/api/LuckPermsProvider.java index 6a5cef019..c1e09c4cf 100644 --- a/api/src/main/java/me/lucko/luckperms/api/LuckPermsProvider.java +++ b/api/src/main/java/net/luckperms/api/LuckPermsProvider.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api; +package net.luckperms.api; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/actionlog/Action.java b/api/src/main/java/net/luckperms/api/actionlog/Action.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/actionlog/Action.java rename to api/src/main/java/net/luckperms/api/actionlog/Action.java index 4da0d15a4..b66175ea8 100644 --- a/api/src/main/java/me/lucko/luckperms/api/actionlog/Action.java +++ b/api/src/main/java/net/luckperms/api/actionlog/Action.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.actionlog; +package net.luckperms.api.actionlog; -import me.lucko.luckperms.api.LuckPermsProvider; +import net.luckperms.api.LuckPermsProvider; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/actionlog/ActionLog.java b/api/src/main/java/net/luckperms/api/actionlog/ActionLog.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/actionlog/ActionLog.java rename to api/src/main/java/net/luckperms/api/actionlog/ActionLog.java index 84c90d1b5..4d01946ec 100644 --- a/api/src/main/java/me/lucko/luckperms/api/actionlog/ActionLog.java +++ b/api/src/main/java/net/luckperms/api/actionlog/ActionLog.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.actionlog; +package net.luckperms.api.actionlog; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/actionlog/ActionLogger.java b/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/actionlog/ActionLogger.java rename to api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java index 22c0c797e..16e12ffde 100644 --- a/api/src/main/java/me/lucko/luckperms/api/actionlog/ActionLogger.java +++ b/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.actionlog; +package net.luckperms.api.actionlog; -import me.lucko.luckperms.api.messaging.MessagingService; +import net.luckperms.api.messaging.MessagingService; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedData.java rename to api/src/main/java/net/luckperms/api/cacheddata/CachedData.java index fb829b558..709ebff30 100644 --- a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedData.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.cacheddata; +package net.luckperms.api.cacheddata; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedDataManager.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedDataManager.java rename to api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java index 7922b94d2..7c5cd4bd3 100644 --- a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedDataManager.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.cacheddata; +package net.luckperms.api.cacheddata; -import me.lucko.luckperms.api.model.PermissionHolder; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.model.PermissionHolder; +import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedMetaData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedMetaData.java rename to api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java index c24984736..10414a586 100644 --- a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedMetaData.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.cacheddata; +package net.luckperms.api.cacheddata; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.metastacking.MetaStackDefinition; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedPermissionData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedPermissionData.java rename to api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java index 94233e763..6da5a09fe 100644 --- a/api/src/main/java/me/lucko/luckperms/api/cacheddata/CachedPermissionData.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.cacheddata; +package net.luckperms.api.cacheddata; -import me.lucko.luckperms.api.node.Tristate; +import net.luckperms.api.node.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/Context.java b/api/src/main/java/net/luckperms/api/context/Context.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/context/Context.java rename to api/src/main/java/net/luckperms/api/context/Context.java index db062d92f..e56a85d03 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/Context.java +++ b/api/src/main/java/net/luckperms/api/context/Context.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/ContextCalculator.java b/api/src/main/java/net/luckperms/api/context/ContextCalculator.java similarity index 99% rename from api/src/main/java/me/lucko/luckperms/api/context/ContextCalculator.java rename to api/src/main/java/net/luckperms/api/context/ContextCalculator.java index dd9a020d4..a923b7447 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/ContextCalculator.java +++ b/api/src/main/java/net/luckperms/api/context/ContextCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/ContextConsumer.java b/api/src/main/java/net/luckperms/api/context/ContextConsumer.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/context/ContextConsumer.java rename to api/src/main/java/net/luckperms/api/context/ContextConsumer.java index 51cd717d4..e3f58a0cb 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/ContextConsumer.java +++ b/api/src/main/java/net/luckperms/api/context/ContextConsumer.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/ContextManager.java b/api/src/main/java/net/luckperms/api/context/ContextManager.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/context/ContextManager.java rename to api/src/main/java/net/luckperms/api/context/ContextManager.java index d6351227a..f83cefab4 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/ContextManager.java +++ b/api/src/main/java/net/luckperms/api/context/ContextManager.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.query.QueryMode; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.model.user.User; +import net.luckperms.api.query.QueryMode; +import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/ContextSet.java b/api/src/main/java/net/luckperms/api/context/ContextSet.java similarity index 99% rename from api/src/main/java/me/lucko/luckperms/api/context/ContextSet.java rename to api/src/main/java/net/luckperms/api/context/ContextSet.java index 02307c5c0..e1c2c6cd1 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/ContextSet.java +++ b/api/src/main/java/net/luckperms/api/context/ContextSet.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/ContextSetFactory.java b/api/src/main/java/net/luckperms/api/context/ContextSetFactory.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/context/ContextSetFactory.java rename to api/src/main/java/net/luckperms/api/context/ContextSetFactory.java index 88b40dc5b..b261f9f00 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/ContextSetFactory.java +++ b/api/src/main/java/net/luckperms/api/context/ContextSetFactory.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/DefaultContextKeys.java b/api/src/main/java/net/luckperms/api/context/DefaultContextKeys.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/context/DefaultContextKeys.java rename to api/src/main/java/net/luckperms/api/context/DefaultContextKeys.java index 49afdac6e..0097e3193 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/DefaultContextKeys.java +++ b/api/src/main/java/net/luckperms/api/context/DefaultContextKeys.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; /** * Some default context keys used by the plugin. diff --git a/api/src/main/java/me/lucko/luckperms/api/context/ImmutableContextSet.java b/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/context/ImmutableContextSet.java rename to api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java index 8ce282a5b..bbb8c260a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/ImmutableContextSet.java +++ b/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; -import me.lucko.luckperms.api.LuckPermsProvider; +import net.luckperms.api.LuckPermsProvider; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/MutableContextSet.java b/api/src/main/java/net/luckperms/api/context/MutableContextSet.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/context/MutableContextSet.java rename to api/src/main/java/net/luckperms/api/context/MutableContextSet.java index b7caf90ad..83bc91384 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/MutableContextSet.java +++ b/api/src/main/java/net/luckperms/api/context/MutableContextSet.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; -import me.lucko.luckperms.api.LuckPermsProvider; +import net.luckperms.api.LuckPermsProvider; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/context/StaticContextCalculator.java b/api/src/main/java/net/luckperms/api/context/StaticContextCalculator.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/context/StaticContextCalculator.java rename to api/src/main/java/net/luckperms/api/context/StaticContextCalculator.java index 418c76a27..9550f12b0 100644 --- a/api/src/main/java/me/lucko/luckperms/api/context/StaticContextCalculator.java +++ b/api/src/main/java/net/luckperms/api/context/StaticContextCalculator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.context; +package net.luckperms.api.context; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/Cancellable.java b/api/src/main/java/net/luckperms/api/event/Cancellable.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/event/Cancellable.java rename to api/src/main/java/net/luckperms/api/event/Cancellable.java index 5b8a655c1..217016380 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/Cancellable.java +++ b/api/src/main/java/net/luckperms/api/event/Cancellable.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event; +package net.luckperms.api.event; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/EventBus.java b/api/src/main/java/net/luckperms/api/event/EventBus.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/event/EventBus.java rename to api/src/main/java/net/luckperms/api/event/EventBus.java index 4f9578242..2cbc833eb 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/EventBus.java +++ b/api/src/main/java/net/luckperms/api/event/EventBus.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event; +package net.luckperms.api.event; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/EventSubscription.java b/api/src/main/java/net/luckperms/api/event/EventSubscription.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/event/EventSubscription.java rename to api/src/main/java/net/luckperms/api/event/EventSubscription.java index d6288e22c..ffae8abf7 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/EventSubscription.java +++ b/api/src/main/java/net/luckperms/api/event/EventSubscription.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event; +package net.luckperms.api.event; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/LuckPermsEvent.java b/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java similarity index 95% rename from api/src/main/java/me/lucko/luckperms/api/event/LuckPermsEvent.java rename to api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java index 77f0ed714..9620ebc56 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/LuckPermsEvent.java +++ b/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event; +package net.luckperms.api.event; -import me.lucko.luckperms.api.LuckPerms; +import net.luckperms.api.LuckPerms; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/Param.java b/api/src/main/java/net/luckperms/api/event/Param.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/event/Param.java rename to api/src/main/java/net/luckperms/api/event/Param.java index 7d28d41c4..cb2bb7645 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/Param.java +++ b/api/src/main/java/net/luckperms/api/event/Param.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event; +package net.luckperms.api.event; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/Sourced.java b/api/src/main/java/net/luckperms/api/event/Sourced.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/event/Sourced.java rename to api/src/main/java/net/luckperms/api/event/Sourced.java index ab7ae04f7..9b833562b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/Sourced.java +++ b/api/src/main/java/net/luckperms/api/event/Sourced.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event; +package net.luckperms.api.event; -import me.lucko.luckperms.api.event.source.Source; +import net.luckperms.api.event.source.Source; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/cause/CreationCause.java b/api/src/main/java/net/luckperms/api/event/cause/CreationCause.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/event/cause/CreationCause.java rename to api/src/main/java/net/luckperms/api/event/cause/CreationCause.java index 305477e03..7f41275cc 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/cause/CreationCause.java +++ b/api/src/main/java/net/luckperms/api/event/cause/CreationCause.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.cause; +package net.luckperms.api.event.cause; /** * The cause of a group/track creation diff --git a/api/src/main/java/me/lucko/luckperms/api/event/cause/DeletionCause.java b/api/src/main/java/net/luckperms/api/event/cause/DeletionCause.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/event/cause/DeletionCause.java rename to api/src/main/java/net/luckperms/api/event/cause/DeletionCause.java index a357caa12..4fa91077f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/cause/DeletionCause.java +++ b/api/src/main/java/net/luckperms/api/event/cause/DeletionCause.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.cause; +package net.luckperms.api.event.cause; /** * The cause of a group/track deletion diff --git a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupCacheLoadEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/group/GroupCacheLoadEvent.java rename to api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java index b30ca3a25..f116e5c6b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupCacheLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.group; +package net.luckperms.api.event.group; -import me.lucko.luckperms.api.cacheddata.CachedDataManager; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.group.Group; +import net.luckperms.api.cacheddata.CachedDataManager; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.group.Group; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupCreateEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/group/GroupCreateEvent.java rename to api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java index d70d3f679..173709392 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupCreateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.group; +package net.luckperms.api.event.group; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.group.Group; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.group.Group; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupDataRecalculateEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/group/GroupDataRecalculateEvent.java rename to api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java index c018b2b1c..4a3bbadd7 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupDataRecalculateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.group; +package net.luckperms.api.event.group; -import me.lucko.luckperms.api.cacheddata.CachedDataManager; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.group.Group; +import net.luckperms.api.cacheddata.CachedDataManager; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.group.Group; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupDeleteEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java similarity index 89% rename from api/src/main/java/me/lucko/luckperms/api/event/group/GroupDeleteEvent.java rename to api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java index 047f8dad5..54b253a89 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupDeleteEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.group; +package net.luckperms.api.event.group; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.event.cause.DeletionCause; -import me.lucko.luckperms.api.node.Node; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.event.cause.DeletionCause; +import net.luckperms.api.node.Node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadAllEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupLoadAllEvent.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadAllEvent.java rename to api/src/main/java/net/luckperms/api/event/group/GroupLoadAllEvent.java index a468182be..da281846b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadAllEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupLoadAllEvent.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.group; +package net.luckperms.api.event.group; -import me.lucko.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.LuckPermsEvent; /** * Called when all groups have been loaded in from storage. diff --git a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java similarity index 89% rename from api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadEvent.java rename to api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java index c5f661464..e3fa9101a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.group; +package net.luckperms.api.event.group; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.group.Group; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.group.Group; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/log/LogBroadcastEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/event/log/LogBroadcastEvent.java rename to api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java index 25defa791..67e48b8b8 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/log/LogBroadcastEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.log; +package net.luckperms.api.event.log; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.Cancellable; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/log/LogNetworkPublishEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java similarity index 88% rename from api/src/main/java/me/lucko/luckperms/api/event/log/LogNetworkPublishEvent.java rename to api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java index fd54ca173..f0fa4c7e1 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/log/LogNetworkPublishEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.log; +package net.luckperms.api.event.log; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.Cancellable; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/log/LogNotifyEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/event/log/LogNotifyEvent.java rename to api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java index cef8a538b..cf336a8a0 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/log/LogNotifyEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.log; +package net.luckperms.api.event.log; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.Cancellable; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.platform.PlatformEntity; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.platform.PlatformEntity; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/log/LogPublishEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/log/LogPublishEvent.java rename to api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java index f746b1738..301c6739c 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/log/LogPublishEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.log; +package net.luckperms.api.event.log; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.Cancellable; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/log/LogReceiveEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/event/log/LogReceiveEvent.java rename to api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java index 40eee6f27..49a079782 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/log/LogReceiveEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.log; +package net.luckperms.api.event.log; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeAddEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java similarity index 92% rename from api/src/main/java/me/lucko/luckperms/api/event/node/NodeAddEvent.java rename to api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java index a458434f8..f046904ad 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeAddEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.node; +package net.luckperms.api.event.node; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.node.Node; +import net.luckperms.api.event.Param; +import net.luckperms.api.node.Node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeClearEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/event/node/NodeClearEvent.java rename to api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java index da69b696b..c44b59fb9 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeClearEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.node; +package net.luckperms.api.event.node; /** * Called when a holder has their nodes cleared diff --git a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeMutateEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/node/NodeMutateEvent.java rename to api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java index 3f4b474fd..89930074d 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeMutateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java @@ -23,15 +23,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.node; +package net.luckperms.api.event.node; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.PermissionHolder; -import me.lucko.luckperms.api.model.group.Group; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.node.Node; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.PermissionHolder; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.model.user.User; +import net.luckperms.api.node.Node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeRemoveEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java similarity index 92% rename from api/src/main/java/me/lucko/luckperms/api/event/node/NodeRemoveEvent.java rename to api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java index abe96d40f..abec8817b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/node/NodeRemoveEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.node; +package net.luckperms.api.event.node; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.node.Node; +import net.luckperms.api.event.Param; +import net.luckperms.api.node.Node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/player/PlayerDataSaveEvent.java b/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java similarity index 88% rename from api/src/main/java/me/lucko/luckperms/api/event/player/PlayerDataSaveEvent.java rename to api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java index 8a7609f2d..c22d18f06 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/player/PlayerDataSaveEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.player; +package net.luckperms.api.event.player; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.model.user.UserManager; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.model.user.UserManager; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/player/PlayerLoginProcessEvent.java b/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/event/player/PlayerLoginProcessEvent.java rename to api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java index e6673df2e..4470504fc 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/player/PlayerLoginProcessEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.player; +package net.luckperms.api.event.player; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.util.Result; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.user.User; +import net.luckperms.api.util.Result; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/source/EntitySource.java b/api/src/main/java/net/luckperms/api/event/source/EntitySource.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/event/source/EntitySource.java rename to api/src/main/java/net/luckperms/api/event/source/EntitySource.java index 2d1e7a136..0cd02792f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/source/EntitySource.java +++ b/api/src/main/java/net/luckperms/api/event/source/EntitySource.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.source; +package net.luckperms.api.event.source; -import me.lucko.luckperms.api.platform.PlatformEntity; +import net.luckperms.api.platform.PlatformEntity; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/source/Source.java b/api/src/main/java/net/luckperms/api/event/source/Source.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/event/source/Source.java rename to api/src/main/java/net/luckperms/api/event/source/Source.java index e49b58ef0..2bd90bc1a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/source/Source.java +++ b/api/src/main/java/net/luckperms/api/event/source/Source.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.source; +package net.luckperms.api.event.source; -import me.lucko.luckperms.api.platform.PlatformEntity; +import net.luckperms.api.platform.PlatformEntity; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/sync/ConfigReloadEvent.java b/api/src/main/java/net/luckperms/api/event/sync/ConfigReloadEvent.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/event/sync/ConfigReloadEvent.java rename to api/src/main/java/net/luckperms/api/event/sync/ConfigReloadEvent.java index 20d3dde31..c2d3e596b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/sync/ConfigReloadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/sync/ConfigReloadEvent.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.sync; +package net.luckperms.api.event.sync; -import me.lucko.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.LuckPermsEvent; /** * Called when the configuration is reloaded diff --git a/api/src/main/java/me/lucko/luckperms/api/event/sync/PostSyncEvent.java b/api/src/main/java/net/luckperms/api/event/sync/PostSyncEvent.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/event/sync/PostSyncEvent.java rename to api/src/main/java/net/luckperms/api/event/sync/PostSyncEvent.java index 70ee005df..0a048ca04 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/sync/PostSyncEvent.java +++ b/api/src/main/java/net/luckperms/api/event/sync/PostSyncEvent.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.sync; +package net.luckperms.api.event.sync; -import me.lucko.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.LuckPermsEvent; /** * Called when an sync task has been completed diff --git a/api/src/main/java/me/lucko/luckperms/api/event/sync/PreNetworkSyncEvent.java b/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java similarity index 89% rename from api/src/main/java/me/lucko/luckperms/api/event/sync/PreNetworkSyncEvent.java rename to api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java index 6b596c52b..242ced99b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/sync/PreNetworkSyncEvent.java +++ b/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.sync; +package net.luckperms.api.event.sync; -import me.lucko.luckperms.api.event.Cancellable; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/sync/PreSyncEvent.java b/api/src/main/java/net/luckperms/api/event/sync/PreSyncEvent.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/event/sync/PreSyncEvent.java rename to api/src/main/java/net/luckperms/api/event/sync/PreSyncEvent.java index 183a25399..fa258bccc 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/sync/PreSyncEvent.java +++ b/api/src/main/java/net/luckperms/api/event/sync/PreSyncEvent.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.sync; +package net.luckperms.api.event.sync; -import me.lucko.luckperms.api.event.Cancellable; -import me.lucko.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.LuckPermsEvent; /** * Called before a sync task runs diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackCreateEvent.java b/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/track/TrackCreateEvent.java rename to api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java index 3c04da10c..ad6d8ed7e 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackCreateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track; +package net.luckperms.api.event.track; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.track.Track; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.track.Track; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackDeleteEvent.java b/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/event/track/TrackDeleteEvent.java rename to api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java index 493611599..21f7f1e67 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackDeleteEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track; +package net.luckperms.api.event.track; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.event.cause.DeletionCause; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.event.cause.DeletionCause; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadAllEvent.java b/api/src/main/java/net/luckperms/api/event/track/TrackLoadAllEvent.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadAllEvent.java rename to api/src/main/java/net/luckperms/api/event/track/TrackLoadAllEvent.java index 5ba36978f..de251d0b8 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadAllEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/TrackLoadAllEvent.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track; +package net.luckperms.api.event.track; -import me.lucko.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.LuckPermsEvent; /** * Called when all tracks have been loaded in from storage. diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadEvent.java b/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadEvent.java rename to api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java index e0055b149..6d84a3a96 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track; +package net.luckperms.api.event.track; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.track.Track; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.track.Track; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackAddGroupEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackAddGroupEvent.java rename to api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java index 266198d51..29ac01207 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackAddGroupEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track.mutate; +package net.luckperms.api.event.track.mutate; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackClearEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackClearEvent.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackClearEvent.java rename to api/src/main/java/net/luckperms/api/event/track/mutate/TrackClearEvent.java index 73339e175..2774a4b16 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackClearEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackClearEvent.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track.mutate; +package net.luckperms.api.event.track.mutate; /** * Called when a track is cleared diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackMutateEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java similarity index 91% rename from api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackMutateEvent.java rename to api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java index 91c77f6a5..979558aa2 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackMutateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track.mutate; +package net.luckperms.api.event.track.mutate; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.track.Track; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.track.Track; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java rename to api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java index 77063e4bf..7d10c7ed6 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.track.mutate; +package net.luckperms.api.event.track.mutate; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/UserCacheLoadEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/user/UserCacheLoadEvent.java rename to api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java index 9391c3529..49658123a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/UserCacheLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user; +package net.luckperms.api.event.user; -import me.lucko.luckperms.api.cacheddata.CachedDataManager; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.user.User; +import net.luckperms.api.cacheddata.CachedDataManager; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.user.User; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/UserDataRecalculateEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java similarity index 87% rename from api/src/main/java/me/lucko/luckperms/api/event/user/UserDataRecalculateEvent.java rename to api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java index 520ca568c..3e6875487 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/UserDataRecalculateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user; +package net.luckperms.api.event.user; -import me.lucko.luckperms.api.cacheddata.CachedDataManager; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.user.User; +import net.luckperms.api.cacheddata.CachedDataManager; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.user.User; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/UserFirstLoginEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/event/user/UserFirstLoginEvent.java rename to api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java index a3a6fe602..86bb3f0a4 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/UserFirstLoginEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user; +package net.luckperms.api.event.user; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/UserLoadEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java similarity index 89% rename from api/src/main/java/me/lucko/luckperms/api/event/user/UserLoadEvent.java rename to api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java index e8233a0c8..b764addfc 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/UserLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user; +package net.luckperms.api.event.user; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.model.user.User; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.model.user.User; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/track/TrackAction.java b/api/src/main/java/net/luckperms/api/event/user/track/TrackAction.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/event/user/track/TrackAction.java rename to api/src/main/java/net/luckperms/api/event/user/track/TrackAction.java index a64ea362e..676e3edf0 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/track/TrackAction.java +++ b/api/src/main/java/net/luckperms/api/event/user/track/TrackAction.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user.track; +package net.luckperms.api.event.user.track; /** * Represents the type of action performed in a {@link UserTrackEvent} diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/track/UserDemoteEvent.java b/api/src/main/java/net/luckperms/api/event/user/track/UserDemoteEvent.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/event/user/track/UserDemoteEvent.java rename to api/src/main/java/net/luckperms/api/event/user/track/UserDemoteEvent.java index ffd686bd4..31ab30343 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/track/UserDemoteEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/track/UserDemoteEvent.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user.track; +package net.luckperms.api.event.user.track; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/track/UserPromoteEvent.java b/api/src/main/java/net/luckperms/api/event/user/track/UserPromoteEvent.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/event/user/track/UserPromoteEvent.java rename to api/src/main/java/net/luckperms/api/event/user/track/UserPromoteEvent.java index 2068703b8..07b5abd7f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/track/UserPromoteEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/track/UserPromoteEvent.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user.track; +package net.luckperms.api.event.user.track; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/event/user/track/UserTrackEvent.java b/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java similarity index 89% rename from api/src/main/java/me/lucko/luckperms/api/event/user/track/UserTrackEvent.java rename to api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java index 19e974d9c..be4a8cb16 100644 --- a/api/src/main/java/me/lucko/luckperms/api/event/user/track/UserTrackEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.event.user.track; +package net.luckperms.api.event.user.track; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; -import me.lucko.luckperms.api.event.Sourced; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.track.Track; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; +import net.luckperms.api.event.Sourced; +import net.luckperms.api.model.user.User; +import net.luckperms.api.track.Track; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messaging/MessagingService.java b/api/src/main/java/net/luckperms/api/messaging/MessagingService.java similarity index 95% rename from api/src/main/java/me/lucko/luckperms/api/messaging/MessagingService.java rename to api/src/main/java/net/luckperms/api/messaging/MessagingService.java index 376499f22..743621e25 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messaging/MessagingService.java +++ b/api/src/main/java/net/luckperms/api/messaging/MessagingService.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messaging; +package net.luckperms.api.messaging; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.model.user.User; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.model.user.User; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/IncomingMessageConsumer.java b/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/messenger/IncomingMessageConsumer.java rename to api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java index d6e83232d..6d53df5cb 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/IncomingMessageConsumer.java +++ b/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger; +package net.luckperms.api.messenger; -import me.lucko.luckperms.api.messenger.message.Message; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; +import net.luckperms.api.messenger.message.Message; +import net.luckperms.api.messenger.message.OutgoingMessage; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/Messenger.java b/api/src/main/java/net/luckperms/api/messenger/Messenger.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/messenger/Messenger.java rename to api/src/main/java/net/luckperms/api/messenger/Messenger.java index 6245016c6..611a8e739 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/Messenger.java +++ b/api/src/main/java/net/luckperms/api/messenger/Messenger.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger; +package net.luckperms.api.messenger; -import me.lucko.luckperms.api.messenger.message.Message; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; +import net.luckperms.api.messenger.message.Message; +import net.luckperms.api.messenger.message.OutgoingMessage; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/MessengerProvider.java b/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/messenger/MessengerProvider.java rename to api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java index 6222473a4..3a49cf6a5 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/MessengerProvider.java +++ b/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger; +package net.luckperms.api.messenger; -import me.lucko.luckperms.api.LuckPerms; +import net.luckperms.api.LuckPerms; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/message/Message.java b/api/src/main/java/net/luckperms/api/messenger/message/Message.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/messenger/message/Message.java rename to api/src/main/java/net/luckperms/api/messenger/message/Message.java index f1f68ba23..c1372d672 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/message/Message.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/Message.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger.message; +package net.luckperms.api.messenger.message; -import me.lucko.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.Messenger; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/message/OutgoingMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java similarity index 95% rename from api/src/main/java/me/lucko/luckperms/api/messenger/message/OutgoingMessage.java rename to api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java index 0eabb3124..88634a007 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/message/OutgoingMessage.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger.message; +package net.luckperms.api.messenger.message; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.IncomingMessageConsumer; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/message/type/ActionLogMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/messenger/message/type/ActionLogMessage.java rename to api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java index 3e2286667..9cf522423 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/message/type/ActionLogMessage.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger.message.type; +package net.luckperms.api.messenger.message.type; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.messenger.message.Message; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.messenger.message.Message; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/message/type/UpdateMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/UpdateMessage.java similarity index 92% rename from api/src/main/java/me/lucko/luckperms/api/messenger/message/type/UpdateMessage.java rename to api/src/main/java/net/luckperms/api/messenger/message/type/UpdateMessage.java index cc83710b9..313f0c4e0 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/message/type/UpdateMessage.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/type/UpdateMessage.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger.message.type; +package net.luckperms.api.messenger.message.type; -import me.lucko.luckperms.api.messenger.message.Message; +import net.luckperms.api.messenger.message.Message; /** * Represents an "update" message. diff --git a/api/src/main/java/me/lucko/luckperms/api/messenger/message/type/UserUpdateMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/messenger/message/type/UserUpdateMessage.java rename to api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java index 3ca3a5d77..15db8071d 100644 --- a/api/src/main/java/me/lucko/luckperms/api/messenger/message/type/UserUpdateMessage.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.messenger.message.type; +package net.luckperms.api.messenger.message.type; -import me.lucko.luckperms.api.messenger.message.Message; +import net.luckperms.api.messenger.message.Message; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/metastacking/DuplicateRemovalFunction.java b/api/src/main/java/net/luckperms/api/metastacking/DuplicateRemovalFunction.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/metastacking/DuplicateRemovalFunction.java rename to api/src/main/java/net/luckperms/api/metastacking/DuplicateRemovalFunction.java index b3895823c..d2ae6a4b9 100644 --- a/api/src/main/java/me/lucko/luckperms/api/metastacking/DuplicateRemovalFunction.java +++ b/api/src/main/java/net/luckperms/api/metastacking/DuplicateRemovalFunction.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.metastacking; +package net.luckperms.api.metastacking; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackDefinition.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackDefinition.java rename to api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java index 5c2845603..31d1ce5ef 100644 --- a/api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackDefinition.java +++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.metastacking; +package net.luckperms.api.metastacking; -import me.lucko.luckperms.api.query.OptionKey; +import net.luckperms.api.query.OptionKey; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackElement.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackElement.java rename to api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java index 590b158fe..9bc6bf5ed 100644 --- a/api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackElement.java +++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.metastacking; +package net.luckperms.api.metastacking; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.types.ChatMetaNode; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackFactory.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackFactory.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackFactory.java rename to api/src/main/java/net/luckperms/api/metastacking/MetaStackFactory.java index 0b606ed81..4e43b178f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackFactory.java +++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackFactory.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.metastacking; +package net.luckperms.api.metastacking; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/model/DataMutateResult.java b/api/src/main/java/net/luckperms/api/model/DataMutateResult.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/model/DataMutateResult.java rename to api/src/main/java/net/luckperms/api/model/DataMutateResult.java index 48feb3ccf..cac6ed74f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/DataMutateResult.java +++ b/api/src/main/java/net/luckperms/api/model/DataMutateResult.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model; +package net.luckperms.api.model; -import me.lucko.luckperms.api.track.Track; -import me.lucko.luckperms.api.util.Result; +import net.luckperms.api.track.Track; +import net.luckperms.api.util.Result; /** * Represents the result of a data mutation call on a LuckPerms object. diff --git a/api/src/main/java/me/lucko/luckperms/api/model/DataType.java b/api/src/main/java/net/luckperms/api/model/DataType.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/model/DataType.java rename to api/src/main/java/net/luckperms/api/model/DataType.java index 3599e4a54..363ed1707 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/DataType.java +++ b/api/src/main/java/net/luckperms/api/model/DataType.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model; +package net.luckperms.api.model; /** * Represents a type of data. diff --git a/api/src/main/java/me/lucko/luckperms/api/model/PermissionHolder.java b/api/src/main/java/net/luckperms/api/model/PermissionHolder.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/model/PermissionHolder.java rename to api/src/main/java/net/luckperms/api/model/PermissionHolder.java index c6e739cfa..6ef177f37 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/PermissionHolder.java +++ b/api/src/main/java/net/luckperms/api/model/PermissionHolder.java @@ -23,22 +23,22 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model; +package net.luckperms.api.model; -import me.lucko.luckperms.api.cacheddata.CachedDataManager; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.group.Group; -import me.lucko.luckperms.api.model.group.GroupManager; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.model.user.UserManager; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.cacheddata.CachedDataManager; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.model.group.GroupManager; +import net.luckperms.api.model.user.User; +import net.luckperms.api.model.user.UserManager; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/model/PlayerSaveResult.java b/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/model/PlayerSaveResult.java rename to api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java index eca839e59..8eca9fb60 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/PlayerSaveResult.java +++ b/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model; +package net.luckperms.api.model; -import me.lucko.luckperms.api.model.user.UserManager; +import net.luckperms.api.model.user.UserManager; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/model/TemporaryDataMutateResult.java b/api/src/main/java/net/luckperms/api/model/TemporaryDataMutateResult.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/model/TemporaryDataMutateResult.java rename to api/src/main/java/net/luckperms/api/model/TemporaryDataMutateResult.java index d16e7c7fc..39eae4b1a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/TemporaryDataMutateResult.java +++ b/api/src/main/java/net/luckperms/api/model/TemporaryDataMutateResult.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model; +package net.luckperms.api.model; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.util.Result; +import net.luckperms.api.node.Node; +import net.luckperms.api.util.Result; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/model/TemporaryMergeBehaviour.java b/api/src/main/java/net/luckperms/api/model/TemporaryMergeBehaviour.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/model/TemporaryMergeBehaviour.java rename to api/src/main/java/net/luckperms/api/model/TemporaryMergeBehaviour.java index ca7402ae4..bba8eb7a0 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/TemporaryMergeBehaviour.java +++ b/api/src/main/java/net/luckperms/api/model/TemporaryMergeBehaviour.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model; +package net.luckperms.api.model; -import me.lucko.luckperms.api.node.Node; +import net.luckperms.api.node.Node; /** * Controls how the implementation should behave when new temporary nodes are set diff --git a/api/src/main/java/me/lucko/luckperms/api/model/group/Group.java b/api/src/main/java/net/luckperms/api/model/group/Group.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/model/group/Group.java rename to api/src/main/java/net/luckperms/api/model/group/Group.java index 43f9a2fb3..a502609c2 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/group/Group.java +++ b/api/src/main/java/net/luckperms/api/model/group/Group.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model.group; +package net.luckperms.api.model.group; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.model.PermissionHolder; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.model.PermissionHolder; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/model/group/GroupManager.java b/api/src/main/java/net/luckperms/api/model/group/GroupManager.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/model/group/GroupManager.java rename to api/src/main/java/net/luckperms/api/model/group/GroupManager.java index 5211c185f..6e0e244b6 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/group/GroupManager.java +++ b/api/src/main/java/net/luckperms/api/model/group/GroupManager.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model.group; +package net.luckperms.api.model.group; -import me.lucko.luckperms.api.node.HeldNode; +import net.luckperms.api.node.HeldNode; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/model/user/User.java b/api/src/main/java/net/luckperms/api/model/user/User.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/model/user/User.java rename to api/src/main/java/net/luckperms/api/model/user/User.java index 8c0be318d..eee847650 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/user/User.java +++ b/api/src/main/java/net/luckperms/api/model/user/User.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model.user; +package net.luckperms.api.model.user; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.PermissionHolder; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.PermissionHolder; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/model/user/UserManager.java b/api/src/main/java/net/luckperms/api/model/user/UserManager.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/model/user/UserManager.java rename to api/src/main/java/net/luckperms/api/model/user/UserManager.java index e207719ea..604984105 100644 --- a/api/src/main/java/me/lucko/luckperms/api/model/user/UserManager.java +++ b/api/src/main/java/net/luckperms/api/model/user/UserManager.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.model.user; +package net.luckperms.api.model.user; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.HeldNode; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.HeldNode; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/ChatMetaType.java b/api/src/main/java/net/luckperms/api/node/ChatMetaType.java similarity index 95% rename from api/src/main/java/me/lucko/luckperms/api/node/ChatMetaType.java rename to api/src/main/java/net/luckperms/api/node/ChatMetaType.java index 6ac530d6c..6657d067b 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/ChatMetaType.java +++ b/api/src/main/java/net/luckperms/api/node/ChatMetaType.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; -import me.lucko.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.node.types.ChatMetaNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/HeldNode.java b/api/src/main/java/net/luckperms/api/node/HeldNode.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/node/HeldNode.java rename to api/src/main/java/net/luckperms/api/node/HeldNode.java index 21077f33d..8dcd260b8 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/HeldNode.java +++ b/api/src/main/java/net/luckperms/api/node/HeldNode.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; -import me.lucko.luckperms.api.model.PermissionHolder; +import net.luckperms.api.model.PermissionHolder; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/Node.java b/api/src/main/java/net/luckperms/api/node/Node.java similarity index 91% rename from api/src/main/java/me/lucko/luckperms/api/node/Node.java rename to api/src/main/java/net/luckperms/api/node/Node.java index c2f62e335..257724b4c 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/Node.java +++ b/api/src/main/java/net/luckperms/api/node/Node.java @@ -23,20 +23,20 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.DisplayNameNode; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PermissionNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.RegexPermissionNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.node.types.WeightNode; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.DisplayNameNode; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PermissionNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.RegexPermissionNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.node.types.WeightNode; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/NodeBuilder.java b/api/src/main/java/net/luckperms/api/node/NodeBuilder.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/node/NodeBuilder.java rename to api/src/main/java/net/luckperms/api/node/NodeBuilder.java index 302c5bd41..1462b5850 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/NodeBuilder.java +++ b/api/src/main/java/net/luckperms/api/node/NodeBuilder.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.node.metadata.NodeMetadataKey; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/NodeBuilderRegistry.java b/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java similarity index 86% rename from api/src/main/java/me/lucko/luckperms/api/node/NodeBuilderRegistry.java rename to api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java index 7833fde7a..f9e8bcab6 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/NodeBuilderRegistry.java +++ b/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java @@ -23,16 +23,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; -import me.lucko.luckperms.api.node.types.DisplayNameNode; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PermissionNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.RegexPermissionNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.node.types.WeightNode; +import net.luckperms.api.node.types.DisplayNameNode; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PermissionNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.RegexPermissionNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.node.types.WeightNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/NodeEqualityPredicate.java b/api/src/main/java/net/luckperms/api/node/NodeEqualityPredicate.java similarity index 99% rename from api/src/main/java/me/lucko/luckperms/api/node/NodeEqualityPredicate.java rename to api/src/main/java/net/luckperms/api/node/NodeEqualityPredicate.java index 72f67c6d1..2a1a7297a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/NodeEqualityPredicate.java +++ b/api/src/main/java/net/luckperms/api/node/NodeEqualityPredicate.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/NodeType.java b/api/src/main/java/net/luckperms/api/node/NodeType.java similarity index 91% rename from api/src/main/java/me/lucko/luckperms/api/node/NodeType.java rename to api/src/main/java/net/luckperms/api/node/NodeType.java index e60a0510a..71c7d2d46 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/NodeType.java +++ b/api/src/main/java/net/luckperms/api/node/NodeType.java @@ -23,17 +23,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; -import me.lucko.luckperms.api.node.types.ChatMetaNode; -import me.lucko.luckperms.api.node.types.DisplayNameNode; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PermissionNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.RegexPermissionNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.node.types.WeightNode; +import net.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.node.types.DisplayNameNode; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PermissionNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.RegexPermissionNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.node.types.WeightNode; import java.util.Objects; import java.util.Optional; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/ScopedNode.java b/api/src/main/java/net/luckperms/api/node/ScopedNode.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/node/ScopedNode.java rename to api/src/main/java/net/luckperms/api/node/ScopedNode.java index 50ed43dab..9ce55a013 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/ScopedNode.java +++ b/api/src/main/java/net/luckperms/api/node/ScopedNode.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/SimpleNodeType.java b/api/src/main/java/net/luckperms/api/node/SimpleNodeType.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/node/SimpleNodeType.java rename to api/src/main/java/net/luckperms/api/node/SimpleNodeType.java index 6626ecb8b..c2baaff97 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/SimpleNodeType.java +++ b/api/src/main/java/net/luckperms/api/node/SimpleNodeType.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; import java.util.Objects; import java.util.function.Function; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/Tristate.java b/api/src/main/java/net/luckperms/api/node/Tristate.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/node/Tristate.java rename to api/src/main/java/net/luckperms/api/node/Tristate.java index 7218e75d2..670c8da5a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/Tristate.java +++ b/api/src/main/java/net/luckperms/api/node/Tristate.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node; +package net.luckperms.api.node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/metadata/NodeMetadataKey.java b/api/src/main/java/net/luckperms/api/node/metadata/NodeMetadataKey.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/node/metadata/NodeMetadataKey.java rename to api/src/main/java/net/luckperms/api/node/metadata/NodeMetadataKey.java index bd596bef1..daedb3309 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/metadata/NodeMetadataKey.java +++ b/api/src/main/java/net/luckperms/api/node/metadata/NodeMetadataKey.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.metadata; +package net.luckperms.api.node.metadata; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/metadata/SimpleNodeMetadataKey.java b/api/src/main/java/net/luckperms/api/node/metadata/SimpleNodeMetadataKey.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/node/metadata/SimpleNodeMetadataKey.java rename to api/src/main/java/net/luckperms/api/node/metadata/SimpleNodeMetadataKey.java index 8da2405b7..b34eba49a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/metadata/SimpleNodeMetadataKey.java +++ b/api/src/main/java/net/luckperms/api/node/metadata/SimpleNodeMetadataKey.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.metadata; +package net.luckperms.api.node.metadata; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java b/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java similarity index 91% rename from api/src/main/java/me/lucko/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java rename to api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java index 8b2717768..3084ae15f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java +++ b/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.metadata.types; +package net.luckperms.api.node.metadata.types; -import me.lucko.luckperms.api.model.PermissionHolder; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.model.PermissionHolder; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.metadata.NodeMetadataKey; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/ChatMetaNode.java b/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java similarity index 92% rename from api/src/main/java/me/lucko/luckperms/api/node/types/ChatMetaNode.java rename to api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java index db541cb48..1bbe1ddce 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/ChatMetaNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.ScopedNode; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.ScopedNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/DisplayNameNode.java b/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java similarity index 90% rename from api/src/main/java/me/lucko/luckperms/api/node/types/DisplayNameNode.java rename to api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java index 0f0e2adff..4f84be800 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/DisplayNameNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.ScopedNode; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.ScopedNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/InheritanceNode.java b/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java similarity index 91% rename from api/src/main/java/me/lucko/luckperms/api/node/types/InheritanceNode.java rename to api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java index ed9ca4763..9a2c74305 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/InheritanceNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.model.group.Group; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.ScopedNode; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.ScopedNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/MetaNode.java b/api/src/main/java/net/luckperms/api/node/types/MetaNode.java similarity index 91% rename from api/src/main/java/me/lucko/luckperms/api/node/types/MetaNode.java rename to api/src/main/java/net/luckperms/api/node/types/MetaNode.java index 0b95830b1..0def5b34f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/MetaNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/MetaNode.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.ScopedNode; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.ScopedNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/PermissionNode.java b/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java similarity index 92% rename from api/src/main/java/me/lucko/luckperms/api/node/types/PermissionNode.java rename to api/src/main/java/net/luckperms/api/node/types/PermissionNode.java index c5530a5c3..bcd699de7 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/PermissionNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.ScopedNode; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.ScopedNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/PrefixNode.java b/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/node/types/PrefixNode.java rename to api/src/main/java/net/luckperms/api/node/types/PrefixNode.java index a8e4d6010..5035da6f6 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/PrefixNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/RegexPermissionNode.java b/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java similarity index 92% rename from api/src/main/java/me/lucko/luckperms/api/node/types/RegexPermissionNode.java rename to api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java index 6345d157d..f9c1a6899 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/RegexPermissionNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.ScopedNode; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.ScopedNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/SuffixNode.java b/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java similarity index 93% rename from api/src/main/java/me/lucko/luckperms/api/node/types/SuffixNode.java rename to api/src/main/java/net/luckperms/api/node/types/SuffixNode.java index 5eacc23c7..a358c0ae3 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/SuffixNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/node/types/WeightNode.java b/api/src/main/java/net/luckperms/api/node/types/WeightNode.java similarity index 89% rename from api/src/main/java/me/lucko/luckperms/api/node/types/WeightNode.java rename to api/src/main/java/net/luckperms/api/node/types/WeightNode.java index ed6a711c7..ed1da6fef 100644 --- a/api/src/main/java/me/lucko/luckperms/api/node/types/WeightNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/WeightNode.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.node.types; +package net.luckperms.api.node.types; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.ScopedNode; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.ScopedNode; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/platform/Platform.java b/api/src/main/java/net/luckperms/api/platform/Platform.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/platform/Platform.java rename to api/src/main/java/net/luckperms/api/platform/Platform.java index 0459eeade..da2c5fb90 100644 --- a/api/src/main/java/me/lucko/luckperms/api/platform/Platform.java +++ b/api/src/main/java/net/luckperms/api/platform/Platform.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.platform; +package net.luckperms.api.platform; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/platform/PlatformEntity.java b/api/src/main/java/net/luckperms/api/platform/PlatformEntity.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/platform/PlatformEntity.java rename to api/src/main/java/net/luckperms/api/platform/PlatformEntity.java index 008553676..5f3ca264a 100644 --- a/api/src/main/java/me/lucko/luckperms/api/platform/PlatformEntity.java +++ b/api/src/main/java/net/luckperms/api/platform/PlatformEntity.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.platform; +package net.luckperms.api.platform; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/platform/PluginMetadata.java b/api/src/main/java/net/luckperms/api/platform/PluginMetadata.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/platform/PluginMetadata.java rename to api/src/main/java/net/luckperms/api/platform/PluginMetadata.java index e250b12f1..ffd43117f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/platform/PluginMetadata.java +++ b/api/src/main/java/net/luckperms/api/platform/PluginMetadata.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.platform; +package net.luckperms.api.platform; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/query/DefaultQueryOptions.java b/api/src/main/java/net/luckperms/api/query/DefaultQueryOptions.java similarity index 94% rename from api/src/main/java/me/lucko/luckperms/api/query/DefaultQueryOptions.java rename to api/src/main/java/net/luckperms/api/query/DefaultQueryOptions.java index 00525bd25..6ab4d8a85 100644 --- a/api/src/main/java/me/lucko/luckperms/api/query/DefaultQueryOptions.java +++ b/api/src/main/java/net/luckperms/api/query/DefaultQueryOptions.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.query; +package net.luckperms.api.query; -import me.lucko.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.ImmutableContextSet; import java.util.EnumSet; diff --git a/api/src/main/java/me/lucko/luckperms/api/query/Flag.java b/api/src/main/java/net/luckperms/api/query/Flag.java similarity index 98% rename from api/src/main/java/me/lucko/luckperms/api/query/Flag.java rename to api/src/main/java/net/luckperms/api/query/Flag.java index 1e3abf191..2e40fdf09 100644 --- a/api/src/main/java/me/lucko/luckperms/api/query/Flag.java +++ b/api/src/main/java/net/luckperms/api/query/Flag.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.query; +package net.luckperms.api.query; /** * The flags which can be set for a query. diff --git a/api/src/main/java/me/lucko/luckperms/api/query/OptionKey.java b/api/src/main/java/net/luckperms/api/query/OptionKey.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/query/OptionKey.java rename to api/src/main/java/net/luckperms/api/query/OptionKey.java index 7d1dfbd29..89830a18f 100644 --- a/api/src/main/java/me/lucko/luckperms/api/query/OptionKey.java +++ b/api/src/main/java/net/luckperms/api/query/OptionKey.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.query; +package net.luckperms.api.query; /** * Represents a key for a custom option defined in {@link QueryOptions}. diff --git a/api/src/main/java/me/lucko/luckperms/api/query/QueryMode.java b/api/src/main/java/net/luckperms/api/query/QueryMode.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/query/QueryMode.java rename to api/src/main/java/net/luckperms/api/query/QueryMode.java index 43e0973a9..7e193abd5 100644 --- a/api/src/main/java/me/lucko/luckperms/api/query/QueryMode.java +++ b/api/src/main/java/net/luckperms/api/query/QueryMode.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.query; +package net.luckperms.api.query; /** * Represents the type of query associated with a given {@link QueryOptions}. diff --git a/api/src/main/java/me/lucko/luckperms/api/query/QueryOptions.java b/api/src/main/java/net/luckperms/api/query/QueryOptions.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/query/QueryOptions.java rename to api/src/main/java/net/luckperms/api/query/QueryOptions.java index 3a966b694..1906850ac 100644 --- a/api/src/main/java/me/lucko/luckperms/api/query/QueryOptions.java +++ b/api/src/main/java/net/luckperms/api/query/QueryOptions.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.query; +package net.luckperms.api.query; -import me.lucko.luckperms.api.LuckPermsProvider; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/query/dataorder/DataQueryOrder.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/query/dataorder/DataQueryOrder.java rename to api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java index 1f4481de2..f3f078a08 100644 --- a/api/src/main/java/me/lucko/luckperms/api/query/dataorder/DataQueryOrder.java +++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.query.dataorder; +package net.luckperms.api.query.dataorder; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.model.DataType; +import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/query/dataorder/DataQueryOrderFunction.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java similarity index 91% rename from api/src/main/java/me/lucko/luckperms/api/query/dataorder/DataQueryOrderFunction.java rename to api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java index 1de59b479..96a01f144 100644 --- a/api/src/main/java/me/lucko/luckperms/api/query/dataorder/DataQueryOrderFunction.java +++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.query.dataorder; +package net.luckperms.api.query.dataorder; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.PermissionHolder; -import me.lucko.luckperms.api.query.OptionKey; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.PermissionHolder; +import net.luckperms.api.query.OptionKey; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/track/DemotionResult.java b/api/src/main/java/net/luckperms/api/track/DemotionResult.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/track/DemotionResult.java rename to api/src/main/java/net/luckperms/api/track/DemotionResult.java index f9f878217..f43720e8c 100644 --- a/api/src/main/java/me/lucko/luckperms/api/track/DemotionResult.java +++ b/api/src/main/java/net/luckperms/api/track/DemotionResult.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.track; +package net.luckperms.api.track; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.util.Result; +import net.luckperms.api.model.user.User; +import net.luckperms.api.util.Result; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/track/PromotionResult.java b/api/src/main/java/net/luckperms/api/track/PromotionResult.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/track/PromotionResult.java rename to api/src/main/java/net/luckperms/api/track/PromotionResult.java index 7efc04cf8..fdd713b68 100644 --- a/api/src/main/java/me/lucko/luckperms/api/track/PromotionResult.java +++ b/api/src/main/java/net/luckperms/api/track/PromotionResult.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.track; +package net.luckperms.api.track; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.util.Result; +import net.luckperms.api.model.user.User; +import net.luckperms.api.util.Result; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/me/lucko/luckperms/api/track/Track.java b/api/src/main/java/net/luckperms/api/track/Track.java similarity index 96% rename from api/src/main/java/me/lucko/luckperms/api/track/Track.java rename to api/src/main/java/net/luckperms/api/track/Track.java index 81d969115..5a90eba68 100644 --- a/api/src/main/java/me/lucko/luckperms/api/track/Track.java +++ b/api/src/main/java/net/luckperms/api/track/Track.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.track; +package net.luckperms.api.track; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.group.Group; -import me.lucko.luckperms.api.model.user.User; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.model.user.User; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/track/TrackManager.java b/api/src/main/java/net/luckperms/api/track/TrackManager.java similarity index 99% rename from api/src/main/java/me/lucko/luckperms/api/track/TrackManager.java rename to api/src/main/java/net/luckperms/api/track/TrackManager.java index b31251f08..15d831ae0 100644 --- a/api/src/main/java/me/lucko/luckperms/api/track/TrackManager.java +++ b/api/src/main/java/net/luckperms/api/track/TrackManager.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.track; +package net.luckperms.api.track; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/me/lucko/luckperms/api/util/Result.java b/api/src/main/java/net/luckperms/api/util/Result.java similarity index 97% rename from api/src/main/java/me/lucko/luckperms/api/util/Result.java rename to api/src/main/java/net/luckperms/api/util/Result.java index 8e84dbaff..e392d7025 100644 --- a/api/src/main/java/me/lucko/luckperms/api/util/Result.java +++ b/api/src/main/java/net/luckperms/api/util/Result.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.util; +package net.luckperms.api.util; /** * Represents a generic result, which can either be successful or fail. diff --git a/bukkit-legacy/build.gradle b/bukkit-legacy/build.gradle index fa36386bf..aabccbbeb 100644 --- a/bukkit-legacy/build.gradle +++ b/bukkit-legacy/build.gradle @@ -12,6 +12,7 @@ shadowJar { archiveName = "LuckPerms-Bukkit-Legacy-${project.ext.fullVersion}.jar" dependencies { + include(dependency('net.luckperms:.*')) include(dependency('me.lucko.luckperms:.*')) include(dependency('com.google.guava:guava:.*')) include(dependency('com.google.code.gson:gson:.*')) 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 6ca99e6f0..d6c1ce800 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java @@ -25,7 +25,6 @@ package me.lucko.luckperms.bukkit; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.bukkit.compat.CraftBukkitUtil; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; @@ -34,6 +33,7 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; import net.kyori.text.adapter.bukkit.TextAdapter; +import net.luckperms.api.node.Tristate; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java index aeb515936..98111b75c 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java @@ -25,7 +25,6 @@ package me.lucko.luckperms.bukkit; -import me.lucko.luckperms.api.platform.Platform; import me.lucko.luckperms.bukkit.compat.NullSafeConsoleCommandSender; import me.lucko.luckperms.common.dependencies.classloader.PluginClassLoader; import me.lucko.luckperms.common.dependencies.classloader.ReflectionClassLoader; @@ -33,6 +32,8 @@ import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.logging.JavaPluginLogger; import me.lucko.luckperms.common.plugin.logging.PluginLogger; +import net.luckperms.api.platform.Platform; + import org.bukkit.OfflinePlayer; import org.bukkit.Server; import org.bukkit.command.ConsoleCommandSender; 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 73205a2ee..746a2f54e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -25,9 +25,6 @@ package me.lucko.luckperms.bukkit; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.event.user.UserDataRecalculateEvent; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bukkit.calculator.BukkitCalculatorFactory; import me.lucko.luckperms.bukkit.compat.LuckPermsBrigadier; import me.lucko.luckperms.bukkit.context.BukkitContextManager; @@ -64,6 +61,10 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.tasks.CacheHousekeepingTask; import me.lucko.luckperms.common.tasks.ExpireTemporaryTask; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.event.user.UserDataRecalculateEvent; +import net.luckperms.api.query.QueryOptions; + import org.bukkit.OfflinePlayer; import org.bukkit.command.PluginCommand; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java index 54c128577..9d679e981 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit.calculator; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.bukkit.context.BukkitContextManager; import me.lucko.luckperms.common.cacheddata.CacheMetadata; @@ -40,6 +39,8 @@ import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.HolderType; +import net.luckperms.api.query.QueryOptions; + public class BukkitCalculatorFactory implements CalculatorFactory { private final LPBukkitPlugin plugin; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java index f67f5e4e2..095456158 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.bukkit.calculator; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; +import net.luckperms.api.node.Tristate; + import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java index d05db50b0..8e9a7e0be 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.bukkit.calculator; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; +import net.luckperms.api.node.Tristate; + import org.bukkit.permissions.Permission; /** diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java index 15dc23a05..a0ec415e0 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java @@ -27,9 +27,6 @@ package me.lucko.luckperms.bukkit.context; import com.github.benmanes.caffeine.cache.LoadingCache; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.OptionKey; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.config.ConfigKeys; @@ -38,6 +35,10 @@ import me.lucko.luckperms.common.context.QueryOptionsCache; import me.lucko.luckperms.common.context.QueryOptionsSupplier; import me.lucko.luckperms.common.util.CaffeineFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.OptionKey; +import net.luckperms.api.query.QueryOptions; + import org.bukkit.entity.Player; import java.util.concurrent.TimeUnit; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/WorldCalculator.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/WorldCalculator.java index 9cab956dc..d62ffef84 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/WorldCalculator.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/WorldCalculator.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.bukkit.context; -import me.lucko.luckperms.api.context.ContextCalculator; -import me.lucko.luckperms.api.context.ContextConsumer; -import me.lucko.luckperms.api.context.DefaultContextKeys; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.DefaultContextKeys; + import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java index 63e5cfbe7..94e6ffef0 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit.inject.permissible; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.bukkit.calculator.DefaultsProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; @@ -37,6 +36,8 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; +import net.luckperms.api.node.Tristate; + import org.bukkit.entity.Player; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissionAttachment.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissionAttachment.java index a7751d68a..cee711abb 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissionAttachment.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissionAttachment.java @@ -27,14 +27,15 @@ package me.lucko.luckperms.bukkit.inject.permissible; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; 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; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.metadata.NodeMetadataKey; + import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionRemovedExecutor; import org.bukkit.plugin.Plugin; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java index 11c02e00f..b4189b5df 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.bukkit.inject.permissible; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bukkit.inject.dummy.DummyPermissibleBase; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java index 5f0390993..86a42721e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java @@ -31,10 +31,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cache.Cache; +import net.luckperms.api.node.Tristate; + import org.bukkit.permissions.Permission; import org.bukkit.plugin.PluginManager; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java index fc990f478..379ba925a 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.bukkit.messaging; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.MessengerProvider; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; import me.lucko.luckperms.common.messaging.MessagingFactory; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.MessengerProvider; + import org.checkerframework.checker.nullness.qual.NonNull; public class BukkitMessagingFactory extends MessagingFactory { diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java index c0a11d2b6..0fd24647e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.bukkit.messaging; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; import me.lucko.luckperms.bukkit.LPBukkitPlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; + import org.checkerframework.checker.nullness.qual.NonNull; import lilypad.client.connect.api.Connect; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java index 8e661ab4a..6f6631645 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java @@ -30,11 +30,12 @@ import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; import me.lucko.luckperms.bukkit.LPBukkitPlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; + import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; import org.bukkit.scheduler.BukkitRunnable; 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 f77e3e27f..c0212964c 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 @@ -31,10 +31,6 @@ import de.bananaco.bpermissions.api.Permission; import de.bananaco.bpermissions.api.World; import de.bananaco.bpermissions.api.WorldManager; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -53,6 +49,11 @@ import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.ProgressLogger; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; + 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 3ffa75e3a..712311161 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.bukkit.migration; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -49,6 +44,12 @@ import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.ProgressLogger; import me.lucko.luckperms.common.util.Uuids; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.Node; + import org.anjocaido.groupmanager.GlobalGroups; import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.dataholder.WorldDataHolder; 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 12ab030ac..a81258d82 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 @@ -27,9 +27,6 @@ package me.lucko.luckperms.bukkit.migration; import com.platymuus.bukkit.permissions.PermissionsPlugin; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -47,6 +44,10 @@ import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.ProgressLogger; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; + import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; 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 a4d246e0c..c951da041 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 @@ -27,9 +27,6 @@ package me.lucko.luckperms.bukkit.migration; import com.google.common.base.Strings; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -49,6 +46,10 @@ import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.ProgressLogger; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; + import org.bukkit.Bukkit; import ru.tehkode.permissions.PermissionEntity; 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 a1351a3c4..8b0d7371b 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 @@ -33,10 +33,6 @@ import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin; import com.google.common.collect.ImmutableSet; import com.zaxxer.hikari.HikariDataSource; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeBuilder; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -55,6 +51,11 @@ import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.ProgressLogger; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeBuilder; + import org.bukkit.Bukkit; import java.sql.Connection; 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 3233f164c..affcb53b2 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.bukkit.migration; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -49,6 +44,12 @@ import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.ProgressLogger; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.Node; + import org.bukkit.Bukkit; import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService; import org.tyrannyofheaven.bukkit.zPermissions.dao.PermissionService; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultChat.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultChat.java index 5609313f7..afca59dd7 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultChat.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultChat.java @@ -27,14 +27,6 @@ package me.lucko.luckperms.bukkit.vault; import com.google.common.base.Strings; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.query.Flag; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.cacheddata.type.MetaCache; @@ -46,6 +38,14 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.factory.NodeTypes; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.QueryOptions; import net.milkbowl.vault.chat.Chat; import java.util.Objects; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java index 2aa12486b..cf3694028 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java @@ -27,15 +27,6 @@ package me.lucko.luckperms.bukkit.vault; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.Flag; -import me.lucko.luckperms.api.query.QueryOptions; -import me.lucko.luckperms.api.util.Result; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.bukkit.context.BukkitContextManager; import me.lucko.luckperms.common.cacheddata.type.PermissionCache; @@ -52,6 +43,15 @@ import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.QueryOptions; +import net.luckperms.api.util.Result; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; 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 6b540d7b0..4fccd6b28 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java @@ -25,7 +25,6 @@ package me.lucko.luckperms.bungee; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.bungee.event.TristateCheckEvent; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; @@ -34,6 +33,7 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; import net.kyori.text.adapter.bungeecord.TextAdapter; +import net.luckperms.api.node.Tristate; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java index 1360fb02d..981a9dd1a 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java @@ -25,7 +25,6 @@ package me.lucko.luckperms.bungee; -import me.lucko.luckperms.api.platform.Platform; import me.lucko.luckperms.bungee.util.RedisBungeeUtil; import me.lucko.luckperms.common.dependencies.classloader.PluginClassLoader; import me.lucko.luckperms.common.dependencies.classloader.ReflectionClassLoader; @@ -34,6 +33,7 @@ import me.lucko.luckperms.common.plugin.logging.JavaPluginLogger; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; +import net.luckperms.api.platform.Platform; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Plugin; 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 52beba035..8da8a600e 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -25,8 +25,6 @@ package me.lucko.luckperms.bungee; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bungee.calculator.BungeeCalculatorFactory; import me.lucko.luckperms.bungee.context.BackendServerCalculator; import me.lucko.luckperms.bungee.context.BungeeContextManager; @@ -52,6 +50,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.tasks.CacheHousekeepingTask; import me.lucko.luckperms.common.tasks.ExpireTemporaryTask; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.query.QueryOptions; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.io.File; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java index 9cb2710a3..3078332f6 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bungee.calculator; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bungee.LPBungeePlugin; import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.calculator.CalculatorFactory; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.calculator.processor.RegexProcessor; import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; +import net.luckperms.api.query.QueryOptions; + public class BungeeCalculatorFactory implements CalculatorFactory { private final LPBungeePlugin plugin; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BackendServerCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BackendServerCalculator.java index 32fc63903..87ffc76f4 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BackendServerCalculator.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BackendServerCalculator.java @@ -25,12 +25,12 @@ package me.lucko.luckperms.bungee.context; -import me.lucko.luckperms.api.context.ContextCalculator; -import me.lucko.luckperms.api.context.ContextConsumer; -import me.lucko.luckperms.api.context.DefaultContextKeys; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.DefaultContextKeys; import net.md_5.bungee.api.connection.ProxiedPlayer; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeeContextManager.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeeContextManager.java index 62cbe3907..4891efcc9 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeeContextManager.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeeContextManager.java @@ -27,13 +27,13 @@ package me.lucko.luckperms.bungee.context; import com.github.benmanes.caffeine.cache.LoadingCache; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bungee.LPBungeePlugin; import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.context.QueryOptionsSupplier; import me.lucko.luckperms.common.util.CaffeineFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.QueryOptions; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.util.concurrent.TimeUnit; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java index b5f6710b2..a41a55774 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java @@ -28,8 +28,8 @@ package me.lucko.luckperms.bungee.context; import com.imaginarycode.minecraft.redisbungee.RedisBungee; import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; -import me.lucko.luckperms.api.context.ContextConsumer; -import me.lucko.luckperms.api.context.StaticContextCalculator; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.StaticContextCalculator; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java b/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java index 7cd68d467..6b66bab51 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java @@ -25,8 +25,7 @@ package me.lucko.luckperms.bungee.event; -import me.lucko.luckperms.api.node.Tristate; - +import net.luckperms.api.node.Tristate; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java b/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java index 5f51bb42b..479fa8302 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java @@ -25,14 +25,14 @@ package me.lucko.luckperms.bungee.listeners; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.bungee.LPBungeePlugin; import me.lucko.luckperms.bungee.event.TristateCheckEvent; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PermissionCheckEvent; import net.md_5.bungee.api.plugin.Listener; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java index 912c7a473..4d53bc956 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.bungee.messaging; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.MessengerProvider; import me.lucko.luckperms.bungee.LPBungeePlugin; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; import me.lucko.luckperms.common.messaging.MessagingFactory; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.MessengerProvider; + import org.checkerframework.checker.nullness.qual.NonNull; public class BungeeMessagingFactory extends MessagingFactory { diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/PluginMessageMessenger.java b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/PluginMessageMessenger.java index 9752cc832..4b06cce22 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/PluginMessageMessenger.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/PluginMessageMessenger.java @@ -29,11 +29,11 @@ import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; import me.lucko.luckperms.bungee.LPBungeePlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java index 18872b6ee..eede99df5 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java @@ -29,11 +29,11 @@ import com.imaginarycode.minecraft.redisbungee.RedisBungee; import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; import me.lucko.luckperms.bungee.LPBungeePlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; 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 e7ee9b1af..a8f04d580 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.bungee.migration; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -48,6 +45,9 @@ import net.alpenblock.bungeeperms.Group; import net.alpenblock.bungeeperms.PermEntity; import net.alpenblock.bungeeperms.Server; import net.alpenblock.bungeeperms.World; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; import java.util.List; import java.util.Map; diff --git a/common/build.gradle b/common/build.gradle index dc7913ed6..7dda7bab0 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':luckperms-api') + compile project(':api') compile 'org.checkerframework:checker-qual:2.5.5' compile('net.kyori:text-api:3.0.0') { diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java index 8efac649b..f7e67f4ca 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java @@ -30,9 +30,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.util.gson.JObject; +import net.luckperms.api.actionlog.Action; + import java.time.Instant; import java.util.UUID; 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 e3952d040..67923aa93 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 @@ -27,9 +27,10 @@ package me.lucko.luckperms.common.actionlog; import com.google.common.collect.ImmutableSortedSet; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.util.ImmutableCollectors; +import net.luckperms.api.actionlog.Action; + import java.util.Comparator; import java.util.SortedSet; import java.util.TreeSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java index 979fffd3e..2c4460c44 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.actionlog; -import me.lucko.luckperms.api.event.log.LogBroadcastEvent; -import me.lucko.luckperms.api.event.log.LogNotifyEvent; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.commands.log.LogNotify; import me.lucko.luckperms.common.config.ConfigKeys; @@ -35,6 +33,9 @@ import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; +import net.luckperms.api.event.log.LogBroadcastEvent; +import net.luckperms.api.event.log.LogNotifyEvent; + import java.util.Optional; public class LogDispatcher { diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java index 1ea63f02b..0e8da0a5e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java @@ -27,10 +27,6 @@ package me.lucko.luckperms.common.actionlog; import com.google.common.base.Strings; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.context.Context; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.DefaultContextKeys; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.model.PermissionHolder; @@ -39,6 +35,11 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.context.Context; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.DefaultContextKeys; + import org.checkerframework.checker.nullness.qual.NonNull; import java.time.Instant; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/ApiRegistrationUtil.java b/common/src/main/java/me/lucko/luckperms/common/api/ApiRegistrationUtil.java index 9f19896ee..a674d78ef 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/ApiRegistrationUtil.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/ApiRegistrationUtil.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.api; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.LuckPermsProvider; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.LuckPermsProvider; import java.lang.reflect.Method; 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 c3885f98d..972a5d61a 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 @@ -25,19 +25,6 @@ package me.lucko.luckperms.common.api; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.actionlog.ActionLogger; -import me.lucko.luckperms.api.context.ContextManager; -import me.lucko.luckperms.api.event.EventBus; -import me.lucko.luckperms.api.messaging.MessagingService; -import me.lucko.luckperms.api.messenger.MessengerProvider; -import me.lucko.luckperms.api.metastacking.MetaStackFactory; -import me.lucko.luckperms.api.model.group.GroupManager; -import me.lucko.luckperms.api.model.user.UserManager; -import me.lucko.luckperms.api.node.NodeBuilderRegistry; -import me.lucko.luckperms.api.platform.Platform; -import me.lucko.luckperms.api.platform.PluginMetadata; -import me.lucko.luckperms.api.track.TrackManager; import me.lucko.luckperms.common.api.implementation.ApiActionLogger; import me.lucko.luckperms.common.api.implementation.ApiContextManager; import me.lucko.luckperms.common.api.implementation.ApiGroupManager; @@ -51,6 +38,20 @@ import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.actionlog.ActionLogger; +import net.luckperms.api.context.ContextManager; +import net.luckperms.api.event.EventBus; +import net.luckperms.api.messaging.MessagingService; +import net.luckperms.api.messenger.MessengerProvider; +import net.luckperms.api.metastacking.MetaStackFactory; +import net.luckperms.api.model.group.GroupManager; +import net.luckperms.api.model.user.UserManager; +import net.luckperms.api.node.NodeBuilderRegistry; +import net.luckperms.api.platform.Platform; +import net.luckperms.api.platform.PluginMetadata; +import net.luckperms.api.track.TrackManager; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collection; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java index f20f1eece..e2b3e0f5a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.actionlog.ActionLog; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.api.ApiUtils; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.actionlog.ActionLog; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java index 2072c94c8..d1167530b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.actionlog.ActionLog; -import me.lucko.luckperms.api.actionlog.ActionLogger; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.actionlog.ActionLog; +import net.luckperms.api.actionlog.ActionLogger; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java index 25f565092..895f29995 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java @@ -25,23 +25,24 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.context.ContextCalculator; -import me.lucko.luckperms.api.context.ContextSetFactory; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.query.QueryMode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsBuilderImpl; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextSetFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.user.User; +import net.luckperms.api.query.QueryMode; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; import java.util.Optional; @SuppressWarnings("unchecked") -public class ApiContextManager implements me.lucko.luckperms.api.context.ContextManager { +public class ApiContextManager implements net.luckperms.api.context.ContextManager { private final LuckPermsPlugin plugin; private final ContextManager handle; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java index 963567fa4..55c78a7c2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.context.ContextSetFactory; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.common.context.contextset.ImmutableContextSetImpl; import me.lucko.luckperms.common.context.contextset.MutableContextSetImpl; +import net.luckperms.api.context.ContextSetFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.MutableContextSet; + import org.checkerframework.checker.nullness.qual.NonNull; public class ApiContextSetFactory implements ContextSetFactory { diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java index 8a33b4e7e..61899184c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java @@ -27,18 +27,19 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.common.cacheddata.GroupCachedDataManager; import me.lucko.luckperms.common.model.Group; +import net.luckperms.api.context.ContextSet; + import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Objects; import java.util.OptionalInt; -public class ApiGroup extends ApiPermissionHolder implements me.lucko.luckperms.api.model.group.Group { - public static Group cast(me.lucko.luckperms.api.model.group.Group group) { +public class ApiGroup extends ApiPermissionHolder implements net.luckperms.api.model.group.Group { + public static Group cast(net.luckperms.api.model.group.Group group) { Objects.requireNonNull(group, "group"); Preconditions.checkState(group instanceof ApiGroup, "Illegal instance " + group.getClass() + " cannot be handled by this implementation."); return ((ApiGroup) group).getHandle(); diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java index 6e60d839d..91fa26f9a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java @@ -25,9 +25,6 @@ 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.api.node.HeldNode; import me.lucko.luckperms.common.api.ApiUtils; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; @@ -37,6 +34,10 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.ImmutableCollectors; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.event.cause.DeletionCause; +import net.luckperms.api.node.HeldNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; @@ -45,13 +46,13 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; -public class ApiGroupManager extends ApiAbstractManager> implements me.lucko.luckperms.api.model.group.GroupManager { +public class ApiGroupManager extends ApiAbstractManager> implements net.luckperms.api.model.group.GroupManager { public ApiGroupManager(LuckPermsPlugin plugin, GroupManager handle) { super(plugin, handle); } @Override - protected me.lucko.luckperms.api.model.group.Group getDelegateFor(me.lucko.luckperms.common.model.Group internal) { + protected net.luckperms.api.model.group.Group getDelegateFor(me.lucko.luckperms.common.model.Group internal) { if (internal == null) { return null; } @@ -60,20 +61,20 @@ public class ApiGroupManager extends ApiAbstractManager createAndLoadGroup(@NonNull String name) { + public @NonNull CompletableFuture createAndLoadGroup(@NonNull String name) { name = ApiUtils.checkName(Objects.requireNonNull(name, "name")); return this.plugin.getStorage().createAndLoadGroup(name, CreationCause.API) .thenApply(this::getDelegateFor); } @Override - public @NonNull CompletableFuture> loadGroup(@NonNull String name) { + public @NonNull CompletableFuture> loadGroup(@NonNull String name) { name = ApiUtils.checkName(Objects.requireNonNull(name, "name")); return this.plugin.getStorage().loadGroup(name).thenApply(opt -> opt.map(this::getDelegateFor)); } @Override - public @NonNull CompletableFuture saveGroup(me.lucko.luckperms.api.model.group.Group group) { + public @NonNull CompletableFuture saveGroup(net.luckperms.api.model.group.Group group) { Objects.requireNonNull(group, "group"); return this.plugin.getStorage().saveGroup(ApiGroup.cast(group)).thenRun(() -> { // invalidate caches - they have potentially been affected by @@ -84,7 +85,7 @@ public class ApiGroupManager extends ApiAbstractManager deleteGroup(me.lucko.luckperms.api.model.group.Group group) { + public @NonNull CompletableFuture deleteGroup(net.luckperms.api.model.group.Group group) { Objects.requireNonNull(group, "group"); if (group.getName().equalsIgnoreCase(NodeFactory.DEFAULT_GROUP_NAME)) { throw new IllegalArgumentException("Cannot delete the default group."); @@ -110,13 +111,13 @@ public class ApiGroupManager extends ApiAbstractManager getLoadedGroups() { + public @NonNull Set getLoadedGroups() { return this.handle.getAll().values().stream() .map(this::getDelegateFor) .collect(ImmutableCollectors.toSet()); diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java index 4192989ab..84a4b8734 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java @@ -25,10 +25,11 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.messaging.MessagingService; -import me.lucko.luckperms.api.model.user.User; import me.lucko.luckperms.common.messaging.InternalMessagingService; +import net.luckperms.api.messaging.MessagingService; +import net.luckperms.api.model.user.User; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java index 01acf67dc..0284d7b74 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java @@ -27,14 +27,15 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.metastacking.DuplicateRemovalFunction; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.api.metastacking.MetaStackElement; -import me.lucko.luckperms.api.metastacking.MetaStackFactory; import me.lucko.luckperms.common.metastacking.SimpleMetaStackDefinition; import me.lucko.luckperms.common.metastacking.StandardStackElements; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.metastacking.DuplicateRemovalFunction; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.metastacking.MetaStackFactory; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java index d7987bbb8..3ee6542de 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java @@ -25,16 +25,6 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeBuilderRegistry; -import me.lucko.luckperms.api.node.types.DisplayNameNode; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PermissionNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.RegexPermissionNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.node.types.WeightNode; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.node.types.DisplayName; import me.lucko.luckperms.common.node.types.Inheritance; @@ -45,6 +35,17 @@ import me.lucko.luckperms.common.node.types.RegexPermission; import me.lucko.luckperms.common.node.types.Suffix; import me.lucko.luckperms.common.node.types.Weight; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeBuilderRegistry; +import net.luckperms.api.node.types.DisplayNameNode; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PermissionNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.RegexPermissionNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.node.types.WeightNode; + import org.checkerframework.checker.nullness.qual.NonNull; public final class ApiNodeBuilderRegistry implements NodeBuilderRegistry { diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java index 3dd5f540f..996a9c0fe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java @@ -27,22 +27,23 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.collect.ImmutableSortedSet; -import me.lucko.luckperms.api.cacheddata.CachedDataManager; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.TemporaryDataMutateResult; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.node.utils.NodeTools; +import net.luckperms.api.cacheddata.CachedDataManager; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.TemporaryDataMutateResult; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collection; @@ -55,7 +56,7 @@ import java.util.TreeSet; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -public class ApiPermissionHolder implements me.lucko.luckperms.api.model.PermissionHolder { +public class ApiPermissionHolder implements net.luckperms.api.model.PermissionHolder { private final PermissionHolder handle; private final Normal normalData; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java index 6f5ba1611..1fbe9abfd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java @@ -25,10 +25,11 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.platform.Platform; -import me.lucko.luckperms.api.platform.PluginMetadata; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.platform.Platform; +import net.luckperms.api.platform.PluginMetadata; + import org.checkerframework.checker.nullness.qual.NonNull; import java.time.Instant; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java index bf79ec043..f995e32eb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java @@ -27,22 +27,23 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.group.Group; -import me.lucko.luckperms.api.model.user.User; -import me.lucko.luckperms.api.track.DemotionResult; -import me.lucko.luckperms.api.track.PromotionResult; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.model.user.User; +import net.luckperms.api.track.DemotionResult; +import net.luckperms.api.track.PromotionResult; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; import java.util.Objects; -public class ApiTrack implements me.lucko.luckperms.api.track.Track { - public static Track cast(me.lucko.luckperms.api.track.Track track) { +public class ApiTrack implements net.luckperms.api.track.Track { + public static Track cast(net.luckperms.api.track.Track track) { Objects.requireNonNull(track, "track"); Preconditions.checkState(track instanceof ApiTrack, "Illegal instance " + track.getClass() + " cannot be handled by this implementation."); return ((ApiTrack) track).getHandle(); diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java index ac4ab5099..3183cd49c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java @@ -25,14 +25,15 @@ 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.model.Track; import me.lucko.luckperms.common.model.manager.track.TrackManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.ImmutableCollectors; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.event.cause.DeletionCause; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; @@ -40,13 +41,13 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; -public class ApiTrackManager extends ApiAbstractManager> implements me.lucko.luckperms.api.track.TrackManager { +public class ApiTrackManager extends ApiAbstractManager> implements net.luckperms.api.track.TrackManager { public ApiTrackManager(LuckPermsPlugin plugin, TrackManager handle) { super(plugin, handle); } @Override - protected me.lucko.luckperms.api.track.Track getDelegateFor(Track internal) { + protected net.luckperms.api.track.Track getDelegateFor(Track internal) { if (internal == null) { return null; } @@ -55,26 +56,26 @@ public class ApiTrackManager extends ApiAbstractManager createAndLoadTrack(@NonNull String name) { + public @NonNull CompletableFuture createAndLoadTrack(@NonNull String name) { name = ApiUtils.checkName(Objects.requireNonNull(name, "name")); return this.plugin.getStorage().createAndLoadTrack(name, CreationCause.API) .thenApply(this::getDelegateFor); } @Override - public @NonNull CompletableFuture> loadTrack(@NonNull String name) { + public @NonNull CompletableFuture> loadTrack(@NonNull String name) { name = ApiUtils.checkName(Objects.requireNonNull(name, "name")); return this.plugin.getStorage().loadTrack(name).thenApply(opt -> opt.map(this::getDelegateFor)); } @Override - public @NonNull CompletableFuture saveTrack(me.lucko.luckperms.api.track.Track track) { + public @NonNull CompletableFuture saveTrack(net.luckperms.api.track.Track track) { Objects.requireNonNull(track, "track"); return this.plugin.getStorage().saveTrack(ApiTrack.cast(track)); } @Override - public @NonNull CompletableFuture deleteTrack(me.lucko.luckperms.api.track.Track track) { + public @NonNull CompletableFuture deleteTrack(net.luckperms.api.track.Track track) { Objects.requireNonNull(track, "track"); return this.plugin.getStorage().deleteTrack(ApiTrack.cast(track), DeletionCause.API); } @@ -85,13 +86,13 @@ public class ApiTrackManager extends ApiAbstractManager getLoadedTracks() { + public @NonNull Set getLoadedTracks() { return this.handle.getAll().values().stream() .map(this::getDelegateFor) .collect(ImmutableCollectors.toSet()); diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java index d63cabb35..36b166bca 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java @@ -27,20 +27,21 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; import me.lucko.luckperms.common.cacheddata.UserCachedDataManager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeEqualityPredicate; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; import java.util.UUID; -public class ApiUser extends ApiPermissionHolder implements me.lucko.luckperms.api.model.user.User { - public static User cast(me.lucko.luckperms.api.model.user.User u) { +public class ApiUser extends ApiPermissionHolder implements net.luckperms.api.model.user.User { + public static User cast(net.luckperms.api.model.user.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/implementation/ApiUserManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java index 4c6030ec8..867659e90 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.api.implementation; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.HeldNode; import me.lucko.luckperms.common.api.ApiUtils; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; @@ -36,6 +34,9 @@ import me.lucko.luckperms.common.model.manager.user.UserManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.ImmutableCollectors; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.HeldNode; + import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; @@ -45,13 +46,13 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; -public class ApiUserManager extends ApiAbstractManager> implements me.lucko.luckperms.api.model.user.UserManager { +public class ApiUserManager extends ApiAbstractManager> implements net.luckperms.api.model.user.UserManager { public ApiUserManager(LuckPermsPlugin plugin, UserManager handle) { super(plugin, handle); } @Override - protected me.lucko.luckperms.api.model.user.User getDelegateFor(User internal) { + protected net.luckperms.api.model.user.User getDelegateFor(User internal) { if (internal == null) { return null; } @@ -59,7 +60,7 @@ public class ApiUserManager extends ApiAbstractManager loadUser(@NonNull UUID uuid, @Nullable String username) { + public @NonNull CompletableFuture loadUser(@NonNull UUID uuid, @Nullable String username) { Objects.requireNonNull(uuid, "uuid"); ApiUtils.checkUsername(username, this.plugin); @@ -84,7 +85,7 @@ public class ApiUserManager extends ApiAbstractManager saveUser(me.lucko.luckperms.api.model.user.User user) { + public @NonNull CompletableFuture saveUser(net.luckperms.api.model.user.User user) { Objects.requireNonNull(user, "user"); return this.plugin.getStorage().saveUser(ApiUser.cast(user)); } @@ -108,19 +109,19 @@ public class ApiUserManager extends ApiAbstractManager getLoadedUsers() { + public @NonNull Set getLoadedUsers() { return this.handle.getAll().values().stream() .map(this::getDelegateFor) .collect(ImmutableCollectors.toSet()); @@ -133,7 +134,7 @@ public class ApiUserManager extends ApiAbstractManager extends SharedMainCommand { public CommandMeta(LocaleManager locale, boolean user) { super(CommandSpec.META.localize(locale), "Meta", user, ImmutableList.builder() 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 72f053e16..6186e0a9f 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 @@ -25,10 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -50,6 +46,10 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; import java.util.List; 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 a9ee9bbec..dc5b75776 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 @@ -25,12 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.TemporaryDataMutateResult; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.util.Result; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -54,6 +48,12 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.TemporaryDataMutateResult; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.util.Result; import java.util.List; 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 250dcffcc..80bb5d5a0 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -46,6 +43,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeType; + import java.util.List; public class MetaClear extends SharedSubCommand { 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 200a760d9..b35de2dcc 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 @@ -27,14 +27,6 @@ package me.lucko.luckperms.common.commands.generic.meta; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.metadata.types.InheritanceOriginMetadata; -import me.lucko.luckperms.api.node.types.ChatMetaNode; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; @@ -57,6 +49,14 @@ import net.kyori.text.ComponentBuilder; import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; +import net.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.query.QueryOptions; import java.util.Comparator; import java.util.LinkedHashSet; 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 638c7472b..49509e29e 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 @@ -25,10 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -50,6 +46,10 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; import java.util.List; 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 2d43cad3a..694957284 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 @@ -25,10 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -50,6 +46,10 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; import java.util.List; 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 d65b4e550..05cd47b2f 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.types.MetaNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -51,6 +46,11 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.types.MetaNode; import java.util.List; 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 ed2683c61..6aa41831e 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.command.CommandResult; @@ -53,6 +48,11 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.query.QueryOptions; import java.util.List; import java.util.OptionalInt; 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 048424647..19f9119af 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 @@ -25,12 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.types.MetaNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -54,6 +48,12 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.types.MetaNode; import java.util.List; 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 6f9b3ecc7..517e4296c 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 @@ -25,13 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.TemporaryDataMutateResult; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.query.QueryOptions; -import me.lucko.luckperms.api.util.Result; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.command.CommandResult; @@ -57,6 +50,13 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.TemporaryDataMutateResult; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.query.QueryOptions; +import net.luckperms.api.util.Result; import java.util.List; import java.util.OptionalInt; 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 d2b2e0052..b8a1d8f68 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.types.MetaNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -45,6 +42,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.types.MetaNode; + import java.util.List; public class MetaUnset extends SharedSubCommand { 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 711899886..efa7fc4b2 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.meta; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.types.MetaNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -45,6 +42,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.types.MetaNode; + import java.util.List; public class MetaUnsetTemp extends SharedSubCommand { 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 c6a9e57dc..22379b7f0 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.generic.other; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -44,6 +42,9 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; + import java.util.List; public class HolderClear extends SubCommand { 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 3ebd0bc45..cec653a1c 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.commands.generic.other; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; @@ -47,6 +46,7 @@ import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; import net.kyori.text.event.HoverEvent; import net.kyori.text.format.TextColor; +import net.luckperms.api.context.ImmutableContextSet; import java.util.Collections; import java.util.List; 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 db12cda89..5d5ed1524 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 @@ -27,9 +27,6 @@ package me.lucko.luckperms.common.commands.generic.other; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; @@ -46,6 +43,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.types.InheritanceNode; + import java.util.ArrayList; import java.util.List; import java.util.Map; 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 d5b0b5cf6..746d45135 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -49,6 +46,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; + import java.util.List; public class ParentAdd extends SharedSubCommand { 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 7381e7ce7..31f2c4f02 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.TemporaryDataMutateResult; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.util.Result; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -53,6 +48,12 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.TemporaryDataMutateResult; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.util.Result; + import java.util.List; public class ParentAddTemp extends SharedSubCommand { 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 3ab0a78e8..e134523c0 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -43,6 +42,8 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; + import java.util.List; public class ParentClear extends SharedSubCommand { 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 d3cdd658b..510ca8efe 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -51,6 +48,10 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeType; + import java.util.List; public class ParentClearTrack extends SharedSubCommand { 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 e1a8472d0..736439aea 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; @@ -54,6 +52,8 @@ import net.kyori.text.ComponentBuilder; import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.query.QueryOptions; import java.util.Collections; import java.util.Comparator; 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 1908e583c..7cc4aef53 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -51,6 +48,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; + import java.util.List; public class ParentRemove extends SharedSubCommand { 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 a2983c4e0..3dc2c69d3 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -48,6 +45,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; + import java.util.List; public class ParentRemoveTemp extends SharedSubCommand { 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 905d24cf5..e3a6e6014 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -50,6 +48,9 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; + import java.util.List; public class ParentSet extends SharedSubCommand { 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 54882c378..8adb085d7 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -51,6 +48,10 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeType; + import java.util.List; public class ParentSetTrack extends SharedSubCommand { 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 17ff33175..782daaac8 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 @@ -25,10 +25,6 @@ package me.lucko.luckperms.common.commands.generic.parent; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; @@ -49,6 +45,11 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; + import java.util.List; public class UserSwitchPrimaryGroup extends SharedSubCommand { 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 b57b8afdf..d97700d86 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 @@ -25,10 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; @@ -47,6 +43,11 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.Tristate; + import java.util.List; public class PermissionCheck extends SharedSubCommand { 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 d64738207..8347f4a1f 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; @@ -46,6 +44,9 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.node.NodeEqualityPredicate; + import java.util.List; public class PermissionCheckInherits extends SharedSubCommand { 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 1aa67f6ba..2627234b7 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.types.PermissionNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -45,6 +42,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.types.PermissionNode; + import java.util.List; public class PermissionClear extends SharedSubCommand { 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 91b9a76cf..42d79044f 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SharedSubCommand; @@ -54,6 +52,8 @@ import net.kyori.text.ComponentBuilder; import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; import java.util.ArrayList; import java.util.Collections; 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 e1481ff41..015c03fa0 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -50,6 +45,12 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.InheritanceNode; + import java.util.List; public class PermissionSet extends SharedSubCommand { 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 3f65b7082..a88c12cc1 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 @@ -25,13 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.TemporaryDataMutateResult; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.util.Result; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -54,6 +47,14 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.TemporaryDataMutateResult; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.util.Result; + import java.util.List; public class PermissionSetTemp extends SharedSubCommand { 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 094c25ba5..7d70ccbea 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -50,6 +45,12 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.InheritanceNode; + import java.util.List; public class PermissionUnset extends SharedSubCommand { 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 33f077b7a..32b422874 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 @@ -25,11 +25,6 @@ package me.lucko.luckperms.common.commands.generic.permission; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -50,6 +45,12 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.InheritanceNode; + import java.util.List; public class PermissionUnsetTemp extends SharedSubCommand { 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 f099d6373..36e852da1 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; @@ -39,6 +37,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.cause.CreationCause; + import java.util.List; public class CreateGroup extends SingleCommand { 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 baddd78e4..b4e163f18 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.cause.DeletionCause; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; @@ -42,6 +40,9 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.cause.DeletionCause; + import java.util.List; public class DeleteGroup extends SingleCommand { 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 9f6d05488..8256011f2 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -42,6 +40,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.model.DataType; + import java.util.List; public class GroupClone extends SubCommand { 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 90ca99474..2c6a6aa35 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; @@ -41,6 +39,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.InheritanceNode; + import java.util.List; import java.util.stream.Collectors; 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 783034136..59ed278ba 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 @@ -27,9 +27,6 @@ package me.lucko.luckperms.common.commands.group; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.node.HeldNode; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.cache.LoadingMap; @@ -59,6 +56,9 @@ import net.kyori.text.ComponentBuilder; import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.node.HeldNode; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.InheritanceNode; import java.util.ArrayList; import java.util.List; 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 3b778711e..c1c8379de 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.event.cause.DeletionCause; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -42,6 +39,10 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.event.cause.DeletionCause; +import net.luckperms.api.model.DataType; + import java.util.List; public class GroupRename extends SubCommand { 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 06850e1ab..cc5228d75 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.types.DisplayNameNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -46,6 +43,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.types.DisplayNameNode; + import java.util.List; public class GroupSetDisplayName extends SubCommand { 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 7e1e9089d..5d172f0a8 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.types.WeightNode; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -44,6 +42,9 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.types.WeightNode; + import java.util.List; public class GroupSetWeight extends SubCommand { 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 6892fb4f2..6062098d8 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.log; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; @@ -44,6 +43,8 @@ import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Paginated; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; + import java.util.List; import java.util.Map; import java.util.SortedMap; 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 2529de874..697044d1f 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.commands.log; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -41,6 +38,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; + import java.util.List; import java.util.Optional; import java.util.UUID; 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 c27e7ee61..667ed7025 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.log; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; @@ -41,6 +40,8 @@ import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Paginated; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; + import java.util.List; import java.util.Map; import java.util.SortedMap; 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 321f2d403..7d38afd16 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.log; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; @@ -40,6 +39,8 @@ import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Paginated; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; + import java.util.List; import java.util.Map; import java.util.SortedMap; 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 894bc0aa5..6a5645c14 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.log; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; @@ -44,6 +43,8 @@ import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Paginated; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; + import java.util.List; import java.util.Map; import java.util.SortedMap; 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 f300e98e4..df418d0e7 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.log; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; @@ -41,6 +40,8 @@ import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Paginated; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; + import java.util.List; import java.util.Map; import java.util.SortedMap; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationUtils.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationUtils.java index 99fe148f8..9fe4096d8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationUtils.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationUtils.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.common.commands.migration; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeType; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeType; + public final class MigrationUtils { private MigrationUtils() {} 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 b2a462982..c6469837e 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 @@ -30,11 +30,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.event.cause.DeletionCause; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; @@ -56,6 +51,12 @@ import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.web.WebEditor; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.event.cause.DeletionCause; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; + import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashSet; 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 7db3f7fc6..ad78434f9 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -43,6 +42,8 @@ import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; +import net.luckperms.api.node.Tristate; + import java.util.List; import java.util.UUID; import java.util.stream.Collectors; 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 489f49a4b..ceed83513 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 @@ -25,12 +25,6 @@ package me.lucko.luckperms.common.commands.misc; -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.api.query.Flag; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.cacheddata.type.PermissionCache; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; @@ -57,6 +51,12 @@ import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; import net.kyori.text.event.HoverEvent; import net.kyori.text.format.TextColor; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.StaticContextCalculator; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.QueryOptions; import java.util.List; import java.util.Map; 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 ab6437af2..0318b28ee 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -39,6 +38,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; import java.util.Map; 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 ed0a8345f..58f20f4b3 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 @@ -27,8 +27,6 @@ package me.lucko.luckperms.common.commands.misc; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.node.HeldNode; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.bulkupdate.comparison.Comparison; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; @@ -59,6 +57,8 @@ import net.kyori.text.ComponentBuilder; import net.kyori.text.TextComponent; import net.kyori.text.event.ClickEvent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.node.HeldNode; +import net.luckperms.api.node.Node; import java.util.ArrayList; import java.util.List; 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 01fc3cb31..de749269a 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; @@ -39,6 +37,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.cause.CreationCause; + import java.util.List; public class CreateTrack extends SingleCommand { 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 41bf71a17..1fb40df79 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.cause.DeletionCause; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SingleCommand; @@ -41,6 +39,9 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.cause.DeletionCause; + import java.util.List; public class DeleteTrack extends SingleCommand { 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 b076f8d56..6f53b1a16 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.api.model.DataMutateResult; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -44,6 +43,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.model.DataMutateResult; + import java.util.List; public class TrackAppend extends SubCommand { 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 ab3dff52b..a4dcf0a96 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -40,6 +39,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.event.cause.CreationCause; + import java.util.List; public class TrackClone extends SubCommand { 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 b7d968dcb..51f805cdb 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.api.model.DataMutateResult; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -44,6 +43,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.model.DataMutateResult; + import java.util.List; public class TrackInsert extends SubCommand { 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 d45483133..6b9d7066a 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.api.model.DataMutateResult; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -43,6 +42,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.model.DataMutateResult; + import java.util.List; public class TrackRemove extends SubCommand { 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 db0065581..cfbcb900e 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.event.cause.DeletionCause; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -41,6 +39,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.event.cause.DeletionCause; + import java.util.List; public class TrackRename extends SubCommand { 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 2bacd3a57..a5df3de42 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands.user; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -41,6 +40,8 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.model.DataType; + 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 b429f4875..ddb1c5b2c 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.user; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.track.DemotionResult; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -48,6 +46,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.track.DemotionResult; + 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 e5040401b..6971b77c3 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 @@ -27,10 +27,6 @@ package me.lucko.luckperms.common.commands.user; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -47,6 +43,11 @@ import me.lucko.luckperms.common.util.DurationFormatter; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.query.QueryOptions; + import java.util.List; import java.util.Map; import java.util.stream.Collectors; 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 9327b524e..8be0f80ad 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.common.commands.user; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.track.PromotionResult; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; @@ -48,6 +46,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.track.PromotionResult; + import java.util.List; import java.util.function.Predicate; 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 92b96131c..b5c53bb51 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 @@ -28,12 +28,6 @@ package me.lucko.luckperms.common.config; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.metastacking.DuplicateRemovalFunction; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.query.Flag; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.command.utils.ArgumentParser; import me.lucko.luckperms.common.defaultassignments.AssignmentRule; import me.lucko.luckperms.common.graph.TraversalAlgorithm; @@ -49,6 +43,13 @@ import me.lucko.luckperms.common.storage.implementation.split.SplitStorageType; import me.lucko.luckperms.common.storage.misc.StorageCredentials; import me.lucko.luckperms.common.util.ImmutableCollectors; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.metastacking.DuplicateRemovalFunction; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.QueryOptions; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; 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 246a0b97b..9d5d00c06 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 @@ -28,10 +28,11 @@ package me.lucko.luckperms.common.config; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.context.ContextSetJsonSerializer; import me.lucko.luckperms.common.util.gson.GsonProvider; +import net.luckperms.api.context.ImmutableContextSet; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java index 34cb97cfb..261f15e2c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java @@ -27,14 +27,15 @@ package me.lucko.luckperms.common.context; import com.google.common.collect.ImmutableList; -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.api.query.QueryOptions; import me.lucko.luckperms.common.cache.ExpiringCache; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.StaticContextCalculator; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ContextSetComparator.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetComparator.java index 9be945464..f7111f972 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/ContextSetComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetComparator.java @@ -25,9 +25,9 @@ package me.lucko.luckperms.common.context; -import me.lucko.luckperms.api.context.Context; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.Context; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; import java.util.ArrayList; import java.util.Comparator; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ContextSetConfigurateSerializer.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetConfigurateSerializer.java index ee31395ae..2d3d00180 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/ContextSetConfigurateSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetConfigurateSerializer.java @@ -27,9 +27,9 @@ package me.lucko.luckperms.common.context; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.context.MutableContextSet; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.MutableContextSet; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.SimpleConfigurationNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ContextSetJsonSerializer.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetJsonSerializer.java index 66dce6ee6..8adcb6c8f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/ContextSetJsonSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextSetJsonSerializer.java @@ -32,9 +32,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.context.MutableContextSet; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.MutableContextSet; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/LPStaticContextsCalculator.java b/common/src/main/java/me/lucko/luckperms/common/context/LPStaticContextsCalculator.java index 3a154d561..d314e7097 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/LPStaticContextsCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/LPStaticContextsCalculator.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.common.context; -import me.lucko.luckperms.api.context.ContextConsumer; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.StaticContextCalculator; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.config.LuckPermsConfiguration; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.StaticContextCalculator; + import org.checkerframework.checker.nullness.qual.NonNull; public class LPStaticContextsCalculator implements StaticContextCalculator { diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ProxiedContextCalculator.java b/common/src/main/java/me/lucko/luckperms/common/context/ProxiedContextCalculator.java index a38150c9d..c4c7f889a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/ProxiedContextCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ProxiedContextCalculator.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.context; -import me.lucko.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextCalculator; /** * Represents a {@link ContextCalculator} which delegates calls to another object. diff --git a/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsCache.java b/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsCache.java index d194b6cb8..f919370f8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsCache.java @@ -25,10 +25,11 @@ package me.lucko.luckperms.common.context; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cache.ExpiringCache; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.concurrent.TimeUnit; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsSupplier.java b/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsSupplier.java index fb0649d6a..351fb25f1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsSupplier.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/QueryOptionsSupplier.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.context; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.QueryOptions; /** * Supplies contexts for a given subject. diff --git a/common/src/main/java/me/lucko/luckperms/common/context/contextset/AbstractContextSet.java b/common/src/main/java/me/lucko/luckperms/common/context/contextset/AbstractContextSet.java index 60cab96da..e3f4e006e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/contextset/AbstractContextSet.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/contextset/AbstractContextSet.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.context.contextset; import com.google.common.collect.ImmutableSet; import com.google.common.collect.SetMultimap; -import me.lucko.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ContextSet; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/contextset/ContextImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/contextset/ContextImpl.java index 91975957c..40cae4c94 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/contextset/ContextImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/contextset/ContextImpl.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.context.contextset; -import me.lucko.luckperms.api.context.Context; +import net.luckperms.api.context.Context; public final class ContextImpl implements Context { private final String key; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/contextset/ImmutableContextSetImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/contextset/ImmutableContextSetImpl.java index 123ccc6d6..0283d16f9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/contextset/ImmutableContextSetImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/contextset/ImmutableContextSetImpl.java @@ -33,10 +33,10 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; -import me.lucko.luckperms.api.context.Context; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.context.MutableContextSet; +import net.luckperms.api.context.Context; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.MutableContextSet; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/contextset/MutableContextSetImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/contextset/MutableContextSetImpl.java index 880efb644..59273cbcb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/contextset/MutableContextSetImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/contextset/MutableContextSetImpl.java @@ -34,10 +34,10 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; -import me.lucko.luckperms.api.context.Context; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.context.MutableContextSet; +import net.luckperms.api.context.Context; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.MutableContextSet; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentExpression.java b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentExpression.java index c160710d5..791a2c129 100644 --- a/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentExpression.java +++ b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentExpression.java @@ -27,14 +27,15 @@ package me.lucko.luckperms.common.defaultassignments; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.util.Scripting; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.Tristate; + import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentRule.java b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentRule.java index 0a19ad213..9af1d62f8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentRule.java +++ b/common/src/main/java/me/lucko/luckperms/common/defaultassignments/AssignmentRule.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.common.defaultassignments; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.util.ImmutableCollectors; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.Tristate; + import java.util.List; public class AssignmentRule { diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java index a8914a32b..f3e7de5e3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java @@ -29,13 +29,14 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; import com.google.gson.JsonElement; -import me.lucko.luckperms.api.platform.Platform; import me.lucko.luckperms.common.config.ConfigKeys; 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 net.luckperms.api.platform.Platform; + import java.util.LinkedHashSet; import java.util.List; import java.util.Set; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java b/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java index a8d5ee3f2..e55539e91 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java @@ -25,14 +25,14 @@ package me.lucko.luckperms.common.event; -import me.lucko.luckperms.api.event.EventBus; -import me.lucko.luckperms.api.event.EventSubscription; -import me.lucko.luckperms.api.event.LuckPermsEvent; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import net.kyori.event.EventSubscriber; import net.kyori.event.SimpleEventBus; +import net.luckperms.api.event.EventBus; +import net.luckperms.api.event.EventSubscription; +import net.luckperms.api.event.LuckPermsEvent; import org.checkerframework.checker.nullness.qual.NonNull; 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 ef68cd468..61fac60b5 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 @@ -28,48 +28,6 @@ package me.lucko.luckperms.common.event; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.Cancellable; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.event.cause.DeletionCause; -import me.lucko.luckperms.api.event.group.GroupCacheLoadEvent; -import me.lucko.luckperms.api.event.group.GroupCreateEvent; -import me.lucko.luckperms.api.event.group.GroupDataRecalculateEvent; -import me.lucko.luckperms.api.event.group.GroupDeleteEvent; -import me.lucko.luckperms.api.event.group.GroupLoadAllEvent; -import me.lucko.luckperms.api.event.group.GroupLoadEvent; -import me.lucko.luckperms.api.event.log.LogBroadcastEvent; -import me.lucko.luckperms.api.event.log.LogNetworkPublishEvent; -import me.lucko.luckperms.api.event.log.LogNotifyEvent; -import me.lucko.luckperms.api.event.log.LogPublishEvent; -import me.lucko.luckperms.api.event.log.LogReceiveEvent; -import me.lucko.luckperms.api.event.node.NodeAddEvent; -import me.lucko.luckperms.api.event.node.NodeClearEvent; -import me.lucko.luckperms.api.event.node.NodeRemoveEvent; -import me.lucko.luckperms.api.event.player.PlayerDataSaveEvent; -import me.lucko.luckperms.api.event.player.PlayerLoginProcessEvent; -import me.lucko.luckperms.api.event.source.Source; -import me.lucko.luckperms.api.event.sync.ConfigReloadEvent; -import me.lucko.luckperms.api.event.sync.PostSyncEvent; -import me.lucko.luckperms.api.event.sync.PreNetworkSyncEvent; -import me.lucko.luckperms.api.event.sync.PreSyncEvent; -import me.lucko.luckperms.api.event.track.TrackCreateEvent; -import me.lucko.luckperms.api.event.track.TrackDeleteEvent; -import me.lucko.luckperms.api.event.track.TrackLoadAllEvent; -import me.lucko.luckperms.api.event.track.TrackLoadEvent; -import me.lucko.luckperms.api.event.track.mutate.TrackAddGroupEvent; -import me.lucko.luckperms.api.event.track.mutate.TrackClearEvent; -import me.lucko.luckperms.api.event.track.mutate.TrackRemoveGroupEvent; -import me.lucko.luckperms.api.event.user.UserCacheLoadEvent; -import me.lucko.luckperms.api.event.user.UserDataRecalculateEvent; -import me.lucko.luckperms.api.event.user.UserFirstLoginEvent; -import me.lucko.luckperms.api.event.user.UserLoadEvent; -import me.lucko.luckperms.api.event.user.track.UserDemoteEvent; -import me.lucko.luckperms.api.event.user.track.UserPromoteEvent; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.api.implementation.ApiPermissionHolder; import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.cacheddata.GroupCachedDataManager; @@ -85,6 +43,49 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.sender.Sender; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.event.cause.DeletionCause; +import net.luckperms.api.event.group.GroupCacheLoadEvent; +import net.luckperms.api.event.group.GroupCreateEvent; +import net.luckperms.api.event.group.GroupDataRecalculateEvent; +import net.luckperms.api.event.group.GroupDeleteEvent; +import net.luckperms.api.event.group.GroupLoadAllEvent; +import net.luckperms.api.event.group.GroupLoadEvent; +import net.luckperms.api.event.log.LogBroadcastEvent; +import net.luckperms.api.event.log.LogNetworkPublishEvent; +import net.luckperms.api.event.log.LogNotifyEvent; +import net.luckperms.api.event.log.LogPublishEvent; +import net.luckperms.api.event.log.LogReceiveEvent; +import net.luckperms.api.event.node.NodeAddEvent; +import net.luckperms.api.event.node.NodeClearEvent; +import net.luckperms.api.event.node.NodeRemoveEvent; +import net.luckperms.api.event.player.PlayerDataSaveEvent; +import net.luckperms.api.event.player.PlayerLoginProcessEvent; +import net.luckperms.api.event.source.Source; +import net.luckperms.api.event.sync.ConfigReloadEvent; +import net.luckperms.api.event.sync.PostSyncEvent; +import net.luckperms.api.event.sync.PreNetworkSyncEvent; +import net.luckperms.api.event.sync.PreSyncEvent; +import net.luckperms.api.event.track.TrackCreateEvent; +import net.luckperms.api.event.track.TrackDeleteEvent; +import net.luckperms.api.event.track.TrackLoadAllEvent; +import net.luckperms.api.event.track.TrackLoadEvent; +import net.luckperms.api.event.track.mutate.TrackAddGroupEvent; +import net.luckperms.api.event.track.mutate.TrackClearEvent; +import net.luckperms.api.event.track.mutate.TrackRemoveGroupEvent; +import net.luckperms.api.event.user.UserCacheLoadEvent; +import net.luckperms.api.event.user.UserDataRecalculateEvent; +import net.luckperms.api.event.user.UserFirstLoginEvent; +import net.luckperms.api.event.user.UserLoadEvent; +import net.luckperms.api.event.user.track.UserDemoteEvent; +import net.luckperms.api.event.user.track.UserPromoteEvent; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.Node; + import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Collection; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java b/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java index 6e5dae65c..32bc33df1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java @@ -25,10 +25,9 @@ package me.lucko.luckperms.common.event; -import me.lucko.luckperms.api.event.EventSubscription; -import me.lucko.luckperms.api.event.LuckPermsEvent; - import net.kyori.event.EventSubscriber; +import net.luckperms.api.event.EventSubscription; +import net.luckperms.api.event.LuckPermsEvent; 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/event/gen/GeneratedEventSpec.java b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java index 06990510c..cedf16fc8 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 @@ -27,13 +27,14 @@ package me.lucko.luckperms.common.event.gen; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.event.LuckPermsEvent; -import me.lucko.luckperms.api.event.Param; import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.util.PrivateMethodHandles; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.event.LuckPermsEvent; +import net.luckperms.api.event.Param; + import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java b/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java index 515ca6af5..ec4c85741 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.event.model; -import me.lucko.luckperms.api.event.source.EntitySource; -import me.lucko.luckperms.api.platform.PlatformEntity; +import net.luckperms.api.event.source.EntitySource; +import net.luckperms.api.platform.PlatformEntity; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java b/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java index ddbbaa5eb..e9e3a38ee 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java @@ -25,9 +25,10 @@ package me.lucko.luckperms.common.event.model; -import me.lucko.luckperms.api.platform.PlatformEntity; import me.lucko.luckperms.common.sender.Sender; +import net.luckperms.api.platform.PlatformEntity; + 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/event/model/UnknownSource.java b/common/src/main/java/me/lucko/luckperms/common/event/model/UnknownSource.java index 46617edee..23ff3da50 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/model/UnknownSource.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/model/UnknownSource.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.event.model; -import me.lucko.luckperms.api.event.source.Source; +import net.luckperms.api.event.source.Source; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraph.java b/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraph.java index edaaaaac8..3fc7d8381 100644 --- a/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraph.java +++ b/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraph.java @@ -25,10 +25,6 @@ package me.lucko.luckperms.common.inheritance; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.query.Flag; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.graph.Graph; import me.lucko.luckperms.common.graph.TraversalAlgorithm; @@ -36,6 +32,11 @@ import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.QueryOptions; + import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceHandler.java b/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceHandler.java index 92218931d..e8d0f18fe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceHandler.java +++ b/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceHandler.java @@ -25,9 +25,10 @@ package me.lucko.luckperms.common.inheritance; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.query.QueryOptions; + /** * Provides {@link InheritanceGraph}s. */ diff --git a/common/src/main/java/me/lucko/luckperms/common/inheritance/ResolvedGroup.java b/common/src/main/java/me/lucko/luckperms/common/inheritance/ResolvedGroup.java index a8509289e..1c3d0e32a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/inheritance/ResolvedGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/inheritance/ResolvedGroup.java @@ -25,9 +25,10 @@ package me.lucko.luckperms.common.inheritance; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.model.Group; +import net.luckperms.api.node.Node; + public final class ResolvedGroup { private final Node node; private final Group group; 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 6dcfa332d..7f028d02a 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 @@ -25,12 +25,13 @@ package me.lucko.luckperms.common.messaging; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.MessengerProvider; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.model.User; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.MessengerProvider; + 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 6a908c722..120700f42 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 @@ -28,14 +28,6 @@ package me.lucko.luckperms.common.messaging; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.MessengerProvider; -import me.lucko.luckperms.api.messenger.message.Message; -import me.lucko.luckperms.api.messenger.message.type.ActionLogMessage; -import me.lucko.luckperms.api.messenger.message.type.UpdateMessage; -import me.lucko.luckperms.api.messenger.message.type.UserUpdateMessage; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.config.ConfigKeys; @@ -47,6 +39,15 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.gson.GsonProvider; import me.lucko.luckperms.common.util.gson.JObject; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.MessengerProvider; +import net.luckperms.api.messenger.message.Message; +import net.luckperms.api.messenger.message.type.ActionLogMessage; +import net.luckperms.api.messenger.message.type.UpdateMessage; +import net.luckperms.api.messenger.message.type.UserUpdateMessage; + 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/MessagingFactory.java b/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java index 789cad3c1..8feb4595d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java @@ -27,9 +27,6 @@ package me.lucko.luckperms.common.messaging; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.MessengerProvider; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.messaging.redis.RedisMessenger; import me.lucko.luckperms.common.messaging.sql.SqlMessenger; @@ -38,6 +35,10 @@ import me.lucko.luckperms.common.storage.implementation.sql.SqlStorage; import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.MariaDbConnectionFactory; import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.MySqlConnectionFactory; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.MessengerProvider; + import org.checkerframework.checker.nullness.qual.NonNull; public class MessagingFactory

{ diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java index 8b1892934..f2097b686 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.messaging.message; -import me.lucko.luckperms.api.messenger.message.Message; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; +import net.luckperms.api.messenger.message.Message; +import net.luckperms.api.messenger.message.OutgoingMessage; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java index 4ece3dca6..33d4cc45e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java @@ -27,11 +27,12 @@ package me.lucko.luckperms.common.messaging.message; import com.google.gson.JsonElement; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.messenger.message.type.ActionLogMessage; import me.lucko.luckperms.common.actionlog.ActionJsonSerializer; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.messenger.message.type.ActionLogMessage; + 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/UpdateMessageImpl.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UpdateMessageImpl.java index 042768e49..525d56210 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/UpdateMessageImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UpdateMessageImpl.java @@ -27,9 +27,10 @@ package me.lucko.luckperms.common.messaging.message; import com.google.gson.JsonElement; -import me.lucko.luckperms.api.messenger.message.type.UpdateMessage; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; +import net.luckperms.api.messenger.message.type.UpdateMessage; + 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 fb5b9e575..77953cc6f 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 @@ -27,10 +27,11 @@ package me.lucko.luckperms.common.messaging.message; 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.util.gson.JObject; +import net.luckperms.api.messenger.message.type.UserUpdateMessage; + 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/redis/RedisMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java index 3cce37592..4506a8499 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.common.messaging.redis; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; + import org.checkerframework.checker.nullness.qual.NonNull; import redis.clients.jedis.Jedis; diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java index 66412740b..28cbd288e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java @@ -25,9 +25,9 @@ package me.lucko.luckperms.common.messaging.sql; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java index 786986d48..9ed7955ca 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.common.messaging.sql; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.common.storage.implementation.sql.SqlStorage; +import net.luckperms.api.messenger.IncomingMessageConsumer; + import java.sql.Connection; import java.sql.SQLException; import java.util.concurrent.TimeUnit; diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/FluentMetaStackElement.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/FluentMetaStackElement.java index 74cc4741b..cd6ebbb6f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/FluentMetaStackElement.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/FluentMetaStackElement.java @@ -28,9 +28,9 @@ package me.lucko.luckperms.common.metastacking; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.metastacking.MetaStackElement; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.types.ChatMetaNode; 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/MetaStack.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/MetaStack.java index 2b1fe3590..2629671d2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/MetaStack.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/MetaStack.java @@ -25,9 +25,9 @@ package me.lucko.luckperms.common.metastacking; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.types.ChatMetaNode; /** * A live stack of {@link MetaStackEntry} instances, formed from a diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/MetaStackEntry.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/MetaStackEntry.java index ad4e038eb..9d2f54e5f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/MetaStackEntry.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/MetaStackEntry.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.metastacking; -import me.lucko.luckperms.api.metastacking.MetaStackElement; -import me.lucko.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.node.types.ChatMetaNode; import java.util.Optional; 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 478aa98d0..8262d84a7 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 @@ -25,11 +25,12 @@ package me.lucko.luckperms.common.metastacking; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.types.ChatMetaNode; import me.lucko.luckperms.common.util.ImmutableCollectors; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.types.ChatMetaNode; + import java.util.LinkedList; import java.util.List; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackDefinition.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackDefinition.java index 08c6bfed2..07d23c097 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackDefinition.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackDefinition.java @@ -27,9 +27,9 @@ package me.lucko.luckperms.common.metastacking; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.metastacking.DuplicateRemovalFunction; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.metastacking.DuplicateRemovalFunction; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.metastacking.MetaStackElement; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackEntry.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackEntry.java index 895bc1011..126f3ce18 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackEntry.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackEntry.java @@ -25,9 +25,9 @@ package me.lucko.luckperms.common.metastacking; -import me.lucko.luckperms.api.metastacking.MetaStackElement; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.types.ChatMetaNode; import org.checkerframework.checker.nullness.qual.Nullable; 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 9390b6d8f..463b5b113 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 @@ -25,15 +25,16 @@ package me.lucko.luckperms.common.metastacking; -import me.lucko.luckperms.api.metastacking.MetaStackElement; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.metadata.types.InheritanceOriginMetadata; -import me.lucko.luckperms.api.node.types.ChatMetaNode; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.util.Uuids; +import net.luckperms.api.metastacking.MetaStackElement; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; +import net.luckperms.api.node.types.ChatMetaNode; + 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/model/DemotionResults.java b/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java index 6ab8746b5..3d1fb89cf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.api.track.DemotionResult; +import net.luckperms.api.track.DemotionResult; import org.checkerframework.checker.nullness.qual.NonNull; 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 cd4db61d7..7b10a2fc4 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 @@ -25,11 +25,12 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.DisplayNameNode; import me.lucko.luckperms.common.cache.Cache; import me.lucko.luckperms.common.config.ConfigKeys; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.DisplayNameNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Optional; 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 e8c5cde06..e14b375f0 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 @@ -25,14 +25,15 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.DisplayNameNode; import me.lucko.luckperms.common.api.implementation.ApiGroup; import me.lucko.luckperms.common.cache.Cache; import me.lucko.luckperms.common.cacheddata.GroupCachedDataManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.DisplayNameNode; + import java.util.Optional; import java.util.OptionalInt; 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 5dc22ca2f..55e4d32fb 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 @@ -30,19 +30,20 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimap; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.metadata.types.InheritanceOriginMetadata; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cache.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.InheritanceOrigin; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.query.QueryOptions; + 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/model/PermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java index 5ec87dabc..475b121a9 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 @@ -29,22 +29,6 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.TemporaryDataMutateResult; -import me.lucko.luckperms.api.model.TemporaryMergeBehaviour; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.query.Flag; -import me.lucko.luckperms.api.query.QueryOptions; -import me.lucko.luckperms.api.query.dataorder.DataQueryOrder; -import me.lucko.luckperms.api.query.dataorder.DataQueryOrderFunction; import me.lucko.luckperms.common.cacheddata.HolderCachedDataManager; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.inheritance.InheritanceComparator; @@ -54,6 +38,23 @@ import me.lucko.luckperms.common.node.utils.InheritanceInfo; import me.lucko.luckperms.common.node.utils.NodeTools; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.TemporaryDataMutateResult; +import net.luckperms.api.model.TemporaryMergeBehaviour; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.QueryOptions; +import net.luckperms.api.query.dataorder.DataQueryOrder; +import net.luckperms.api.query.dataorder.DataQueryOrderFunction; + 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/model/PermissionHolderIdentifier.java b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolderIdentifier.java index 49d435874..d76ad026c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolderIdentifier.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolderIdentifier.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.api.model.PermissionHolder.Identifier; +import net.luckperms.api.model.PermissionHolder.Identifier; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java b/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java index 1c951cd0f..f19898d44 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.api.track.PromotionResult; +import net.luckperms.api.track.PromotionResult; import org.checkerframework.checker.nullness.qual.NonNull; 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 7efb838f2..71b7d692c 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 @@ -27,19 +27,20 @@ package me.lucko.luckperms.common.model; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.model.DataMutateResult; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.track.DemotionResult; -import me.lucko.luckperms.api.track.PromotionResult; 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; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.model.DataMutateResult; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.track.DemotionResult; +import net.luckperms.api.track.PromotionResult; + import org.checkerframework.checker.nullness.qual.Nullable; import java.util.ArrayList; 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 9b666f0cc..9b287367a 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,7 +25,6 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.cacheddata.UserCachedDataManager; import me.lucko.luckperms.common.config.ConfigKeys; @@ -33,6 +32,8 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.primarygroup.ContextualHolder; import me.lucko.luckperms.common.primarygroup.PrimaryGroupHolder; +import net.luckperms.api.model.DataType; + import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Optional; 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 2aaf2269b..575d26734 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 @@ -25,12 +25,13 @@ package me.lucko.luckperms.common.model; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.WeightNode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cache.Cache; import me.lucko.luckperms.common.config.ConfigKeys; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.WeightNode; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java index 9f4b5d7d5..63466e98b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java @@ -27,11 +27,6 @@ package me.lucko.luckperms.common.model.manager.user; import com.google.common.collect.ImmutableCollection; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.UserIdentifier; @@ -39,6 +34,12 @@ import me.lucko.luckperms.common.model.manager.AbstractManager; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.types.InheritanceNode; + import java.util.Optional; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java index b332e5e23..92fa8b283 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java @@ -27,16 +27,17 @@ package me.lucko.luckperms.common.node; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; -import me.lucko.luckperms.api.node.ScopedNode; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.RegexPermissionNode; import me.lucko.luckperms.common.node.utils.ShorthandParser; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.ScopedNode; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.RegexPermissionNode; + 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/AbstractNodeBuilder.java b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNodeBuilder.java index 0e479e84f..6b05fbe41 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/AbstractNodeBuilder.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNodeBuilder.java @@ -25,12 +25,12 @@ package me.lucko.luckperms.common.node; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.ScopedNode; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.ScopedNode; +import net.luckperms.api.node.metadata.NodeMetadataKey; 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/comparator/HeldPermissionComparator.java b/common/src/main/java/me/lucko/luckperms/common/node/comparator/HeldPermissionComparator.java index 15ca22c56..2df46f9b3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/comparator/HeldPermissionComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/comparator/HeldPermissionComparator.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.node.comparator; -import me.lucko.luckperms.api.node.HeldNode; +import net.luckperms.api.node.HeldNode; import java.util.Comparator; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeComparator.java b/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeComparator.java index cd9e233eb..628821402 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeComparator.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.node.comparator; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.types.PermissionNode; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.types.PermissionNode; import java.time.Instant; import java.time.temporal.ChronoUnit; 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 336a8ea04..0358da3ed 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 @@ -25,9 +25,10 @@ package me.lucko.luckperms.common.node.comparator; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.context.ContextSetComparator; +import net.luckperms.api.node.Node; + import java.util.Comparator; /** diff --git a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeFactory.java b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeFactory.java index 77a581767..710e0bd89 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeFactory.java @@ -25,17 +25,18 @@ package me.lucko.luckperms.common.node.factory; -import me.lucko.luckperms.api.context.Context; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.types.ChatMetaNode; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; +import net.luckperms.api.context.Context; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; + /** * Utility class to make Node(Builder) instances from strings or existing Nodes */ diff --git a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeTypes.java b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeTypes.java index 45d3faa9c..d1580cca4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeTypes.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeTypes.java @@ -27,18 +27,6 @@ package me.lucko.luckperms.common.node.factory; import com.google.common.base.Splitter; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.types.DisplayNameNode; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.RegexPermissionNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.node.types.WeightNode; import me.lucko.luckperms.common.cache.PatternCache; import me.lucko.luckperms.common.node.types.DisplayName; import me.lucko.luckperms.common.node.types.Inheritance; @@ -49,6 +37,19 @@ import me.lucko.luckperms.common.node.types.RegexPermission; import me.lucko.luckperms.common.node.types.Suffix; import me.lucko.luckperms.common.node.types.Weight; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.types.DisplayNameNode; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.RegexPermissionNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.node.types.WeightNode; + 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/HeldNodeImpl.java b/common/src/main/java/me/lucko/luckperms/common/node/model/HeldNodeImpl.java index 75848e622..8aa393f7f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/model/HeldNodeImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/model/HeldNodeImpl.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.node.model; -import me.lucko.luckperms.api.node.HeldNode; -import me.lucko.luckperms.api.node.Node; +import net.luckperms.api.node.HeldNode; +import net.luckperms.api.node.Node; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/model/InheritanceOrigin.java b/common/src/main/java/me/lucko/luckperms/common/node/model/InheritanceOrigin.java index 56475870e..9a47214cf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/model/InheritanceOrigin.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/model/InheritanceOrigin.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.node.model; -import me.lucko.luckperms.api.node.metadata.types.InheritanceOriginMetadata; +import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/model/NodeDataContainer.java b/common/src/main/java/me/lucko/luckperms/common/node/model/NodeDataContainer.java index fd4cf2d14..3ce23bf33 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/model/NodeDataContainer.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/model/NodeDataContainer.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.common.node.model; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.node.Node; + import java.util.Objects; import java.util.Optional; import java.util.Set; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java b/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java index 6554111e8..8638a971e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.DisplayNameNode; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.DisplayNameNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java index 0bfc33c1a..1cf875339 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.group.Group; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.InheritanceNode; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.InheritanceNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java index 83b6f9955..8a32bbfa2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.MetaNode; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.MetaNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java index a5032898c..c178c6d37 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java @@ -25,15 +25,16 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.NodeBuilder; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.PermissionNode; import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeTypes; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.NodeBuilder; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.PermissionNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java index a10539979..93660b262 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.PrefixNode; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.PrefixNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java b/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java index dda4b4d3e..d23f3626d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java @@ -25,15 +25,16 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.RegexPermissionNode; import me.lucko.luckperms.common.cache.Cache; import me.lucko.luckperms.common.cache.PatternCache; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.RegexPermissionNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java index 6dfeeedf9..d029971fd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.SuffixNode; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.SuffixNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java index 8b4eb2de4..aeecd8c6d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.common.node.types; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.node.types.WeightNode; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.NodeFactory; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.node.types.WeightNode; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/utils/InheritanceInfo.java b/common/src/main/java/me/lucko/luckperms/common/node/utils/InheritanceInfo.java index 2d84b7f99..7e3b8d7ec 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/utils/InheritanceInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/utils/InheritanceInfo.java @@ -25,9 +25,9 @@ package me.lucko.luckperms.common.node.utils; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.node.metadata.types.InheritanceOriginMetadata; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; import java.util.Objects; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeTools.java b/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeTools.java index 7e4aaa2da..b8da354c3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeTools.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeTools.java @@ -25,8 +25,8 @@ package me.lucko.luckperms.common.node.utils; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeEqualityPredicate; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeEqualityPredicate; import java.util.ArrayList; import java.util.HashSet; 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 d31be4091..2dcae61af 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.plugin; -import me.lucko.luckperms.api.LuckPerms; import me.lucko.luckperms.common.actionlog.LogDispatcher; import me.lucko.luckperms.common.api.ApiRegistrationUtil; import me.lucko.luckperms.common.api.LuckPermsApiProvider; @@ -55,6 +54,8 @@ import me.lucko.luckperms.common.treeview.PermissionRegistry; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.web.Bytebin; +import net.luckperms.api.LuckPerms; + import java.io.IOException; import java.util.EnumSet; import java.util.Optional; 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 a76a8b3ef..3ac8a705a 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.plugin; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.actionlog.LogDispatcher; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.calculator.CalculatorFactory; @@ -55,6 +54,8 @@ import me.lucko.luckperms.common.treeview.PermissionRegistry; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.web.Bytebin; +import net.luckperms.api.query.QueryOptions; + import java.util.Collections; import java.util.List; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java b/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java index 7cdf973ab..11e9f3b90 100644 --- a/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java +++ b/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.common.plugin.bootstrap; -import me.lucko.luckperms.api.platform.Platform; import me.lucko.luckperms.common.dependencies.classloader.PluginClassLoader; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; +import net.luckperms.api.platform.Platform; + import org.checkerframework.checker.nullness.qual.Nullable; import java.io.InputStream; 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 0be9463ea..8cffe7010 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 @@ -25,14 +25,15 @@ package me.lucko.luckperms.common.plugin.util; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.platform.Platform; 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 net.luckperms.api.model.DataType; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.platform.Platform; + import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/me/lucko/luckperms/common/primarygroup/AllParentsByWeightHolder.java b/common/src/main/java/me/lucko/luckperms/common/primarygroup/AllParentsByWeightHolder.java index 99b52c3a7..229a7606b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/primarygroup/AllParentsByWeightHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/primarygroup/AllParentsByWeightHolder.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.common.primarygroup; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.inheritance.InheritanceGraph; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.User; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Optional; diff --git a/common/src/main/java/me/lucko/luckperms/common/primarygroup/ContextualHolder.java b/common/src/main/java/me/lucko/luckperms/common/primarygroup/ContextualHolder.java index b86da83f3..fb96a1a90 100644 --- a/common/src/main/java/me/lucko/luckperms/common/primarygroup/ContextualHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/primarygroup/ContextualHolder.java @@ -27,11 +27,12 @@ package me.lucko.luckperms.common.primarygroup; import com.github.benmanes.caffeine.cache.LoadingCache; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.util.CaffeineFactory; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/common/src/main/java/me/lucko/luckperms/common/primarygroup/ParentsByWeightHolder.java b/common/src/main/java/me/lucko/luckperms/common/primarygroup/ParentsByWeightHolder.java index 8ffda99e1..9c7939fb8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/primarygroup/ParentsByWeightHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/primarygroup/ParentsByWeightHolder.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.common.primarygroup; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.User; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.LinkedHashSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/query/FlagUtils.java b/common/src/main/java/me/lucko/luckperms/common/query/FlagUtils.java index 41900aec8..59b511cdd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/query/FlagUtils.java +++ b/common/src/main/java/me/lucko/luckperms/common/query/FlagUtils.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.common.query; -import me.lucko.luckperms.api.query.Flag; +import net.luckperms.api.query.Flag; import java.util.EnumSet; import java.util.Set; diff --git a/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java index 45ac0fd5b..6bb90d50f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java @@ -25,12 +25,12 @@ package me.lucko.luckperms.common.query; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.Flag; -import me.lucko.luckperms.api.query.OptionKey; -import me.lucko.luckperms.api.query.QueryMode; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.OptionKey; +import net.luckperms.api.query.QueryMode; +import net.luckperms.api.query.QueryOptions; 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/query/QueryOptionsImpl.java b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java index d7ed124d2..85a9202db 100644 --- a/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java @@ -27,12 +27,12 @@ package me.lucko.luckperms.common.query; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.Flag; -import me.lucko.luckperms.api.query.OptionKey; -import me.lucko.luckperms.api.query.QueryMode; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.Flag; +import net.luckperms.api.query.OptionKey; +import net.luckperms.api.query.QueryMode; +import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; 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 90d859cc3..01d068c45 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 @@ -27,11 +27,11 @@ package me.lucko.luckperms.common.sender; import com.google.common.base.Splitter; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; +import net.luckperms.api.node.Tristate; import java.lang.ref.WeakReference; import java.util.UUID; 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 0c02a0358..fdcf645e6 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 @@ -25,11 +25,11 @@ package me.lucko.luckperms.common.sender; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; +import net.luckperms.api.node.Tristate; import java.util.UUID; 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 ce4365a2a..2788b4ce4 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 @@ -25,15 +25,15 @@ package me.lucko.luckperms.common.sender; -import me.lucko.luckperms.api.context.DefaultContextKeys; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import net.kyori.text.Component; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; import java.util.Set; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/sender/SenderFactory.java b/common/src/main/java/me/lucko/luckperms/common/sender/SenderFactory.java index 7e6b5272d..1b1ee50fe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/sender/SenderFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/sender/SenderFactory.java @@ -25,10 +25,10 @@ package me.lucko.luckperms.common.sender; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import net.kyori.text.Component; +import net.luckperms.api.node.Tristate; import java.util.Objects; import java.util.UUID; 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 909c33025..d1c01e093 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 @@ -27,11 +27,6 @@ package me.lucko.luckperms.common.storage; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.event.cause.DeletionCause; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.HeldNode; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; @@ -42,6 +37,12 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.implementation.StorageImplementation; import me.lucko.luckperms.common.util.ThrowingRunnable; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.event.cause.DeletionCause; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.HeldNode; + import java.util.List; import java.util.Map; import java.util.Optional; 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 0a14b5896..4db75097a 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 @@ -25,9 +25,6 @@ package me.lucko.luckperms.common.storage.implementation; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.HeldNode; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; @@ -36,6 +33,10 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.HeldNode; + import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Collections; 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 e19600fba..574064d2b 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 @@ -29,16 +29,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.types.ChatMetaNode; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.context.ContextSetConfigurateSerializer; @@ -56,6 +46,17 @@ import me.lucko.luckperms.common.storage.implementation.file.loader.YamlLoader; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.util.MoreFiles; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.types.ChatMetaNode; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; + import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.SimpleConfigurationNode; import ninja.leaping.configurate.Types; 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 6b05be271..f5060ff6a 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.storage.implementation.file; -import me.lucko.luckperms.api.node.HeldNode; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.model.manager.group.GroupManager; @@ -35,6 +34,8 @@ import me.lucko.luckperms.common.node.model.NodeDataContainer; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.implementation.file.loader.ConfigurateLoader; +import net.luckperms.api.node.HeldNode; + import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.loader.ConfigurationLoader; 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 bd0225762..6420d1c51 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 @@ -29,13 +29,14 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.stream.JsonReader; -import me.lucko.luckperms.api.actionlog.Action; import me.lucko.luckperms.common.actionlog.ActionJsonSerializer; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.gson.GsonProvider; +import net.luckperms.api.actionlog.Action; + import java.io.BufferedReader; 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 b4f593bb7..9d05b45af 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 @@ -30,10 +30,11 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; -import me.lucko.luckperms.api.model.PlayerSaveResult; import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; import me.lucko.luckperms.common.util.Uuids; +import net.luckperms.api.model.PlayerSaveResult; + 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/SeparatedConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java index dcb8839bf..972525984 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.storage.implementation.file; -import me.lucko.luckperms.api.node.HeldNode; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.model.User; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.storage.implementation.file.loader.ConfigurateL import me.lucko.luckperms.common.util.MoreFiles; import me.lucko.luckperms.common.util.Uuids; +import net.luckperms.api.node.HeldNode; + import ninja.leaping.configurate.ConfigurationNode; import java.io.IOException; 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 7db4a3ea4..98f8152ec 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 @@ -37,15 +37,6 @@ import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Filters; import com.mongodb.client.model.ReplaceOptions; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.context.Context; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.context.MutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.HeldNode; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; @@ -64,6 +55,16 @@ import me.lucko.luckperms.common.storage.implementation.StorageImplementation; import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; import me.lucko.luckperms.common.storage.misc.StorageCredentials; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.context.Context; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.MutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.HeldNode; +import net.luckperms.api.node.Node; + import org.bson.Document; import java.time.Instant; 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 408a9b1a4..a791f1b18 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 @@ -27,9 +27,6 @@ package me.lucko.luckperms.common.storage.implementation.split; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.HeldNode; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; @@ -40,6 +37,10 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.StorageType; import me.lucko.luckperms.common.storage.implementation.StorageImplementation; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.HeldNode; + import java.util.LinkedHashMap; import java.util.List; import java.util.Map; 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 4082fb7c7..e6e9b68bf 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 @@ -28,11 +28,6 @@ package me.lucko.luckperms.common.storage.implementation.sql; import com.google.common.collect.Maps; import com.google.gson.reflect.TypeToken; -import me.lucko.luckperms.api.actionlog.Action; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.model.PlayerSaveResult; -import me.lucko.luckperms.api.node.HeldNode; -import me.lucko.luckperms.api.node.Node; import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; @@ -56,6 +51,12 @@ import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.Po import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; import me.lucko.luckperms.common.util.gson.GsonProvider; +import net.luckperms.api.actionlog.Action; +import net.luckperms.api.model.DataType; +import net.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.node.HeldNode; +import net.luckperms.api.node.Node; + import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java b/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java index ec06165a6..14afd95a4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.common.storage.misc; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.api.model.PlayerSaveResult; +import net.luckperms.api.model.PlayerSaveResult; 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/tasks/SyncTask.java b/common/src/main/java/me/lucko/luckperms/common/tasks/SyncTask.java index d4293732e..f756d8b4e 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 @@ -25,11 +25,12 @@ package me.lucko.luckperms.common.tasks; -import me.lucko.luckperms.api.event.cause.CreationCause; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.event.cause.CreationCause; + import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; 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 7e0a40d9c..72c5172fc 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.verbose; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.sender.Sender; @@ -34,6 +33,8 @@ import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.verbose.event.VerboseEvent; +import net.luckperms.api.query.QueryOptions; + import java.util.Map; import java.util.Queue; import java.util.UUID; 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 31e3f5c8a..243c4a1e4 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 @@ -27,8 +27,6 @@ package me.lucko.luckperms.common.verbose; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryMode; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.MessageUtils; @@ -46,6 +44,8 @@ import me.lucko.luckperms.common.web.Bytebin; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryMode; import java.text.SimpleDateFormat; import java.util.ArrayList; 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 459ad19b9..81f49add8 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 @@ -25,9 +25,10 @@ package me.lucko.luckperms.common.verbose.event; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.util.gson.JObject; +import net.luckperms.api.query.QueryOptions; + 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 159f3ad75..71516d36b 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 @@ -25,10 +25,11 @@ package me.lucko.luckperms.common.verbose.event; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.util.gson.JObject; +import net.luckperms.api.query.QueryOptions; + 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 1b92bef66..6fcdad522 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 @@ -27,13 +27,14 @@ package me.lucko.luckperms.common.verbose.event; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.context.Context; -import me.lucko.luckperms.api.query.QueryMode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.util.StackTracePrinter; import me.lucko.luckperms.common.util.gson.JArray; import me.lucko.luckperms.common.util.gson.JObject; +import net.luckperms.api.context.Context; +import net.luckperms.api.query.QueryMode; +import net.luckperms.api.query.QueryOptions; + import java.util.Objects; /** 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 a7444ac9b..333f1fde4 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 @@ -30,8 +30,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeBuilder; import me.lucko.luckperms.common.context.ContextSetJsonSerializer; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.Track; @@ -42,6 +40,9 @@ 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 net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeBuilder; + import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java index 55d22192f..67682cd18 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.api.platform.Platform; import me.lucko.luckperms.common.dependencies.classloader.PluginClassLoader; import me.lucko.luckperms.common.dependencies.classloader.ReflectionClassLoader; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.logging.PluginLogger; +import net.luckperms.api.platform.Platform; + import cn.nukkit.Player; import cn.nukkit.plugin.PluginBase; 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 c55040b98..69ca26021 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java @@ -25,9 +25,6 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.event.user.UserDataRecalculateEvent; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.calculator.CalculatorFactory; @@ -61,6 +58,10 @@ import me.lucko.luckperms.nukkit.inject.server.LPSubscriptionMap; import me.lucko.luckperms.nukkit.listeners.NukkitConnectionListener; import me.lucko.luckperms.nukkit.listeners.NukkitPlatformListener; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.event.user.UserDataRecalculateEvent; +import net.luckperms.api.query.QueryOptions; + import cn.nukkit.Player; import cn.nukkit.command.PluginCommand; import cn.nukkit.permission.Permission; 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 742579c22..d5d48de5c 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java @@ -25,13 +25,13 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; +import net.luckperms.api.node.Tristate; import cn.nukkit.Player; import cn.nukkit.command.CommandSender; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java index f3c12de18..52bab1c9f 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.nukkit.calculator; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.nukkit.LPNukkitPlugin; +import net.luckperms.api.node.Tristate; + import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java index be9e63486..77017b606 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.nukkit.calculator; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.inject.PermissionDefault; +import net.luckperms.api.node.Tristate; + /** * Permission Processor for Nukkits "default" permission system. */ diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/NukkitCalculatorFactory.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/NukkitCalculatorFactory.java index 9f73838a2..d121bd62b 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/NukkitCalculatorFactory.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/NukkitCalculatorFactory.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.nukkit.calculator; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.calculator.PermissionCalculator; @@ -40,6 +39,8 @@ import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.context.NukkitContextManager; +import net.luckperms.api.query.QueryOptions; + public class NukkitCalculatorFactory implements CalculatorFactory { private final LPNukkitPlugin plugin; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java index 5994e1006..338d19a3d 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java @@ -27,9 +27,6 @@ package me.lucko.luckperms.nukkit.context; import com.github.benmanes.caffeine.cache.LoadingCache; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.OptionKey; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ContextManager; @@ -38,6 +35,10 @@ import me.lucko.luckperms.common.context.QueryOptionsSupplier; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.nukkit.LPNukkitPlugin; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.OptionKey; +import net.luckperms.api.query.QueryOptions; + import cn.nukkit.Player; import java.util.concurrent.TimeUnit; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/WorldCalculator.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/WorldCalculator.java index 5c7413ed7..f130d06f3 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/WorldCalculator.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/WorldCalculator.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.nukkit.context; -import me.lucko.luckperms.api.context.ContextCalculator; -import me.lucko.luckperms.api.context.ContextConsumer; -import me.lucko.luckperms.api.context.DefaultContextKeys; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.DefaultContextKeys; + import org.checkerframework.checker.nullness.qual.NonNull; import cn.nukkit.Player; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java index f7cdf2a47..6628f3ed3 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.nukkit.inject.permissible; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.QueryOptionsSupplier; @@ -38,6 +37,8 @@ import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.calculator.DefaultsProcessor; import me.lucko.luckperms.nukkit.inject.PermissionDefault; +import net.luckperms.api.node.Tristate; + import org.checkerframework.checker.nullness.qual.NonNull; import cn.nukkit.Player; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java index a0dff759e..b5655033c 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java @@ -27,15 +27,16 @@ package me.lucko.luckperms.nukkit.inject.permissible; import com.google.common.base.Preconditions; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.metadata.NodeMetadataKey; -import me.lucko.luckperms.api.util.Result; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.nukkit.inject.dummy.DummyPlugin; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.metadata.NodeMetadataKey; +import net.luckperms.api.util.Result; + import cn.nukkit.permission.Permission; import cn.nukkit.permission.PermissionAttachment; import cn.nukkit.permission.PermissionRemovedExecutor; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java index 7f439bc33..bdc876309 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.nukkit.inject.permissible; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.calculator.result.TristateResult; 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.inject.dummy.DummyPermissibleBase; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + import cn.nukkit.permission.PermissibleBase; import cn.nukkit.permission.Permission; import cn.nukkit.permission.PermissionAttachment; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java index 5e8d0f465..eee5b0836 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java @@ -28,10 +28,11 @@ package me.lucko.luckperms.nukkit.inject.server; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.cache.Cache; import me.lucko.luckperms.nukkit.LPNukkitPlugin; +import net.luckperms.api.node.Tristate; + import org.checkerframework.checker.nullness.qual.NonNull; import cn.nukkit.permission.Permission; diff --git a/settings.gradle b/settings.gradle index 6898d418a..e5de4f935 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,6 @@ rootProject.name = 'luckperms' - -// set the artifact id for the API to 'luckperms-api' -include 'api' -findProject(':api')?.name = 'luckperms-api' - include ( + 'api', 'common', 'bukkit', 'bukkit-legacy', diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java index b10ace7fa..000123430 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.sponge.service.proxy.api6; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; 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.ProxiedServiceObject; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; + import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.api.plugin.PluginContainer; 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 7c9fa9cd1..5cbbb7bf5 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.service.proxy.api6; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.context.QueryOptionsSupplier; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; @@ -35,6 +34,8 @@ import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import me.lucko.luckperms.sponge.service.model.ProxiedServiceObject; import me.lucko.luckperms.sponge.service.model.ProxiedSubject; +import net.luckperms.api.context.ImmutableContextSet; + import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.service.context.Context; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java index dbc378931..b4f2f2a9d 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.sponge.service.proxy.api7; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; 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.ProxiedServiceObject; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; + import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.api.plugin.PluginContainer; 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 f06973a81..669818d15 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.service.proxy.api7; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.context.QueryOptionsSupplier; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPPermissionService; @@ -34,6 +33,8 @@ import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import me.lucko.luckperms.sponge.service.model.ProxiedServiceObject; import me.lucko.luckperms.sponge.service.model.ProxiedSubject; +import net.luckperms.api.context.ImmutableContextSet; + import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.service.context.Context; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java index 18bebbd9c..492428b7e 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java @@ -27,13 +27,14 @@ package me.lucko.luckperms.sponge.service; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.context.contextset.ContextImpl; import me.lucko.luckperms.sponge.service.context.DelegatingContextSet; import me.lucko.luckperms.sponge.service.context.DelegatingImmutableContextSet; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; + import org.spongepowered.api.service.context.Context; import java.util.Map; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingContextSet.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingContextSet.java index e33b0d440..1821e0751 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingContextSet.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingContextSet.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.context; -import me.lucko.luckperms.api.context.ContextSet; +import net.luckperms.api.context.ContextSet; import org.spongepowered.api.service.context.Context; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingImmutableContextSet.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingImmutableContextSet.java index 6f8a06e98..cc792b5f8 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingImmutableContextSet.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingImmutableContextSet.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.context; -import me.lucko.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.ImmutableContextSet; import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.service.context.Context; @@ -74,7 +74,7 @@ public class DelegatingImmutableContextSet extends AbstractDelegatingContextSet } private final class ContextSetIterator implements Iterator { - private final Iterator it = DelegatingImmutableContextSet.this.delegate.iterator(); + private final Iterator it = DelegatingImmutableContextSet.this.delegate.iterator(); @Override public boolean hasNext() { @@ -83,7 +83,7 @@ public class DelegatingImmutableContextSet extends AbstractDelegatingContextSet @Override public Context next() { - me.lucko.luckperms.api.context.Context next = this.it.next(); + net.luckperms.api.context.Context next = this.it.next(); return new Context(next.getKey(), next.getValue()); } diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingMutableContextSet.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingMutableContextSet.java index bce6d5cea..d757372d1 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingMutableContextSet.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/DelegatingMutableContextSet.java @@ -25,9 +25,10 @@ package me.lucko.luckperms.sponge.service.context; -import me.lucko.luckperms.api.context.MutableContextSet; import me.lucko.luckperms.common.context.contextset.ContextImpl; +import net.luckperms.api.context.MutableContextSet; + import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.service.context.Context; @@ -94,7 +95,7 @@ public class DelegatingMutableContextSet extends AbstractDelegatingContextSet { } private final class ContextSetIterator implements Iterator { - private final Iterator it = DelegatingMutableContextSet.this.delegate.iterator(); + private final Iterator it = DelegatingMutableContextSet.this.delegate.iterator(); private Context current; @Override @@ -104,7 +105,7 @@ public class DelegatingMutableContextSet extends AbstractDelegatingContextSet { @Override public Context next() { - me.lucko.luckperms.api.context.Context next = this.it.next(); + net.luckperms.api.context.Context next = this.it.next(); // track the iterators cursor to handle #remove calls this.current = new Context(next.getKey(), next.getValue()); diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java index 81547e036..b8574dbb5 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java @@ -27,9 +27,9 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java index 3eaad59ab..cff2f416e 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java @@ -29,8 +29,8 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.dataorder.DataQueryOrder; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.dataorder.DataQueryOrder; import org.spongepowered.api.service.permission.SubjectCollection; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java index bc8d25f1f..63dd4a82f 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java @@ -28,9 +28,9 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Tristate; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Tristate; import org.spongepowered.api.service.permission.SubjectData; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/ProxiedSubject.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/ProxiedSubject.java index 2f69b66a6..a5f80a00d 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/ProxiedSubject.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/ProxiedSubject.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.sponge.service.model; -import me.lucko.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.context.ImmutableContextSet; import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.service.permission.Subject; 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 b31c40bb1..c8098361f 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java @@ -225,8 +225,8 @@ public class LPSpongeBootstrap implements LuckPermsBootstrap { // provide information about the platform @Override - public me.lucko.luckperms.api.platform.Platform.Type getType() { - return me.lucko.luckperms.api.platform.Platform.Type.SPONGE; + public net.luckperms.api.platform.Platform.Type getType() { + return net.luckperms.api.platform.Platform.Type.SPONGE; } @Override 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 b08f4fda5..0c7025c86 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java @@ -25,8 +25,6 @@ package me.lucko.luckperms.sponge; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.abstraction.Command; @@ -61,6 +59,9 @@ import me.lucko.luckperms.sponge.service.model.ProxiedServiceObject; import me.lucko.luckperms.sponge.service.model.persisted.PersistedCollection; import me.lucko.luckperms.sponge.tasks.ServiceCacheHousekeepingTask; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.query.QueryOptions; + import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java index edd05211e..711db0bd6 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; @@ -33,6 +32,7 @@ import me.lucko.luckperms.sponge.service.CompatibilityUtil; import net.kyori.text.Component; import net.kyori.text.adapter.spongeapi.TextAdapter; +import net.luckperms.api.node.Tristate; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.entity.living.player.Player; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java index 19e25d775..e9746a911 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.sponge.calculator; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + public abstract class DefaultsProcessor implements PermissionProcessor { private static final TristateResult.Factory TYPE_DEFAULTS_RESULT_FACTORY = new TristateResult.Factory(DefaultsProcessor.class, "type defaults"); private static final TristateResult.Factory ROOT_DEFAULTS_RESULT_FACTORY = new TristateResult.Factory(DefaultsProcessor.class, "root defaults"); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedDefaultsProcessor.java index 0644be8af..5f7e8db28 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedDefaultsProcessor.java @@ -25,10 +25,11 @@ package me.lucko.luckperms.sponge.calculator; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; +import net.luckperms.api.query.QueryOptions; + public class FixedDefaultsProcessor extends DefaultsProcessor { private final LPSubject defaultsSubject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupDefaultsProcessor.java index 3b05d71bd..d05c6e066 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupDefaultsProcessor.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.sponge.calculator; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; +import net.luckperms.api.query.QueryOptions; + public class GroupDefaultsProcessor extends DefaultsProcessor implements PermissionProcessor { public GroupDefaultsProcessor(LPPermissionService service, QueryOptions queryOptions) { super(service, queryOptions); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeCalculatorFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeCalculatorFactory.java index 23067752b..a975260e5 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeCalculatorFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeCalculatorFactory.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.calculator; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.calculator.PermissionCalculator; @@ -39,6 +38,8 @@ import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.sponge.LPSpongePlugin; +import net.luckperms.api.query.QueryOptions; + public class SpongeCalculatorFactory implements CalculatorFactory { private final LPSpongePlugin plugin; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java index c58289de7..0087d3f9d 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.sponge.calculator; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.node.AbstractNode; +import net.luckperms.api.node.Tristate; + public class SpongeWildcardProcessor extends AbstractPermissionProcessor implements PermissionProcessor { private static final TristateResult.Factory RESULT_FACTORY = new TristateResult.Factory(SpongeWildcardProcessor.class); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserDefaultsProcessor.java index 6ed7f8312..e9d019a30 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserDefaultsProcessor.java @@ -25,11 +25,12 @@ package me.lucko.luckperms.sponge.calculator; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; +import net.luckperms.api.query.QueryOptions; + public class UserDefaultsProcessor extends DefaultsProcessor implements PermissionProcessor { public UserDefaultsProcessor(LPPermissionService service, QueryOptions queryOptions) { super(service, queryOptions); 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 15b800daa..319b981cd 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; public class OptionClear extends SubCommand { 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 21a017f2c..0a01f5da5 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.commands; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -40,6 +39,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; import java.util.Map; 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 23e45ca09..714e982eb 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; public class OptionSet extends SubCommand { 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 c832c9bbb..d9678806b 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; public class OptionUnset extends SubCommand { 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 4411711f4..4f504913d 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -41,6 +40,8 @@ import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import org.spongepowered.api.Sponge; import java.util.List; 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 47c3e0da9..bd5420c53 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; public class ParentClear extends SubCommand { 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 69c2f104a..4eaaf8717 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.commands; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -41,6 +40,8 @@ import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; import java.util.Map; 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 692206c50..7bfe241ae 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -41,6 +40,8 @@ import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import org.spongepowered.api.Sponge; import java.util.List; 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 0de81702e..c0d92ec37 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; public class PermissionClear extends SubCommand { 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 6a24d35c3..eabc84d14 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.commands; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.SubCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -40,6 +39,8 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; + import java.util.List; import java.util.Map; 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 04f6f5cff..63150eb47 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 @@ -25,8 +25,6 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.CommandException; import me.lucko.luckperms.common.command.abstraction.SubCommand; @@ -40,6 +38,9 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; + import java.util.List; public class PermissionSet extends SubCommand { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeCommandUtils.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeCommandUtils.java index 933861844..2d13fbbf2 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeCommandUtils.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeCommandUtils.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.sponge.commands; -import me.lucko.luckperms.api.context.ContextSet; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.command.utils.ArgumentParser; import me.lucko.luckperms.common.command.utils.MessageUtils; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.node.Tristate; + import java.util.List; import java.util.Map; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeContextManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeContextManager.java index 994bf2206..c19c8ea7a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeContextManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeContextManager.java @@ -27,14 +27,15 @@ package me.lucko.luckperms.sponge.context; import com.github.benmanes.caffeine.cache.LoadingCache; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.context.QueryOptionsCache; import me.lucko.luckperms.common.context.QueryOptionsSupplier; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.sponge.LPSpongePlugin; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.QueryOptions; + import org.spongepowered.api.service.permission.Subject; import java.util.concurrent.TimeUnit; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeProxiedContextCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeProxiedContextCalculator.java index 720325b29..dfd548536 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeProxiedContextCalculator.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongeProxiedContextCalculator.java @@ -25,9 +25,10 @@ package me.lucko.luckperms.sponge.context; -import me.lucko.luckperms.api.context.ContextConsumer; import me.lucko.luckperms.common.context.ProxiedContextCalculator; +import net.luckperms.api.context.ContextConsumer; + import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.context.ContextCalculator; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/context/WorldCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/WorldCalculator.java index 6c2cf6f04..e77378d31 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/context/WorldCalculator.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/WorldCalculator.java @@ -25,12 +25,13 @@ package me.lucko.luckperms.sponge.context; -import me.lucko.luckperms.api.context.ContextCalculator; -import me.lucko.luckperms.api.context.ContextConsumer; -import me.lucko.luckperms.api.context.DefaultContextKeys; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.DefaultContextKeys; + import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.entity.living.player.Player; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java index 2567b3999..ca2707277 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java @@ -27,11 +27,12 @@ package me.lucko.luckperms.sponge.messaging; import com.google.common.collect.Iterables; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; import me.lucko.luckperms.sponge.LPSpongePlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; + import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.Platform; import org.spongepowered.api.entity.living.player.Player; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java index 12681a3b1..a920a5d03 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.sponge.messaging; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.MessengerProvider; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; import me.lucko.luckperms.common.messaging.MessagingFactory; import me.lucko.luckperms.sponge.LPSpongePlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.MessengerProvider; + import org.checkerframework.checker.nullness.qual.NonNull; public class SpongeMessagingFactory extends MessagingFactory { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeGroupManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeGroupManager.java index b8405d439..cfbd3ac1e 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeGroupManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeGroupManager.java @@ -32,10 +32,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.event.cause.CreationCause; -import me.lucko.luckperms.api.node.HeldNode; -import me.lucko.luckperms.api.node.Tristate; 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; @@ -49,6 +45,11 @@ 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 net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.event.cause.CreationCause; +import net.luckperms.api.node.HeldNode; +import net.luckperms.api.node.Tristate; + 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/model/manager/SpongeUserManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeUserManager.java index 802d714d6..731df5209 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeUserManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/manager/SpongeUserManager.java @@ -32,9 +32,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.HeldNode; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; import me.lucko.luckperms.common.model.UserIdentifier; @@ -50,6 +47,10 @@ 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 net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.HeldNode; +import net.luckperms.api.node.Tristate; + 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/ProxyFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java index 8e8349999..08c0beea6 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.sponge.service; -import me.lucko.luckperms.api.model.DataType; 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.LPSubjectData; +import net.luckperms.api.model.DataType; + import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; 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 96ac5e822..fbf237088 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 @@ -25,10 +25,11 @@ package me.lucko.luckperms.sponge.service.inheritance; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.graph.Graph; import me.lucko.luckperms.sponge.service.model.calculated.CalculatedSubject; +import net.luckperms.api.query.QueryOptions; + import java.util.stream.Collectors; /** diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java index 890e5f4b1..22405a8c9 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java @@ -27,9 +27,6 @@ package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.graph.TraversalAlgorithm; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; @@ -39,6 +36,10 @@ import me.lucko.luckperms.sponge.service.inheritance.SubjectInheritanceGraph; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java index c85ea76c8..10800d5ef 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java @@ -27,10 +27,6 @@ package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.metastacking.DuplicateRemovalFunction; -import me.lucko.luckperms.api.metastacking.MetaStackDefinition; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.AbstractCachedDataManager; import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; @@ -45,6 +41,11 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.sponge.calculator.FixedDefaultsProcessor; import me.lucko.luckperms.sponge.calculator.SpongeWildcardProcessor; +import net.luckperms.api.metastacking.DuplicateRemovalFunction; +import net.luckperms.api.metastacking.MetaStackDefinition; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.query.QueryOptions; + import java.util.Map; public class CalculatedSubjectCachedDataManager extends AbstractCachedDataManager implements CalculatorFactory { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectData.java index 15c50294c..3c310b030 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectData.java @@ -29,10 +29,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.context.ContextSetComparator; import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPPermissionService; @@ -40,6 +36,11 @@ 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 net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + import org.spongepowered.api.service.permission.SubjectData; import java.util.HashMap; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/MonitoredSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/MonitoredSubjectData.java index 3a8c6c4f7..3878c7e2a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/MonitoredSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/MonitoredSubjectData.java @@ -25,13 +25,14 @@ package me.lucko.luckperms.sponge.service.model.calculated; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Tristate; + import java.util.concurrent.CompletableFuture; /** diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java index 075bd6197..07a4e051f 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java @@ -27,10 +27,6 @@ package me.lucko.luckperms.sponge.service.model.permissionholder; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.graph.TraversalAlgorithm; import me.lucko.luckperms.common.inheritance.InheritanceGraph; @@ -47,6 +43,11 @@ import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubjectData.java index cc82d5a24..e1dc8110e 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubjectData.java @@ -28,17 +28,6 @@ package me.lucko.luckperms.sponge.service.model.permissionholder; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.model.DataType; -import me.lucko.luckperms.api.node.ChatMetaType; -import me.lucko.luckperms.api.node.Node; -import me.lucko.luckperms.api.node.NodeType; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.node.types.InheritanceNode; -import me.lucko.luckperms.api.node.types.MetaNode; -import me.lucko.luckperms.api.node.types.PrefixNode; -import me.lucko.luckperms.api.node.types.SuffixNode; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; @@ -52,6 +41,18 @@ 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 net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.DataType; +import net.luckperms.api.node.ChatMetaType; +import net.luckperms.api.node.Node; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.node.types.MetaNode; +import net.luckperms.api.node.types.PrefixNode; +import net.luckperms.api.node.types.SuffixNode; +import net.luckperms.api.query.QueryOptions; + import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.SubjectData; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedCollection.java index 26bb19240..325a6fc9f 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedCollection.java @@ -30,8 +30,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.util.Predicates; @@ -41,6 +39,9 @@ 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 net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.node.Tristate; + import org.spongepowered.api.service.permission.SubjectCollection; import java.util.Map; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubject.java index fda48b7fa..a89cc2ad1 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubject.java @@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.service.model.persisted; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.sponge.service.LuckPermsService; @@ -36,6 +35,8 @@ 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 net.luckperms.api.model.DataType; + 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/model/persisted/PersistedSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubjectData.java index 9d94decc7..80686f990 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/PersistedSubjectData.java @@ -25,10 +25,11 @@ package me.lucko.luckperms.sponge.service.model.persisted; -import me.lucko.luckperms.api.model.DataType; import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.model.calculated.MonitoredSubjectData; +import net.luckperms.api.model.DataType; + /** * Extension of CalculatedSubjectData which persists data when modified */ diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectDataContainer.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectDataContainer.java index 5b031cbf8..af2294893 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectDataContainer.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectDataContainer.java @@ -32,7 +32,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.lucko.luckperms.api.context.ImmutableContextSet; import me.lucko.luckperms.common.context.ContextSetComparator; import me.lucko.luckperms.common.context.ContextSetJsonSerializer; import me.lucko.luckperms.sponge.service.model.LPPermissionService; @@ -40,6 +39,8 @@ 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 net.luckperms.api.context.ImmutableContextSet; + import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityBootstrap.java b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityBootstrap.java index 10293da5d..c172c6b05 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityBootstrap.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityBootstrap.java @@ -35,13 +35,14 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import me.lucko.luckperms.api.platform.Platform; import me.lucko.luckperms.common.dependencies.classloader.PluginClassLoader; 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 net.luckperms.api.platform.Platform; + import org.slf4j.Logger; import java.io.InputStream; 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 6f4e9d0d4..7152146a7 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java @@ -27,8 +27,6 @@ package me.lucko.luckperms.velocity; import com.velocitypowered.api.proxy.Player; -import me.lucko.luckperms.api.LuckPerms; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.CommandManager; @@ -54,6 +52,9 @@ import me.lucko.luckperms.velocity.listeners.MonitoringPermissionCheckListener; import me.lucko.luckperms.velocity.listeners.VelocityConnectionListener; import me.lucko.luckperms.velocity.messaging.VelocityMessagingFactory; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.query.QueryOptions; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; 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 deda9add8..b1002057d 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.velocity; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; -import me.lucko.luckperms.api.node.Tristate; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; @@ -36,6 +35,7 @@ import me.lucko.luckperms.common.util.TextUtils; import me.lucko.luckperms.velocity.service.CompatibilityUtil; import net.kyori.text.Component; +import net.luckperms.api.node.Tristate; import java.util.UUID; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/calculator/VelocityCalculatorFactory.java b/velocity/src/main/java/me/lucko/luckperms/velocity/calculator/VelocityCalculatorFactory.java index 232570dbb..7df3bc470 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/calculator/VelocityCalculatorFactory.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/calculator/VelocityCalculatorFactory.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.velocity.calculator; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.calculator.PermissionCalculator; @@ -38,6 +37,8 @@ import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.velocity.LPVelocityPlugin; +import net.luckperms.api.query.QueryOptions; + public class VelocityCalculatorFactory implements CalculatorFactory { private final LPVelocityPlugin plugin; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/context/BackendServerCalculator.java b/velocity/src/main/java/me/lucko/luckperms/velocity/context/BackendServerCalculator.java index a356365b5..454c2b9f6 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/context/BackendServerCalculator.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/context/BackendServerCalculator.java @@ -27,12 +27,13 @@ package me.lucko.luckperms.velocity.context; import com.velocitypowered.api.proxy.Player; -import me.lucko.luckperms.api.context.ContextCalculator; -import me.lucko.luckperms.api.context.ContextConsumer; -import me.lucko.luckperms.api.context.DefaultContextKeys; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.DefaultContextKeys; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.HashSet; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityContextManager.java b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityContextManager.java index 1eccdbc28..ce94cd2d4 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityContextManager.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityContextManager.java @@ -28,14 +28,15 @@ package me.lucko.luckperms.velocity.context; import com.github.benmanes.caffeine.cache.LoadingCache; import com.velocitypowered.api.proxy.Player; -import me.lucko.luckperms.api.context.ImmutableContextSet; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.context.ContextManager; import me.lucko.luckperms.common.context.QueryOptionsCache; import me.lucko.luckperms.common.context.QueryOptionsSupplier; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.velocity.LPVelocityPlugin; +import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.query.QueryOptions; + import java.util.concurrent.TimeUnit; public class VelocityContextManager extends ContextManager { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java b/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java index 078071f34..4548f47a2 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java @@ -33,13 +33,14 @@ import com.velocitypowered.api.permission.PermissionProvider; import com.velocitypowered.api.permission.PermissionSubject; import com.velocitypowered.api.proxy.Player; -import me.lucko.luckperms.api.node.Tristate; -import me.lucko.luckperms.api.query.QueryOptions; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.velocity.LPVelocityPlugin; import me.lucko.luckperms.velocity.service.CompatibilityUtil; +import net.luckperms.api.node.Tristate; +import net.luckperms.api.query.QueryOptions; + import org.checkerframework.checker.nullness.qual.NonNull; public class MonitoringPermissionCheckListener { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/PluginMessageMessenger.java b/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/PluginMessageMessenger.java index 58643b3d9..df3e58987 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/PluginMessageMessenger.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/PluginMessageMessenger.java @@ -37,11 +37,12 @@ import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import com.velocitypowered.api.proxy.server.RegisteredServer; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.message.OutgoingMessage; import me.lucko.luckperms.velocity.LPVelocityPlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.message.OutgoingMessage; + import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java b/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java index cabc06db8..a4ca081a0 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java @@ -25,14 +25,15 @@ package me.lucko.luckperms.velocity.messaging; -import me.lucko.luckperms.api.messenger.IncomingMessageConsumer; -import me.lucko.luckperms.api.messenger.Messenger; -import me.lucko.luckperms.api.messenger.MessengerProvider; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.messaging.LuckPermsMessagingService; import me.lucko.luckperms.common.messaging.MessagingFactory; import me.lucko.luckperms.velocity.LPVelocityPlugin; +import net.luckperms.api.messenger.IncomingMessageConsumer; +import net.luckperms.api.messenger.Messenger; +import net.luckperms.api.messenger.MessengerProvider; + import org.checkerframework.checker.nullness.qual.NonNull; public class VelocityMessagingFactory extends MessagingFactory { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java b/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java index 3aaf76962..eff5f5170 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.velocity.service; -import me.lucko.luckperms.api.node.Tristate; +import net.luckperms.api.node.Tristate; import java.util.Objects;