From 0ae751b5334d274d764815aa571a6767453e9c1c Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 30 Apr 2023 21:27:42 +0100 Subject: [PATCH] Reformat import statements --- .../java/net/luckperms/api/LuckPerms.java | 1 - .../net/luckperms/api/actionlog/Action.java | 1 - .../luckperms/api/actionlog/ActionLogger.java | 1 - .../luckperms/api/cacheddata/CachedData.java | 1 - .../api/cacheddata/CachedDataManager.java | 1 - .../api/cacheddata/CachedMetaData.java | 1 - .../api/cacheddata/CachedPermissionData.java | 1 - .../net/luckperms/api/cacheddata/Result.java | 1 - .../luckperms/api/context/ContextManager.java | 1 - .../api/context/ImmutableContextSet.java | 1 - .../api/context/MutableContextSet.java | 1 - .../luckperms/api/event/LuckPermsEvent.java | 1 - .../api/event/context/ContextUpdateEvent.java | 1 - .../event/extension/ExtensionLoadEvent.java | 1 - .../api/event/group/GroupCacheLoadEvent.java | 1 - .../api/event/group/GroupCreateEvent.java | 1 - .../group/GroupDataRecalculateEvent.java | 1 - .../api/event/group/GroupDeleteEvent.java | 1 - .../api/event/group/GroupLoadEvent.java | 1 - .../api/event/log/LogBroadcastEvent.java | 1 - .../api/event/log/LogNetworkPublishEvent.java | 1 - .../api/event/log/LogNotifyEvent.java | 1 - .../api/event/log/LogPublishEvent.java | 1 - .../api/event/log/LogReceiveEvent.java | 1 - .../api/event/node/NodeAddEvent.java | 1 - .../api/event/node/NodeClearEvent.java | 1 - .../api/event/node/NodeMutateEvent.java | 1 - .../api/event/node/NodeRemoveEvent.java | 1 - .../api/event/player/PlayerDataSaveEvent.java | 1 - .../event/player/PlayerLoginProcessEvent.java | 1 - .../lookup/UniqueIdDetermineTypeEvent.java | 1 - .../player/lookup/UniqueIdLookupEvent.java | 1 - .../player/lookup/UsernameLookupEvent.java | 1 - .../lookup/UsernameValidityCheckEvent.java | 1 - .../api/event/source/EntitySource.java | 1 - .../luckperms/api/event/source/Source.java | 1 - .../api/event/sync/PreNetworkSyncEvent.java | 1 - .../api/event/track/TrackCreateEvent.java | 1 - .../api/event/track/TrackDeleteEvent.java | 1 - .../api/event/track/TrackLoadEvent.java | 1 - .../track/mutate/TrackAddGroupEvent.java | 1 - .../event/track/mutate/TrackMutateEvent.java | 1 - .../track/mutate/TrackRemoveGroupEvent.java | 1 - .../luckperms/api/event/type/Cancellable.java | 1 - .../luckperms/api/event/type/ResultEvent.java | 1 - .../net/luckperms/api/event/type/Sourced.java | 1 - .../api/event/user/UserCacheLoadEvent.java | 1 - .../event/user/UserDataRecalculateEvent.java | 1 - .../api/event/user/UserFirstLoginEvent.java | 1 - .../api/event/user/UserLoadEvent.java | 1 - .../api/event/user/UserUnloadEvent.java | 1 - .../api/event/user/track/UserTrackEvent.java | 1 - .../api/messaging/MessagingService.java | 1 - .../messenger/IncomingMessageConsumer.java | 1 - .../luckperms/api/messenger/Messenger.java | 1 - .../api/messenger/MessengerProvider.java | 1 - .../api/messenger/message/Message.java | 1 - .../messenger/message/OutgoingMessage.java | 1 - .../message/type/ActionLogMessage.java | 1 - .../message/type/UserUpdateMessage.java | 1 - .../api/metastacking/MetaStackDefinition.java | 1 - .../api/metastacking/MetaStackElement.java | 1 - .../luckperms/api/model/PermissionHolder.java | 1 - .../luckperms/api/model/PlayerSaveResult.java | 1 - .../api/model/data/DataMutateResult.java | 1 - .../net/luckperms/api/model/data/NodeMap.java | 1 - .../net/luckperms/api/model/group/Group.java | 1 - .../api/model/group/GroupManager.java | 1 - .../net/luckperms/api/model/user/User.java | 1 - .../luckperms/api/model/user/UserManager.java | 1 - .../net/luckperms/api/node/ChatMetaType.java | 1 - .../java/net/luckperms/api/node/HeldNode.java | 1 - .../java/net/luckperms/api/node/Node.java | 1 - .../net/luckperms/api/node/NodeBuilder.java | 1 - .../api/node/NodeBuilderRegistry.java | 1 - .../java/net/luckperms/api/node/NodeType.java | 1 - .../api/node/matcher/NodeMatcher.java | 1 - .../api/node/matcher/NodeMatcherFactory.java | 1 - .../types/InheritanceOriginMetadata.java | 1 - .../api/node/types/ChatMetaNode.java | 1 - .../api/node/types/DisplayNameNode.java | 1 - .../api/node/types/InheritanceNode.java | 1 - .../luckperms/api/node/types/MetaNode.java | 1 - .../api/node/types/PermissionNode.java | 1 - .../luckperms/api/node/types/PrefixNode.java | 1 - .../api/node/types/RegexPermissionNode.java | 1 - .../luckperms/api/node/types/SuffixNode.java | 1 - .../luckperms/api/node/types/WeightNode.java | 1 - .../luckperms/api/platform/PlayerAdapter.java | 1 - .../net/luckperms/api/query/OptionKey.java | 1 - .../net/luckperms/api/query/QueryOptions.java | 1 - .../api/query/dataorder/DataQueryOrder.java | 1 - .../dataorder/DataQueryOrderFunction.java | 1 - .../api/query/dataorder/DataTypeFilter.java | 1 - .../dataorder/DataTypeFilterFunction.java | 1 - .../api/query/meta/MetaValueSelector.java | 1 - .../luckperms/api/track/DemotionResult.java | 1 - .../luckperms/api/track/PromotionResult.java | 1 - .../java/net/luckperms/api/track/Track.java | 1 - .../loader/BukkitLegacyLoaderPlugin.java | 1 - .../bukkit/loader/BukkitLoaderPlugin.java | 1 - .../bukkit/BukkitAsyncCommandExecutor.java | 2 -- .../bukkit/BukkitCommandExecutor.java | 1 - .../luckperms/bukkit/BukkitConfigAdapter.java | 1 - .../luckperms/bukkit/BukkitEventBus.java | 1 - .../luckperms/bukkit/BukkitSenderFactory.java | 2 -- .../luckperms/bukkit/LPBukkitBootstrap.java | 2 -- .../luckperms/bukkit/LPBukkitPlugin.java | 2 -- .../bukkit/brigadier/LuckPermsBrigadier.java | 2 -- .../calculator/BukkitCalculatorFactory.java | 1 - .../bukkit/calculator/ChildProcessor.java | 1 - .../DefaultPermissionMapProcessor.java | 1 - .../bukkit/calculator/OpProcessor.java | 1 - .../calculator/PermissionMapProcessor.java | 2 -- .../bukkit/context/BukkitContextManager.java | 3 --- .../context/BukkitPlayerCalculator.java | 3 --- .../permissible/DummyPermissibleBase.java | 1 - .../permissible/LuckPermsPermissible.java | 3 --- .../LuckPermsPermissionAttachment.java | 3 --- .../permissible/MonitoredPermissibleBase.java | 2 -- .../permissible/PermissibleInjector.java | 1 - .../PermissibleMonitoringInjector.java | 1 - .../inject/server/InjectorDefaultsMap.java | 1 - .../inject/server/InjectorPermissionMap.java | 1 - .../server/InjectorSubscriptionMap.java | 1 - .../inject/server/LuckPermsDefaultsMap.java | 3 --- .../inject/server/LuckPermsPermissionMap.java | 2 -- .../server/LuckPermsSubscriptionMap.java | 1 - .../listeners/BukkitAutoOpListener.java | 2 -- .../listeners/BukkitCommandListUpdater.java | 3 --- .../listeners/BukkitConnectionListener.java | 2 -- .../listeners/BukkitPlatformListener.java | 1 - .../messaging/BukkitMessagingFactory.java | 2 -- .../bukkit/messaging/LilyPadMessenger.java | 13 ++++------- .../messaging/PluginMessageMessenger.java | 3 --- .../bukkit/util/PluginManagerUtil.java | 1 - .../bukkit/vault/AbstractVaultChat.java | 1 - .../bukkit/vault/AbstractVaultPermission.java | 1 - .../bukkit/vault/LuckPermsVaultChat.java | 2 -- .../vault/LuckPermsVaultPermission.java | 3 --- .../bukkit/vault/VaultHookManager.java | 2 -- .../bungee/loader/BungeeLoaderPlugin.java | 1 - .../bungee/BungeeCommandExecutor.java | 1 - .../luckperms/bungee/BungeeConfigAdapter.java | 1 - .../luckperms/bungee/BungeeEventBus.java | 1 - .../bungee/BungeeSchedulerAdapter.java | 1 - .../luckperms/bungee/BungeeSenderFactory.java | 1 - .../luckperms/bungee/LPBungeeBootstrap.java | 2 -- .../luckperms/bungee/LPBungeePlugin.java | 1 - .../calculator/BungeeCalculatorFactory.java | 1 - .../bungee/context/BungeeContextManager.java | 2 -- .../context/BungeePlayerCalculator.java | 2 -- .../bungee/context/RedisBungeeCalculator.java | 3 --- .../listeners/BungeeConnectionListener.java | 1 - .../BungeePermissionCheckListener.java | 1 - .../messaging/BungeeMessagingFactory.java | 2 -- .../messaging/PluginMessageMessenger.java | 1 - .../messaging/RedisBungeeMessenger.java | 3 --- .../actionlog/ActionJsonSerializer.java | 2 -- .../lucko/luckperms/common/actionlog/Log.java | 2 -- .../common/actionlog/LogDispatcher.java | 1 - .../common/actionlog/LoggedAction.java | 3 --- .../lucko/luckperms/common/api/ApiUtils.java | 1 - .../common/api/LuckPermsApiProvider.java | 2 -- .../api/implementation/ApiActionLog.java | 2 -- .../api/implementation/ApiActionLogger.java | 2 -- .../api/implementation/ApiContextManager.java | 2 -- .../implementation/ApiContextSetFactory.java | 2 -- .../common/api/implementation/ApiGroup.java | 3 --- .../api/implementation/ApiGroupManager.java | 3 --- .../implementation/ApiMessagingService.java | 2 -- .../implementation/ApiMetaStackFactory.java | 3 --- .../ApiNodeBuilderRegistry.java | 2 -- .../implementation/ApiNodeMatcherFactory.java | 2 -- .../implementation/ApiPermissionHolder.java | 2 -- .../api/implementation/ApiPlatform.java | 2 -- .../api/implementation/ApiPlayerAdapter.java | 2 -- .../ApiQueryOptionsRegistry.java | 2 -- .../common/api/implementation/ApiTrack.java | 3 --- .../api/implementation/ApiTrackManager.java | 2 -- .../common/api/implementation/ApiUser.java | 3 --- .../api/implementation/ApiUserManager.java | 3 --- .../luckperms/common/backup/Exporter.java | 2 -- .../luckperms/common/backup/Importer.java | 2 -- .../common/bulkupdate/BulkUpdate.java | 2 -- .../common/bulkupdate/BulkUpdateBuilder.java | 1 - .../common/bulkupdate/action/Action.java | 1 - .../bulkupdate/action/DeleteAction.java | 1 - .../bulkupdate/action/UpdateAction.java | 1 - .../common/bulkupdate/query/Query.java | 1 - .../cacheddata/AbstractCachedDataManager.java | 2 -- .../common/cacheddata/CacheMetadata.java | 1 - .../cacheddata/GroupCachedDataManager.java | 1 - .../cacheddata/HolderCachedDataManager.java | 1 - .../cacheddata/UserCachedDataManager.java | 1 - .../cacheddata/result/IntegerResult.java | 1 - .../cacheddata/result/StringResult.java | 1 - .../cacheddata/result/TristateResult.java | 2 -- .../cacheddata/type/MetaAccumulator.java | 2 -- .../common/cacheddata/type/MetaCache.java | 3 --- .../cacheddata/type/MetaStackAccumulator.java | 2 -- .../cacheddata/type/MonitoredMetaCache.java | 3 --- .../cacheddata/type/PermissionCache.java | 3 --- .../type/SimpleMetaValueSelector.java | 1 - .../common/calculator/CalculatorFactory.java | 1 - .../calculator/PermissionCalculator.java | 2 -- .../AbstractOverrideWildcardProcessor.java | 1 - .../processor/PermissionProcessor.java | 1 - .../calculator/processor/RegexProcessor.java | 2 -- .../processor/SpongeWildcardProcessor.java | 1 - .../processor/WildcardProcessor.java | 2 -- .../common/command/CommandManager.java | 2 -- .../command/abstraction/ChildCommand.java | 1 - .../common/command/abstraction/Command.java | 2 -- .../abstraction/GenericChildCommand.java | 1 - .../command/abstraction/ParentCommand.java | 1 - .../command/abstraction/SingleCommand.java | 1 - .../command/access/ArgumentPermissions.java | 1 - .../common/command/spec/Argument.java | 1 - .../common/command/spec/CommandSpec.java | 1 - .../command/tabcomplete/TabCompletions.java | 2 -- .../common/command/utils/ArgumentList.java | 3 --- .../commands/generic/meta/CommandMeta.java | 1 - .../generic/meta/MetaAddChatMeta.java | 1 - .../generic/meta/MetaAddTempChatMeta.java | 1 - .../commands/generic/meta/MetaClear.java | 1 - .../commands/generic/meta/MetaInfo.java | 2 -- .../generic/meta/MetaRemoveChatMeta.java | 1 - .../generic/meta/MetaRemoveTempChatMeta.java | 1 - .../common/commands/generic/meta/MetaSet.java | 1 - .../generic/meta/MetaSetChatMeta.java | 1 - .../commands/generic/meta/MetaSetTemp.java | 1 - .../generic/meta/MetaSetTempChatMeta.java | 1 - .../commands/generic/meta/MetaUnset.java | 1 - .../commands/generic/meta/MetaUnsetTemp.java | 1 - .../commands/generic/other/HolderClear.java | 1 - .../commands/generic/other/HolderEditor.java | 1 - .../generic/other/HolderShowTracks.java | 2 -- .../generic/parent/CommandParent.java | 1 - .../commands/generic/parent/ParentAdd.java | 1 - .../generic/parent/ParentAddTemp.java | 1 - .../commands/generic/parent/ParentClear.java | 1 - .../generic/parent/ParentClearTrack.java | 1 - .../commands/generic/parent/ParentInfo.java | 1 - .../commands/generic/parent/ParentRemove.java | 1 - .../generic/parent/ParentRemoveTemp.java | 1 - .../commands/generic/parent/ParentSet.java | 1 - .../generic/parent/ParentSetTrack.java | 1 - .../parent/UserSwitchPrimaryGroup.java | 1 - .../generic/permission/CommandPermission.java | 1 - .../generic/permission/PermissionCheck.java | 1 - .../generic/permission/PermissionClear.java | 1 - .../generic/permission/PermissionInfo.java | 1 - .../generic/permission/PermissionSet.java | 1 - .../generic/permission/PermissionSetTemp.java | 1 - .../generic/permission/PermissionUnset.java | 1 - .../permission/PermissionUnsetTemp.java | 1 - .../common/commands/group/CreateGroup.java | 1 - .../common/commands/group/DeleteGroup.java | 1 - .../common/commands/group/GroupClone.java | 1 - .../common/commands/group/GroupInfo.java | 1 - .../commands/group/GroupListMembers.java | 2 -- .../commands/group/GroupParentCommand.java | 1 - .../common/commands/group/GroupRename.java | 1 - .../commands/group/GroupSetDisplayName.java | 1 - .../common/commands/group/GroupSetWeight.java | 1 - .../common/commands/log/LogNotify.java | 1 - .../common/commands/log/LogParentCommand.java | 1 - .../commands/misc/ApplyEditsCommand.java | 1 - .../commands/misc/BulkUpdateCommand.java | 1 - .../common/commands/misc/EditorCommand.java | 1 - .../common/commands/misc/ImportCommand.java | 1 - .../common/commands/misc/InfoCommand.java | 1 - .../common/commands/misc/SearchCommand.java | 2 -- .../commands/misc/TranslationsCommand.java | 1 - .../common/commands/track/CreateTrack.java | 1 - .../common/commands/track/DeleteTrack.java | 1 - .../common/commands/track/TrackAppend.java | 1 - .../common/commands/track/TrackClone.java | 1 - .../common/commands/track/TrackEditor.java | 1 - .../common/commands/track/TrackInsert.java | 1 - .../commands/track/TrackParentCommand.java | 1 - .../common/commands/track/TrackRemove.java | 1 - .../common/commands/track/TrackRename.java | 1 - .../common/commands/user/UserClone.java | 1 - .../common/commands/user/UserDemote.java | 1 - .../common/commands/user/UserInfo.java | 1 - .../commands/user/UserParentCommand.java | 1 - .../common/commands/user/UserPromote.java | 1 - .../luckperms/common/config/ConfigKeys.java | 2 -- .../luckperms/common/config/ContextsFile.java | 2 -- .../adapter/ConfigurateConfigAdapter.java | 2 -- .../EnvironmentVariableConfigAdapter.java | 1 - .../adapter/MultiConfigurationAdapter.java | 1 - .../StringBasedConfigurationAdapter.java | 1 - .../adapter/SystemPropertyConfigAdapter.java | 1 - .../config/generic/key/ConfigKeyFactory.java | 1 - .../common/context/AbstractContextSet.java | 1 - .../luckperms/common/context/ContextImpl.java | 2 -- .../context/ImmutableContextSetImpl.java | 3 --- .../common/context/MutableContextSetImpl.java | 2 -- .../ConfigurationContextCalculator.java | 2 -- .../context/calculator/WorldNameRewriter.java | 1 - .../comparator/ContextSetComparator.java | 1 - .../context/manager/ContextManager.java | 2 -- .../manager/InlineQueryOptionsSupplier.java | 1 - .../context/manager/QueryOptionsCache.java | 2 -- .../ContextSetConfigurateSerializer.java | 3 --- .../serializer/ContextSetJsonSerializer.java | 2 -- .../dependencies/DependencyManagerImpl.java | 3 --- .../common/event/AbstractEventBus.java | 2 -- .../common/event/EventDispatcher.java | 3 --- .../event/LuckPermsEventSubscription.java | 1 - .../common/event/gen/AbstractEvent.java | 1 - .../common/event/gen/GeneratedEventClass.java | 1 - .../common/event/model/EntitySourceImpl.java | 1 - .../event/model/SenderPlatformEntity.java | 2 -- .../common/event/model/UnknownSource.java | 1 - .../extension/SimpleExtensionManager.java | 3 --- .../luckperms/common/http/BytebinClient.java | 2 -- .../common/inheritance/InheritanceGraph.java | 1 - .../inheritance/InheritanceGraphFactory.java | 1 - .../luckperms/common/locale/Message.java | 2 -- .../common/locale/TranslationManager.java | 3 --- .../common/locale/TranslationRepository.java | 5 +--- .../messaging/InternalMessagingService.java | 1 - .../messaging/LuckPermsMessagingService.java | 3 --- .../common/messaging/MessagingFactory.java | 2 -- .../messaging/message/AbstractMessage.java | 1 - .../message/ActionLogMessageImpl.java | 3 --- .../messaging/message/UpdateMessageImpl.java | 3 --- .../message/UserUpdateMessageImpl.java | 3 --- .../common/messaging/nats/NatsMessenger.java | 16 +++++-------- .../AbstractPluginMessageMessenger.java | 2 -- .../messaging/rabbitmq/RabbitMQMessenger.java | 3 --- .../messaging/redis/RedisMessenger.java | 3 --- .../messaging/sql/AbstractSqlMessenger.java | 1 - .../common/messaging/sql/SqlMessenger.java | 1 - .../metastacking/FluentMetaStackElement.java | 2 -- .../SimpleMetaStackDefinition.java | 2 -- .../metastacking/StandardStackElements.java | 2 -- .../common/model/DemotionResults.java | 1 - .../lucko/luckperms/common/model/Group.java | 2 -- .../common/model/InheritanceOrigin.java | 1 - .../common/model/PermissionHolder.java | 3 --- .../model/PermissionHolderIdentifier.java | 1 - .../common/model/PrimaryGroupHolder.java | 1 - .../common/model/PromotionResults.java | 1 - .../lucko/luckperms/common/model/Track.java | 3 --- .../me/lucko/luckperms/common/model/User.java | 2 -- .../luckperms/common/model/WeightCache.java | 2 -- .../common/model/manager/AbstractManager.java | 1 - .../manager/user/AbstractUserManager.java | 1 - .../model/manager/user/UserManager.java | 1 - .../common/model/nodemap/NodeMap.java | 2 -- .../common/model/nodemap/NodeMapBase.java | 1 - .../common/model/nodemap/NodeMapMutable.java | 1 - .../common/model/nodemap/RecordedNodeMap.java | 2 -- .../luckperms/common/node/AbstractNode.java | 3 --- .../common/node/AbstractNodeBuilder.java | 2 -- .../comparator/NodeWithContextComparator.java | 1 - .../common/node/factory/Delimiters.java | 1 - .../common/node/factory/NodeBuilders.java | 2 -- .../node/factory/NodeCommandFactory.java | 1 - .../node/matcher/ConstraintNodeMatcher.java | 2 -- .../node/matcher/StandardNodeMatchers.java | 2 -- .../common/node/types/DisplayName.java | 2 -- .../common/node/types/Inheritance.java | 2 -- .../luckperms/common/node/types/Meta.java | 2 -- .../common/node/types/Permission.java | 2 -- .../luckperms/common/node/types/Prefix.java | 2 -- .../common/node/types/RegexPermission.java | 2 -- .../luckperms/common/node/types/Suffix.java | 2 -- .../luckperms/common/node/types/Weight.java | 2 -- .../common/node/utils/NodeJsonSerializer.java | 2 -- .../plugin/AbstractLuckPermsPlugin.java | 2 -- .../common/plugin/LuckPermsPlugin.java | 1 - .../plugin/bootstrap/LuckPermsBootstrap.java | 2 -- .../util/AbstractConnectionListener.java | 1 - .../common/query/QueryOptionsBuilderImpl.java | 2 -- .../common/query/QueryOptionsImpl.java | 3 --- .../common/sender/AbstractSender.java | 2 -- .../common/sender/DummyConsoleSender.java | 1 - .../lucko/luckperms/common/sender/Sender.java | 1 - .../common/sender/SenderFactory.java | 1 - .../luckperms/common/storage/Storage.java | 2 -- .../implementation/StorageImplementation.java | 2 -- .../file/AbstractConfigurateStorage.java | 3 --- .../file/CombinedConfigurateStorage.java | 2 -- .../implementation/file/FileActionLogger.java | 2 -- .../implementation/file/FileUuidCache.java | 3 --- .../file/SeparatedConfigurateStorage.java | 3 --- .../file/loader/YamlLoader.java | 3 +-- .../implementation/mongodb/MongoStorage.java | 3 --- .../implementation/split/SplitStorage.java | 2 -- .../implementation/sql/SqlStorage.java | 2 -- .../sql/connection/ConnectionFactory.java | 2 -- .../file/FlatfileConnectionFactory.java | 2 -- .../connection/file/H2ConnectionFactory.java | 1 - .../file/SqliteConnectionFactory.java | 1 - .../common/storage/misc/NodeEntry.java | 1 - .../storage/misc/PlayerSaveResultImpl.java | 2 -- .../luckperms/common/tasks/SyncTask.java | 1 - .../common/treeview/ImmutableTreeNode.java | 1 - .../common/treeview/PermissionRegistry.java | 1 - .../luckperms/common/treeview/TreeNode.java | 1 - .../luckperms/common/treeview/TreeView.java | 1 - .../common/util/DurationFormatter.java | 1 - .../luckperms/common/util/Predicates.java | 1 - .../luckperms/common/util/UniqueIdType.java | 1 - .../common/verbose/VerboseCheckTarget.java | 2 -- .../common/verbose/VerboseHandler.java | 1 - .../common/verbose/VerboseListener.java | 2 -- .../common/verbose/event/MetaCheckEvent.java | 2 -- .../verbose/event/PermissionCheckEvent.java | 2 -- .../common/verbose/event/VerboseEvent.java | 2 -- .../common/webeditor/WebEditorRequest.java | 2 -- .../common/webeditor/WebEditorResponse.java | 2 -- .../webeditor/socket/WebEditorSocket.java | 1 - .../socket/listener/HandlerChangeRequest.java | 1 - .../socket/listener/HandlerConnected.java | 1 - .../socket/listener/HandlerHello.java | 1 - .../socket/listener/HandlerPing.java | 1 - .../listener/WebEditorSocketListener.java | 5 +--- .../webeditor/store/WebEditorKeystore.java | 1 - .../webeditor/store/WebEditorSessionMap.java | 1 - .../webeditor/store/WebEditorSocketMap.java | 1 - .../webeditor/store/WebEditorStore.java | 1 - .../common/bulkupdate/BulkUpdateTest.java | 3 --- .../common/bulkupdate/ComparisonTest.java | 5 ---- .../calculator/PermissionCalculatorTest.java | 3 --- .../context/ContextSetComparatorTest.java | 3 --- .../context/ContextSetJsonSerializerTest.java | 3 --- .../context/ImmutableContextSetTest.java | 2 -- .../common/event/EventGeneratorTest.java | 2 -- .../luckperms/common/locale/MessageTest.java | 3 --- .../common/locale/TranslationTest.java | 1 - .../common/model/GroupManagerTest.java | 2 -- .../common/model/InheritanceTest.java | 2 -- .../luckperms/common/model/NodeMapTest.java | 3 --- .../common/model/PermissionHolderTest.java | 3 --- .../common/model/TrackManagerTest.java | 2 -- .../common/model/UserManagerTest.java | 2 -- .../common/node/NodeBuildersTest.java | 2 -- .../luckperms/common/node/NodeParseTest.java | 1 - .../lucko/luckperms/common/node/NodeTest.java | 2 -- .../common/node/ShorthandParserTest.java | 2 -- .../common/storage/SqlStorageTest.java | 8 ------- .../luckperms/common/util/DifferenceTest.java | 2 -- .../common/util/DurationFormatterTest.java | 1 - .../luckperms/common/util/EnumNamerTest.java | 1 - .../luckperms/common/util/IteratorsTest.java | 1 - .../luckperms/common/util/PaginatedTest.java | 1 - .../common/util/UniqueIdTypeTest.java | 1 - .../common/verbose/BooleanExpressionTest.java | 1 - .../common/verbose/VerboseFilterTest.java | 2 -- .../fabric/FabricCalculatorFactory.java | 1 - .../fabric/FabricClassPathAppender.java | 1 - .../luckperms/fabric/FabricConfigAdapter.java | 1 - .../luckperms/fabric/FabricEventBus.java | 1 - .../luckperms/fabric/FabricSenderFactory.java | 1 - .../luckperms/fabric/LPFabricBootstrap.java | 3 --- .../luckperms/fabric/LPFabricPlugin.java | 1 - .../calculator/ServerOwnerProcessor.java | 1 - .../fabric/context/FabricContextManager.java | 1 - .../context/FabricPlayerCalculator.java | 2 -- .../listeners/FabricAutoOpListener.java | 1 - .../listeners/FabricCommandListUpdater.java | 2 -- .../listeners/FabricConnectionListener.java | 2 -- .../listeners/FabricOtherListeners.java | 1 - .../FabricPermissionsApiListener.java | 2 -- .../messaging/FabricMessagingFactory.java | 2 -- .../messaging/PluginMessageMessenger.java | 2 -- .../fabric/mixin/CommandManagerMixin.java | 2 -- .../ServerLoginNetworkHandlerAccessor.java | 2 -- .../fabric/mixin/ServerPlayerEntityMixin.java | 2 -- .../luckperms/fabric/model/MixinUser.java | 1 - .../forge/loader/ForgeLoaderPlugin.java | 2 -- .../luckperms/forge/ForgeCommandExecutor.java | 2 -- .../luckperms/forge/ForgeConfigAdapter.java | 1 - .../lucko/luckperms/forge/ForgeEventBus.java | 1 - .../luckperms/forge/ForgeSenderFactory.java | 1 - .../luckperms/forge/LPForgeBootstrap.java | 3 --- .../lucko/luckperms/forge/LPForgePlugin.java | 1 - .../calculator/ForgeCalculatorFactory.java | 1 - .../calculator/ServerOwnerProcessor.java | 1 - .../capabilities/UserCapabilityImpl.java | 2 -- .../capabilities/UserCapabilityListener.java | 1 - .../forge/context/ForgeContextManager.java | 1 - .../forge/context/ForgePlayerCalculator.java | 2 -- .../forge/listeners/ForgeAutoOpListener.java | 1 - .../listeners/ForgeCommandListUpdater.java | 2 -- .../listeners/ForgeConnectionListener.java | 2 -- .../listeners/ForgePlatformListener.java | 2 -- .../messaging/ForgeMessagingFactory.java | 2 -- .../messaging/PluginMessageMessenger.java | 5 +--- .../forge/service/ForgePermissionHandler.java | 1 - .../ForgePermissionHandlerListener.java | 1 - .../forge/util/BrigadierInjector.java | 2 -- .../forge/util/ForgeEventBusFacade.java | 1 - .../nukkit/loader/NukkitLoaderPlugin.java | 3 +-- .../luckperms/nukkit/LPNukkitBootstrap.java | 8 +++---- .../luckperms/nukkit/LPNukkitPlugin.java | 16 ++++++------- .../nukkit/NukkitCommandExecutor.java | 7 +++--- .../luckperms/nukkit/NukkitConfigAdapter.java | 5 ++-- .../luckperms/nukkit/NukkitEventBus.java | 5 ++-- .../luckperms/nukkit/NukkitPluginLogger.java | 3 +-- .../luckperms/nukkit/NukkitSenderFactory.java | 14 +++++------ .../nukkit/calculator/ChildProcessor.java | 1 - .../DefaultPermissionMapProcessor.java | 1 - .../calculator/NukkitCalculatorFactory.java | 1 - .../nukkit/calculator/OpProcessor.java | 1 - .../calculator/PermissionMapProcessor.java | 1 - .../nukkit/context/NukkitContextManager.java | 5 +--- .../context/NukkitPlayerCalculator.java | 23 ++++++++----------- .../nukkit/inject/PermissionDefault.java | 3 +-- .../permissible/DummyPermissibleBase.java | 3 +-- .../permissible/LuckPermsPermissible.java | 16 +++++-------- .../LuckPermsPermissionAttachment.java | 11 ++++----- .../permissible/MonitoredPermissibleBase.java | 12 ++++------ .../PermissibleMonitoringInjector.java | 3 +-- .../inject/server/InjectorDefaultsMap.java | 6 ++--- .../inject/server/InjectorPermissionMap.java | 3 +-- .../server/InjectorSubscriptionMap.java | 3 +-- .../inject/server/LuckPermsDefaultsMap.java | 16 +++++-------- .../inject/server/LuckPermsPermissionMap.java | 7 ++---- .../server/LuckPermsSubscriptionMap.java | 11 ++++----- .../listeners/NukkitAutoOpListener.java | 4 +--- .../listeners/NukkitConnectionListener.java | 16 ++++++------- .../listeners/NukkitPlatformListener.java | 7 +++--- .../sponge/loader/SpongeLoaderPlugin.java | 2 -- .../proxy/api8/DescriptionBuilder.java | 2 -- .../api8/PermissionDescriptionProxy.java | 2 -- .../proxy/api8/PermissionServiceProxy.java | 2 -- .../proxy/api8/SubjectCollectionProxy.java | 1 - .../service/proxy/api8/SubjectDataProxy.java | 2 -- .../service/proxy/api8/SubjectProxy.java | 2 -- .../sponge/service/CompatibilityUtil.java | 3 --- .../service/context/ForwardingContextSet.java | 1 - .../ForwardingImmutableContextSet.java | 1 - .../model/LPPermissionDescription.java | 1 - .../service/model/LPPermissionService.java | 3 --- .../service/model/LPProxiedSubject.java | 1 - .../sponge/service/model/LPSubject.java | 3 --- .../service/model/LPSubjectCollection.java | 2 -- .../sponge/service/model/LPSubjectData.java | 2 -- .../reference/CachedSubjectReference.java | 1 - .../reference/SubjectReferenceFactory.java | 2 -- .../luckperms/sponge/LPSpongeBootstrap.java | 3 --- .../luckperms/sponge/LPSpongePlugin.java | 2 -- .../sponge/SpongeCommandExecutor.java | 2 -- .../luckperms/sponge/SpongeConfigAdapter.java | 1 - .../luckperms/sponge/SpongeEventBus.java | 1 - .../sponge/SpongeSchedulerAdapter.java | 2 -- .../luckperms/sponge/SpongeSenderFactory.java | 2 -- .../FixedTypeDefaultsProcessor.java | 1 - .../GroupTypeDefaultsProcessor.java | 1 - .../calculator/RootDefaultsProcessor.java | 1 - .../calculator/SpongeCalculatorFactory.java | 1 - .../calculator/TypeDefaultsProcessor.java | 1 - .../calculator/UserTypeDefaultsProcessor.java | 1 - .../sponge/commands/OptionClear.java | 1 - .../luckperms/sponge/commands/OptionInfo.java | 2 -- .../luckperms/sponge/commands/OptionSet.java | 1 - .../sponge/commands/OptionUnset.java | 1 - .../luckperms/sponge/commands/ParentAdd.java | 1 - .../sponge/commands/ParentClear.java | 1 - .../luckperms/sponge/commands/ParentInfo.java | 2 -- .../sponge/commands/ParentRemove.java | 1 - .../sponge/commands/PermissionClear.java | 1 - .../sponge/commands/PermissionInfo.java | 2 -- .../sponge/commands/PermissionSet.java | 1 - .../sponge/commands/SpongeCommandUtils.java | 1 - .../sponge/commands/SpongeParentCommand.java | 1 - .../sponge/context/SpongeContextManager.java | 3 --- .../context/SpongePlayerCalculator.java | 2 -- .../listeners/SpongeCommandListUpdater.java | 3 --- .../listeners/SpongeConnectionListener.java | 1 - .../listeners/SpongePlatformListener.java | 1 - .../messaging/PluginMessageMessenger.java | 3 --- .../messaging/SpongeMessagingFactory.java | 2 -- .../model/manager/SpongeGroupManager.java | 3 --- .../model/manager/SpongeUserManager.java | 3 --- .../sponge/service/LuckPermsService.java | 3 --- .../sponge/service/ProxyFactory.java | 2 -- .../inheritance/SubjectInheritanceGraph.java | 1 - .../service/model/ContextCalculatorProxy.java | 2 -- .../model/SimplePermissionDescription.java | 2 -- .../model/SubjectDataUpdateEventImpl.java | 1 - .../model/calculated/CalculatedSubject.java | 2 -- .../CalculatedSubjectCachedDataManager.java | 2 -- .../calculated/CalculatedSubjectData.java | 3 --- .../calculated/MonitoredSubjectData.java | 1 - .../PermissionHolderSubject.java | 3 --- .../PermissionHolderSubjectData.java | 3 --- .../model/permissionholder/UserSubject.java | 1 - .../model/persisted/PersistedCollection.java | 3 --- .../model/persisted/PersistedSubject.java | 1 - .../model/persisted/PersistedSubjectData.java | 1 - .../model/persisted/SubjectDataContainer.java | 2 -- .../model/persisted/SubjectStorage.java | 1 - .../standalone/app/LuckPermsApplication.java | 2 -- .../app/integration/SingletonPlayer.java | 1 - .../standalone/app/utils/AnsiUtils.java | 1 - .../app/utils/HeartbeatHttpServer.java | 2 -- .../app/utils/TerminalInterface.java | 2 -- standalone/build.gradle | 2 +- .../standalone/loader/StandaloneLoader.java | 1 - .../standalone/LPStandaloneBootstrap.java | 2 -- .../standalone/LPStandalonePlugin.java | 1 - .../StandaloneCalculatorFactory.java | 1 - .../standalone/StandaloneConfigAdapter.java | 1 - .../StandaloneDependencyPreloader.java | 1 - .../standalone/StandaloneHealthReporter.java | 1 - .../StandaloneMessagingFactory.java | 1 - .../standalone/StandaloneSenderFactory.java | 1 - .../stub/StandaloneContextManager.java | 1 - .../luckperms/standalone/IntegrationTest.java | 2 -- .../standalone/MessagingIntegrationTest.java | 5 +--- .../standalone/StorageIntegrationTest.java | 6 +---- .../standalone/utils/TestPluginProvider.java | 1 - .../velocity/LPVelocityBootstrap.java | 3 --- .../luckperms/velocity/LPVelocityPlugin.java | 1 - .../velocity/VelocityCommandExecutor.java | 1 - .../velocity/VelocityConfigAdapter.java | 1 - .../luckperms/velocity/VelocityEventBus.java | 1 - .../velocity/VelocitySchedulerAdapter.java | 1 - .../velocity/VelocitySenderFactory.java | 2 -- .../calculator/VelocityCalculatorFactory.java | 1 - .../context/VelocityContextManager.java | 2 -- .../context/VelocityPlayerCalculator.java | 3 --- .../MonitoringPermissionCheckListener.java | 3 --- .../listeners/VelocityConnectionListener.java | 1 - .../messaging/PluginMessageMessenger.java | 2 -- .../messaging/VelocityMessagingFactory.java | 2 -- .../service/PlayerPermissionProvider.java | 2 -- .../velocity/util/AdventureCompat.java | 1 - 637 files changed, 99 insertions(+), 1087 deletions(-) diff --git a/api/src/main/java/net/luckperms/api/LuckPerms.java b/api/src/main/java/net/luckperms/api/LuckPerms.java index ddd07606f..584cdf29a 100644 --- a/api/src/main/java/net/luckperms/api/LuckPerms.java +++ b/api/src/main/java/net/luckperms/api/LuckPerms.java @@ -46,7 +46,6 @@ import net.luckperms.api.platform.PluginMetadata; import net.luckperms.api.query.QueryOptionsRegistry; import net.luckperms.api.track.Track; import net.luckperms.api.track.TrackManager; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.Internal; diff --git a/api/src/main/java/net/luckperms/api/actionlog/Action.java b/api/src/main/java/net/luckperms/api/actionlog/Action.java index 8b000996c..82d3f2a5a 100644 --- a/api/src/main/java/net/luckperms/api/actionlog/Action.java +++ b/api/src/main/java/net/luckperms/api/actionlog/Action.java @@ -26,7 +26,6 @@ package net.luckperms.api.actionlog; 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/net/luckperms/api/actionlog/ActionLogger.java b/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java index 16e12ffde..0f4bf7878 100644 --- a/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java +++ b/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java @@ -26,7 +26,6 @@ package net.luckperms.api.actionlog; import net.luckperms.api.messaging.MessagingService; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.concurrent.CompletableFuture; diff --git a/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java index ce030d14c..e2e1eec77 100644 --- a/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java @@ -26,7 +26,6 @@ package net.luckperms.api.cacheddata; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java index e1388b358..91682fd42 100644 --- a/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java @@ -30,7 +30,6 @@ import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.model.group.Group; import net.luckperms.api.model.user.User; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.concurrent.CompletableFuture; diff --git a/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java index 15220016f..7e3d28850 100644 --- a/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java @@ -30,7 +30,6 @@ 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.node.types.WeightNode; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java index c97c7ce94..0f5205540 100644 --- a/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java @@ -27,7 +27,6 @@ package net.luckperms.api.cacheddata; import net.luckperms.api.node.Node; import net.luckperms.api.util.Tristate; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/cacheddata/Result.java b/api/src/main/java/net/luckperms/api/cacheddata/Result.java index 9f7398f3d..729c6d788 100644 --- a/api/src/main/java/net/luckperms/api/cacheddata/Result.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/Result.java @@ -26,7 +26,6 @@ package net.luckperms.api.cacheddata; import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/api/src/main/java/net/luckperms/api/context/ContextManager.java b/api/src/main/java/net/luckperms/api/context/ContextManager.java index 5a6d929f9..7719caeb1 100644 --- a/api/src/main/java/net/luckperms/api/context/ContextManager.java +++ b/api/src/main/java/net/luckperms/api/context/ContextManager.java @@ -28,7 +28,6 @@ package net.luckperms.api.context; 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 org.jetbrains.annotations.ApiStatus.Internal; diff --git a/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java b/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java index ef2947ff2..ae2fb0230 100644 --- a/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java +++ b/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java @@ -26,7 +26,6 @@ package net.luckperms.api.context; import net.luckperms.api.LuckPermsProvider; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/api/src/main/java/net/luckperms/api/context/MutableContextSet.java b/api/src/main/java/net/luckperms/api/context/MutableContextSet.java index dca79d999..cdee00145 100644 --- a/api/src/main/java/net/luckperms/api/context/MutableContextSet.java +++ b/api/src/main/java/net/luckperms/api/context/MutableContextSet.java @@ -26,7 +26,6 @@ package net.luckperms.api.context; import net.luckperms.api.LuckPermsProvider; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java b/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java index 9620ebc56..a3f2cd497 100644 --- a/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java +++ b/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java @@ -26,7 +26,6 @@ package net.luckperms.api.event; import net.luckperms.api.LuckPerms; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java b/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java index 8d35fff29..aeac27492 100644 --- a/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.context; import net.luckperms.api.context.ContextManager; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Optional; diff --git a/api/src/main/java/net/luckperms/api/event/extension/ExtensionLoadEvent.java b/api/src/main/java/net/luckperms/api/event/extension/ExtensionLoadEvent.java index 463326e6f..0097fb1a4 100644 --- a/api/src/main/java/net/luckperms/api/event/extension/ExtensionLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/extension/ExtensionLoadEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.extension; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.extension.Extension; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java index 7cb693049..b2ead950a 100644 --- a/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.group.Group; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java index b4ff36054..3f1fad1ab 100644 --- a/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.group.Group; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java index 47f261f1a..182581adc 100644 --- a/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.group.Group; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java index 4816dddfe..4511ca7df 100644 --- a/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.cause.DeletionCause; import net.luckperms.api.event.util.Param; import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Set; diff --git a/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java b/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java index b4c0f0454..b8c2de247 100644 --- a/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.group; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.group.Group; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java index 9e263e5ed..b97c33075 100644 --- a/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java index b376e877d..6f2d90a23 100644 --- a/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; diff --git a/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java index fd23a0c95..c51549348 100644 --- a/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java @@ -30,7 +30,6 @@ import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.util.Param; import net.luckperms.api.platform.PlatformEntity; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java index 2cc247747..060cd1aef 100644 --- a/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java index 5cc4bc6d2..31308d69e 100644 --- a/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java +++ b/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.log; import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; diff --git a/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java index 96f1f99c3..c86985c15 100644 --- a/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java @@ -27,7 +27,6 @@ package net.luckperms.api.event.node; import net.luckperms.api.event.util.Param; import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java index fb6ec7b3f..1bb8e62ce 100644 --- a/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java @@ -27,7 +27,6 @@ package net.luckperms.api.event.node; import net.luckperms.api.event.util.Param; import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java index 42fd02751..f65575695 100644 --- a/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java @@ -32,7 +32,6 @@ import net.luckperms.api.model.data.DataType; 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; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java index d53fa2d2a..fc29ff894 100644 --- a/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java +++ b/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java @@ -27,7 +27,6 @@ package net.luckperms.api.event.node; import net.luckperms.api.event.util.Param; import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java b/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java index 9ccd42e23..dd147f340 100644 --- a/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.model.user.UserManager; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; diff --git a/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java b/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java index ea37aacdd..334f63007 100644 --- a/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.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/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java index faec60cb9..ac1ca8510 100644 --- a/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.player.lookup; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.ResultEvent; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java index e351926f3..d6d9d151e 100644 --- a/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.player.lookup; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.ResultEvent; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java index 4650f080f..54eb0f625 100644 --- a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.player.lookup; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.ResultEvent; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java index 94b7444d7..a96f16875 100644 --- a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java +++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java @@ -27,7 +27,6 @@ package net.luckperms.api.event.player.lookup; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/api/src/main/java/net/luckperms/api/event/source/EntitySource.java b/api/src/main/java/net/luckperms/api/event/source/EntitySource.java index 0cd02792f..4225ad611 100644 --- a/api/src/main/java/net/luckperms/api/event/source/EntitySource.java +++ b/api/src/main/java/net/luckperms/api/event/source/EntitySource.java @@ -26,7 +26,6 @@ package net.luckperms.api.event.source; import net.luckperms.api.platform.PlatformEntity; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/source/Source.java b/api/src/main/java/net/luckperms/api/event/source/Source.java index 2bd90bc1a..9426e870c 100644 --- a/api/src/main/java/net/luckperms/api/event/source/Source.java +++ b/api/src/main/java/net/luckperms/api/event/source/Source.java @@ -26,7 +26,6 @@ package net.luckperms.api.event.source; import net.luckperms.api.platform.PlatformEntity; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java b/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java index eac09f9b0..bf87cbe2a 100644 --- a/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java +++ b/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.sync; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; diff --git a/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java b/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java index 411320c56..3075e56f7 100644 --- a/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.event.util.Param; import net.luckperms.api.track.Track; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java b/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java index cdfb2316f..24c6ee0f7 100644 --- a/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.track; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.cause.DeletionCause; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; diff --git a/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java b/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java index 318a7d201..78d42e273 100644 --- a/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.track; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.track.Track; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java index 3657e9779..14306b4ad 100644 --- a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java @@ -26,7 +26,6 @@ package net.luckperms.api.event.track.mutate; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java index 88f6b0445..276778707 100644 --- a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.track.mutate; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.track.Track; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java index 6d985a2dc..edf93e99f 100644 --- a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java +++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java @@ -26,7 +26,6 @@ package net.luckperms.api.event.track.mutate; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/type/Cancellable.java b/api/src/main/java/net/luckperms/api/event/type/Cancellable.java index 8b665308b..4091406d0 100644 --- a/api/src/main/java/net/luckperms/api/event/type/Cancellable.java +++ b/api/src/main/java/net/luckperms/api/event/type/Cancellable.java @@ -26,7 +26,6 @@ package net.luckperms.api.event.type; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java b/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java index 685702a6a..5f2a951ff 100644 --- a/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java +++ b/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java @@ -26,7 +26,6 @@ package net.luckperms.api.event.type; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.concurrent.atomic.AtomicReference; diff --git a/api/src/main/java/net/luckperms/api/event/type/Sourced.java b/api/src/main/java/net/luckperms/api/event/type/Sourced.java index e3724efe3..407d56d1a 100644 --- a/api/src/main/java/net/luckperms/api/event/type/Sourced.java +++ b/api/src/main/java/net/luckperms/api/event/type/Sourced.java @@ -27,7 +27,6 @@ package net.luckperms.api.event.type; import net.luckperms.api.event.source.Source; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java index 9aa312aff..363df3629 100644 --- a/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.user.User; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java index e9f0b59a7..fbbc72b24 100644 --- a/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.user.User; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java index c1157e233..7f656ed1c 100644 --- a/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java @@ -27,7 +27,6 @@ package net.luckperms.api.event.user; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; diff --git a/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java index 45418b269..8b36fdce7 100644 --- a/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java @@ -28,7 +28,6 @@ package net.luckperms.api.event.user; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.user.User; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java index 21b2ad5dc..a97c9ec63 100644 --- a/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java @@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.user.User; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java b/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java index 3c6bec429..cdec0416b 100644 --- a/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java +++ b/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java @@ -30,7 +30,6 @@ import net.luckperms.api.event.type.Sourced; import net.luckperms.api.event.util.Param; import net.luckperms.api.model.user.User; import net.luckperms.api.track.Track; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Optional; diff --git a/api/src/main/java/net/luckperms/api/messaging/MessagingService.java b/api/src/main/java/net/luckperms/api/messaging/MessagingService.java index d4283053b..3615fd9f2 100644 --- a/api/src/main/java/net/luckperms/api/messaging/MessagingService.java +++ b/api/src/main/java/net/luckperms/api/messaging/MessagingService.java @@ -27,7 +27,6 @@ package net.luckperms.api.messaging; 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/net/luckperms/api/messenger/IncomingMessageConsumer.java b/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java index fe6eb9324..69d59594c 100644 --- a/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java +++ b/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java @@ -27,7 +27,6 @@ package net.luckperms.api.messenger; import net.luckperms.api.messenger.message.Message; import net.luckperms.api.messenger.message.OutgoingMessage; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/messenger/Messenger.java b/api/src/main/java/net/luckperms/api/messenger/Messenger.java index 6d585f7b2..0ffade886 100644 --- a/api/src/main/java/net/luckperms/api/messenger/Messenger.java +++ b/api/src/main/java/net/luckperms/api/messenger/Messenger.java @@ -27,7 +27,6 @@ package net.luckperms.api.messenger; import net.luckperms.api.messenger.message.Message; import net.luckperms.api.messenger.message.OutgoingMessage; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.OverrideOnly; diff --git a/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java b/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java index a20cd7a32..31d12ec9a 100644 --- a/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java +++ b/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java @@ -26,7 +26,6 @@ package net.luckperms.api.messenger; import net.luckperms.api.LuckPerms; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.OverrideOnly; diff --git a/api/src/main/java/net/luckperms/api/messenger/message/Message.java b/api/src/main/java/net/luckperms/api/messenger/message/Message.java index edbd689af..bde57a056 100644 --- a/api/src/main/java/net/luckperms/api/messenger/message/Message.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/Message.java @@ -26,7 +26,6 @@ package net.luckperms.api.messenger.message; import net.luckperms.api.messenger.Messenger; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java index 88634a007..9bf39ef8d 100644 --- a/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java @@ -26,7 +26,6 @@ package net.luckperms.api.messenger.message; import net.luckperms.api.messenger.IncomingMessageConsumer; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java index 9cf522423..55c093e6d 100644 --- a/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java @@ -27,7 +27,6 @@ package net.luckperms.api.messenger.message.type; 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/net/luckperms/api/messenger/message/type/UserUpdateMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java index 15db8071d..88f8c642c 100644 --- a/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java +++ b/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java @@ -26,7 +26,6 @@ package net.luckperms.api.messenger.message.type; import net.luckperms.api.messenger.message.Message; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; diff --git a/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java index 71140281d..0b91379c6 100644 --- a/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java +++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java @@ -26,7 +26,6 @@ package net.luckperms.api.metastacking; import net.luckperms.api.query.OptionKey; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java index 9bc6bf5ed..bb5c0248a 100644 --- a/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java +++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java @@ -27,7 +27,6 @@ package net.luckperms.api.metastacking; 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/net/luckperms/api/model/PermissionHolder.java b/api/src/main/java/net/luckperms/api/model/PermissionHolder.java index dd1dae4b5..831d1b6ca 100644 --- a/api/src/main/java/net/luckperms/api/model/PermissionHolder.java +++ b/api/src/main/java/net/luckperms/api/model/PermissionHolder.java @@ -35,7 +35,6 @@ import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeType; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java b/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java index 9a9bcfd14..fd7d875ce 100644 --- a/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java +++ b/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java @@ -26,7 +26,6 @@ package net.luckperms.api.model; import net.luckperms.api.model.user.UserManager; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java b/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java index 68676414f..39bddd54d 100644 --- a/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java +++ b/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java @@ -29,7 +29,6 @@ import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.node.Node; import net.luckperms.api.track.Track; import net.luckperms.api.util.Result; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/model/data/NodeMap.java b/api/src/main/java/net/luckperms/api/model/data/NodeMap.java index abdd86135..a52498b72 100644 --- a/api/src/main/java/net/luckperms/api/model/data/NodeMap.java +++ b/api/src/main/java/net/luckperms/api/model/data/NodeMap.java @@ -35,7 +35,6 @@ import net.luckperms.api.model.user.UserManager; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; import net.luckperms.api.util.Tristate; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/model/group/Group.java b/api/src/main/java/net/luckperms/api/model/group/Group.java index 1e30d2ced..17c4e7056 100644 --- a/api/src/main/java/net/luckperms/api/model/group/Group.java +++ b/api/src/main/java/net/luckperms/api/model/group/Group.java @@ -27,7 +27,6 @@ package net.luckperms.api.model.group; import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/net/luckperms/api/model/group/GroupManager.java b/api/src/main/java/net/luckperms/api/model/group/GroupManager.java index 551a3bbfe..b7a37dbcf 100644 --- a/api/src/main/java/net/luckperms/api/model/group/GroupManager.java +++ b/api/src/main/java/net/luckperms/api/model/group/GroupManager.java @@ -28,7 +28,6 @@ package net.luckperms.api.model.group; import net.luckperms.api.node.HeldNode; import net.luckperms.api.node.Node; import net.luckperms.api.node.matcher.NodeMatcher; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/model/user/User.java b/api/src/main/java/net/luckperms/api/model/user/User.java index 0c3e45e6c..94b746b10 100644 --- a/api/src/main/java/net/luckperms/api/model/user/User.java +++ b/api/src/main/java/net/luckperms/api/model/user/User.java @@ -27,7 +27,6 @@ package net.luckperms.api.model.user; import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.model.data.DataMutateResult; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/net/luckperms/api/model/user/UserManager.java b/api/src/main/java/net/luckperms/api/model/user/UserManager.java index d58336a0c..f1819ccb9 100644 --- a/api/src/main/java/net/luckperms/api/model/user/UserManager.java +++ b/api/src/main/java/net/luckperms/api/model/user/UserManager.java @@ -29,7 +29,6 @@ import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.node.HeldNode; import net.luckperms.api.node.Node; import net.luckperms.api.node.matcher.NodeMatcher; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/net/luckperms/api/node/ChatMetaType.java b/api/src/main/java/net/luckperms/api/node/ChatMetaType.java index 0f73c912e..d0033a919 100644 --- a/api/src/main/java/net/luckperms/api/node/ChatMetaType.java +++ b/api/src/main/java/net/luckperms/api/node/ChatMetaType.java @@ -28,7 +28,6 @@ package net.luckperms.api.node; import net.luckperms.api.node.types.ChatMetaNode; import net.luckperms.api.node.types.PrefixNode; import net.luckperms.api.node.types.SuffixNode; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Locale; diff --git a/api/src/main/java/net/luckperms/api/node/HeldNode.java b/api/src/main/java/net/luckperms/api/node/HeldNode.java index 55d2754d7..ed966dba2 100644 --- a/api/src/main/java/net/luckperms/api/node/HeldNode.java +++ b/api/src/main/java/net/luckperms/api/node/HeldNode.java @@ -26,7 +26,6 @@ package net.luckperms.api.node; import net.luckperms.api.model.PermissionHolder; - import org.checkerframework.checker.nullness.qual.NonNull; /** diff --git a/api/src/main/java/net/luckperms/api/node/Node.java b/api/src/main/java/net/luckperms/api/node/Node.java index e27fc98a6..881ac9750 100644 --- a/api/src/main/java/net/luckperms/api/node/Node.java +++ b/api/src/main/java/net/luckperms/api/node/Node.java @@ -36,7 +36,6 @@ 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; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/node/NodeBuilder.java b/api/src/main/java/net/luckperms/api/node/NodeBuilder.java index 6e9e38304..9e4c9cdd7 100644 --- a/api/src/main/java/net/luckperms/api/node/NodeBuilder.java +++ b/api/src/main/java/net/luckperms/api/node/NodeBuilder.java @@ -27,7 +27,6 @@ package net.luckperms.api.node; 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; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java b/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java index 83e9601da..5f2dea12b 100644 --- a/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java +++ b/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java @@ -33,7 +33,6 @@ 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.jetbrains.annotations.ApiStatus.Internal; diff --git a/api/src/main/java/net/luckperms/api/node/NodeType.java b/api/src/main/java/net/luckperms/api/node/NodeType.java index 98d783a81..47b5535d4 100644 --- a/api/src/main/java/net/luckperms/api/node/NodeType.java +++ b/api/src/main/java/net/luckperms/api/node/NodeType.java @@ -34,7 +34,6 @@ 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 java.util.Objects; diff --git a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java index bddb8b4c7..d08b550c9 100644 --- a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java +++ b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java @@ -30,7 +30,6 @@ import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; import net.luckperms.api.node.NodeType; import net.luckperms.api.node.types.MetaNode; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java index a32c32ab4..3fd53b570 100644 --- a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java +++ b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java @@ -29,7 +29,6 @@ import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; import net.luckperms.api.node.NodeType; import net.luckperms.api.node.types.MetaNode; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.Internal; diff --git a/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java b/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java index ec318fae5..6abe244f9 100644 --- a/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java +++ b/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java @@ -29,7 +29,6 @@ import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.Node; import net.luckperms.api.node.metadata.NodeMetadataKey; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java b/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java index 1bbe1ddce..f7056ff64 100644 --- a/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java @@ -28,7 +28,6 @@ package net.luckperms.api.node.types; 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/net/luckperms/api/node/types/DisplayNameNode.java b/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java index 36a20b5bb..2c6321b85 100644 --- a/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java @@ -30,7 +30,6 @@ 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/net/luckperms/api/node/types/InheritanceNode.java b/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java index 36be3f3f2..520911b97 100644 --- a/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java @@ -31,7 +31,6 @@ 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/net/luckperms/api/node/types/MetaNode.java b/api/src/main/java/net/luckperms/api/node/types/MetaNode.java index 502d44fca..4939b68e9 100644 --- a/api/src/main/java/net/luckperms/api/node/types/MetaNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/MetaNode.java @@ -30,7 +30,6 @@ 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/net/luckperms/api/node/types/PermissionNode.java b/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java index d6c852d4b..eb5b4934c 100644 --- a/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java @@ -30,7 +30,6 @@ 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; import java.util.OptionalInt; diff --git a/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java b/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java index 5035da6f6..cd74241aa 100644 --- a/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java @@ -28,7 +28,6 @@ package net.luckperms.api.node.types; 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/net/luckperms/api/node/types/RegexPermissionNode.java b/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java index 223f385bc..e9603cac8 100644 --- a/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java @@ -30,7 +30,6 @@ 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; import java.util.Optional; diff --git a/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java b/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java index a358c0ae3..3c80e83ca 100644 --- a/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java @@ -28,7 +28,6 @@ package net.luckperms.api.node.types; 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/net/luckperms/api/node/types/WeightNode.java b/api/src/main/java/net/luckperms/api/node/types/WeightNode.java index ed1da6fef..f01d1aa9f 100644 --- a/api/src/main/java/net/luckperms/api/node/types/WeightNode.java +++ b/api/src/main/java/net/luckperms/api/node/types/WeightNode.java @@ -30,7 +30,6 @@ 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/net/luckperms/api/platform/PlayerAdapter.java b/api/src/main/java/net/luckperms/api/platform/PlayerAdapter.java index 8ac5c6844..1f60dc7d1 100644 --- a/api/src/main/java/net/luckperms/api/platform/PlayerAdapter.java +++ b/api/src/main/java/net/luckperms/api/platform/PlayerAdapter.java @@ -33,7 +33,6 @@ import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.user.User; import net.luckperms.api.model.user.UserManager; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; diff --git a/api/src/main/java/net/luckperms/api/query/OptionKey.java b/api/src/main/java/net/luckperms/api/query/OptionKey.java index 609a0db52..16f9b8baf 100644 --- a/api/src/main/java/net/luckperms/api/query/OptionKey.java +++ b/api/src/main/java/net/luckperms/api/query/OptionKey.java @@ -26,7 +26,6 @@ package net.luckperms.api.query; import net.luckperms.api.node.metadata.NodeMetadataKey; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/query/QueryOptions.java b/api/src/main/java/net/luckperms/api/query/QueryOptions.java index 0d10ac2b3..0ff603e79 100644 --- a/api/src/main/java/net/luckperms/api/query/QueryOptions.java +++ b/api/src/main/java/net/luckperms/api/query/QueryOptions.java @@ -29,7 +29,6 @@ import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.context.ContextSatisfyMode; 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; import org.jetbrains.annotations.ApiStatus.NonExtendable; diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java index 86467c36b..c78af6d7d 100644 --- a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java +++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java @@ -27,7 +27,6 @@ package net.luckperms.api.query.dataorder; import net.luckperms.api.model.data.DataType; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Arrays; diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java index 02af36156..d7e081821 100644 --- a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java +++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java @@ -28,7 +28,6 @@ package net.luckperms.api.query.dataorder; import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.model.data.DataType; import net.luckperms.api.query.OptionKey; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Comparator; diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java index 40d933495..f027212da 100644 --- a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java +++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java @@ -27,7 +27,6 @@ package net.luckperms.api.query.dataorder; import net.luckperms.api.model.data.DataType; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Arrays; diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java index 274385efa..10c8c3b73 100644 --- a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java +++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java @@ -28,7 +28,6 @@ package net.luckperms.api.query.dataorder; import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.model.data.DataType; import net.luckperms.api.query.OptionKey; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java b/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java index c81170971..424126387 100644 --- a/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java +++ b/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java @@ -28,7 +28,6 @@ package net.luckperms.api.query.meta; import net.luckperms.api.cacheddata.Result; import net.luckperms.api.node.types.MetaNode; import net.luckperms.api.query.OptionKey; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; diff --git a/api/src/main/java/net/luckperms/api/track/DemotionResult.java b/api/src/main/java/net/luckperms/api/track/DemotionResult.java index f43720e8c..214f51c64 100644 --- a/api/src/main/java/net/luckperms/api/track/DemotionResult.java +++ b/api/src/main/java/net/luckperms/api/track/DemotionResult.java @@ -27,7 +27,6 @@ package net.luckperms.api.track; import net.luckperms.api.model.user.User; import net.luckperms.api.util.Result; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Optional; diff --git a/api/src/main/java/net/luckperms/api/track/PromotionResult.java b/api/src/main/java/net/luckperms/api/track/PromotionResult.java index fdd713b68..41ae090d5 100644 --- a/api/src/main/java/net/luckperms/api/track/PromotionResult.java +++ b/api/src/main/java/net/luckperms/api/track/PromotionResult.java @@ -27,7 +27,6 @@ package net.luckperms.api.track; import net.luckperms.api.model.user.User; import net.luckperms.api.util.Result; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Optional; diff --git a/api/src/main/java/net/luckperms/api/track/Track.java b/api/src/main/java/net/luckperms/api/track/Track.java index 4ba433de6..83538c502 100644 --- a/api/src/main/java/net/luckperms/api/track/Track.java +++ b/api/src/main/java/net/luckperms/api/track/Track.java @@ -29,7 +29,6 @@ import net.luckperms.api.context.ContextSet; import net.luckperms.api.model.data.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; import org.jetbrains.annotations.Unmodifiable; diff --git a/bukkit-legacy/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLegacyLoaderPlugin.java b/bukkit-legacy/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLegacyLoaderPlugin.java index aad2d7d24..b843f1f73 100644 --- a/bukkit-legacy/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLegacyLoaderPlugin.java +++ b/bukkit-legacy/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLegacyLoaderPlugin.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit.loader; import me.lucko.luckperms.common.loader.JarInJarClassLoader; import me.lucko.luckperms.common.loader.LoaderBootstrap; - import org.bukkit.plugin.java.JavaPlugin; public class BukkitLegacyLoaderPlugin extends JavaPlugin { diff --git a/bukkit/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLoaderPlugin.java b/bukkit/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLoaderPlugin.java index 4f149edc4..1260b7f8c 100644 --- a/bukkit/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLoaderPlugin.java +++ b/bukkit/loader/src/main/java/me/lucko/luckperms/bukkit/loader/BukkitLoaderPlugin.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit.loader; import me.lucko.luckperms.common.loader.JarInJarClassLoader; import me.lucko.luckperms.common.loader.LoaderBootstrap; - import org.bukkit.plugin.java.JavaPlugin; public class BukkitLoaderPlugin extends JavaPlugin { diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java index 5db5186d4..f3a15ba51 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java @@ -26,11 +26,9 @@ package me.lucko.luckperms.bukkit; import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; - import me.lucko.luckperms.bukkit.util.CommandMapUtil; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.sender.Sender; - import org.bukkit.command.Command; import org.bukkit.command.PluginCommand; import org.bukkit.event.EventHandler; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java index 70d36f3a4..24fd39ab2 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.sender.Sender; - import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfigAdapter.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfigAdapter.java index 8538c6560..65b2bb467 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfigAdapter.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfigAdapter.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit; import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitEventBus.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitEventBus.java index cc22fe414..469730103 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitEventBus.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitEventBus.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.event.AbstractEventBus; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.server.PluginDisableEvent; 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 df38b583a..24764d1ad 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java @@ -27,11 +27,9 @@ package me.lucko.luckperms.bukkit; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; - import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.Component; import net.luckperms.api.util.Tristate; - import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.RemoteConsoleCommandSender; 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 949af47bc..be4879ce3 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java @@ -33,9 +33,7 @@ import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender; import me.lucko.luckperms.common.plugin.classpath.JarInJarClassPathAppender; 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 3e68c0e9b..4d46e15e1 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -60,10 +60,8 @@ import me.lucko.luckperms.common.model.manager.user.StandardUserManager; import me.lucko.luckperms.common.plugin.AbstractLuckPermsPlugin; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.common.sender.Sender; - import net.luckperms.api.LuckPerms; 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/brigadier/LuckPermsBrigadier.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java index cd9bda179..11a01bf6c 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java @@ -26,13 +26,11 @@ package me.lucko.luckperms.bukkit.brigadier; import com.mojang.brigadier.tree.LiteralCommandNode; - import me.lucko.commodore.Commodore; import me.lucko.commodore.CommodoreProvider; import me.lucko.commodore.file.CommodoreFileReader; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.sender.Sender; - import org.bukkit.command.Command; import java.io.InputStream; 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 143bde77d..da3871859 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 @@ -37,7 +37,6 @@ import me.lucko.luckperms.common.calculator.processor.SpongeWildcardProcessor; 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; import java.util.ArrayList; 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 22422fedd..4a253dfc8 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 @@ -29,7 +29,6 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractSourceBasedProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.util.Tristate; import java.util.Collections; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultPermissionMapProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultPermissionMapProcessor.java index 9144500ac..8f12d751c 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultPermissionMapProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultPermissionMapProcessor.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.util.Tristate; /** diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/OpProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/OpProcessor.java index c552dd5cf..2eee31591 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/OpProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/OpProcessor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.bukkit.calculator; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.util.Tristate; /** diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/PermissionMapProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/PermissionMapProcessor.java index 4f6ac96c5..1587c16a0 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/PermissionMapProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/PermissionMapProcessor.java @@ -29,9 +29,7 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractOverrideWildcardProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.util.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 2065f2585..9b419582a 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 @@ -26,18 +26,15 @@ package me.lucko.luckperms.bukkit.context; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; 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.UUID; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java index 0b3dcb224..2b14c490d 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java @@ -26,19 +26,16 @@ package me.lucko.luckperms.bukkit.context; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.util.EnumNamer; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; - import org.bukkit.GameMode; import org.bukkit.World; import org.bukkit.World.Environment; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java index ae76882c1..657a25740 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.inject.permissible; import me.lucko.luckperms.common.util.EmptyCollections; - 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/permissible/LuckPermsPermissible.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissible.java index 3b4c7bc0d..bd5e77063 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissible.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissible.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit.inject.permissible; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.bukkit.calculator.OpProcessor; import me.lucko.luckperms.bukkit.calculator.PermissionMapProcessor; @@ -36,10 +35,8 @@ import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.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/LuckPermsPermissionAttachment.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissionAttachment.java index db31a08b8..4afd48c9a 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissionAttachment.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissionAttachment.java @@ -26,17 +26,14 @@ package me.lucko.luckperms.bukkit.inject.permissible; import com.google.common.base.Preconditions; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeBuilders; - import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeBuilder; import net.luckperms.api.node.metadata.NodeMetadataKey; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; - 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 45258c93e..3f37b5386 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 @@ -31,9 +31,7 @@ import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.util.Tristate; - 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/permissible/PermissibleInjector.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java index d7e819a2c..3902c0ebe 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit.inject.permissible; import me.lucko.luckperms.bukkit.util.CraftBukkitImplementation; import me.lucko.luckperms.common.plugin.logging.PluginLogger; - import org.bukkit.entity.Player; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.PermissionAttachment; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleMonitoringInjector.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleMonitoringInjector.java index d55753b04..c223c15d2 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleMonitoringInjector.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleMonitoringInjector.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bukkit.inject.permissible; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.bukkit.util.CraftBukkitImplementation; - import org.bukkit.command.ConsoleCommandSender; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.ServerOperator; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorDefaultsMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorDefaultsMap.java index 68b2a9b81..346d29fcb 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorDefaultsMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorDefaultsMap.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.inject.server; import me.lucko.luckperms.bukkit.LPBukkitPlugin; - import org.bukkit.permissions.Permission; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorPermissionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorPermissionMap.java index bda31d3e8..c6708bed9 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorPermissionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorPermissionMap.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.inject.server; import me.lucko.luckperms.bukkit.LPBukkitPlugin; - import org.bukkit.permissions.Permission; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorSubscriptionMap.java index fd65b1fb8..1afc98a2b 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorSubscriptionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/InjectorSubscriptionMap.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.inject.server; import me.lucko.luckperms.bukkit.LPBukkitPlugin; - import org.bukkit.permissions.Permissible; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java index bcc77146a..91b5f9a0d 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java @@ -30,12 +30,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cache.Cache; - import net.luckperms.api.util.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/inject/server/LuckPermsPermissionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java index fb5c43039..01579398d 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java @@ -27,11 +27,9 @@ package me.lucko.luckperms.bukkit.inject.server; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.treeview.PermissionRegistry; - 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/inject/server/LuckPermsSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java index 0b48d4a49..9c9075c21 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.inject.server; import me.lucko.luckperms.bukkit.LPBukkitPlugin; - import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; import org.bukkit.plugin.PluginManager; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitAutoOpListener.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitAutoOpListener.java index 249d6a377..4fd2d733f 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitAutoOpListener.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitAutoOpListener.java @@ -29,12 +29,10 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.model.User; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.user.UserDataRecalculateEvent; import net.luckperms.api.query.QueryOptions; - import org.bukkit.entity.Player; import java.util.Map; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java index 330b55e96..984d7f010 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java @@ -26,16 +26,13 @@ package me.lucko.luckperms.bukkit.listeners; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.util.CaffeineFactory; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.user.UserDataRecalculateEvent; - import org.bukkit.entity.Player; import java.util.UUID; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java index 9dbbd5b24..58e5816ad 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java @@ -34,10 +34,8 @@ import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; - import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java index fe2b0f7d9..2554ba57d 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.bukkit.listeners; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; - import org.bukkit.command.CommandSender; import org.bukkit.event.Cancellable; import org.bukkit.event.EventHandler; 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 379ba925a..fc01ccdf2 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 @@ -29,11 +29,9 @@ 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 0fd24647e..57d476ee1 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,19 +25,16 @@ package me.lucko.luckperms.bukkit.messaging; -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; import lilypad.client.connect.api.event.EventListener; import lilypad.client.connect.api.event.MessageEvent; import lilypad.client.connect.api.request.RequestException; import lilypad.client.connect.api.request.impl.MessageRequest; +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 java.nio.charset.StandardCharsets; import java.util.Collections; 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 e98f8ee63..c119ab8c0 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 @@ -26,13 +26,10 @@ package me.lucko.luckperms.bukkit.messaging; import com.google.common.collect.Iterables; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.messaging.pluginmsg.AbstractPluginMessageMessenger; - import net.luckperms.api.messenger.IncomingMessageConsumer; import net.luckperms.api.messenger.Messenger; - 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/util/PluginManagerUtil.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/util/PluginManagerUtil.java index 421fcc4e8..47eea2edb 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/util/PluginManagerUtil.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/util/PluginManagerUtil.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.util; import com.google.common.graph.MutableGraph; - import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultChat.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultChat.java index 37164ac91..81e947185 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultChat.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultChat.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.vault; import net.milkbowl.vault.chat.Chat; - import org.bukkit.OfflinePlayer; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultPermission.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultPermission.java index fdce348aa..ed17bc239 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultPermission.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultPermission.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.vault; import net.milkbowl.vault.permission.Permission; - import org.bukkit.OfflinePlayer; import org.bukkit.World; import org.bukkit.entity.Player; 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 cc5e80150..47e9ac4b1 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.vault; import com.google.common.base.Strings; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.cacheddata.type.MetaCache; @@ -39,7 +38,6 @@ import me.lucko.luckperms.common.node.types.Prefix; import me.lucko.luckperms.common.node.types.Suffix; import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; 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 dacc723b6..d5e8860b5 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.bukkit.vault; import com.google.common.base.Preconditions; - import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.bukkit.context.BukkitContextManager; import me.lucko.luckperms.common.cacheddata.result.TristateResult; @@ -46,7 +45,6 @@ import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.util.UniqueIdType; import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.MutableContextSet; @@ -56,7 +54,6 @@ import net.luckperms.api.node.NodeType; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; import net.milkbowl.vault.permission.Permission; - import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHookManager.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHookManager.java index 06ec6dd6c..c9507037a 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHookManager.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHookManager.java @@ -26,10 +26,8 @@ package me.lucko.luckperms.bukkit.vault; import me.lucko.luckperms.bukkit.LPBukkitPlugin; - import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.permission.Permission; - import org.bukkit.plugin.ServicePriority; import org.bukkit.plugin.ServicesManager; diff --git a/bungee/loader/src/main/java/me/lucko/luckperms/bungee/loader/BungeeLoaderPlugin.java b/bungee/loader/src/main/java/me/lucko/luckperms/bungee/loader/BungeeLoaderPlugin.java index 48167204d..2f3715efa 100644 --- a/bungee/loader/src/main/java/me/lucko/luckperms/bungee/loader/BungeeLoaderPlugin.java +++ b/bungee/loader/src/main/java/me/lucko/luckperms/bungee/loader/BungeeLoaderPlugin.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bungee.loader; import me.lucko.luckperms.common.loader.JarInJarClassLoader; import me.lucko.luckperms.common.loader.LoaderBootstrap; - import net.md_5.bungee.api.plugin.Plugin; public class BungeeLoaderPlugin extends Plugin { diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java index 0b2e555e2..607978a28 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.sender.Sender; - import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Command; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeConfigAdapter.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeConfigAdapter.java index c32261981..43230f956 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeConfigAdapter.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeConfigAdapter.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.YamlConfiguration; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeEventBus.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeEventBus.java index e7ba49caf..91b983e33 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeEventBus.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeEventBus.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.event.AbstractEventBus; - import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Plugin; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java index 573bfd886..bb3b3c38e 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSchedulerAdapter.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.common.util.Iterators; - import net.md_5.bungee.api.scheduler.ScheduledTask; import java.util.Collections; 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 1cef0fe74..0aa68df21 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.bungee.event.TristateCheckEvent; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; - import net.kyori.adventure.platform.bungeecord.BungeeAudiences; import net.kyori.adventure.text.Component; import net.luckperms.api.util.Tristate; 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 5caccd210..a2213a5dc 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java @@ -34,13 +34,11 @@ import me.lucko.luckperms.common.plugin.classpath.JarInJarClassPathAppender; 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.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.PluginDescription; - import org.checkerframework.checker.nullness.qual.Nullable; import java.lang.reflect.Field; 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 8875ebc53..ec6066b42 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -47,7 +47,6 @@ import me.lucko.luckperms.common.model.manager.user.StandardUserManager; import me.lucko.luckperms.common.plugin.AbstractLuckPermsPlugin; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.common.sender.Sender; - import net.luckperms.api.LuckPerms; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.query.QueryOptions; 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 f52a00f39..72fcc1f46 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 @@ -35,7 +35,6 @@ import me.lucko.luckperms.common.calculator.processor.RegexProcessor; import me.lucko.luckperms.common.calculator.processor.SpongeWildcardProcessor; import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; - import net.luckperms.api.query.QueryOptions; import java.util.ArrayList; 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 364ce3182..d4772301a 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 @@ -26,13 +26,11 @@ package me.lucko.luckperms.bungee.context; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.bungee.LPBungeePlugin; import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.InlineQueryOptionsSupplier; import me.lucko.luckperms.common.context.manager.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; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java index 902527a3a..bfb8a7009 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.bungee.context; import me.lucko.luckperms.bungee.LPBungeePlugin; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; - import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; @@ -41,7 +40,6 @@ import net.md_5.bungee.api.event.ServerSwitchEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventPriority; - import org.checkerframework.checker.nullness.qual.NonNull; public class BungeePlayerCalculator implements ContextCalculator, Listener { 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 0a610bec1..c26fa4a60 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 @@ -27,14 +27,11 @@ package me.lucko.luckperms.bungee.context; import com.imaginarycode.minecraft.redisbungee.RedisBungee; import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; - import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.StaticContextCalculator; - import org.checkerframework.checker.nullness.qual.NonNull; public class RedisBungeeCalculator implements StaticContextCalculator { diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeeConnectionListener.java b/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeeConnectionListener.java index 413512975..1b1da0910 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeeConnectionListener.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeeConnectionListener.java @@ -31,7 +31,6 @@ import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer; import net.md_5.bungee.api.connection.PendingConnection; 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 e0d0119bb..ac512c865 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 @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; import net.md_5.bungee.api.connection.ProxiedPlayer; 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 4d53bc956..cd7aa2efe 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 @@ -29,11 +29,9 @@ 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 0ea601cbd..89ac9aa05 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.bungee.messaging; import me.lucko.luckperms.bungee.LPBungeePlugin; import me.lucko.luckperms.common.messaging.pluginmsg.AbstractPluginMessageMessenger; - import net.luckperms.api.messenger.IncomingMessageConsumer; import net.luckperms.api.messenger.Messenger; import net.md_5.bungee.api.ProxyServer; 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 5360a7cce..409296648 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 @@ -28,15 +28,12 @@ package me.lucko.luckperms.bungee.messaging; import com.imaginarycode.minecraft.redisbungee.RedisBungee; import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent; - 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; - import org.checkerframework.checker.nullness.qual.NonNull; /** 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 967219cb3..5874444be 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 @@ -29,9 +29,7 @@ import com.google.common.base.Preconditions; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; - import me.lucko.luckperms.common.util.gson.JObject; - import net.luckperms.api.actionlog.Action; import java.time.Instant; 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 e72df5d4c..f5c744988 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,7 @@ package me.lucko.luckperms.common.actionlog; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; - import me.lucko.luckperms.common.util.ImmutableCollectors; - import net.luckperms.api.actionlog.Action; import java.util.ArrayList; 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 dc2c95ac2..c4ffd5b45 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 @@ -31,7 +31,6 @@ import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; 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; 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 4065c4760..defeb575c 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.actionlog; import com.google.common.base.Strings; - import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.model.PermissionHolder; @@ -35,12 +34,10 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.DurationFormatter; - 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.Duration; diff --git a/common/src/main/java/me/lucko/luckperms/common/api/ApiUtils.java b/common/src/main/java/me/lucko/luckperms/common/api/ApiUtils.java index 0a41e927b..a15bcfaa8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/ApiUtils.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/ApiUtils.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.api; import com.google.common.base.Preconditions; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.misc.DataConstraints; 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 143df9e4f..2356ca562 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 @@ -44,7 +44,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.bootstrap.BootstrappedWithLoader; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.logging.PluginLogger; - import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.actionlog.ActionLogger; @@ -61,7 +60,6 @@ import net.luckperms.api.platform.PlayerAdapter; import net.luckperms.api.platform.PluginMetadata; import net.luckperms.api.query.QueryOptionsRegistry; import net.luckperms.api.track.TrackManager; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; 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 8a45b019e..6bacec94e 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 @@ -27,10 +27,8 @@ package me.lucko.luckperms.common.api.implementation; 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 d1167530b..b596e1793 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 @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.api.implementation; 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 7d6031e05..227427b88 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 @@ -28,14 +28,12 @@ package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.common.context.manager.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; 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 becd8bc8e..e7ec45ad7 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 @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.context.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 5441d4238..6748455b7 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 @@ -26,12 +26,9 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; - import me.lucko.luckperms.common.cacheddata.GroupCachedDataManager; import me.lucko.luckperms.common.model.Group; - 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/api/implementation/ApiGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java index d4aeba13b..a118fd248 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.collect.ImmutableListMultimap; - import me.lucko.luckperms.common.api.ApiUtils; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.manager.group.GroupManager; @@ -35,13 +34,11 @@ import me.lucko.luckperms.common.node.matcher.StandardNodeMatchers; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.misc.NodeEntry; 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 net.luckperms.api.node.Node; import net.luckperms.api.node.matcher.NodeMatcher; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collection; 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 7743edee8..064f60505 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 @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.api.implementation; 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 0284d7b74..52f0ec8b4 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 @@ -26,16 +26,13 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.collect.ImmutableList; - 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 2275c91e6..b11be199f 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 @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.node.types.Prefix; 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; @@ -45,7 +44,6 @@ 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/ApiNodeMatcherFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeMatcherFactory.java index e1f6f9dd6..66fa6dcaf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeMatcherFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeMatcherFactory.java @@ -26,14 +26,12 @@ package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.common.node.matcher.StandardNodeMatchers; - import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; import net.luckperms.api.node.NodeType; import net.luckperms.api.node.matcher.NodeMatcher; import net.luckperms.api.node.matcher.NodeMatcherFactory; import net.luckperms.api.node.types.MetaNode; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; 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 1b9c24838..693a2f6aa 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 @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.util.ImmutableCollectors; - import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; @@ -42,7 +41,6 @@ import net.luckperms.api.node.NodeEqualityPredicate; import net.luckperms.api.node.NodeType; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collection; 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 d19884c76..3dcfcfe1e 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 @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.api.implementation; 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/ApiPlayerAdapter.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlayerAdapter.java index 9c9d5d80d..d093fd9a2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlayerAdapter.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlayerAdapter.java @@ -27,12 +27,10 @@ package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.model.manager.user.UserManager; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.user.User; import net.luckperms.api.platform.PlayerAdapter; 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/api/implementation/ApiQueryOptionsRegistry.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiQueryOptionsRegistry.java index be41c9c6b..e415eaf20 100644 --- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiQueryOptionsRegistry.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiQueryOptionsRegistry.java @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.api.implementation; import me.lucko.luckperms.common.query.QueryOptionsImpl; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.QueryOptionsRegistry; - import org.checkerframework.checker.nullness.qual.NonNull; public final class ApiQueryOptionsRegistry implements QueryOptionsRegistry { 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 ad74d7c24..d7836b363 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 @@ -26,17 +26,14 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; - 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.data.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; 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 99c062b6a..d329022db 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 @@ -30,10 +30,8 @@ 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; 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 52e8c8961..21d62c5dc 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 @@ -26,16 +26,13 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.base.Preconditions; - import me.lucko.luckperms.common.cacheddata.UserCachedDataManager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.types.Inheritance; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeEqualityPredicate; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Locale; 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 2be57b78a..4303ffb3a 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.api.implementation; import com.google.common.collect.ImmutableListMultimap; - import me.lucko.luckperms.common.api.ApiUtils; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.manager.user.UserManager; @@ -35,12 +34,10 @@ import me.lucko.luckperms.common.node.matcher.StandardNodeMatchers; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.misc.NodeEntry; import me.lucko.luckperms.common.util.ImmutableCollectors; - import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.node.HeldNode; import net.luckperms.api.node.Node; import net.luckperms.api.node.matcher.NodeMatcher; - 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/backup/Exporter.java b/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java index 974a2a4f8..911e757ab 100644 --- a/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java +++ b/common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.backup; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.http.AbstractHttpClient; import me.lucko.luckperms.common.http.UnsuccessfulRequestException; import me.lucko.luckperms.common.locale.Message; @@ -42,7 +41,6 @@ import me.lucko.luckperms.common.util.CompletableFutures; 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.kyori.adventure.text.Component; import java.io.BufferedWriter; diff --git a/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java b/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java index 820604389..707a925ea 100644 --- a/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java +++ b/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java @@ -30,7 +30,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; @@ -41,7 +40,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.CompletableFutures; import me.lucko.luckperms.common.util.Uuids; - import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java index 82bf1bae9..33375355d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java @@ -28,9 +28,7 @@ package me.lucko.luckperms.common.bulkupdate; import me.lucko.luckperms.common.bulkupdate.action.Action; import me.lucko.luckperms.common.bulkupdate.query.Query; import me.lucko.luckperms.common.model.HolderType; - import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.Nullable; import java.util.HashSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateBuilder.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateBuilder.java index e936c28e6..3203e80ac 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateBuilder.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateBuilder.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.bulkupdate; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.bulkupdate.action.Action; import me.lucko.luckperms.common.bulkupdate.query.Query; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/Action.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/Action.java index 1e25f2d79..25b9d681c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/Action.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/Action.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.bulkupdate.action; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; - import net.luckperms.api.node.Node; /** diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/DeleteAction.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/DeleteAction.java index c38e97c5f..97319562c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/DeleteAction.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/DeleteAction.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.bulkupdate.action; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; - import net.luckperms.api.node.Node; public class DeleteAction implements Action { diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/UpdateAction.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/UpdateAction.java index 4fb41e039..81639b3f4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/UpdateAction.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/UpdateAction.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.bulkupdate.action; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; import me.lucko.luckperms.common.bulkupdate.query.QueryField; import me.lucko.luckperms.common.node.factory.NodeBuilders; - import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java index ae37dde50..7cf3f6b03 100644 --- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java +++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.bulkupdate.query; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; - import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java index b48a450bd..61780b7b9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.common.util.CompletableFutures; - import net.luckperms.api.cacheddata.CachedData; import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.cacheddata.CachedMetaData; @@ -43,7 +42,6 @@ import net.luckperms.api.metastacking.MetaStackDefinition; import net.luckperms.api.node.ChatMetaType; import net.luckperms.api.node.Node; 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/cacheddata/CacheMetadata.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java index 84c9095ac..3ca24a162 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.cacheddata; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; - import net.luckperms.api.cacheddata.CachedData; import net.luckperms.api.query.QueryOptions; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java index eae5955ad..a6c660f37 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.cacheddata; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; - import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.query.QueryOptions; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedDataManager.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedDataManager.java index ca48561ac..152126fce 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedDataManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedDataManager.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.PermissionHolder; - import net.luckperms.api.metastacking.MetaStackDefinition; import net.luckperms.api.node.ChatMetaType; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java index 36b132d1c..f22fe7ae8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.cacheddata; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; - import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.query.QueryOptions; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java index 31e89226b..3546484d4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.cacheddata.result; import net.luckperms.api.cacheddata.Result; import net.luckperms.api.node.Node; 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/cacheddata/result/StringResult.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/StringResult.java index a88a9148c..69121af17 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/StringResult.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/StringResult.java @@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.Result; import net.luckperms.api.node.Node; import net.luckperms.api.node.types.ChatMetaNode; import net.luckperms.api.node.types.MetaNode; - import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java index f8a8a49f6..cb4c6817c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.cacheddata.result; import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.cacheddata.Result; import net.luckperms.api.node.Node; import net.luckperms.api.util.Tristate; - 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/cacheddata/type/MetaAccumulator.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaAccumulator.java index 98b29f49b..008c6fd21 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaAccumulator.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaAccumulator.java @@ -27,13 +27,11 @@ package me.lucko.luckperms.common.cacheddata.type; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; - import me.lucko.luckperms.common.cacheddata.result.IntegerResult; import me.lucko.luckperms.common.cacheddata.result.StringResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.node.types.Weight; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.luckperms.api.metastacking.MetaStackDefinition; import net.luckperms.api.node.ChatMetaType; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java index a6e8469cd..46670715f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java @@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimaps; - import me.lucko.luckperms.common.cacheddata.UsageTracked; import me.lucko.luckperms.common.cacheddata.result.IntegerResult; import me.lucko.luckperms.common.cacheddata.result.StringResult; @@ -41,7 +40,6 @@ import me.lucko.luckperms.common.node.types.Prefix; import me.lucko.luckperms.common.node.types.Suffix; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.cacheddata.CachedMetaData; import net.luckperms.api.cacheddata.Result; import net.luckperms.api.metastacking.MetaStackDefinition; @@ -51,7 +49,6 @@ import net.luckperms.api.node.types.SuffixNode; import net.luckperms.api.node.types.WeightNode; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.meta.MetaValueSelector; - 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/cacheddata/type/MetaStackAccumulator.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaStackAccumulator.java index ad7eb88a6..031ad7c34 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaStackAccumulator.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaStackAccumulator.java @@ -26,12 +26,10 @@ package me.lucko.luckperms.common.cacheddata.type; import me.lucko.luckperms.common.cacheddata.result.StringResult; - import net.luckperms.api.metastacking.MetaStackDefinition; 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; import java.util.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java index 7b56a5c99..0b4498233 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.cacheddata.type; import com.google.common.collect.ForwardingMap; - import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.cacheddata.result.IntegerResult; import me.lucko.luckperms.common.cacheddata.result.StringResult; @@ -34,14 +33,12 @@ import me.lucko.luckperms.common.node.types.Prefix; import me.lucko.luckperms.common.node.types.Suffix; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.cacheddata.CachedMetaData; 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.node.types.WeightNode; 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/cacheddata/type/PermissionCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java index 6b754579e..b0352b3ac 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java @@ -26,20 +26,17 @@ package me.lucko.luckperms.common.cacheddata.type; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.cacheddata.UsageTracked; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.cacheddata.CachedPermissionData; import net.luckperms.api.cacheddata.Result; import net.luckperms.api.node.Node; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java index d8cdd1f14..26004cdc9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.cacheddata.type; import net.luckperms.api.cacheddata.Result; import net.luckperms.api.node.types.MetaNode; import net.luckperms.api.query.meta.MetaValueSelector; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java b/common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java index 1af131d6d..b7f494ee7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.calculator; import me.lucko.luckperms.common.cacheddata.CacheMetadata; - import net.luckperms.api.query.QueryOptions; /** diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java index c3de5f829..868827424 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java @@ -31,9 +31,7 @@ import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collection; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractOverrideWildcardProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractOverrideWildcardProcessor.java index e8546ea42..89012544e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractOverrideWildcardProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractOverrideWildcardProcessor.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.calculator.processor; import me.lucko.luckperms.common.cacheddata.result.TristateResult; - import net.luckperms.api.util.Tristate; public abstract class AbstractOverrideWildcardProcessor extends AbstractPermissionProcessor implements PermissionProcessor { diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java index 9920c74ce..5d553ca13 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.calculator.processor; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.PermissionCalculator; - import net.luckperms.api.node.Node; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java index d6a32505a..e5a387220 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java @@ -27,10 +27,8 @@ package me.lucko.luckperms.common.calculator.processor; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.node.types.RegexPermission; - import net.luckperms.api.node.Node; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/SpongeWildcardProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/SpongeWildcardProcessor.java index 01c8fbb8d..2e2b53692 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/SpongeWildcardProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/SpongeWildcardProcessor.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.calculator.processor; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.node.AbstractNode; - import net.luckperms.api.node.Node; public class SpongeWildcardProcessor extends AbstractSourceBasedProcessor implements PermissionProcessor { diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java index d1d08b2f9..c12bb5a74 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.calculator.processor; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.node.AbstractNode; - import net.luckperms.api.node.Node; import net.luckperms.api.util.Tristate; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java b/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java index c5be1966a..1c83836f0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.command; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ThreadFactoryBuilder; - import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.command.abstraction.CommandException; import me.lucko.luckperms.common.command.tabcomplete.CompletionSupplier; @@ -68,7 +67,6 @@ import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.ExpiringSet; import me.lucko.luckperms.common.util.ImmutableCollectors; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ChildCommand.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ChildCommand.java index d388ab0bf..2e7672ddf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ChildCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ChildCommand.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.command.spec.Argument; import me.lucko.luckperms.common.command.spec.CommandSpec; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.sender.Sender; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java index 68410e923..46561bb0a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java @@ -31,9 +31,7 @@ import me.lucko.luckperms.common.command.spec.CommandSpec; import me.lucko.luckperms.common.command.utils.ArgumentList; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; - import net.kyori.adventure.text.Component; - 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/command/abstraction/GenericChildCommand.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/GenericChildCommand.java index 853af290e..b39997250 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/GenericChildCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/GenericChildCommand.java @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java index cbde0a9c8..d51bb325f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SingleCommand.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SingleCommand.java index 4575e5939..af83f9a2d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SingleCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/SingleCommand.java @@ -32,7 +32,6 @@ import me.lucko.luckperms.common.command.utils.ArgumentList; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java b/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java index b6b678f05..005fd1e3a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java @@ -39,7 +39,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextSet; import net.luckperms.api.util.Tristate; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/spec/Argument.java b/common/src/main/java/me/lucko/luckperms/common/command/spec/Argument.java index 660b3e408..cf089893e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/spec/Argument.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/spec/Argument.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.command.spec; import me.lucko.luckperms.common.locale.Message; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TranslatableComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/spec/CommandSpec.java b/common/src/main/java/me/lucko/luckperms/common/command/spec/CommandSpec.java index 35bbe104f..cc5050321 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/spec/CommandSpec.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/spec/CommandSpec.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.command.spec; import me.lucko.luckperms.common.util.ImmutableCollectors; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TranslatableComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java b/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java index 53dc22693..08e112a00 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java @@ -26,12 +26,10 @@ package me.lucko.luckperms.common.command.tabcomplete; import com.google.common.base.Splitter; - import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.treeview.PermissionRegistry; import me.lucko.luckperms.common.treeview.TreeNode; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.ImmutableContextSet; import java.util.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java b/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java index 14b663a5b..2c199a725 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.command.utils; import com.google.common.collect.ForwardingList; - import me.lucko.luckperms.common.command.abstraction.CommandException; import me.lucko.luckperms.common.commands.user.UserParentCommand; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; @@ -34,13 +33,11 @@ import me.lucko.luckperms.common.context.MutableContextSetImpl; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.DurationParser; - import net.luckperms.api.context.Context; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.TemporaryNodeMergeStrategy; - import org.checkerframework.checker.nullness.qual.NonNull; import java.time.Duration; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/CommandMeta.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/CommandMeta.java index 400a7232c..62ccd9eca 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/CommandMeta.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/CommandMeta.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.generic.meta; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.command.abstraction.GenericChildCommand; import me.lucko.luckperms.common.command.abstraction.GenericParentCommand; import me.lucko.luckperms.common.command.spec.CommandSpec; 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 8df2295ac..eb23817ef 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 b37c73451..d46843299 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 5bd4bfc80..5836484d4 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 b0a8e2951..dae4da91b 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.generic.meta; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.command.abstraction.GenericChildCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -39,7 +38,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsImpl; 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.ChatMetaNode; 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 9fc80c568..a4ee32c1b 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 19c391ec9..f19daaf24 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 4fbc8e3cb..7e81b7d45 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.node.types.Meta; 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.data.DataType; import net.luckperms.api.node.Node; 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 6a6da7122..55d050b01 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 @@ -43,7 +43,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsImpl; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 877589d16..8962e64b9 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 @@ -42,7 +42,6 @@ import me.lucko.luckperms.common.node.types.Meta; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 09bb41a71..d7ce523a9 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 @@ -44,7 +44,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsImpl; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 797f59319..05f2f5ff1 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 48a165938..d600a27e9 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 ad3d9afb3..422492ccf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderClear.java @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; 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 d7bcaf5bd..25044ae6b 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 @@ -43,7 +43,6 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.webeditor.WebEditorRequest; import me.lucko.luckperms.common.webeditor.WebEditorSession; - import net.luckperms.api.node.Node; import java.util.ArrayList; 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 9dee07c70..d3e801d4a 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.generic.other; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.command.abstraction.ChildCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -40,7 +39,6 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.node.Node; import net.luckperms.api.node.types.InheritanceNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/CommandParent.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/CommandParent.java index 0d4a78db5..b1593ac45 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/CommandParent.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/CommandParent.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.generic.parent; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.command.abstraction.GenericChildCommand; import me.lucko.luckperms.common.command.abstraction.GenericParentCommand; import me.lucko.luckperms.common.command.spec.CommandSpec; 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 2d101e61e..fa294551f 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 @@ -43,7 +43,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 40770eaed..d73b7e709 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 @@ -44,7 +44,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 cb9bc83ac..29e8623ce 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 7b936234d..dcca0b5c5 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 @@ -44,7 +44,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 d7b2eb470..59da06418 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.node.types.InheritanceNode; import java.util.Collections; 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 208d4330d..9d43604c0 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 @@ -46,7 +46,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataMutateResult; 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 377caaa29..c3f473d6e 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 @@ -42,7 +42,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataMutateResult; 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 afe376266..32f43445e 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 @@ -45,7 +45,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 a306da03b..d12d913d9 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 @@ -44,7 +44,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 f798948b8..d174b7dea 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 @@ -45,7 +45,6 @@ import me.lucko.luckperms.common.node.types.Inheritance; 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.data.DataType; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/CommandPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/CommandPermission.java index b1c9baa36..64d2c850d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/CommandPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/CommandPermission.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.generic.permission; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.command.abstraction.GenericChildCommand; import me.lucko.luckperms.common.command.abstraction.GenericParentCommand; import me.lucko.luckperms.common.command.spec.CommandSpec; 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 f341c3f35..469083eb9 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 @@ -44,7 +44,6 @@ import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.kyori.adventure.text.Component; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.PermissionHolder.Identifier; 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 ee6b880a1..31d953f58 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; 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 714461a51..84926fda5 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 @@ -39,7 +39,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeType; 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 c629408d4..0e3639990 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.node.factory.NodeBuilders; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 5b59d2a68..57bc65cff 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 @@ -42,7 +42,6 @@ import me.lucko.luckperms.common.node.factory.NodeBuilders; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 ed2f2e25b..05d639984 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.node.factory.NodeBuilders; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 cfc8e9fe0..f1371fb44 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.node.factory.NodeBuilders; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; 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 2e9aaf5ae..5c3c9a88d 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.cause.CreationCause; 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 29e5ee9d4..e3b5a546a 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 @@ -52,7 +52,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.cause.DeletionCause; 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 02be4069a..01f487326 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 @@ -38,7 +38,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.model.data.DataType; 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 d3f2d3598..e99c1f02d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java @@ -37,7 +37,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.node.Node; import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.query.QueryOptions; 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 396c2065f..6646dfe54 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.group; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.command.abstraction.ChildCommand; import me.lucko.luckperms.common.command.access.ArgumentPermissions; @@ -47,7 +46,6 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.NodeEntry; import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.node.types.InheritanceNode; import java.util.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupParentCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupParentCommand.java index ead05681d..356ffb346 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupParentCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupParentCommand.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.commands.group; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.command.abstraction.ParentCommand; import me.lucko.luckperms.common.command.spec.CommandSpec; 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 0300ea2d6..cbef015dc 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 @@ -48,7 +48,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.event.cause.DeletionCause; 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 9326fa7a4..479638630 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.node.types.DisplayName; 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.data.DataType; import net.luckperms.api.node.NodeType; 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 bb7fd53e3..7193510f4 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 @@ -39,7 +39,6 @@ import me.lucko.luckperms.common.node.types.Weight; 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.data.DataType; import net.luckperms.api.node.NodeType; 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 332d9f659..678eb44cb 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 @@ -37,7 +37,6 @@ import me.lucko.luckperms.common.node.types.Permission; 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.data.DataType; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogParentCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogParentCommand.java index 5f701f60b..0e368f755 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogParentCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogParentCommand.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.log; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.command.abstraction.ParentCommand; 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 f5ca93e40..afeba3d62 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.misc; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.command.abstraction.SingleCommand; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.command.spec.CommandSpec; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java index 7c6b63d15..d5e9ede5e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.misc; import com.github.benmanes.caffeine.cache.Cache; - import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.BulkUpdateBuilder; import me.lucko.luckperms.common.bulkupdate.BulkUpdateStatistics; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java index 46ac1698d..46b182dfb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.webeditor.WebEditorRequest; import me.lucko.luckperms.common.webeditor.WebEditorSession; - import net.luckperms.api.node.Node; import java.util.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java index 0b65e30f8..9316ac02c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.misc; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.backup.Importer; import me.lucko.luckperms.common.command.abstraction.SingleCommand; import me.lucko.luckperms.common.command.access.CommandPermission; 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 9acebe27e..78845ca3c 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 @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; 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 49c3048da..c68f612ac 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.commands.misc; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.bulkupdate.comparison.Comparison; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; @@ -47,7 +46,6 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.NodeEntry; import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.node.Node; import java.util.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/TranslationsCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/TranslationsCommand.java index 052031cb9..81f810552 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/TranslationsCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/TranslationsCommand.java @@ -36,7 +36,6 @@ import me.lucko.luckperms.common.locale.TranslationRepository.LanguageInfo; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import java.io.IOException; 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 bb1d324a5..0a11aba63 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 @@ -35,7 +35,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.cause.CreationCause; 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 8dc2ad274..3b1e3a8f8 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 @@ -38,7 +38,6 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.cause.DeletionCause; 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 f0b6ae9ba..d87176e95 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.model.data.DataMutateResult; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java index c4d9e19ce..b52a54e12 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java @@ -38,7 +38,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.event.cause.CreationCause; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackEditor.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackEditor.java index 215531e62..cc4efff64 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackEditor.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackEditor.java @@ -43,7 +43,6 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.webeditor.WebEditorRequest; import me.lucko.luckperms.common.webeditor.WebEditorSession; - import net.luckperms.api.node.Node; import java.util.ArrayList; 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 b6fe12edc..44461877d 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 @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.model.data.DataMutateResult; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackParentCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackParentCommand.java index ea79419d5..659f49ad8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackParentCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackParentCommand.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.commands.track; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.command.abstraction.ParentCommand; import me.lucko.luckperms.common.command.spec.CommandSpec; 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 01fc0c9d1..b9218729f 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 @@ -40,7 +40,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.model.data.DataMutateResult; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRename.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackRename.java index 358d3dada..8a4929c12 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 @@ -38,7 +38,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.kyori.adventure.text.Component; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.event.cause.DeletionCause; 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 6769e9550..a7161c740 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 @@ -37,7 +37,6 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.model.data.DataType; 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 d4ac566e2..d46879cb6 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 @@ -42,7 +42,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.track.DemotionResult; 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 068f4e6b7..67f9f68bd 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 @@ -38,7 +38,6 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.UniqueIdType; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.node.Node; import net.luckperms.api.node.types.InheritanceNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserParentCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserParentCommand.java index 64d2ce346..623bbcfdc 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserParentCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserParentCommand.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.commands.user; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.command.abstraction.ParentCommand; import me.lucko.luckperms.common.command.spec.CommandSpec; 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 6bf891f2f..36c6b2cad 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 @@ -42,7 +42,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.track.PromotionResult; 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 36b45a44a..221e515dd 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,7 +28,6 @@ package me.lucko.luckperms.common.config; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.cacheddata.type.SimpleMetaValueSelector; import me.lucko.luckperms.common.config.generic.KeyedConfiguration; import me.lucko.luckperms.common.config.generic.key.ConfigKey; @@ -45,7 +44,6 @@ 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 me.lucko.luckperms.common.util.Predicates; - import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.metastacking.DuplicateRemovalFunction; import net.luckperms.api.metastacking.MetaStackDefinition; 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 be59d1946..593038d13 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 @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.config; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.context.serializer.ContextSetJsonSerializer; import me.lucko.luckperms.common.util.gson.GsonProvider; - import net.luckperms.api.context.ImmutableContextSet; import java.io.BufferedReader; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/ConfigurateConfigAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/ConfigurateConfigAdapter.java index 4362f37f3..d37eefe30 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/ConfigurateConfigAdapter.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/ConfigurateConfigAdapter.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.config.generic.adapter; import com.google.common.base.Splitter; - import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.loader.ConfigurationLoader; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java index abc11b437..ab4e573fe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.config.generic.adapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Locale; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/MultiConfigurationAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/MultiConfigurationAdapter.java index fcdf1b876..2c4f965f9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/MultiConfigurationAdapter.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/MultiConfigurationAdapter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.config.generic.adapter; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java index 6b2f5fcf2..a1b81daa9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.config.generic.adapter; import com.google.common.base.Splitter; - import org.checkerframework.checker.nullness.qual.Nullable; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java index 5b0bee744..75c08130c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.config.generic.adapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import org.checkerframework.checker.nullness.qual.Nullable; public class SystemPropertyConfigAdapter extends StringBasedConfigurationAdapter { diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/key/ConfigKeyFactory.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/key/ConfigKeyFactory.java index ac9a76773..cd7da5a0c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/generic/key/ConfigKeyFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/key/ConfigKeyFactory.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.config.generic.key; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; import java.util.Locale; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java b/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java index 0acc898c7..bd8346c98 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java @@ -29,7 +29,6 @@ import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Locale; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java index 2aaf761d1..23c238331 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.context; import me.lucko.luckperms.common.context.comparator.ContextComparator; - import net.luckperms.api.context.Context; - import org.checkerframework.checker.nullness.qual.NonNull; public final class ContextImpl implements Context, Comparable { diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java index e4b77685d..4f9153aff 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java @@ -30,15 +30,12 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Iterators; import com.google.common.collect.Multimaps; - import me.lucko.luckperms.common.context.comparator.ContextComparator; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextSatisfyMode; 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; import java.util.Arrays; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java index 1bb2ffcd2..667fd53e6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java @@ -31,13 +31,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextSatisfyMode; 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; import java.util.Arrays; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java b/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java index 065896df4..9665a7ee9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java @@ -28,13 +28,11 @@ package me.lucko.luckperms.common.context.calculator; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.config.LuckPermsConfiguration; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; - import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.StaticContextCalculator; - import org.checkerframework.checker.nullness.qual.NonNull; public class ConfigurationContextCalculator implements StaticContextCalculator { diff --git a/common/src/main/java/me/lucko/luckperms/common/context/calculator/WorldNameRewriter.java b/common/src/main/java/me/lucko/luckperms/common/context/calculator/WorldNameRewriter.java index 98c1123c7..3a2e865df 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/calculator/WorldNameRewriter.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/calculator/WorldNameRewriter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.context.calculator; import me.lucko.luckperms.common.config.ConfigKeys; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.DefaultContextKeys; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/comparator/ContextSetComparator.java b/common/src/main/java/me/lucko/luckperms/common/context/comparator/ContextSetComparator.java index a91e34724..9cbd51abe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/comparator/ContextSetComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/comparator/ContextSetComparator.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.context.comparator; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; - import net.luckperms.api.context.Context; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManager.java b/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManager.java index dbdfddfe1..5b95b8f6a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManager.java @@ -30,14 +30,12 @@ import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.context.calculator.ForwardingContextCalculator; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; 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.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/manager/InlineQueryOptionsSupplier.java b/common/src/main/java/me/lucko/luckperms/common/context/manager/InlineQueryOptionsSupplier.java index 798a1d772..b4d7b6d5d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/manager/InlineQueryOptionsSupplier.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/manager/InlineQueryOptionsSupplier.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.context.manager; import com.github.benmanes.caffeine.cache.LoadingCache; - import net.luckperms.api.query.QueryOptions; public final class InlineQueryOptionsSupplier implements QueryOptionsSupplier { diff --git a/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java b/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java index 15228ce27..385f9ad1f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.context.manager; 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/serializer/ContextSetConfigurateSerializer.java b/common/src/main/java/me/lucko/luckperms/common/context/serializer/ContextSetConfigurateSerializer.java index f9b5bbada..b0ad9f184 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/serializer/ContextSetConfigurateSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/serializer/ContextSetConfigurateSerializer.java @@ -26,13 +26,10 @@ package me.lucko.luckperms.common.context.serializer; import com.google.common.base.Preconditions; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.context.MutableContextSetImpl; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.MutableContextSet; - import ninja.leaping.configurate.ConfigurationNode; import java.util.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/context/serializer/ContextSetJsonSerializer.java b/common/src/main/java/me/lucko/luckperms/common/context/serializer/ContextSetJsonSerializer.java index 70b4b83b5..fab2178f3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/context/serializer/ContextSetJsonSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/context/serializer/ContextSetJsonSerializer.java @@ -31,10 +31,8 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.context.MutableContextSetImpl; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.MutableContextSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java index c8afb362f..d40acfa94 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.dependencies; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.dependencies.classloader.IsolatedClassLoader; import me.lucko.luckperms.common.dependencies.relocation.Relocation; import me.lucko.luckperms.common.dependencies.relocation.RelocationHandler; @@ -34,9 +33,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender; import me.lucko.luckperms.common.storage.StorageType; import me.lucko.luckperms.common.util.MoreFiles; - import net.luckperms.api.platform.Platform; - import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import java.io.IOException; 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 08f22ed98..ff11bcd96 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 @@ -27,13 +27,11 @@ package me.lucko.luckperms.common.event; 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; import java.util.Objects; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java b/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java index db5a774f1..fe1155135 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.event; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.api.implementation.ApiPermissionHolder; import me.lucko.luckperms.common.cacheddata.GroupCachedDataManager; import me.lucko.luckperms.common.cacheddata.UserCachedDataManager; @@ -42,7 +41,6 @@ import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Difference; - import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.cause.CreationCause; @@ -95,7 +93,6 @@ import net.luckperms.api.extension.Extension; import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.Nullable; import java.util.List; 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 2df785fc5..bc0c06665 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 @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.event; 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/AbstractEvent.java b/common/src/main/java/me/lucko/luckperms/common/event/gen/AbstractEvent.java index 890fd6a20..5dd3b120e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/gen/AbstractEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/gen/AbstractEvent.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.event.gen; import net.luckperms.api.LuckPerms; import net.luckperms.api.event.LuckPermsEvent; - import org.checkerframework.checker.nullness.qual.NonNull; import java.lang.invoke.MethodHandles; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventClass.java b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventClass.java index 54fe9fa00..248f929e5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventClass.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventClass.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.event.gen; import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.event.EventDispatcher; - import net.bytebuddy.ByteBuddy; import net.bytebuddy.ClassFileVersion; import net.bytebuddy.description.NamedElement; 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 ec4c85741..3919cd827 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.event.model; import net.luckperms.api.event.source.EntitySource; import net.luckperms.api.platform.PlatformEntity; - import org.checkerframework.checker.nullness.qual.NonNull; public class EntitySourceImpl implements EntitySource { 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 bd2f48425..aac1b5261 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 @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.event.model; 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 23ff3da50..571367c8b 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.event.model; import net.luckperms.api.event.source.Source; - import org.checkerframework.checker.nullness.qual.NonNull; public final class UnknownSource implements Source { diff --git a/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java b/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java index 9a0143c9b..f0d941f61 100644 --- a/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java @@ -26,15 +26,12 @@ package me.lucko.luckperms.common.extension; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.classpath.URLClassLoaderAccess; import me.lucko.luckperms.common.util.gson.GsonProvider; - import net.luckperms.api.LuckPerms; import net.luckperms.api.extension.Extension; import net.luckperms.api.extension.ExtensionManager; - import org.checkerframework.checker.nullness.qual.NonNull; import java.io.BufferedReader; diff --git a/common/src/main/java/me/lucko/luckperms/common/http/BytebinClient.java b/common/src/main/java/me/lucko/luckperms/common/http/BytebinClient.java index ad50d7d70..38b7978dd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/http/BytebinClient.java +++ b/common/src/main/java/me/lucko/luckperms/common/http/BytebinClient.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.http; import com.google.gson.JsonElement; - import me.lucko.luckperms.common.util.gson.GsonProvider; - import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; 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 4474b0ef0..c463b1381 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 @@ -31,7 +31,6 @@ import me.lucko.luckperms.common.graph.TraversalAlgorithm; 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.node.types.InheritanceNode; import net.luckperms.api.query.QueryOptions; diff --git a/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraphFactory.java b/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraphFactory.java index 61fd32b33..ce508626f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraphFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/inheritance/InheritanceGraphFactory.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.inheritance; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsImpl; - import net.luckperms.api.query.QueryOptions; /** diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java index 34eed5df7..74fee43d5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.locale; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; @@ -38,7 +37,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.DurationFormatter; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.text.TextComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java index 3c4cf41ae..2ceb2ba66 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java @@ -26,17 +26,14 @@ package me.lucko.luckperms.common.locale; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.MoreFiles; - import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.kyori.adventure.translation.GlobalTranslator; import net.kyori.adventure.translation.TranslationRegistry; import net.kyori.adventure.translation.Translator; import net.kyori.adventure.util.UTF8ResourceBundleControl; - import org.checkerframework.checker.nullness.qual.Nullable; import java.io.BufferedReader; diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java index f787c6ca9..c350e7a9f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java @@ -28,18 +28,15 @@ package me.lucko.luckperms.common.locale; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.http.UnsuccessfulRequestException; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.gson.GsonProvider; - -import org.checkerframework.checker.nullness.qual.Nullable; - import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; +import org.checkerframework.checker.nullness.qual.Nullable; import java.io.BufferedReader; import java.io.BufferedWriter; 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 7f028d02a..2b4ee5521 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.messaging; 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; 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 a18e8682b..3297b1a2c 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.messaging; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.config.ConfigKeys; @@ -39,7 +38,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.ExpiringSet; 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; @@ -48,7 +46,6 @@ 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 e42ef02bd..c7a6271e5 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 @@ -37,12 +37,10 @@ import me.lucko.luckperms.common.storage.implementation.StorageImplementation; 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 me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.PostgresConnectionFactory; 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; import java.util.Locale; 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 f2097b686..c37f8711f 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.messaging.message; import net.luckperms.api.messenger.message.Message; import net.luckperms.api.messenger.message.OutgoingMessage; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.UUID; 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 33d4cc45e..db24d1122 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 @@ -26,13 +26,10 @@ package me.lucko.luckperms.common.messaging.message; import com.google.gson.JsonElement; - 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 525d56210..95a0e34c4 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 @@ -26,11 +26,8 @@ package me.lucko.luckperms.common.messaging.message; import com.google.gson.JsonElement; - 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 77953cc6f..96d66c4d7 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 @@ -26,12 +26,9 @@ package me.lucko.luckperms.common.messaging.message; import com.google.gson.JsonElement; - 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/nats/NatsMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java index ce0d492bf..6e283be4c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java @@ -28,16 +28,6 @@ package me.lucko.luckperms.common.messaging.nats; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; - -import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import me.lucko.luckperms.common.util.Throwing; - -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 io.nats.client.Connection; import io.nats.client.Dispatcher; import io.nats.client.Message; @@ -45,6 +35,12 @@ import io.nats.client.MessageHandler; import io.nats.client.Nats; import io.nats.client.Options; import io.nats.client.Options.Builder; +import me.lucko.luckperms.common.plugin.LuckPermsPlugin; +import me.lucko.luckperms.common.util.Throwing; +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 java.time.Duration; diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java index 8bfb7f492..4cbf43850 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java @@ -28,11 +28,9 @@ package me.lucko.luckperms.common.messaging.pluginmsg; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; - 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/rabbitmq/RabbitMQMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/rabbitmq/RabbitMQMessenger.java index b766c9872..7ef3e7188 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/rabbitmq/RabbitMQMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/rabbitmq/RabbitMQMessenger.java @@ -35,14 +35,11 @@ import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.DeliverCallback; import com.rabbitmq.client.Delivery; - import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; - 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 java.util.concurrent.TimeUnit; 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 c673730bf..8fec0f7d7 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 @@ -26,13 +26,10 @@ package me.lucko.luckperms.common.messaging.redis; 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; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; 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 875d9b4da..c9488373d 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 @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.messaging.sql; 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 java.sql.Connection; 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 9ed7955ca..8e2c34672 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 @@ -29,7 +29,6 @@ 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; 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 cd6ebbb6f..09973bb2b 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 @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.metastacking; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - 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/SimpleMetaStackDefinition.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStackDefinition.java index 07d23c097..fc526b9cd 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 @@ -26,11 +26,9 @@ package me.lucko.luckperms.common.metastacking; import com.google.common.collect.ImmutableList; - 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; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java index 4f071abe7..508ff6e14 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 @@ -28,13 +28,11 @@ package me.lucko.luckperms.common.metastacking; import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.ImmutableCollectors; - import net.luckperms.api.metastacking.MetaStackElement; import net.luckperms.api.model.PermissionHolder; 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 3d1fb89cf..993edbd65 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.model; import net.luckperms.api.track.DemotionResult; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; 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 66cb5fc5d..cbcec4ded 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 @@ -32,14 +32,12 @@ import me.lucko.luckperms.common.cacheddata.result.IntegerResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.luckperms.api.node.NodeType; import net.luckperms.api.node.types.DisplayNameNode; import net.luckperms.api.node.types.WeightNode; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Locale; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java b/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java index 904b51e96..3c368afe6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.model; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; 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 50e3bc32c..700f04403 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.model; import com.google.common.collect.Iterables; - import me.lucko.luckperms.common.cacheddata.HolderCachedDataManager; import me.lucko.luckperms.common.cacheddata.result.IntegerResult; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; @@ -40,7 +39,6 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.DataSelector; import me.lucko.luckperms.common.util.Difference; - import net.kyori.adventure.text.Component; import net.luckperms.api.context.ContextSet; import net.luckperms.api.model.data.DataMutateResult; @@ -54,7 +52,6 @@ import net.luckperms.api.node.types.WeightNode; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; - 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 4d5c772e1..8faf2eded 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.model; import net.luckperms.api.model.PermissionHolder.Identifier; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PrimaryGroupHolder.java b/common/src/main/java/me/lucko/luckperms/common/model/PrimaryGroupHolder.java index 87ceef189..1e8368cd9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/PrimaryGroupHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/PrimaryGroupHolder.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.model; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.inheritance.InheritanceGraph; - import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.query.QueryOptions; 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 f19898d44..213e49d37 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.model; import net.luckperms.api.track.PromotionResult; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Objects; 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 b06b5bd3c..0eff019b7 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 @@ -26,13 +26,11 @@ package me.lucko.luckperms.common.model; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.api.implementation.ApiTrack; import me.lucko.luckperms.common.model.manager.group.GroupManager; import me.lucko.luckperms.common.node.types.Inheritance; 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.data.DataMutateResult; import net.luckperms.api.model.data.DataType; @@ -40,7 +38,6 @@ import net.luckperms.api.node.Node; 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 879624bad..35a2bd440 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 @@ -29,10 +29,8 @@ import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.cacheddata.UserCachedDataManager; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.kyori.adventure.text.Component; import net.luckperms.api.query.QueryOptions; - 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 a62d1895a..6b947ed7d 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 @@ -29,10 +29,8 @@ import me.lucko.luckperms.common.cache.Cache; import me.lucko.luckperms.common.cacheddata.result.IntegerResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.query.QueryOptionsImpl; - import net.luckperms.api.node.NodeType; import net.luckperms.api.node.types.WeightNode; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Locale; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/manager/AbstractManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/AbstractManager.java index 1df7651d6..871968e6f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/manager/AbstractManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/AbstractManager.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.model.manager; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.cache.LoadingMap; import java.util.Collection; 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 bd3b4771e..3b84e3399 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 @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.node.types.Inheritance; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.CompletableFutures; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.Node; import net.luckperms.api.node.types.InheritanceNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserManager.java index 7b64a2561..175caf382 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/UserManager.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.model.manager.user; import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.manager.Manager; - import net.luckperms.api.node.Node; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMap.java b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMap.java index 8e4a0b9ab..4ade7a1f4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMap.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMap.java @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.model.nodemap; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator; import me.lucko.luckperms.common.util.Difference; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapBase.java b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapBase.java index 3274e8a01..ebb33a6ce 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapBase.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapBase.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.model.nodemap; import com.google.common.collect.ImmutableCollection; - import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapMutable.java b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapMutable.java index 291bb9a32..5bd83a371 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapMutable.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/NodeMapMutable.java @@ -32,7 +32,6 @@ import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.node.comparator.NodeComparator; import me.lucko.luckperms.common.util.Difference; import me.lucko.luckperms.common.util.Difference.ChangeType; - import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; diff --git a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/RecordedNodeMap.java b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/RecordedNodeMap.java index 37eebf274..e655c2ccf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/nodemap/RecordedNodeMap.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/nodemap/RecordedNodeMap.java @@ -27,9 +27,7 @@ package me.lucko.luckperms.common.model.nodemap; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.util.Difference; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.Node; 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 aaa0c11cb..0ea09eee0 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,9 +27,7 @@ package me.lucko.luckperms.common.node; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.node.utils.ShorthandParser; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeBuilder; @@ -37,7 +35,6 @@ 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.PermissionNode; - 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 8840dcde0..ca2a97b79 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 @@ -26,13 +26,11 @@ package me.lucko.luckperms.common.node; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; - import net.luckperms.api.context.ContextSet; 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/NodeWithContextComparator.java b/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeWithContextComparator.java index 16f405857..222a1495c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeWithContextComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/comparator/NodeWithContextComparator.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.node.comparator; import me.lucko.luckperms.common.context.comparator.ContextSetComparator; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.Node; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/factory/Delimiters.java b/common/src/main/java/me/lucko/luckperms/common/node/factory/Delimiters.java index e872e27fa..74886c2cf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/factory/Delimiters.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/factory/Delimiters.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.node.factory; import com.google.common.base.Splitter; - import me.lucko.luckperms.common.cache.PatternCache; import me.lucko.luckperms.common.node.AbstractNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java index 6147058f6..00fad6501 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.node.types.Prefix; 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.types.DisplayNameNode; import net.luckperms.api.node.types.InheritanceNode; @@ -42,7 +41,6 @@ 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/factory/NodeCommandFactory.java b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeCommandFactory.java index 47212c29a..c487a178d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeCommandFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeCommandFactory.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.node.factory; import me.lucko.luckperms.common.model.HolderType; - import net.luckperms.api.context.Context; import net.luckperms.api.node.Node; import net.luckperms.api.node.types.ChatMetaNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java b/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java index da6786246..b5c7d361b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.node.matcher; import me.lucko.luckperms.common.bulkupdate.comparison.Constraint; - import net.luckperms.api.node.Node; import net.luckperms.api.node.matcher.NodeMatcher; - 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/matcher/StandardNodeMatchers.java b/common/src/main/java/me/lucko/luckperms/common/node/matcher/StandardNodeMatchers.java index 9960268f9..552d437bd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/matcher/StandardNodeMatchers.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/matcher/StandardNodeMatchers.java @@ -35,12 +35,10 @@ import me.lucko.luckperms.common.node.types.Prefix; 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.Node; import net.luckperms.api.node.NodeEqualityPredicate; import net.luckperms.api.node.NodeType; import net.luckperms.api.node.types.MetaNode; - 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/types/DisplayName.java b/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java index b61d8de5b..fe87b1a9d 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 @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.node.types; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; - 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 org.checkerframework.checker.nullness.qual.Nullable; 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 0dc6f47da..d19128022 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 @@ -27,13 +27,11 @@ package me.lucko.luckperms.common.node.types; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; - import me.lucko.luckperms.common.storage.misc.DataConstraints; 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 org.checkerframework.checker.nullness.qual.Nullable; 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 6dfaea7f3..f5477088e 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 @@ -28,11 +28,9 @@ package me.lucko.luckperms.common.node.types; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.Delimiters; - 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 org.checkerframework.checker.nullness.qual.Nullable; 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 8c62b021b..31357b33b 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 @@ -29,12 +29,10 @@ 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.NodeBuilders; - 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 d03905bd0..3902afae2 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 @@ -28,12 +28,10 @@ package me.lucko.luckperms.common.node.types; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.Delimiters; - 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 org.checkerframework.checker.nullness.qual.Nullable; 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 e8c7df816..c04c943a6 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 @@ -29,11 +29,9 @@ 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 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 org.checkerframework.checker.nullness.qual.Nullable; 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 b7774e8e9..4821c0513 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 @@ -28,12 +28,10 @@ package me.lucko.luckperms.common.node.types; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.factory.Delimiters; - 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 org.checkerframework.checker.nullness.qual.Nullable; 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 1b4bfb2d0..4e6c02085 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 @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.node.types; import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNodeBuilder; - 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 org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeJsonSerializer.java b/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeJsonSerializer.java index cc532060a..a92ac3e2a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeJsonSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/node/utils/NodeJsonSerializer.java @@ -28,10 +28,8 @@ package me.lucko.luckperms.common.node.utils; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.context.serializer.ContextSetJsonSerializer; import me.lucko.luckperms.common.node.factory.NodeBuilders; - import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeBuilder; import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; 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 27715187e..2f4b14cf7 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 @@ -63,9 +63,7 @@ import me.lucko.luckperms.common.treeview.PermissionRegistry; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.webeditor.socket.WebEditorSocket; import me.lucko.luckperms.common.webeditor.store.WebEditorStore; - import net.luckperms.api.LuckPerms; - import okhttp3.OkHttpClient; import java.io.IOException; 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 e6c5ab0c2..23d0f4e90 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 @@ -57,7 +57,6 @@ import me.lucko.luckperms.common.tasks.SyncTask; import me.lucko.luckperms.common.treeview.PermissionRegistry; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.webeditor.store.WebEditorStore; - import net.luckperms.api.query.QueryOptions; import java.util.Collections; 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 df8fbcb53..def95b260 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 @@ -28,9 +28,7 @@ package me.lucko.luckperms.common.plugin.bootstrap; import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender; 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 ea226dbe2..62c41d9cd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/plugin/util/AbstractConnectionListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/plugin/util/AbstractConnectionListener.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.plugin.util; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.model.data.DataType; import net.luckperms.api.platform.Platform; 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 868bc5c50..3ff75aa63 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 @@ -26,14 +26,12 @@ package me.lucko.luckperms.common.query; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; - 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 ef93f4fe1..ce25b26da 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,9 +27,7 @@ package me.lucko.luckperms.common.query; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; - import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; @@ -37,7 +35,6 @@ 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/sender/AbstractSender.java b/common/src/main/java/me/lucko/luckperms/common/sender/AbstractSender.java index 1722722eb..0d8db2101 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 @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.sender; import com.google.common.collect.Iterables; - import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.luckperms.api.util.Tristate; diff --git a/common/src/main/java/me/lucko/luckperms/common/sender/DummyConsoleSender.java b/common/src/main/java/me/lucko/luckperms/common/sender/DummyConsoleSender.java index d92c37b7d..76c9af57e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/sender/DummyConsoleSender.java +++ b/common/src/main/java/me/lucko/luckperms/common/sender/DummyConsoleSender.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.sender; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.luckperms.api.util.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 a4287a7d0..03073647b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/sender/Sender.java +++ b/common/src/main/java/me/lucko/luckperms/common/sender/Sender.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.sender; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.kyori.adventure.text.Component; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; 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 797e2b6fe..5d2f2da73 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.sender; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.kyori.adventure.text.Component; import net.luckperms.api.util.Tristate; 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 61e10fc0e..685af72ac 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.storage; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.model.Group; @@ -38,7 +37,6 @@ import me.lucko.luckperms.common.storage.implementation.StorageImplementation; import me.lucko.luckperms.common.storage.implementation.split.SplitStorage; import me.lucko.luckperms.common.storage.misc.NodeEntry; import me.lucko.luckperms.common.util.Throwing; - import net.kyori.adventure.text.Component; import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.cause.CreationCause; 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 c8e27a046..2c65a605d 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 @@ -33,12 +33,10 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.matcher.ConstraintNodeMatcher; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.misc.NodeEntry; - import net.kyori.adventure.text.Component; import net.luckperms.api.actionlog.Action; import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.node.Node; - 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 69a2a1ca3..9bf3ddf8e 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.storage.implementation.file; import com.google.common.collect.Iterables; - import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; @@ -47,7 +46,6 @@ import me.lucko.luckperms.common.storage.implementation.file.loader.ConfigurateL import me.lucko.luckperms.common.storage.implementation.file.loader.JsonLoader; import me.lucko.luckperms.common.storage.implementation.file.loader.YamlLoader; import me.lucko.luckperms.common.util.MoreFiles; - import net.luckperms.api.actionlog.Action; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; @@ -58,7 +56,6 @@ 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.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 aaa58dc1d..491d9586d 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 @@ -34,9 +34,7 @@ import me.lucko.luckperms.common.storage.implementation.file.watcher.FileWatcher import me.lucko.luckperms.common.storage.misc.NodeEntry; import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Uuids; - import net.luckperms.api.node.Node; - 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 6420d1c51..12a15d375 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 @@ -28,13 +28,11 @@ package me.lucko.luckperms.common.storage.implementation.file; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.stream.JsonReader; - 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; 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 c6d8497a9..346a3cbb4 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 @@ -29,12 +29,9 @@ import com.google.common.base.Splitter; import com.google.common.collect.Iterables; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; - 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 047440e89..cf2a2bd3f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.storage.implementation.file; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.model.User; @@ -40,9 +39,7 @@ import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.MoreFiles; import me.lucko.luckperms.common.util.Uuids; - import net.luckperms.api.node.Node; - import ninja.leaping.configurate.ConfigurationNode; import java.io.IOException; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/loader/YamlLoader.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/loader/YamlLoader.java index 6bfb11199..eb41a564d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/loader/YamlLoader.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/loader/YamlLoader.java @@ -25,11 +25,10 @@ package me.lucko.luckperms.common.storage.implementation.file.loader; -import org.yaml.snakeyaml.DumperOptions; - import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.loader.ConfigurationLoader; import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; +import org.yaml.snakeyaml.DumperOptions; import java.nio.charset.StandardCharsets; import java.nio.file.Files; 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 ba71f33db..3055f8b84 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 @@ -36,7 +36,6 @@ import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Filters; import com.mongodb.client.model.ReplaceOptions; - import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; @@ -55,7 +54,6 @@ import me.lucko.luckperms.common.storage.misc.NodeEntry; import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; import me.lucko.luckperms.common.storage.misc.StorageCredentials; import me.lucko.luckperms.common.util.Iterators; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.luckperms.api.actionlog.Action; @@ -66,7 +64,6 @@ import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeBuilder; - import org.bson.Document; import org.bson.UuidRepresentation; 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 5b2584c84..baa52a6c1 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.storage.implementation.split; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.locale.Message; @@ -38,7 +37,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.storage.StorageType; import me.lucko.luckperms.common.storage.implementation.StorageImplementation; import me.lucko.luckperms.common.storage.misc.NodeEntry; - import net.kyori.adventure.text.Component; import net.luckperms.api.actionlog.Action; import net.luckperms.api.model.PlayerSaveResult; 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 0c063e6c3..81409aa9c 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,7 +28,6 @@ package me.lucko.luckperms.common.storage.implementation.sql; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.gson.reflect.TypeToken; - import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; @@ -50,7 +49,6 @@ import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl; import me.lucko.luckperms.common.util.Difference; import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.util.gson.GsonProvider; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.luckperms.api.actionlog.Action; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java index 36014e1c9..002a9aa08 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java @@ -26,12 +26,10 @@ package me.lucko.luckperms.common.storage.implementation.sql.connection; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.kyori.adventure.text.Component; import java.sql.Connection; import java.sql.SQLException; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java index 368c34785..0886d1f2a 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.storage.implementation.sql.connection.file; import me.lucko.luckperms.common.storage.implementation.sql.connection.ConnectionFactory; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -36,7 +35,6 @@ import java.nio.file.Path; import java.sql.Connection; import java.sql.SQLException; import java.text.DecimalFormat; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/H2ConnectionFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/H2ConnectionFactory.java index 22ecdb2ad..b0c7808b2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/H2ConnectionFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/H2ConnectionFactory.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.storage.implementation.sql.connection.file; import me.lucko.luckperms.common.dependencies.Dependency; -import me.lucko.luckperms.common.dependencies.classloader.IsolatedClassLoader; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import java.lang.reflect.Constructor; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/SqliteConnectionFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/SqliteConnectionFactory.java index b1d907cc4..ab9e986fe 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/SqliteConnectionFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/SqliteConnectionFactory.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.storage.implementation.sql.connection.file; import me.lucko.luckperms.common.dependencies.Dependency; -import me.lucko.luckperms.common.dependencies.classloader.IsolatedClassLoader; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import java.lang.reflect.Constructor; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java b/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java index 12a97ca5f..6c51df421 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.storage.misc; import net.luckperms.api.node.HeldNode; import net.luckperms.api.node.Node; - import org.checkerframework.checker.nullness.qual.NonNull; @SuppressWarnings("deprecation") 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 e8c899d73..b61f5239c 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 @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.storage.misc; import com.google.common.collect.ImmutableSet; - 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 f2c8fb565..28a0aee90 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 @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.tasks; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.model.manager.group.GroupManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.luckperms.api.event.cause.CreationCause; import java.util.concurrent.TimeUnit; diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java b/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java index ba8aeb7c3..725f77c6d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java +++ b/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.treeview; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.gson.JsonObject; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.ArrayList; diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java b/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java index 9d2aba13e..5e51f0c04 100644 --- a/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java +++ b/common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.treeview; import com.google.common.base.Splitter; - import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.common.util.ImmutableCollectors; diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java index be0b69ce4..6893d18bd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java +++ b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.treeview; import com.google.common.collect.Maps; - import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java index 732460494..e3c4692c5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java +++ b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.treeview; import com.google.common.base.Splitter; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.cacheddata.type.PermissionCache; import me.lucko.luckperms.common.http.AbstractHttpClient; import me.lucko.luckperms.common.http.BytebinClient; diff --git a/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java b/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java index c5d624cdf..23b346877 100644 --- a/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.util; import me.lucko.luckperms.common.locale.TranslationManager; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; diff --git a/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java b/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java index 1fd028861..9f49b7201 100644 --- a/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.util; import com.google.common.collect.Range; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Locale; diff --git a/common/src/main/java/me/lucko/luckperms/common/util/UniqueIdType.java b/common/src/main/java/me/lucko/luckperms/common/util/UniqueIdType.java index 6e19428c2..e31ccd814 100644 --- a/common/src/main/java/me/lucko/luckperms/common/util/UniqueIdType.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/UniqueIdType.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.util; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java index 50d0e82d0..c249c8b3b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java @@ -27,9 +27,7 @@ package me.lucko.luckperms.common.verbose; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.User; - import net.luckperms.api.model.PermissionHolder; - import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Objects; 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 4e489e6d3..613b802ed 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 @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.verbose.event.CheckOrigin; 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; 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 22c082368..b9dc0e451 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.verbose; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.http.AbstractHttpClient; import me.lucko.luckperms.common.http.BytebinClient; @@ -42,7 +41,6 @@ import me.lucko.luckperms.common.verbose.event.CheckOrigin; 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.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.text.event.HoverEvent; 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 eba966d96..20169c0cf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java @@ -26,12 +26,10 @@ package me.lucko.luckperms.common.verbose.event; import com.google.gson.JsonArray; - import me.lucko.luckperms.common.cacheddata.result.StringResult; import me.lucko.luckperms.common.node.utils.NodeJsonSerializer; import me.lucko.luckperms.common.util.gson.JObject; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; - import net.luckperms.api.query.QueryOptions; import java.util.Locale; 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 f047de036..f0a06270e 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 @@ -26,12 +26,10 @@ package me.lucko.luckperms.common.verbose.event; import com.google.gson.JsonArray; - import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.node.utils.NodeJsonSerializer; import me.lucko.luckperms.common.util.gson.JObject; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; - import net.luckperms.api.query.QueryOptions; import java.util.Locale; 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 d1457d178..2f4f39188 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 @@ -26,13 +26,11 @@ package me.lucko.luckperms.common.verbose.event; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.util.StackTracePrinter; import me.lucko.luckperms.common.util.gson.JArray; import me.lucko.luckperms.common.util.gson.JObject; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.expression.BooleanExpressionCompiler.VariableEvaluator; - import net.luckperms.api.cacheddata.Result; import net.luckperms.api.context.Context; import net.luckperms.api.query.QueryMode; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorRequest.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorRequest.java index 07af8e80b..f10f5c9d5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorRequest.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorRequest.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.webeditor; import com.google.common.base.Preconditions; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.context.serializer.ContextSetJsonSerializer; import me.lucko.luckperms.common.model.Group; @@ -45,7 +44,6 @@ import me.lucko.luckperms.common.util.gson.GsonProvider; import me.lucko.luckperms.common.util.gson.JArray; import me.lucko.luckperms.common.util.gson.JObject; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.Node; import net.luckperms.api.query.QueryOptions; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorResponse.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorResponse.java index 8cd9eb054..a4d5eeb8e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorResponse.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/WebEditorResponse.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.common.webeditor; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.access.ArgumentPermissions; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -46,7 +45,6 @@ import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.Difference; import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.webeditor.store.RemoteSession; - import net.kyori.adventure.text.Component; import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.cause.CreationCause; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/WebEditorSocket.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/WebEditorSocket.java index 221b502e0..c8a6d8320 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/WebEditorSocket.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/WebEditorSocket.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.webeditor.socket; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.http.BytesocksClient; import me.lucko.luckperms.common.http.UnsuccessfulRequestException; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerChangeRequest.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerChangeRequest.java index 9ccf5fb50..fe8bc20a2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerChangeRequest.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerChangeRequest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.webeditor.socket.listener; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.http.UnsuccessfulRequestException; import me.lucko.luckperms.common.locale.Message; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerConnected.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerConnected.java index 457d62913..204eae250 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerConnected.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerConnected.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.webeditor.socket.listener; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.webeditor.socket.SocketMessageType; import me.lucko.luckperms.common.webeditor.socket.WebEditorSocket; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerHello.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerHello.java index a5c239004..94f17515b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerHello.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerHello.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.webeditor.socket.listener; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.webeditor.socket.CryptographyUtils; import me.lucko.luckperms.common.webeditor.socket.SocketMessageType; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerPing.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerPing.java index 68fe75549..e17f33f42 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerPing.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/HandlerPing.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.webeditor.socket.listener; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.webeditor.socket.SocketMessageType; import me.lucko.luckperms.common.webeditor.socket.WebEditorSocket; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java index f3f23b3b4..6295a7288 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java @@ -26,17 +26,14 @@ package me.lucko.luckperms.common.webeditor.socket.listener; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.util.gson.GsonProvider; import me.lucko.luckperms.common.webeditor.socket.CryptographyUtils; import me.lucko.luckperms.common.webeditor.socket.SocketMessageType; import me.lucko.luckperms.common.webeditor.socket.WebEditorSocket; - -import org.checkerframework.checker.nullness.qual.NonNull; - import okhttp3.Response; import okhttp3.WebSocket; import okhttp3.WebSocketListener; +import org.checkerframework.checker.nullness.qual.NonNull; import java.io.EOFException; import java.security.PublicKey; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorKeystore.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorKeystore.java index ab64c4ae6..44c6de0ad 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorKeystore.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorKeystore.java @@ -32,7 +32,6 @@ import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.gson.GsonProvider; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeType; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java index 473983b42..7033a6b07 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.webeditor.store; import me.lucko.luckperms.common.webeditor.WebEditorRequest; - import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSocketMap.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSocketMap.java index 9462cc6dc..99e807010 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSocketMap.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSocketMap.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.webeditor.store; import com.github.benmanes.caffeine.cache.Cache; - import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.common.webeditor.socket.WebEditorSocket; diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorStore.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorStore.java index 421dc3fce..e92c51b0e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorStore.java +++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorStore.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.webeditor.store; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.webeditor.socket.CryptographyUtils; diff --git a/common/src/test/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateTest.java b/common/src/test/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateTest.java index 2a3245047..9520dfc12 100644 --- a/common/src/test/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/bulkupdate/BulkUpdateTest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.bulkupdate; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.bulkupdate.action.Action; import me.lucko.luckperms.common.bulkupdate.action.DeleteAction; import me.lucko.luckperms.common.bulkupdate.action.UpdateAction; @@ -36,9 +35,7 @@ import me.lucko.luckperms.common.bulkupdate.query.Query; import me.lucko.luckperms.common.bulkupdate.query.QueryField; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.common.node.types.Permission; - import net.luckperms.api.node.Node; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/common/src/test/java/me/lucko/luckperms/common/bulkupdate/ComparisonTest.java b/common/src/test/java/me/lucko/luckperms/common/bulkupdate/ComparisonTest.java index b2f8ea434..eee355de7 100644 --- a/common/src/test/java/me/lucko/luckperms/common/bulkupdate/ComparisonTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/bulkupdate/ComparisonTest.java @@ -26,14 +26,9 @@ package me.lucko.luckperms.common.bulkupdate; import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison; - -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.junit.jupiter.api.Assertions.assertEquals; public class ComparisonTest { diff --git a/common/src/test/java/me/lucko/luckperms/common/calculator/PermissionCalculatorTest.java b/common/src/test/java/me/lucko/luckperms/common/calculator/PermissionCalculatorTest.java index 1bac3431e..ecc87e1b6 100644 --- a/common/src/test/java/me/lucko/luckperms/common/calculator/PermissionCalculatorTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/calculator/PermissionCalculatorTest.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.calculator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractOverrideWildcardProcessor; @@ -44,10 +43,8 @@ import me.lucko.luckperms.common.treeview.PermissionRegistry; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.node.Node; import net.luckperms.api.util.Tristate; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/common/src/test/java/me/lucko/luckperms/common/context/ContextSetComparatorTest.java b/common/src/test/java/me/lucko/luckperms/common/context/ContextSetComparatorTest.java index 76a1a305d..e8041f93e 100644 --- a/common/src/test/java/me/lucko/luckperms/common/context/ContextSetComparatorTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/context/ContextSetComparatorTest.java @@ -26,11 +26,8 @@ package me.lucko.luckperms.common.context; import com.google.common.collect.Lists; - import me.lucko.luckperms.common.context.comparator.ContextSetComparator; - import net.luckperms.api.context.ImmutableContextSet; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/common/src/test/java/me/lucko/luckperms/common/context/ContextSetJsonSerializerTest.java b/common/src/test/java/me/lucko/luckperms/common/context/ContextSetJsonSerializerTest.java index 3adb4c51d..5202c5a7c 100644 --- a/common/src/test/java/me/lucko/luckperms/common/context/ContextSetJsonSerializerTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/context/ContextSetJsonSerializerTest.java @@ -28,12 +28,9 @@ package me.lucko.luckperms.common.context; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; - import me.lucko.luckperms.common.context.serializer.ContextSetJsonSerializer; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/common/src/test/java/me/lucko/luckperms/common/context/ImmutableContextSetTest.java b/common/src/test/java/me/lucko/luckperms/common/context/ImmutableContextSetTest.java index e73756792..e53867de7 100644 --- a/common/src/test/java/me/lucko/luckperms/common/context/ImmutableContextSetTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/context/ImmutableContextSetTest.java @@ -26,11 +26,9 @@ package me.lucko.luckperms.common.context; import com.google.common.collect.ImmutableSet; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.context.ImmutableContextSet; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/common/src/test/java/me/lucko/luckperms/common/event/EventGeneratorTest.java b/common/src/test/java/me/lucko/luckperms/common/event/EventGeneratorTest.java index acbab2fb4..1e409947c 100644 --- a/common/src/test/java/me/lucko/luckperms/common/event/EventGeneratorTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/event/EventGeneratorTest.java @@ -26,13 +26,11 @@ package me.lucko.luckperms.common.event; import me.lucko.luckperms.common.event.gen.GeneratedEventClass; - import net.luckperms.api.LuckPerms; import net.luckperms.api.event.LuckPermsEvent; import net.luckperms.api.event.player.PlayerDataSaveEvent; import net.luckperms.api.event.sync.PreSyncEvent; import net.luckperms.api.model.PlayerSaveResult; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/common/src/test/java/me/lucko/luckperms/common/locale/MessageTest.java b/common/src/test/java/me/lucko/luckperms/common/locale/MessageTest.java index 097be8e3f..8de84b4f9 100644 --- a/common/src/test/java/me/lucko/luckperms/common/locale/MessageTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/locale/MessageTest.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.locale; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.command.spec.Argument; import me.lucko.luckperms.common.command.spec.CommandSpec; @@ -44,7 +43,6 @@ import me.lucko.luckperms.common.node.types.Prefix; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.storage.Storage; - import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentIteratorFlag; @@ -61,7 +59,6 @@ import net.luckperms.api.node.types.ChatMetaNode; import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.node.types.MetaNode; import net.luckperms.api.platform.Platform; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/me/lucko/luckperms/common/locale/TranslationTest.java b/common/src/test/java/me/lucko/luckperms/common/locale/TranslationTest.java index 0a8d49ef3..8d95a9e28 100644 --- a/common/src/test/java/me/lucko/luckperms/common/locale/TranslationTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/locale/TranslationTest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.locale; import net.kyori.adventure.util.UTF8ResourceBundleControl; - import org.junit.jupiter.api.Test; import java.util.Locale; diff --git a/common/src/test/java/me/lucko/luckperms/common/model/GroupManagerTest.java b/common/src/test/java/me/lucko/luckperms/common/model/GroupManagerTest.java index a01f7c26d..e235c7cb3 100644 --- a/common/src/test/java/me/lucko/luckperms/common/model/GroupManagerTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/model/GroupManagerTest.java @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.model; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.model.manager.group.StandardGroupManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/common/src/test/java/me/lucko/luckperms/common/model/InheritanceTest.java b/common/src/test/java/me/lucko/luckperms/common/model/InheritanceTest.java index 572ea6018..0db100a0e 100644 --- a/common/src/test/java/me/lucko/luckperms/common/model/InheritanceTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/model/InheritanceTest.java @@ -36,9 +36,7 @@ import me.lucko.luckperms.common.node.types.Inheritance; import me.lucko.luckperms.common.node.types.Weight; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsImpl; - import net.luckperms.api.context.ContextSatisfyMode; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/me/lucko/luckperms/common/model/NodeMapTest.java b/common/src/test/java/me/lucko/luckperms/common/model/NodeMapTest.java index 0da67e4a3..bd61748b1 100644 --- a/common/src/test/java/me/lucko/luckperms/common/model/NodeMapTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/model/NodeMapTest.java @@ -28,13 +28,11 @@ package me.lucko.luckperms.common.model; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.model.nodemap.NodeMapMutable; import me.lucko.luckperms.common.node.factory.NodeBuilders; import me.lucko.luckperms.common.query.QueryOptionsBuilderImpl; import me.lucko.luckperms.common.util.Difference; - import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; @@ -45,7 +43,6 @@ import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryMode; import net.luckperms.api.query.QueryOptions; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/common/src/test/java/me/lucko/luckperms/common/model/PermissionHolderTest.java b/common/src/test/java/me/lucko/luckperms/common/model/PermissionHolderTest.java index 95416023e..695c6691a 100644 --- a/common/src/test/java/me/lucko/luckperms/common/model/PermissionHolderTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/model/PermissionHolderTest.java @@ -26,16 +26,13 @@ package me.lucko.luckperms.common.model; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.event.EventDispatcher; import me.lucko.luckperms.common.node.types.Permission; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataType; import net.luckperms.api.model.data.TemporaryNodeMergeStrategy; import net.luckperms.api.node.types.PermissionNode; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/common/src/test/java/me/lucko/luckperms/common/model/TrackManagerTest.java b/common/src/test/java/me/lucko/luckperms/common/model/TrackManagerTest.java index b9e6f4a7d..7f420e160 100644 --- a/common/src/test/java/me/lucko/luckperms/common/model/TrackManagerTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/model/TrackManagerTest.java @@ -26,10 +26,8 @@ package me.lucko.luckperms.common.model; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.model.manager.track.StandardTrackManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/common/src/test/java/me/lucko/luckperms/common/model/UserManagerTest.java b/common/src/test/java/me/lucko/luckperms/common/model/UserManagerTest.java index 2d58a0382..14e3b34d8 100644 --- a/common/src/test/java/me/lucko/luckperms/common/model/UserManagerTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/model/UserManagerTest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.model; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.config.LuckPermsConfiguration; import me.lucko.luckperms.common.event.EventDispatcher; @@ -36,7 +35,6 @@ import me.lucko.luckperms.common.node.types.Permission; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/common/src/test/java/me/lucko/luckperms/common/node/NodeBuildersTest.java b/common/src/test/java/me/lucko/luckperms/common/node/NodeBuildersTest.java index 95850ac31..b46011aea 100644 --- a/common/src/test/java/me/lucko/luckperms/common/node/NodeBuildersTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/node/NodeBuildersTest.java @@ -27,10 +27,8 @@ package me.lucko.luckperms.common.node; import me.lucko.luckperms.common.node.factory.NodeBuilders; import me.lucko.luckperms.common.node.types.Permission; - import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeBuilder; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; diff --git a/common/src/test/java/me/lucko/luckperms/common/node/NodeParseTest.java b/common/src/test/java/me/lucko/luckperms/common/node/NodeParseTest.java index 5f154818b..c4bab713c 100644 --- a/common/src/test/java/me/lucko/luckperms/common/node/NodeParseTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/node/NodeParseTest.java @@ -32,7 +32,6 @@ import me.lucko.luckperms.common.node.types.Prefix; 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 org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; diff --git a/common/src/test/java/me/lucko/luckperms/common/node/NodeTest.java b/common/src/test/java/me/lucko/luckperms/common/node/NodeTest.java index d20bdc3e8..94a84b307 100644 --- a/common/src/test/java/me/lucko/luckperms/common/node/NodeTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/node/NodeTest.java @@ -27,11 +27,9 @@ package me.lucko.luckperms.common.node; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.node.types.Permission; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.Node; import net.luckperms.api.node.metadata.NodeMetadataKey; - import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/common/src/test/java/me/lucko/luckperms/common/node/ShorthandParserTest.java b/common/src/test/java/me/lucko/luckperms/common/node/ShorthandParserTest.java index 33a62de7d..23b1c9968 100644 --- a/common/src/test/java/me/lucko/luckperms/common/node/ShorthandParserTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/node/ShorthandParserTest.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.node; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.node.utils.ShorthandParser; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/common/src/test/java/me/lucko/luckperms/common/storage/SqlStorageTest.java b/common/src/test/java/me/lucko/luckperms/common/storage/SqlStorageTest.java index 98bbd0cc9..bb9836882 100644 --- a/common/src/test/java/me/lucko/luckperms/common/storage/SqlStorageTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/storage/SqlStorageTest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.storage; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.actionlog.Log; import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.event.EventDispatcher; @@ -39,13 +38,10 @@ import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.storage.implementation.sql.SqlStorage; import me.lucko.luckperms.common.storage.implementation.sql.connection.ConnectionFactory; import me.lucko.luckperms.common.storage.implementation.sql.connection.file.NonClosableConnection; - import net.luckperms.api.actionlog.Action; import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.model.PlayerSaveResult.Outcome; import net.luckperms.api.node.Node; -import net.luckperms.api.node.types.PermissionNode; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -56,9 +52,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -73,7 +66,6 @@ import static org.mockito.AdditionalAnswers.answer; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) public class SqlStorageTest { diff --git a/common/src/test/java/me/lucko/luckperms/common/util/DifferenceTest.java b/common/src/test/java/me/lucko/luckperms/common/util/DifferenceTest.java index c42659de6..e4f819eaf 100644 --- a/common/src/test/java/me/lucko/luckperms/common/util/DifferenceTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/util/DifferenceTest.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.common.util; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.util.Difference.ChangeType; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/common/src/test/java/me/lucko/luckperms/common/util/DurationFormatterTest.java b/common/src/test/java/me/lucko/luckperms/common/util/DurationFormatterTest.java index a7d7b8079..ce1811315 100644 --- a/common/src/test/java/me/lucko/luckperms/common/util/DurationFormatterTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/util/DurationFormatterTest.java @@ -31,7 +31,6 @@ import net.kyori.adventure.text.renderer.TranslatableComponentRenderer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.kyori.adventure.translation.TranslationRegistry; import net.kyori.adventure.util.UTF8ResourceBundleControl; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/me/lucko/luckperms/common/util/EnumNamerTest.java b/common/src/test/java/me/lucko/luckperms/common/util/EnumNamerTest.java index c7d1c9411..5764c48e9 100644 --- a/common/src/test/java/me/lucko/luckperms/common/util/EnumNamerTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/util/EnumNamerTest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.util; import com.google.common.collect.ImmutableMap; - import org.junit.jupiter.api.Test; import java.util.Locale; diff --git a/common/src/test/java/me/lucko/luckperms/common/util/IteratorsTest.java b/common/src/test/java/me/lucko/luckperms/common/util/IteratorsTest.java index 8ae550b94..df70b349c 100644 --- a/common/src/test/java/me/lucko/luckperms/common/util/IteratorsTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/util/IteratorsTest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.util; import com.google.common.collect.ImmutableList; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/common/src/test/java/me/lucko/luckperms/common/util/PaginatedTest.java b/common/src/test/java/me/lucko/luckperms/common/util/PaginatedTest.java index 360d317b1..7a0ed3795 100644 --- a/common/src/test/java/me/lucko/luckperms/common/util/PaginatedTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/util/PaginatedTest.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.common.util; import com.google.common.collect.ImmutableList; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.CsvSource; diff --git a/common/src/test/java/me/lucko/luckperms/common/util/UniqueIdTypeTest.java b/common/src/test/java/me/lucko/luckperms/common/util/UniqueIdTypeTest.java index 0515f4606..e20dae47c 100644 --- a/common/src/test/java/me/lucko/luckperms/common/util/UniqueIdTypeTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/util/UniqueIdTypeTest.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.util; import me.lucko.luckperms.common.event.EventDispatcher; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/me/lucko/luckperms/common/verbose/BooleanExpressionTest.java b/common/src/test/java/me/lucko/luckperms/common/verbose/BooleanExpressionTest.java index 584e8978a..c151fe853 100644 --- a/common/src/test/java/me/lucko/luckperms/common/verbose/BooleanExpressionTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/verbose/BooleanExpressionTest.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.common.verbose; import me.lucko.luckperms.common.verbose.expression.BooleanExpressionCompiler; import me.lucko.luckperms.common.verbose.expression.BooleanExpressionCompiler.VariableEvaluator; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/common/src/test/java/me/lucko/luckperms/common/verbose/VerboseFilterTest.java b/common/src/test/java/me/lucko/luckperms/common/verbose/VerboseFilterTest.java index 5001ece74..bed0a6180 100644 --- a/common/src/test/java/me/lucko/luckperms/common/verbose/VerboseFilterTest.java +++ b/common/src/test/java/me/lucko/luckperms/common/verbose/VerboseFilterTest.java @@ -31,9 +31,7 @@ import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.verbose.event.CheckOrigin; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; - import net.luckperms.api.util.Tristate; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricCalculatorFactory.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricCalculatorFactory.java index 6fca4aceb..b1219527f 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricCalculatorFactory.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricCalculatorFactory.java @@ -36,7 +36,6 @@ import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.fabric.calculator.ServerOwnerProcessor; import me.lucko.luckperms.fabric.context.FabricContextManager; - import net.luckperms.api.query.QueryOptions; import java.util.ArrayList; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricClassPathAppender.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricClassPathAppender.java index 88403a80d..665d1ec97 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricClassPathAppender.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricClassPathAppender.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.fabric; import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender; - import net.fabricmc.loader.launch.common.FabricLauncherBase; import java.net.MalformedURLException; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricConfigAdapter.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricConfigAdapter.java index fbc07eb2c..a2fec3ef3 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricConfigAdapter.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricConfigAdapter.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.fabric; import me.lucko.luckperms.common.config.generic.adapter.ConfigurateConfigAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.hocon.HoconConfigurationLoader; import ninja.leaping.configurate.loader.ConfigurationLoader; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricEventBus.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricEventBus.java index 59a7d41b6..0799cb5ce 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricEventBus.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricEventBus.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.fabric; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.event.AbstractEventBus; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.fabricmc.loader.api.ModContainer; public class FabricEventBus extends AbstractEventBus { diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java index 1e3537c2d..d6a0713a9 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; import me.lucko.luckperms.fabric.model.MixinUser; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.luckperms.api.util.Tristate; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java index 468c7d8dc..6486ca86f 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java @@ -26,13 +26,11 @@ package me.lucko.luckperms.fabric; import com.mojang.authlib.GameProfile; - import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender; import me.lucko.luckperms.common.plugin.logging.Log4jPluginLogger; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; - import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.loader.api.FabricLoader; @@ -40,7 +38,6 @@ import net.fabricmc.loader.api.ModContainer; import net.luckperms.api.platform.Platform; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; - import org.apache.logging.log4j.LogManager; import java.io.IOException; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricPlugin.java b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricPlugin.java index b2d01b231..7834a4a54 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricPlugin.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricPlugin.java @@ -48,7 +48,6 @@ import me.lucko.luckperms.fabric.listeners.FabricConnectionListener; import me.lucko.luckperms.fabric.listeners.FabricOtherListeners; import me.lucko.luckperms.fabric.listeners.FabricPermissionsApiListener; import me.lucko.luckperms.fabric.messaging.FabricMessagingFactory; - import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.loader.api.ModContainer; import net.kyori.adventure.text.Component; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/calculator/ServerOwnerProcessor.java b/fabric/src/main/java/me/lucko/luckperms/fabric/calculator/ServerOwnerProcessor.java index 9426e7675..5282b0bb0 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/calculator/ServerOwnerProcessor.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/calculator/ServerOwnerProcessor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.fabric.calculator; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.util.Tristate; /** diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java index 39498db5b..cc6f97cee 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.fabric.model.MixinUser; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.query.OptionKey; import net.luckperms.api.query.QueryOptions; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java index e964e9e7a..87cfb368f 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricPlayerCalculator.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.util.EnumNamer; import me.lucko.luckperms.fabric.LPFabricPlugin; import me.lucko.luckperms.fabric.event.PlayerChangeWorldCallback; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; @@ -42,7 +41,6 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; import net.minecraft.world.GameMode; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.NotNull; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricAutoOpListener.java b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricAutoOpListener.java index 90ff6ffdf..9d7cc0a14 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricAutoOpListener.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricAutoOpListener.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.fabric.LPFabricPlugin; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.user.UserDataRecalculateEvent; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricCommandListUpdater.java b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricCommandListUpdater.java index 3fb1c6203..0d8c5e9d9 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricCommandListUpdater.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricCommandListUpdater.java @@ -26,13 +26,11 @@ package me.lucko.luckperms.fabric.listeners; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.common.api.implementation.ApiGroup; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.fabric.LPFabricPlugin; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.group.GroupDataRecalculateEvent; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricConnectionListener.java b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricConnectionListener.java index 624a3fe74..8eb106c4b 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricConnectionListener.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricConnectionListener.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.fabric.listeners; import com.mojang.authlib.GameProfile; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.locale.TranslationManager; @@ -36,7 +35,6 @@ import me.lucko.luckperms.fabric.FabricSenderFactory; import me.lucko.luckperms.fabric.LPFabricPlugin; import me.lucko.luckperms.fabric.mixin.ServerLoginNetworkHandlerAccessor; import me.lucko.luckperms.fabric.model.MixinUser; - import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents; import net.fabricmc.fabric.api.networking.v1.ServerLoginNetworking.LoginSynchronizer; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricOtherListeners.java b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricOtherListeners.java index 96f854bae..393b3bfba 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricOtherListeners.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricOtherListeners.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.fabric.LPFabricPlugin; import me.lucko.luckperms.fabric.event.PreExecuteCommandCallback; - import net.minecraft.server.command.ServerCommandSource; import java.util.regex.Pattern; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiListener.java b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiListener.java index 275076875..f25d84991 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiListener.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiListener.java @@ -37,14 +37,12 @@ import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.event.CheckOrigin; import me.lucko.luckperms.fabric.LPFabricPlugin; import me.lucko.luckperms.fabric.model.MixinUser; - import net.fabricmc.fabric.api.util.TriState; import net.luckperms.api.util.Tristate; import net.minecraft.command.CommandSource; import net.minecraft.entity.Entity; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Optional; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java index 9b207bc88..f86ac11a4 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java @@ -29,11 +29,9 @@ 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.fabric.LPFabricPlugin; - 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 FabricMessagingFactory extends MessagingFactory { diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java index 291b68fae..1a2b99f97 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java @@ -26,11 +26,9 @@ package me.lucko.luckperms.fabric.messaging; import com.google.common.collect.Iterables; - import me.lucko.luckperms.common.messaging.pluginmsg.AbstractPluginMessageMessenger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.fabric.LPFabricPlugin; - import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java index ac7659c14..5f5c5b438 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/CommandManagerMixin.java @@ -27,10 +27,8 @@ package me.lucko.luckperms.fabric.mixin; import com.mojang.brigadier.ParseResults; import me.lucko.luckperms.fabric.event.PreExecuteCommandCallback; - import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerLoginNetworkHandlerAccessor.java b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerLoginNetworkHandlerAccessor.java index 9d0db0c74..49a495ef9 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerLoginNetworkHandlerAccessor.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerLoginNetworkHandlerAccessor.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.fabric.mixin; import com.mojang.authlib.GameProfile; - import net.minecraft.server.network.ServerLoginNetworkHandler; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerPlayerEntityMixin.java b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerPlayerEntityMixin.java index fe3990dec..fc99d810e 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerPlayerEntityMixin.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/mixin/ServerPlayerEntityMixin.java @@ -34,13 +34,11 @@ import me.lucko.luckperms.common.verbose.event.CheckOrigin; import me.lucko.luckperms.fabric.context.FabricContextManager; import me.lucko.luckperms.fabric.event.PlayerChangeWorldCallback; import me.lucko.luckperms.fabric.model.MixinUser; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; import net.minecraft.network.packet.c2s.play.ClientSettingsC2SPacket; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/model/MixinUser.java b/fabric/src/main/java/me/lucko/luckperms/fabric/model/MixinUser.java index 370f212d6..291ebfb55 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/model/MixinUser.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/model/MixinUser.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.fabric.model; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.fabric.context.FabricContextManager; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/forge/loader/src/main/java/me/lucko/luckperms/forge/loader/ForgeLoaderPlugin.java b/forge/loader/src/main/java/me/lucko/luckperms/forge/loader/ForgeLoaderPlugin.java index 951311603..efa83d172 100644 --- a/forge/loader/src/main/java/me/lucko/luckperms/forge/loader/ForgeLoaderPlugin.java +++ b/forge/loader/src/main/java/me/lucko/luckperms/forge/loader/ForgeLoaderPlugin.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.forge.loader; import me.lucko.luckperms.common.loader.JarInJarClassLoader; import me.lucko.luckperms.common.loader.LoaderBootstrap; - import net.minecraftforge.fml.IExtensionPoint; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; @@ -37,7 +36,6 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.network.NetworkConstants; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/ForgeCommandExecutor.java b/forge/src/main/java/me/lucko/luckperms/forge/ForgeCommandExecutor.java index 4f959c6c1..43adc0e0d 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/ForgeCommandExecutor.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/ForgeCommandExecutor.java @@ -30,10 +30,8 @@ import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.tree.ArgumentCommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; - import me.lucko.luckperms.common.command.BrigadierCommandExecutor; import me.lucko.luckperms.common.sender.Sender; - import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.EntityArgument; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/ForgeConfigAdapter.java b/forge/src/main/java/me/lucko/luckperms/forge/ForgeConfigAdapter.java index a5d431a81..2d9464f24 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/ForgeConfigAdapter.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/ForgeConfigAdapter.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.forge; import me.lucko.luckperms.common.config.generic.adapter.ConfigurateConfigAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.hocon.HoconConfigurationLoader; import ninja.leaping.configurate.loader.ConfigurationLoader; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/ForgeEventBus.java b/forge/src/main/java/me/lucko/luckperms/forge/ForgeEventBus.java index 18228958b..d35fb7f22 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/ForgeEventBus.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/ForgeEventBus.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.forge; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.event.AbstractEventBus; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/ForgeSenderFactory.java b/forge/src/main/java/me/lucko/luckperms/forge/ForgeSenderFactory.java index e2c728f6b..8a8f63a2e 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/ForgeSenderFactory.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/ForgeSenderFactory.java @@ -35,7 +35,6 @@ import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.event.CheckOrigin; import me.lucko.luckperms.forge.capabilities.UserCapability; import me.lucko.luckperms.forge.capabilities.UserCapabilityImpl; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.luckperms.api.util.Tristate; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java b/forge/src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java index 54bad0744..25cb53fc5 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.forge; import com.mojang.authlib.GameProfile; - import me.lucko.luckperms.common.loader.LoaderBootstrap; import me.lucko.luckperms.common.plugin.bootstrap.BootstrappedWithLoader; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; @@ -36,7 +35,6 @@ import me.lucko.luckperms.common.plugin.logging.Log4jPluginLogger; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.forge.util.ForgeEventBusFacade; - import net.luckperms.api.platform.Platform; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -49,7 +47,6 @@ import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.forgespi.language.IModInfo; - import org.apache.logging.log4j.LogManager; import org.apache.maven.artifact.versioning.ArtifactVersion; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/LPForgePlugin.java b/forge/src/main/java/me/lucko/luckperms/forge/LPForgePlugin.java index 0e2326cdf..55356d5e9 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/LPForgePlugin.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/LPForgePlugin.java @@ -50,7 +50,6 @@ import me.lucko.luckperms.forge.listeners.ForgeConnectionListener; import me.lucko.luckperms.forge.listeners.ForgePlatformListener; import me.lucko.luckperms.forge.messaging.ForgeMessagingFactory; import me.lucko.luckperms.forge.service.ForgePermissionHandlerListener; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.luckperms.api.LuckPerms; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/calculator/ForgeCalculatorFactory.java b/forge/src/main/java/me/lucko/luckperms/forge/calculator/ForgeCalculatorFactory.java index b4450dade..8cdf33c30 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/calculator/ForgeCalculatorFactory.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/calculator/ForgeCalculatorFactory.java @@ -36,7 +36,6 @@ import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.forge.LPForgePlugin; import me.lucko.luckperms.forge.context.ForgeContextManager; - import net.luckperms.api.query.QueryOptions; import java.util.ArrayList; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/calculator/ServerOwnerProcessor.java b/forge/src/main/java/me/lucko/luckperms/forge/calculator/ServerOwnerProcessor.java index a78471135..7ec513487 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/calculator/ServerOwnerProcessor.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/calculator/ServerOwnerProcessor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.forge.calculator; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.util.Tristate; /** diff --git a/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityImpl.java b/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityImpl.java index a9cd8d2e1..540a83a93 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityImpl.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityImpl.java @@ -31,13 +31,11 @@ import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.verbose.event.CheckOrigin; import me.lucko.luckperms.forge.context.ForgeContextManager; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraftforge.common.util.LazyOptional; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityListener.java b/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityListener.java index 8a54108c1..a97a69445 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityListener.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapabilityListener.java @@ -36,7 +36,6 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/context/ForgeContextManager.java b/forge/src/main/java/me/lucko/luckperms/forge/context/ForgeContextManager.java index 2a10fe4cf..1e5069079 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/context/ForgeContextManager.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/context/ForgeContextManager.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; import me.lucko.luckperms.forge.LPForgePlugin; import me.lucko.luckperms.forge.capabilities.UserCapabilityImpl; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.query.OptionKey; import net.luckperms.api.query.QueryOptions; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/context/ForgePlayerCalculator.java b/forge/src/main/java/me/lucko/luckperms/forge/context/ForgePlayerCalculator.java index 356a54575..6f37ec65d 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/context/ForgePlayerCalculator.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/context/ForgePlayerCalculator.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.forge.context; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.forge.LPForgePlugin; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; @@ -44,7 +43,6 @@ import net.minecraft.world.level.GameType; import net.minecraft.world.level.storage.ServerLevelData; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; - import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Set; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeAutoOpListener.java b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeAutoOpListener.java index fbb975002..949046a37 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeAutoOpListener.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeAutoOpListener.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.forge.LPForgePlugin; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.user.UserDataRecalculateEvent; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeCommandListUpdater.java b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeCommandListUpdater.java index 9a534a209..b97bd1dba 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeCommandListUpdater.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeCommandListUpdater.java @@ -26,13 +26,11 @@ package me.lucko.luckperms.forge.listeners; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.common.api.implementation.ApiGroup; import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.forge.LPForgePlugin; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.group.GroupDataRecalculateEvent; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeConnectionListener.java b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeConnectionListener.java index 2cd283097..fad2eca18 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeConnectionListener.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgeConnectionListener.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.forge.listeners; import com.mojang.authlib.GameProfile; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.locale.TranslationManager; @@ -35,7 +34,6 @@ import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.forge.ForgeSenderFactory; import me.lucko.luckperms.forge.LPForgePlugin; import me.lucko.luckperms.forge.capabilities.UserCapabilityImpl; - import net.kyori.adventure.text.Component; import net.minecraft.core.UUIDUtil; import net.minecraft.network.Connection; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgePlatformListener.java b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgePlatformListener.java index 22fe6385c..5f06396a3 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgePlatformListener.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/listeners/ForgePlatformListener.java @@ -28,12 +28,10 @@ package me.lucko.luckperms.forge.listeners; import com.mojang.brigadier.context.CommandContextBuilder; import com.mojang.brigadier.context.ParsedCommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.forge.LPForgePlugin; import me.lucko.luckperms.forge.util.BrigadierInjector; - import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.server.players.ServerOpList; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java b/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java index a0c07d566..26852ba64 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java @@ -29,11 +29,9 @@ 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.forge.LPForgePlugin; - 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 ForgeMessagingFactory extends MessagingFactory { diff --git a/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java b/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java index f3cda3635..ece83b802 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java @@ -26,11 +26,10 @@ package me.lucko.luckperms.forge.messaging; import com.google.common.collect.Iterables; - +import io.netty.buffer.Unpooled; import me.lucko.luckperms.common.messaging.pluginmsg.AbstractPluginMessageMessenger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.forge.LPForgePlugin; - import net.luckperms.api.messenger.IncomingMessageConsumer; import net.luckperms.api.messenger.Messenger; import net.minecraft.network.FriendlyByteBuf; @@ -43,8 +42,6 @@ import net.minecraft.server.players.PlayerList; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.event.EventNetworkChannel; -import io.netty.buffer.Unpooled; - import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java b/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java index 3e5005b86..dcb89efba 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.verbose.event.CheckOrigin; import me.lucko.luckperms.forge.LPForgeBootstrap; import me.lucko.luckperms.forge.LPForgePlugin; import me.lucko.luckperms.forge.capabilities.UserCapabilityImpl; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.query.QueryMode; import net.luckperms.api.query.QueryOptions; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandlerListener.java b/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandlerListener.java index 315cb9e43..c4fa08aeb 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandlerListener.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandlerListener.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.forge.service; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.forge.LPForgePlugin; - import net.minecraftforge.common.ForgeConfig; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/util/BrigadierInjector.java b/forge/src/main/java/me/lucko/luckperms/forge/util/BrigadierInjector.java index 9f27e7af7..61c74c5f1 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/util/BrigadierInjector.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/util/BrigadierInjector.java @@ -28,13 +28,11 @@ package me.lucko.luckperms.forge.util; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; - import me.lucko.luckperms.common.graph.Graph; import me.lucko.luckperms.common.graph.TraversalAlgorithm; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.forge.capabilities.UserCapability; import me.lucko.luckperms.forge.capabilities.UserCapabilityImpl; - import net.luckperms.api.util.Tristate; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerPlayer; diff --git a/forge/src/main/java/me/lucko/luckperms/forge/util/ForgeEventBusFacade.java b/forge/src/main/java/me/lucko/luckperms/forge/util/ForgeEventBusFacade.java index 3c6ea378c..a13337240 100644 --- a/forge/src/main/java/me/lucko/luckperms/forge/util/ForgeEventBusFacade.java +++ b/forge/src/main/java/me/lucko/luckperms/forge/util/ForgeEventBusFacade.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.forge.util; import me.lucko.luckperms.common.loader.JarInJarClassLoader; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.GenericEvent; diff --git a/nukkit/loader/src/main/java/me/lucko/luckperms/nukkit/loader/NukkitLoaderPlugin.java b/nukkit/loader/src/main/java/me/lucko/luckperms/nukkit/loader/NukkitLoaderPlugin.java index 8f8cb1abc..e9efde91e 100644 --- a/nukkit/loader/src/main/java/me/lucko/luckperms/nukkit/loader/NukkitLoaderPlugin.java +++ b/nukkit/loader/src/main/java/me/lucko/luckperms/nukkit/loader/NukkitLoaderPlugin.java @@ -25,11 +25,10 @@ package me.lucko.luckperms.nukkit.loader; +import cn.nukkit.plugin.PluginBase; import me.lucko.luckperms.common.loader.JarInJarClassLoader; import me.lucko.luckperms.common.loader.LoaderBootstrap; -import cn.nukkit.plugin.PluginBase; - public class NukkitLoaderPlugin extends PluginBase { private static final String JAR_NAME = "luckperms-nukkit.jarinjar"; private static final String BOOTSTRAP_CLASS = "me.lucko.luckperms.nukkit.LPNukkitBootstrap"; 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 8dc90ad22..bdac4e7ee 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java @@ -25,19 +25,17 @@ package me.lucko.luckperms.nukkit; +import cn.nukkit.Player; +import cn.nukkit.Server; +import cn.nukkit.plugin.PluginBase; import me.lucko.luckperms.common.loader.LoaderBootstrap; import me.lucko.luckperms.common.plugin.bootstrap.BootstrappedWithLoader; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender; import me.lucko.luckperms.common.plugin.classpath.JarInJarClassPathAppender; import me.lucko.luckperms.common.plugin.logging.PluginLogger; - import net.luckperms.api.platform.Platform; -import cn.nukkit.Player; -import cn.nukkit.Server; -import cn.nukkit.plugin.PluginBase; - import java.nio.file.Path; import java.time.Instant; import java.util.ArrayList; 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 843a7d17d..27ecf50bc 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java @@ -25,6 +25,13 @@ package me.lucko.luckperms.nukkit; +import cn.nukkit.Player; +import cn.nukkit.command.PluginCommand; +import cn.nukkit.permission.Permission; +import cn.nukkit.plugin.PluginBase; +import cn.nukkit.plugin.PluginManager; +import cn.nukkit.plugin.service.ServicePriority; +import cn.nukkit.utils.Config; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -55,18 +62,9 @@ import me.lucko.luckperms.nukkit.inject.server.LuckPermsSubscriptionMap; import me.lucko.luckperms.nukkit.listeners.NukkitAutoOpListener; import me.lucko.luckperms.nukkit.listeners.NukkitConnectionListener; import me.lucko.luckperms.nukkit.listeners.NukkitPlatformListener; - import net.luckperms.api.LuckPerms; import net.luckperms.api.query.QueryOptions; -import cn.nukkit.Player; -import cn.nukkit.command.PluginCommand; -import cn.nukkit.permission.Permission; -import cn.nukkit.plugin.PluginBase; -import cn.nukkit.plugin.PluginManager; -import cn.nukkit.plugin.service.ServicePriority; -import cn.nukkit.utils.Config; - import java.util.Optional; import java.util.stream.Stream; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java index c4622f50c..f9a03dfad 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java @@ -25,10 +25,6 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.common.command.CommandManager; -import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; -import me.lucko.luckperms.common.sender.Sender; - import cn.nukkit.command.Command; import cn.nukkit.command.CommandExecutor; import cn.nukkit.command.CommandSender; @@ -37,6 +33,9 @@ import cn.nukkit.command.PluginCommand; import cn.nukkit.event.EventHandler; import cn.nukkit.event.Listener; import cn.nukkit.event.server.ServerCommandEvent; +import me.lucko.luckperms.common.command.CommandManager; +import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; +import me.lucko.luckperms.common.sender.Sender; import java.util.List; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitConfigAdapter.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitConfigAdapter.java index e53c0b08f..8e390caf3 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitConfigAdapter.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitConfigAdapter.java @@ -25,11 +25,10 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; -import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import cn.nukkit.utils.Config; import cn.nukkit.utils.ConfigSection; +import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; +import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import java.io.File; import java.util.HashMap; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitEventBus.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitEventBus.java index aea3613c0..c901a89c9 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitEventBus.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitEventBus.java @@ -25,13 +25,12 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.common.api.LuckPermsApiProvider; -import me.lucko.luckperms.common.event.AbstractEventBus; - import cn.nukkit.event.EventHandler; import cn.nukkit.event.Listener; import cn.nukkit.event.plugin.PluginDisableEvent; import cn.nukkit.plugin.Plugin; +import me.lucko.luckperms.common.api.LuckPermsApiProvider; +import me.lucko.luckperms.common.event.AbstractEventBus; public class NukkitEventBus extends AbstractEventBus implements Listener { public NukkitEventBus(LPNukkitPlugin plugin, LuckPermsApiProvider apiProvider) { diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitPluginLogger.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitPluginLogger.java index 454814532..d5bcbe509 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitPluginLogger.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitPluginLogger.java @@ -25,9 +25,8 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.common.plugin.logging.PluginLogger; - import cn.nukkit.utils.Logger; +import me.lucko.luckperms.common.plugin.logging.PluginLogger; public class NukkitPluginLogger implements PluginLogger { private final Logger logger; 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 dd2126b84..93ffb4b16 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java @@ -25,17 +25,15 @@ package me.lucko.luckperms.nukkit; -import me.lucko.luckperms.common.locale.TranslationManager; -import me.lucko.luckperms.common.sender.Sender; -import me.lucko.luckperms.common.sender.SenderFactory; - -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import net.luckperms.api.util.Tristate; - import cn.nukkit.Player; import cn.nukkit.command.CommandSender; import cn.nukkit.command.ConsoleCommandSender; +import me.lucko.luckperms.common.locale.TranslationManager; +import me.lucko.luckperms.common.sender.Sender; +import me.lucko.luckperms.common.sender.SenderFactory; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; +import net.luckperms.api.util.Tristate; import java.util.Locale; import java.util.UUID; 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 53c479ded..824457e80 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 @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractSourceBasedProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import net.luckperms.api.util.Tristate; import java.util.Collections; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultPermissionMapProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultPermissionMapProcessor.java index 2e7a9c398..59f123544 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultPermissionMapProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultPermissionMapProcessor.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import net.luckperms.api.util.Tristate; /** 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 e2a5aad76..a2549a0d6 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 @@ -37,7 +37,6 @@ import me.lucko.luckperms.common.config.ConfigKeys; 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; import java.util.ArrayList; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/OpProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/OpProcessor.java index c2c9b61e3..e2570dff0 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/OpProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/OpProcessor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.nukkit.calculator; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; - import net.luckperms.api.util.Tristate; /** diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/PermissionMapProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/PermissionMapProcessor.java index d287c647d..9f0674371 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/PermissionMapProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/PermissionMapProcessor.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.calculator.processor.AbstractOverrideWildcardPr import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.inject.PermissionDefault; - import net.luckperms.api.util.Tristate; /** 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 4cacd3c5c..b6cf7c502 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 @@ -25,21 +25,18 @@ package me.lucko.luckperms.nukkit.context; +import cn.nukkit.Player; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; 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.UUID; import java.util.concurrent.TimeUnit; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java index 82df303b5..b54c562a4 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java @@ -25,19 +25,6 @@ package me.lucko.luckperms.nukkit.context; -import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.context.ImmutableContextSetImpl; -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - -import net.luckperms.api.context.Context; -import net.luckperms.api.context.ContextCalculator; -import net.luckperms.api.context.ContextConsumer; -import net.luckperms.api.context.ContextSet; -import net.luckperms.api.context.DefaultContextKeys; -import net.luckperms.api.context.ImmutableContextSet; - -import org.checkerframework.checker.nullness.qual.NonNull; - import cn.nukkit.Player; import cn.nukkit.Server; import cn.nukkit.event.EventHandler; @@ -46,6 +33,16 @@ import cn.nukkit.event.Listener; import cn.nukkit.event.entity.EntityLevelChangeEvent; import cn.nukkit.event.player.PlayerGameModeChangeEvent; import cn.nukkit.level.Level; +import me.lucko.luckperms.common.config.ConfigKeys; +import me.lucko.luckperms.common.context.ImmutableContextSetImpl; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; +import net.luckperms.api.context.Context; +import net.luckperms.api.context.ContextCalculator; +import net.luckperms.api.context.ContextConsumer; +import net.luckperms.api.context.ContextSet; +import net.luckperms.api.context.DefaultContextKeys; +import net.luckperms.api.context.ImmutableContextSet; +import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Locale; import java.util.Set; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java index b1180d658..a3f184fcf 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java @@ -25,9 +25,8 @@ package me.lucko.luckperms.nukkit.inject; -import org.checkerframework.checker.nullness.qual.Nullable; - import cn.nukkit.permission.Permission; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.HashMap; import java.util.Locale; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/DummyPermissibleBase.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/DummyPermissibleBase.java index 8257c371a..1f67723c7 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/DummyPermissibleBase.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/DummyPermissibleBase.java @@ -25,13 +25,12 @@ package me.lucko.luckperms.nukkit.inject.permissible; -import me.lucko.luckperms.common.util.EmptyCollections; - import cn.nukkit.permission.PermissibleBase; import cn.nukkit.permission.Permission; import cn.nukkit.permission.PermissionAttachment; import cn.nukkit.permission.PermissionAttachmentInfo; import cn.nukkit.plugin.Plugin; +import me.lucko.luckperms.common.util.EmptyCollections; import java.lang.reflect.Field; import java.util.Collections; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java index 81db6d90d..11f469f2a 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java @@ -25,9 +25,14 @@ package me.lucko.luckperms.nukkit.inject.permissible; +import cn.nukkit.Player; +import cn.nukkit.permission.PermissibleBase; +import cn.nukkit.permission.Permission; +import cn.nukkit.permission.PermissionAttachment; +import cn.nukkit.permission.PermissionAttachmentInfo; +import cn.nukkit.plugin.Plugin; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; @@ -37,20 +42,11 @@ import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.calculator.OpProcessor; import me.lucko.luckperms.nukkit.calculator.PermissionMapProcessor; import me.lucko.luckperms.nukkit.inject.PermissionDefault; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import cn.nukkit.Player; -import cn.nukkit.permission.PermissibleBase; -import cn.nukkit.permission.Permission; -import cn.nukkit.permission.PermissionAttachment; -import cn.nukkit.permission.PermissionAttachmentInfo; -import cn.nukkit.plugin.Plugin; - import java.lang.reflect.Field; import java.util.Collection; import java.util.Iterator; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissionAttachment.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissionAttachment.java index 811edef3f..65ed6055f 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissionAttachment.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissionAttachment.java @@ -25,23 +25,20 @@ package me.lucko.luckperms.nukkit.inject.permissible; +import cn.nukkit.permission.Permission; +import cn.nukkit.permission.PermissionAttachment; +import cn.nukkit.permission.PermissionRemovedExecutor; +import cn.nukkit.plugin.Plugin; import com.google.common.base.Preconditions; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.node.factory.NodeBuilders; - import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeBuilder; import net.luckperms.api.node.metadata.NodeMetadataKey; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; -import cn.nukkit.permission.Permission; -import cn.nukkit.permission.PermissionAttachment; -import cn.nukkit.permission.PermissionRemovedExecutor; -import cn.nukkit.plugin.Plugin; - import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; 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 f74bdd9e4..2db971959 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,21 +25,19 @@ package me.lucko.luckperms.nukkit.inject.permissible; +import cn.nukkit.permission.PermissibleBase; +import cn.nukkit.permission.Permission; +import cn.nukkit.permission.PermissionAttachment; +import cn.nukkit.permission.PermissionAttachmentInfo; +import cn.nukkit.plugin.Plugin; import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import net.luckperms.api.util.Tristate; -import cn.nukkit.permission.PermissibleBase; -import cn.nukkit.permission.Permission; -import cn.nukkit.permission.PermissionAttachment; -import cn.nukkit.permission.PermissionAttachmentInfo; -import cn.nukkit.plugin.Plugin; - import java.util.Map; /** diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleMonitoringInjector.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleMonitoringInjector.java index 604d313cb..ad95030bf 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleMonitoringInjector.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleMonitoringInjector.java @@ -25,10 +25,9 @@ package me.lucko.luckperms.nukkit.inject.permissible; -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import cn.nukkit.command.ConsoleCommandSender; import cn.nukkit.permission.PermissibleBase; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; import java.lang.reflect.Field; import java.util.Objects; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorDefaultsMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorDefaultsMap.java index a53e9063b..6fda212d0 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorDefaultsMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorDefaultsMap.java @@ -25,13 +25,11 @@ package me.lucko.luckperms.nukkit.inject.server; -import com.google.common.collect.ImmutableMap; - -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import cn.nukkit.Server; import cn.nukkit.permission.Permission; import cn.nukkit.plugin.PluginManager; +import com.google.common.collect.ImmutableMap; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorPermissionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorPermissionMap.java index 23c47914f..d78da28cf 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorPermissionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorPermissionMap.java @@ -25,11 +25,10 @@ package me.lucko.luckperms.nukkit.inject.server; -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import cn.nukkit.Server; import cn.nukkit.permission.Permission; import cn.nukkit.plugin.PluginManager; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorSubscriptionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorSubscriptionMap.java index 691020dcb..17c240595 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorSubscriptionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/InjectorSubscriptionMap.java @@ -25,11 +25,10 @@ package me.lucko.luckperms.nukkit.inject.server; -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import cn.nukkit.Server; import cn.nukkit.permission.Permissible; import cn.nukkit.plugin.PluginManager; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; import java.lang.reflect.Field; import java.util.Map; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java index a632cb8b3..ff2ce74ea 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java @@ -25,18 +25,14 @@ package me.lucko.luckperms.nukkit.inject.server; -import com.google.common.collect.ForwardingMap; -import com.google.common.collect.ImmutableMap; - -import me.lucko.luckperms.common.cache.Cache; -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - -import net.luckperms.api.util.Tristate; - -import org.checkerframework.checker.nullness.qual.NonNull; - import cn.nukkit.permission.Permission; import cn.nukkit.plugin.PluginManager; +import com.google.common.collect.ForwardingMap; +import com.google.common.collect.ImmutableMap; +import me.lucko.luckperms.common.cache.Cache; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; +import net.luckperms.api.util.Tristate; +import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collections; import java.util.HashMap; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java index 10ca83e72..a276b48c8 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java @@ -25,19 +25,16 @@ package me.lucko.luckperms.nukkit.inject.server; +import cn.nukkit.permission.Permission; +import cn.nukkit.plugin.PluginManager; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.treeview.PermissionRegistry; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import cn.nukkit.permission.Permission; -import cn.nukkit.plugin.PluginManager; - import java.lang.reflect.Field; import java.util.Collections; import java.util.HashMap; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java index bb6277a64..1c3846b74 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java @@ -25,16 +25,13 @@ package me.lucko.luckperms.nukkit.inject.server; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - -import org.checkerframework.checker.nullness.qual.NonNull; - import cn.nukkit.Player; import cn.nukkit.permission.Permissible; import cn.nukkit.plugin.PluginManager; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; +import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collection; import java.util.Collections; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitAutoOpListener.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitAutoOpListener.java index 499077fd2..8a7792f72 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitAutoOpListener.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitAutoOpListener.java @@ -25,18 +25,16 @@ package me.lucko.luckperms.nukkit.listeners; +import cn.nukkit.Player; import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.user.UserDataRecalculateEvent; import net.luckperms.api.query.QueryOptions; -import cn.nukkit.Player; - import java.util.Map; /** diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java index c6e3aa732..b12432af2 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitConnectionListener.java @@ -25,6 +25,13 @@ package me.lucko.luckperms.nukkit.listeners; +import cn.nukkit.Player; +import cn.nukkit.event.EventHandler; +import cn.nukkit.event.EventPriority; +import cn.nukkit.event.Listener; +import cn.nukkit.event.player.PlayerAsyncPreLoginEvent; +import cn.nukkit.event.player.PlayerLoginEvent; +import cn.nukkit.event.player.PlayerQuitEvent; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.locale.TranslationManager; @@ -33,18 +40,9 @@ import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.inject.permissible.LuckPermsPermissible; import me.lucko.luckperms.nukkit.inject.permissible.PermissibleInjector; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import cn.nukkit.Player; -import cn.nukkit.event.EventHandler; -import cn.nukkit.event.EventPriority; -import cn.nukkit.event.Listener; -import cn.nukkit.event.player.PlayerAsyncPreLoginEvent; -import cn.nukkit.event.player.PlayerLoginEvent; -import cn.nukkit.event.player.PlayerQuitEvent; - import java.util.Collections; import java.util.HashSet; import java.util.Set; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitPlatformListener.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitPlatformListener.java index 722bf9a0d..1b6e2dd21 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitPlatformListener.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/listeners/NukkitPlatformListener.java @@ -25,10 +25,6 @@ package me.lucko.luckperms.nukkit.listeners; -import me.lucko.luckperms.common.config.ConfigKeys; -import me.lucko.luckperms.common.locale.Message; -import me.lucko.luckperms.nukkit.LPNukkitPlugin; - import cn.nukkit.command.CommandSender; import cn.nukkit.event.Cancellable; import cn.nukkit.event.EventHandler; @@ -36,6 +32,9 @@ import cn.nukkit.event.Listener; import cn.nukkit.event.player.PlayerCommandPreprocessEvent; import cn.nukkit.event.server.RemoteServerCommandEvent; import cn.nukkit.event.server.ServerCommandEvent; +import me.lucko.luckperms.common.config.ConfigKeys; +import me.lucko.luckperms.common.locale.Message; +import me.lucko.luckperms.nukkit.LPNukkitPlugin; import java.util.Locale; import java.util.regex.Pattern; diff --git a/sponge/loader/src/main/java/me/lucko/luckperms/sponge/loader/SpongeLoaderPlugin.java b/sponge/loader/src/main/java/me/lucko/luckperms/sponge/loader/SpongeLoaderPlugin.java index 90710d013..233ca6f00 100644 --- a/sponge/loader/src/main/java/me/lucko/luckperms/sponge/loader/SpongeLoaderPlugin.java +++ b/sponge/loader/src/main/java/me/lucko/luckperms/sponge/loader/SpongeLoaderPlugin.java @@ -27,10 +27,8 @@ package me.lucko.luckperms.sponge.loader; import com.google.inject.Inject; import com.google.inject.Injector; - import me.lucko.luckperms.common.loader.JarInJarClassLoader; import me.lucko.luckperms.common.loader.LoaderBootstrap; - import org.spongepowered.api.Server; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.Order; diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/DescriptionBuilder.java b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/DescriptionBuilder.java index 072813bcf..ce9e7ac9a 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/DescriptionBuilder.java +++ b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/DescriptionBuilder.java @@ -31,10 +31,8 @@ import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; - import net.kyori.adventure.text.Component; import net.luckperms.api.util.Tristate; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.api.service.permission.PermissionDescription; diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionDescriptionProxy.java b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionDescriptionProxy.java index 9212a53df..df708117e 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionDescriptionProxy.java +++ b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionDescriptionProxy.java @@ -29,9 +29,7 @@ import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject; - import net.kyori.adventure.text.Component; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.service.permission.PermissionDescription; diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionServiceProxy.java b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionServiceProxy.java index 10629063f..0a161db5e 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionServiceProxy.java +++ b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionServiceProxy.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.proxy.api8; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.PermissionAndContextService; @@ -34,7 +33,6 @@ import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.event.Cause; import org.spongepowered.api.service.context.Context; diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectCollectionProxy.java b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectCollectionProxy.java index e054193ab..5da7051f8 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectCollectionProxy.java +++ b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectCollectionProxy.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.event.Cause; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectDataProxy.java b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectDataProxy.java index a9e1d21dc..a860eafe5 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectDataProxy.java +++ b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectDataProxy.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.proxy.api8; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.util.CompletableFutures; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.CompatibilityUtil; @@ -35,7 +34,6 @@ import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject; 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 org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.api.service.context.Context; diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectProxy.java b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectProxy.java index f80280e2e..843e55bdd 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectProxy.java +++ b/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectProxy.java @@ -32,9 +32,7 @@ import me.lucko.luckperms.sponge.service.model.LPProxiedSubject; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import me.lucko.luckperms.sponge.service.model.LPSubjectUser; - import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.entity.living.player.server.ServerPlayer; import org.spongepowered.api.event.Cause; 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 7cd3111d6..ae330a791 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 @@ -26,16 +26,13 @@ package me.lucko.luckperms.sponge.service; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.context.ContextImpl; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.sponge.service.context.ForwardingContextSet; import me.lucko.luckperms.sponge.service.context.ForwardingImmutableContextSet; - import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.util.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/ForwardingContextSet.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingContextSet.java index a153e6443..9c7af22a1 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingContextSet.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingContextSet.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.context; import net.luckperms.api.context.ContextSet; - import org.spongepowered.api.service.context.Context; import java.util.Set; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java index c0377e10f..fa2eb332e 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.context; import net.luckperms.api.context.ImmutableContextSet; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.service.context.Context; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java index 24b0b39fa..bcbff5a3c 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.model; import net.kyori.adventure.text.Component; - import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.plugin.PluginContainer; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java index 1eed19a27..08d2d6ebb 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java @@ -27,15 +27,12 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.sponge.service.PermissionAndContextService; import me.lucko.luckperms.sponge.service.reference.SubjectReferenceFactory; - import net.kyori.adventure.text.Component; import net.luckperms.api.context.ImmutableContextSet; - import org.spongepowered.api.entity.living.player.server.ServerPlayer; import org.spongepowered.api.event.Cause; import org.spongepowered.api.service.context.ContextCalculator; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java index c717401af..d5f0664fc 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.model; import net.luckperms.api.query.QueryOptions; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.service.permission.Subject; 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 42c5daa68..90d103257 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 @@ -26,13 +26,10 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.model.PermissionHolderIdentifier; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; - import org.spongepowered.api.service.permission.Subject; import java.util.Optional; 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 a94e0b109..955dd7526 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 @@ -28,10 +28,8 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.query.dataorder.DataQueryOrder; - import org.spongepowered.api.service.permission.SubjectCollection; import java.util.Optional; 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 35014f268..11c869983 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 @@ -27,11 +27,9 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.util.Tristate; - import org.spongepowered.api.service.permission.SubjectData; import java.util.concurrent.CompletableFuture; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java index 6586f8fb6..e00202db4 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.sponge.service.reference; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/SubjectReferenceFactory.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/SubjectReferenceFactory.java index 2a92f2e53..87b8dfd42 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/SubjectReferenceFactory.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/SubjectReferenceFactory.java @@ -27,13 +27,11 @@ package me.lucko.luckperms.sponge.service.reference; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.base.Splitter; - import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPProxiedSubject; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import org.spongepowered.api.service.permission.Subject; import org.spongepowered.api.service.permission.SubjectReference; 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 3b91e497d..e48271856 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge; import com.google.inject.Inject; import com.google.inject.Injector; - import me.lucko.luckperms.common.loader.LoaderBootstrap; import me.lucko.luckperms.common.plugin.bootstrap.BootstrappedWithLoader; import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; @@ -36,9 +35,7 @@ import me.lucko.luckperms.common.plugin.classpath.JarInJarClassPathAppender; import me.lucko.luckperms.common.plugin.logging.Log4jPluginLogger; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.util.MoreFiles; - import net.luckperms.api.platform.Platform; - import org.apache.logging.log4j.Logger; import org.spongepowered.api.Game; import org.spongepowered.api.Platform.Component; 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 655ed6a7d..b1d60eb13 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java @@ -55,12 +55,10 @@ import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.persisted.PersistedCollection; import me.lucko.luckperms.sponge.tasks.ServiceCacheHousekeepingTask; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.luckperms.api.LuckPerms; import net.luckperms.api.query.QueryOptions; - import org.spongepowered.api.command.Command; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.lifecycle.ProvideServiceEvent; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java index 3467d539b..3d4ea5654 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java @@ -29,9 +29,7 @@ import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.sender.Sender; - import net.kyori.adventure.text.Component; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.command.Command; import org.spongepowered.api.command.CommandCause; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfigAdapter.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfigAdapter.java index 592f20cd4..6e517bab8 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfigAdapter.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfigAdapter.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.sponge; import me.lucko.luckperms.common.config.generic.adapter.ConfigurateConfigAdapter; import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.hocon.HoconConfigurationLoader; import ninja.leaping.configurate.loader.ConfigurationLoader; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeEventBus.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeEventBus.java index 105eae51d..4c00b4c4a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeEventBus.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeEventBus.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.event.AbstractEventBus; - import org.spongepowered.api.Sponge; import org.spongepowered.plugin.PluginContainer; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java index ba73077da..29a024f0e 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSchedulerAdapter.java @@ -26,11 +26,9 @@ package me.lucko.luckperms.sponge; import com.google.common.base.Suppliers; - import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.common.util.Iterators; - import org.spongepowered.api.Game; import org.spongepowered.api.scheduler.ScheduledTask; import org.spongepowered.api.scheduler.Scheduler; 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 06bc24700..ac585a945 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java @@ -29,11 +29,9 @@ import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; import me.lucko.luckperms.sponge.service.CompatibilityUtil; - import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; import net.luckperms.api.util.Tristate; - import org.spongepowered.api.SystemSubject; import org.spongepowered.api.command.exception.CommandException; import org.spongepowered.api.entity.living.player.Player; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedTypeDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedTypeDefaultsProcessor.java index 7846e6d82..0a6ef248c 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedTypeDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/FixedTypeDefaultsProcessor.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.calculator; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; - import net.luckperms.api.query.QueryOptions; public class FixedTypeDefaultsProcessor extends TypeDefaultsProcessor { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupTypeDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupTypeDefaultsProcessor.java index 830162893..c3c03dee3 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupTypeDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/GroupTypeDefaultsProcessor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.sponge.calculator; 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 GroupTypeDefaultsProcessor extends TypeDefaultsProcessor implements PermissionProcessor { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/RootDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/RootDefaultsProcessor.java index 0d8aac0e6..d87128b3d 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/RootDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/RootDefaultsProcessor.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.calculator.processor.AbstractOverrideWildcardProcessor; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.sponge.service.model.LPPermissionService; - import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; 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 f55d15745..ac7044c9b 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 @@ -36,7 +36,6 @@ import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.HolderType; import me.lucko.luckperms.sponge.LPSpongePlugin; - import net.luckperms.api.query.QueryOptions; import java.util.ArrayList; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/TypeDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/TypeDefaultsProcessor.java index 99af378ca..373d3a8b5 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/TypeDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/TypeDefaultsProcessor.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.calculator.processor.AbstractOverrideWildcardPr 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; import net.luckperms.api.util.Tristate; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserTypeDefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserTypeDefaultsProcessor.java index de5d7da3c..fcb874481 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserTypeDefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/UserTypeDefaultsProcessor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.sponge.calculator; 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 UserTypeDefaultsProcessor extends TypeDefaultsProcessor implements PermissionProcessor { 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 07a82264d..6722f92d4 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 @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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; public class OptionClear extends ChildCommand { 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 655da0e72..585e05175 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.commands; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.command.abstraction.ChildCommand; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.command.spec.CommandSpec; @@ -35,7 +34,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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.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 c634b6792..ab133562a 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 @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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; public class OptionSet extends ChildCommand { 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 58833481d..be3a939d2 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 @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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; public class OptionUnset extends ChildCommand { 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 2866ce6d3..586036369 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 @@ -36,7 +36,6 @@ 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.context.ImmutableContextSet; public class ParentAdd extends ChildCommand { 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 7e391b1b3..340316a92 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 @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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; public class ParentClear extends ChildCommand { 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 416ee30a9..52915fa33 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.commands; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.command.abstraction.ChildCommand; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.command.spec.CommandSpec; @@ -36,7 +35,6 @@ import me.lucko.luckperms.common.sender.Sender; 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; 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 4c8455fcb..e35d834f7 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 @@ -36,7 +36,6 @@ 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.context.ImmutableContextSet; public class ParentRemove extends ChildCommand { 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 641134493..229abed1d 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 @@ -33,7 +33,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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; public class PermissionClear extends ChildCommand { 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 a045af377..1ff407810 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.commands; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.command.abstraction.ChildCommand; import me.lucko.luckperms.common.command.access.CommandPermission; import me.lucko.luckperms.common.command.spec.CommandSpec; @@ -35,7 +34,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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.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 9dc9e00a3..cc9fc5ae1 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 @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; 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.util.Tristate; 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 c6b943038..8efd4a49b 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 @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.command.utils.ArgumentList; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.luckperms.api.context.ContextSet; import net.luckperms.api.util.Tristate; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeParentCommand.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeParentCommand.java index 12df23de3..8a4768581 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeParentCommand.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeParentCommand.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.commands; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.command.abstraction.ChildCommand; import me.lucko.luckperms.common.command.abstraction.Command; import me.lucko.luckperms.common.command.abstraction.CommandException; 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 371d96c52..2fa491800 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.context; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.InlineQueryOptionsSupplier; import me.lucko.luckperms.common.context.manager.QueryOptionsSupplier; @@ -34,13 +33,11 @@ import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.sponge.LPSpongePlugin; import me.lucko.luckperms.sponge.service.model.ContextCalculatorProxy; import me.lucko.luckperms.sponge.service.model.TemporaryCauseHolderSubject; - import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.StaticContextCalculator; import net.luckperms.api.query.QueryOptions; - import org.spongepowered.api.entity.living.player.server.ServerPlayer; import org.spongepowered.api.event.Cause; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java index 993021521..ede7aef76 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java @@ -28,14 +28,12 @@ package me.lucko.luckperms.sponge.context; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.sponge.LPSpongePlugin; - import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.Game; import org.spongepowered.api.ResourceKey; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeCommandListUpdater.java b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeCommandListUpdater.java index 8f0a28bef..a91691493 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeCommandListUpdater.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeCommandListUpdater.java @@ -26,16 +26,13 @@ package me.lucko.luckperms.sponge.listeners; import com.github.benmanes.caffeine.cache.LoadingCache; - import me.lucko.luckperms.common.cache.BufferedRequest; import me.lucko.luckperms.common.event.LuckPermsEventListener; import me.lucko.luckperms.common.util.CaffeineFactory; import me.lucko.luckperms.sponge.LPSpongePlugin; - import net.luckperms.api.event.EventBus; import net.luckperms.api.event.context.ContextUpdateEvent; import net.luckperms.api.event.user.UserDataRecalculateEvent; - import org.spongepowered.api.command.manager.CommandManager; import org.spongepowered.api.entity.living.player.server.ServerPlayer; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java index 3a929ed7a..63de33d21 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java @@ -31,7 +31,6 @@ import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.sponge.LPSpongePlugin; - import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.Order; import org.spongepowered.api.event.filter.IsCancelled; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongePlatformListener.java b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongePlatformListener.java index 6184d10ca..feb8f60cc 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongePlatformListener.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongePlatformListener.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.listeners; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.sponge.LPSpongePlugin; - import org.spongepowered.api.command.CommandCause; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.command.ExecuteCommandEvent; 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 f9b54d84c..37c3a258f 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 @@ -26,13 +26,10 @@ package me.lucko.luckperms.sponge.messaging; import com.google.common.collect.Iterables; - import me.lucko.luckperms.common.messaging.pluginmsg.AbstractPluginMessageMessenger; import me.lucko.luckperms.sponge.LPSpongePlugin; - import net.luckperms.api.messenger.IncomingMessageConsumer; import net.luckperms.api.messenger.Messenger; - import org.spongepowered.api.ResourceKey; import org.spongepowered.api.entity.living.player.server.ServerPlayer; import org.spongepowered.api.network.EngineConnectionSide; 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 88b84d0a1..186936a2d 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 @@ -29,11 +29,9 @@ 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 5c9c351b6..a011ce14a 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 @@ -31,7 +31,6 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.model.manager.group.AbstractGroupManager; import me.lucko.luckperms.common.node.matcher.StandardNodeMatchers; @@ -45,12 +44,10 @@ import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.node.Node; import net.luckperms.api.util.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 10d6aa60f..1219c5484 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 @@ -31,7 +31,6 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; - import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.model.manager.user.AbstractUserManager; import me.lucko.luckperms.common.model.manager.user.UserHousekeeper; @@ -46,11 +45,9 @@ import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.Node; import net.luckperms.api.util.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/LuckPermsService.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java index 8a47af6d1..259bca26b 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.service; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.util.Predicates; @@ -48,10 +47,8 @@ import me.lucko.luckperms.sponge.service.model.persisted.DefaultsCollection; import me.lucko.luckperms.sponge.service.model.persisted.PersistedCollection; import me.lucko.luckperms.sponge.service.model.persisted.SubjectStorage; import me.lucko.luckperms.sponge.service.reference.SubjectReferenceFactory; - import net.kyori.adventure.text.Component; import net.luckperms.api.context.ImmutableContextSet; - import org.spongepowered.api.entity.living.player.server.ServerPlayer; import org.spongepowered.api.event.Cause; import org.spongepowered.api.event.permission.SubjectDataUpdateEvent; 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 5bec3ce32..5fa3dbb23 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 @@ -36,9 +36,7 @@ import me.lucko.luckperms.sponge.service.proxy.api8.PermissionServiceProxy; import me.lucko.luckperms.sponge.service.proxy.api8.SubjectCollectionProxy; import me.lucko.luckperms.sponge.service.proxy.api8.SubjectDataProxy; import me.lucko.luckperms.sponge.service.proxy.api8.SubjectProxy; - import net.luckperms.api.model.data.DataType; - import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.api.service.permission.SubjectCollection; import org.spongepowered.api.service.permission.SubjectData; 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 ca419d4e4..7430ffb70 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.service.inheritance; 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/ContextCalculatorProxy.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/ContextCalculatorProxy.java index a7d2d089a..1c5b74bfa 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/ContextCalculatorProxy.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/ContextCalculatorProxy.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.sponge.service.model; import me.lucko.luckperms.common.context.calculator.ForwardingContextCalculator; - import net.luckperms.api.context.ContextConsumer; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.event.Cause; import org.spongepowered.api.event.EventContext; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java index a2af9021f..eef979ee6 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java @@ -26,9 +26,7 @@ package me.lucko.luckperms.sponge.service.model; import me.lucko.luckperms.sponge.service.ProxyFactory; - import net.kyori.adventure.text.Component; - import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.plugin.PluginContainer; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java index 68f736a26..9dd44a10a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.model; import me.lucko.luckperms.sponge.LPSpongePlugin; - import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.event.Cause; import org.spongepowered.api.event.EventContext; 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 3f8864096..98fd97ab5 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.graph.TraversalAlgorithm; @@ -36,7 +35,6 @@ import me.lucko.luckperms.sponge.LPSpongePlugin; 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.Node; import net.luckperms.api.node.types.MetaNode; 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 9172dd839..9509ea9a3 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.cacheddata.AbstractCachedDataManager; import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator; @@ -42,7 +41,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.sponge.calculator.FixedTypeDefaultsProcessor; import me.lucko.luckperms.sponge.calculator.RootDefaultsProcessor; - import net.luckperms.api.metastacking.DuplicateRemovalFunction; import net.luckperms.api.metastacking.MetaStackDefinition; import net.luckperms.api.node.ChatMetaType; 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 ea688e7a0..20d0a31ae 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 @@ -28,7 +28,6 @@ package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.comparator.ContextSetComparator; import me.lucko.luckperms.common.model.InheritanceOrigin; @@ -39,7 +38,6 @@ import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import net.luckperms.api.context.ContextSatisfyMode; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; @@ -49,7 +47,6 @@ import net.luckperms.api.node.types.MetaNode; import net.luckperms.api.node.types.PermissionNode; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; - 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 408c5da58..800cee826 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 @@ -28,7 +28,6 @@ package me.lucko.luckperms.sponge.service.model.calculated; 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.data.DataType; import net.luckperms.api.util.Tristate; 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 98b307876..b98f33b74 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 @@ -26,7 +26,6 @@ package me.lucko.luckperms.sponge.service.model.permissionholder; import com.google.common.collect.ImmutableList; - import me.lucko.luckperms.common.cacheddata.type.MetaCache; import me.lucko.luckperms.common.graph.TraversalAlgorithm; import me.lucko.luckperms.common.inheritance.InheritanceGraph; @@ -43,12 +42,10 @@ import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPProxiedSubject; 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.data.DataType; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Tristate; - import org.spongepowered.api.service.permission.PermissionService; import java.util.Optional; 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 f6a19f8e3..f490f5dda 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 @@ -27,7 +27,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.common.cacheddata.type.MetaAccumulator; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; @@ -44,7 +43,6 @@ import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.ChatMetaType; @@ -55,7 +53,6 @@ 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.util.Tristate; - 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/permissionholder/UserSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/UserSubject.java index 921c9a394..95afabba9 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/UserSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/UserSubject.java @@ -31,7 +31,6 @@ import me.lucko.luckperms.sponge.model.SpongeUser; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectUser; - import org.spongepowered.api.Sponge; import org.spongepowered.api.entity.living.player.server.ServerPlayer; 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 859d8b23b..05b1ef6d6 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 @@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.cache.LoadingMap; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.common.util.ImmutableCollectors; @@ -39,10 +38,8 @@ import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.util.Tristate; - import org.spongepowered.api.service.permission.SubjectCollection; import java.util.Locale; 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 bc15b38a2..612e0665b 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 @@ -35,7 +35,6 @@ import me.lucko.luckperms.sponge.service.model.LPSubject; 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.data.DataType; import java.io.IOException; 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 39d94eeff..18d418bb5 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 @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.service.model.persisted; import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.model.calculated.MonitoredSubjectData; - import net.luckperms.api.model.data.DataType; /** 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 3d8808c75..4b402dcf1 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 @@ -31,14 +31,12 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.context.comparator.ContextSetComparator; import me.lucko.luckperms.common.context.serializer.ContextSetJsonSerializer; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import me.lucko.luckperms.sponge.service.model.calculated.CalculatedSubjectData; - import net.luckperms.api.context.ImmutableContextSet; import java.util.ArrayList; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectStorage.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectStorage.java index 717c9cd05..866905504 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectStorage.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/persisted/SubjectStorage.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge.service.model.persisted; import com.google.common.collect.ImmutableSet; import com.google.gson.JsonObject; - import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.util.MoreFiles; import me.lucko.luckperms.common.util.gson.GsonProvider; diff --git a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/LuckPermsApplication.java b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/LuckPermsApplication.java index 312611e4e..11043b7a0 100644 --- a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/LuckPermsApplication.java +++ b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/LuckPermsApplication.java @@ -31,9 +31,7 @@ import me.lucko.luckperms.standalone.app.integration.ShutdownCallback; import me.lucko.luckperms.standalone.app.utils.DockerCommandSocket; import me.lucko.luckperms.standalone.app.utils.HeartbeatHttpServer; import me.lucko.luckperms.standalone.app.utils.TerminalInterface; - import net.luckperms.api.LuckPerms; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/integration/SingletonPlayer.java b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/integration/SingletonPlayer.java index 9e195ffd1..cf6b64c8a 100644 --- a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/integration/SingletonPlayer.java +++ b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/integration/SingletonPlayer.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.standalone.app.integration; import me.lucko.luckperms.standalone.app.LuckPermsApplication; import me.lucko.luckperms.standalone.app.utils.AnsiUtils; - import net.kyori.adventure.text.Component; import java.util.UUID; diff --git a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/AnsiUtils.java b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/AnsiUtils.java index ab2ac5086..048831e32 100644 --- a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/AnsiUtils.java +++ b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/AnsiUtils.java @@ -34,7 +34,6 @@ import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.ansi.ANSIComponentRenderer; import net.kyori.ansi.StyleOps; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/HeartbeatHttpServer.java b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/HeartbeatHttpServer.java index 5338bd9f5..912b4be4d 100644 --- a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/HeartbeatHttpServer.java +++ b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/HeartbeatHttpServer.java @@ -29,9 +29,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; - import me.lucko.luckperms.standalone.app.integration.HealthReporter; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/TerminalInterface.java b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/TerminalInterface.java index 1981326cb..856d7e1a4 100644 --- a/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/TerminalInterface.java +++ b/standalone/app/src/main/java/me/lucko/luckperms/standalone/app/utils/TerminalInterface.java @@ -27,9 +27,7 @@ package me.lucko.luckperms.standalone.app.utils; import me.lucko.luckperms.standalone.app.LuckPermsApplication; import me.lucko.luckperms.standalone.app.integration.CommandExecutor; - import net.minecrell.terminalconsole.SimpleTerminalConsole; - import org.jline.reader.Candidate; import org.jline.reader.LineReader; import org.jline.reader.LineReaderBuilder; diff --git a/standalone/build.gradle b/standalone/build.gradle index 157d3f051..1b4f63228 100644 --- a/standalone/build.gradle +++ b/standalone/build.gradle @@ -35,7 +35,7 @@ dependencies { testImplementation 'com.h2database:h2:2.1.214' testImplementation 'mysql:mysql-connector-java:8.0.23' testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.2' - testImplementation 'org.mongodb:mongodb-driver-sync:4.5.0' + testImplementation 'org.mongodb:mongodb-driver-legacy:4.5.0' testImplementation 'me.lucko.configurate:configurate-toml:3.7' testImplementation 'org.spongepowered:configurate-hocon:3.7.2' testImplementation 'org.yaml:snakeyaml:1.28' diff --git a/standalone/loader/src/main/java/me/lucko/luckperms/standalone/loader/StandaloneLoader.java b/standalone/loader/src/main/java/me/lucko/luckperms/standalone/loader/StandaloneLoader.java index 2a384bd47..5657e78f7 100644 --- a/standalone/loader/src/main/java/me/lucko/luckperms/standalone/loader/StandaloneLoader.java +++ b/standalone/loader/src/main/java/me/lucko/luckperms/standalone/loader/StandaloneLoader.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.loader.JarInJarClassLoader; import me.lucko.luckperms.common.loader.LoaderBootstrap; import me.lucko.luckperms.standalone.app.LuckPermsApplication; import me.lucko.luckperms.standalone.app.integration.ShutdownCallback; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandaloneBootstrap.java b/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandaloneBootstrap.java index 2287b5b19..d43ba7614 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandaloneBootstrap.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandaloneBootstrap.java @@ -33,9 +33,7 @@ import me.lucko.luckperms.common.plugin.classpath.JarInJarClassPathAppender; import me.lucko.luckperms.common.plugin.logging.Log4jPluginLogger; import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.standalone.app.LuckPermsApplication; - import net.luckperms.api.platform.Platform; - import org.jetbrains.annotations.VisibleForTesting; import java.nio.file.Path; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandalonePlugin.java b/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandalonePlugin.java index bc714410a..f084b168b 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandalonePlugin.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/LPStandalonePlugin.java @@ -43,7 +43,6 @@ import me.lucko.luckperms.standalone.app.integration.SingletonPlayer; import me.lucko.luckperms.standalone.stub.StandaloneContextManager; import me.lucko.luckperms.standalone.stub.StandaloneDummyConnectionListener; import me.lucko.luckperms.standalone.stub.StandaloneEventBus; - import net.luckperms.api.LuckPerms; import net.luckperms.api.query.QueryOptions; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneCalculatorFactory.java b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneCalculatorFactory.java index 571af1838..1819b0326 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneCalculatorFactory.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneCalculatorFactory.java @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.calculator.processor.RegexProcessor; import me.lucko.luckperms.common.calculator.processor.SpongeWildcardProcessor; import me.lucko.luckperms.common.calculator.processor.WildcardProcessor; import me.lucko.luckperms.common.config.ConfigKeys; - import net.luckperms.api.query.QueryOptions; import java.util.ArrayList; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneConfigAdapter.java b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneConfigAdapter.java index 3071c6778..abb3860a4 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneConfigAdapter.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneConfigAdapter.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.standalone; import me.lucko.luckperms.common.config.generic.adapter.ConfigurateConfigAdapter; import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.loader.ConfigurationLoader; import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneDependencyPreloader.java b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneDependencyPreloader.java index d2305f511..0d68297c2 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneDependencyPreloader.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneDependencyPreloader.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.standalone; import com.google.common.util.concurrent.ThreadFactoryBuilder; - import me.lucko.luckperms.common.dependencies.Dependency; import me.lucko.luckperms.common.dependencies.DependencyManager; import me.lucko.luckperms.common.dependencies.DependencyManagerImpl; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneHealthReporter.java b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneHealthReporter.java index 4eadad16b..6bf89818b 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneHealthReporter.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneHealthReporter.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.standalone; import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.standalone.app.integration.HealthReporter; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneMessagingFactory.java b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneMessagingFactory.java index 1b4cb3350..d0771f84d 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneMessagingFactory.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneMessagingFactory.java @@ -25,7 +25,6 @@ package me.lucko.luckperms.standalone; -import me.lucko.luckperms.standalone.LPStandalonePlugin; import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.common.messaging.MessagingFactory; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneSenderFactory.java b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneSenderFactory.java index d7fbc7b3e..254dc50a3 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneSenderFactory.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/StandaloneSenderFactory.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.standalone; import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.sender.SenderFactory; import me.lucko.luckperms.standalone.app.integration.SingletonPlayer; - import net.kyori.adventure.text.Component; import net.luckperms.api.util.Tristate; diff --git a/standalone/src/main/java/me/lucko/luckperms/standalone/stub/StandaloneContextManager.java b/standalone/src/main/java/me/lucko/luckperms/standalone/stub/StandaloneContextManager.java index 0c25f2dd9..43cfde390 100644 --- a/standalone/src/main/java/me/lucko/luckperms/standalone/stub/StandaloneContextManager.java +++ b/standalone/src/main/java/me/lucko/luckperms/standalone/stub/StandaloneContextManager.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; import me.lucko.luckperms.standalone.LPStandalonePlugin; import me.lucko.luckperms.standalone.app.integration.SingletonPlayer; - import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.query.QueryOptions; diff --git a/standalone/src/test/java/me/lucko/luckperms/standalone/IntegrationTest.java b/standalone/src/test/java/me/lucko/luckperms/standalone/IntegrationTest.java index 9481d1b55..278dacb58 100644 --- a/standalone/src/test/java/me/lucko/luckperms/standalone/IntegrationTest.java +++ b/standalone/src/test/java/me/lucko/luckperms/standalone/IntegrationTest.java @@ -31,10 +31,8 @@ import me.lucko.luckperms.common.node.types.Permission; import me.lucko.luckperms.standalone.app.integration.CommandExecutor; import me.lucko.luckperms.standalone.app.integration.HealthReporter; import me.lucko.luckperms.standalone.utils.TestPluginProvider; - import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeEqualityPredicate; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/standalone/src/test/java/me/lucko/luckperms/standalone/MessagingIntegrationTest.java b/standalone/src/test/java/me/lucko/luckperms/standalone/MessagingIntegrationTest.java index 2bc50e739..037988829 100644 --- a/standalone/src/test/java/me/lucko/luckperms/standalone/MessagingIntegrationTest.java +++ b/standalone/src/test/java/me/lucko/luckperms/standalone/MessagingIntegrationTest.java @@ -26,13 +26,10 @@ package me.lucko.luckperms.standalone; import com.google.common.collect.ImmutableMap; - import me.lucko.luckperms.common.messaging.InternalMessagingService; import me.lucko.luckperms.standalone.app.integration.HealthReporter; import me.lucko.luckperms.standalone.utils.TestPluginProvider; - import net.luckperms.api.event.sync.PreNetworkSyncEvent; - import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -51,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @Testcontainers -//@Tag("docker") +@Tag("docker") public class MessagingIntegrationTest { private static void testMessaging(Map config, Path tempDirA, Path tempDirB) throws InterruptedException { diff --git a/standalone/src/test/java/me/lucko/luckperms/standalone/StorageIntegrationTest.java b/standalone/src/test/java/me/lucko/luckperms/standalone/StorageIntegrationTest.java index 50e759e0b..bbf63ad64 100644 --- a/standalone/src/test/java/me/lucko/luckperms/standalone/StorageIntegrationTest.java +++ b/standalone/src/test/java/me/lucko/luckperms/standalone/StorageIntegrationTest.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.standalone; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.node.types.Inheritance; import me.lucko.luckperms.common.node.types.Permission; @@ -36,13 +35,10 @@ import me.lucko.luckperms.standalone.app.integration.HealthReporter; import me.lucko.luckperms.standalone.utils.TestPluginBootstrap; import me.lucko.luckperms.standalone.utils.TestPluginBootstrap.TestPlugin; import me.lucko.luckperms.standalone.utils.TestPluginProvider; - import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.Node; - import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.testcontainers.containers.GenericContainer; @@ -59,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @Testcontainers -@Tag("docker") +//@Tag("docker") public class StorageIntegrationTest { private static final Node TEST_PERMISSION = Permission.builder() diff --git a/standalone/src/test/java/me/lucko/luckperms/standalone/utils/TestPluginProvider.java b/standalone/src/test/java/me/lucko/luckperms/standalone/utils/TestPluginProvider.java index 42b18a702..89f6ba076 100644 --- a/standalone/src/test/java/me/lucko/luckperms/standalone/utils/TestPluginProvider.java +++ b/standalone/src/test/java/me/lucko/luckperms/standalone/utils/TestPluginProvider.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.standalone.utils; import me.lucko.luckperms.standalone.app.LuckPermsApplication; import me.lucko.luckperms.standalone.utils.TestPluginBootstrap.TestPlugin; - import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import java.nio.file.Path; 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 6dc3a9209..d548153e0 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityBootstrap.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityBootstrap.java @@ -34,15 +34,12 @@ import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; - import me.lucko.luckperms.common.plugin.bootstrap.LuckPermsBootstrap; import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender; 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.nio.file.Path; 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 f3bb1ff8a..a8430298c 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java @@ -46,7 +46,6 @@ import me.lucko.luckperms.velocity.context.VelocityPlayerCalculator; 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.context.DefaultContextKeys; import net.luckperms.api.query.QueryOptions; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java index 7f93f3b06..560077586 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.velocity; import com.velocitypowered.api.command.RawCommand; import com.velocitypowered.api.proxy.ConsoleCommandSource; import com.velocitypowered.api.proxy.ProxyServer; - import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.sender.Sender; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityConfigAdapter.java b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityConfigAdapter.java index 9e21cecd4..a5df89716 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityConfigAdapter.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityConfigAdapter.java @@ -28,7 +28,6 @@ package me.lucko.luckperms.velocity; import me.lucko.luckperms.common.config.generic.adapter.ConfigurateConfigAdapter; import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; - import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.loader.ConfigurationLoader; import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityEventBus.java b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityEventBus.java index 2393a41d3..14def5829 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityEventBus.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityEventBus.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.velocity; import com.velocitypowered.api.plugin.PluginContainer; - import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.event.AbstractEventBus; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java index 33e458240..4c945e1da 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySchedulerAdapter.java @@ -26,7 +26,6 @@ package me.lucko.luckperms.velocity; import com.velocitypowered.api.scheduler.ScheduledTask; - import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask; import me.lucko.luckperms.common.util.Iterators; 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 1728ec885..61e3b3ab4 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java @@ -28,13 +28,11 @@ package me.lucko.luckperms.velocity; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.ConsoleCommandSource; import com.velocitypowered.api.proxy.Player; - import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.sender.SenderFactory; import me.lucko.luckperms.velocity.service.CompatibilityUtil; import me.lucko.luckperms.velocity.util.AdventureCompat; - import net.kyori.adventure.text.Component; import net.luckperms.api.util.Tristate; 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 694eebf39..92f8383cc 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 @@ -35,7 +35,6 @@ import me.lucko.luckperms.common.calculator.processor.SpongeWildcardProcessor; 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; import java.util.ArrayList; 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 33ed407b0..add4b7501 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 @@ -27,13 +27,11 @@ package me.lucko.luckperms.velocity.context; import com.github.benmanes.caffeine.cache.LoadingCache; import com.velocitypowered.api.proxy.Player; - import me.lucko.luckperms.common.context.manager.ContextManager; import me.lucko.luckperms.common.context.manager.QueryOptionsCache; import me.lucko.luckperms.common.context.manager.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; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java index 14b0b79f4..55b1f4297 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java @@ -31,17 +31,14 @@ import com.velocitypowered.api.event.player.ServerConnectedEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.velocity.LPVelocityPlugin; - import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; - import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.NotNull; 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 730f5b875..a559cadfb 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 @@ -32,16 +32,13 @@ import com.velocitypowered.api.permission.PermissionFunction; import com.velocitypowered.api.permission.PermissionProvider; import com.velocitypowered.api.permission.PermissionSubject; import com.velocitypowered.api.proxy.Player; - import me.lucko.luckperms.common.cacheddata.result.TristateResult; import me.lucko.luckperms.common.query.QueryOptionsImpl; import me.lucko.luckperms.common.verbose.VerboseCheckTarget; import me.lucko.luckperms.common.verbose.event.CheckOrigin; import me.lucko.luckperms.velocity.LPVelocityPlugin; import me.lucko.luckperms.velocity.service.CompatibilityUtil; - import net.luckperms.api.util.Tristate; - import org.checkerframework.checker.nullness.qual.NonNull; public class MonitoringPermissionCheckListener { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/VelocityConnectionListener.java b/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/VelocityConnectionListener.java index 02028f794..ee92eab25 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/VelocityConnectionListener.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/VelocityConnectionListener.java @@ -32,7 +32,6 @@ import com.velocitypowered.api.event.connection.DisconnectEvent; import com.velocitypowered.api.event.connection.LoginEvent; import com.velocitypowered.api.event.permission.PermissionsSetupEvent; import com.velocitypowered.api.proxy.Player; - import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.locale.TranslationManager; 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 f83b72989..acc76755d 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 @@ -33,10 +33,8 @@ import com.velocitypowered.api.proxy.ProxyServer; 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.common.messaging.pluginmsg.AbstractPluginMessageMessenger; import me.lucko.luckperms.velocity.LPVelocityPlugin; - import net.luckperms.api.messenger.IncomingMessageConsumer; import net.luckperms.api.messenger.Messenger; 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 33c6b21d8..bdd700047 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 @@ -29,11 +29,9 @@ 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/PlayerPermissionProvider.java b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java index b1756f389..2c872e2e0 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java @@ -31,11 +31,9 @@ import com.velocitypowered.api.permission.PermissionProvider; import com.velocitypowered.api.permission.PermissionSubject; import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; - import me.lucko.luckperms.common.context.manager.QueryOptionsSupplier; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.verbose.event.CheckOrigin; - import org.checkerframework.checker.nullness.qual.NonNull; public class PlayerPermissionProvider implements PermissionProvider, PermissionFunction { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/util/AdventureCompat.java b/velocity/src/main/java/me/lucko/luckperms/velocity/util/AdventureCompat.java index 1bda0c98c..db9bafc3c 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/util/AdventureCompat.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/util/AdventureCompat.java @@ -27,7 +27,6 @@ package me.lucko.luckperms.velocity.util; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.ResultedEvent.ComponentResult; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;