From 86aadf2cf8491ad552add3b5ee1ba51a3ccd4efb Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 23 Nov 2019 12:59:40 +0000 Subject: [PATCH] A few more small API changes --- .../api/cacheddata/CachedPermissionData.java | 2 +- .../api/event/extension/ExtensionLoadEvent.java | 2 +- .../api/event/group/GroupCacheLoadEvent.java | 2 +- .../luckperms/api/event/group/GroupCreateEvent.java | 2 +- .../api/event/group/GroupDataRecalculateEvent.java | 2 +- .../luckperms/api/event/group/GroupDeleteEvent.java | 2 +- .../luckperms/api/event/group/GroupLoadEvent.java | 2 +- .../luckperms/api/event/log/LogBroadcastEvent.java | 4 ++-- .../api/event/log/LogNetworkPublishEvent.java | 4 ++-- .../net/luckperms/api/event/log/LogNotifyEvent.java | 4 ++-- .../net/luckperms/api/event/log/LogPublishEvent.java | 4 ++-- .../net/luckperms/api/event/log/LogReceiveEvent.java | 2 +- .../net/luckperms/api/event/node/NodeAddEvent.java | 2 +- .../luckperms/api/event/node/NodeMutateEvent.java | 2 +- .../luckperms/api/event/node/NodeRemoveEvent.java | 2 +- .../api/event/player/PlayerDataSaveEvent.java | 2 +- .../api/event/player/PlayerLoginProcessEvent.java | 2 +- .../api/event/sync/PreNetworkSyncEvent.java | 4 ++-- .../net/luckperms/api/event/sync/PreSyncEvent.java | 2 +- .../luckperms/api/event/track/TrackCreateEvent.java | 2 +- .../luckperms/api/event/track/TrackDeleteEvent.java | 2 +- .../luckperms/api/event/track/TrackLoadEvent.java | 2 +- .../api/event/track/mutate/TrackAddGroupEvent.java | 2 +- .../api/event/track/mutate/TrackMutateEvent.java | 2 +- .../event/track/mutate/TrackRemoveGroupEvent.java | 2 +- .../luckperms/api/event/{ => type}/Cancellable.java | 12 +++++++----- .../net/luckperms/api/event/{ => type}/Sourced.java | 5 +++-- .../luckperms/api/event/user/UserCacheLoadEvent.java | 2 +- .../api/event/user/UserDataRecalculateEvent.java | 2 +- .../api/event/user/UserFirstLoginEvent.java | 2 +- .../net/luckperms/api/event/user/UserLoadEvent.java | 2 +- .../api/event/user/track/UserTrackEvent.java | 4 ++-- .../net/luckperms/api/event/{ => util}/Param.java | 4 ++-- .../java/net/luckperms/api/model/data/NodeMap.java | 2 +- .../net/luckperms/api/{node => util}/Tristate.java | 4 ++-- .../lucko/luckperms/bukkit/BukkitSenderFactory.java | 2 +- .../luckperms/bukkit/calculator/ChildProcessor.java | 2 +- .../bukkit/calculator/DefaultsProcessor.java | 2 +- .../bukkit/inject/permissible/LPPermissible.java | 2 +- .../inject/permissible/MonitoredPermissibleBase.java | 2 +- .../bukkit/inject/server/LPDefaultsMap.java | 2 +- .../bukkit/vault/LuckPermsVaultPermission.java | 2 +- .../lucko/luckperms/bungee/BungeeSenderFactory.java | 2 +- .../luckperms/bungee/event/TristateCheckEvent.java | 2 +- .../listeners/BungeePermissionCheckListener.java | 2 +- .../api/implementation/ApiPermissionHolder.java | 2 +- .../common/cacheddata/type/PermissionCache.java | 2 +- .../common/calculator/PermissionCalculator.java | 2 +- .../common/calculator/processor/MapProcessor.java | 2 +- .../common/calculator/processor/RegexProcessor.java | 2 +- .../calculator/processor/WildcardProcessor.java | 2 +- .../common/calculator/result/TristateResult.java | 2 +- .../common/command/access/ArgumentPermissions.java | 2 +- .../luckperms/common/command/utils/MessageUtils.java | 2 +- .../commands/generic/permission/PermissionCheck.java | 2 +- .../generic/permission/PermissionCheckInherits.java | 2 +- .../luckperms/common/commands/misc/CheckCommand.java | 2 +- .../lucko/luckperms/common/event/EventFactory.java | 2 +- .../common/event/gen/GeneratedEventSpec.java | 2 +- .../luckperms/common/model/PermissionHolder.java | 2 +- .../luckperms/common/sender/AbstractSender.java | 2 +- .../lucko/luckperms/common/sender/DummySender.java | 2 +- .../me/lucko/luckperms/common/sender/Sender.java | 2 +- .../lucko/luckperms/common/sender/SenderFactory.java | 2 +- .../luckperms/common/verbose/VerboseListener.java | 2 +- .../lucko/luckperms/nukkit/NukkitSenderFactory.java | 2 +- .../luckperms/nukkit/calculator/ChildProcessor.java | 2 +- .../nukkit/calculator/DefaultsProcessor.java | 2 +- .../nukkit/inject/permissible/LPPermissible.java | 2 +- .../inject/permissible/MonitoredPermissibleBase.java | 2 +- .../nukkit/inject/server/LPDefaultsMap.java | 2 +- .../service/proxy/api6/DescriptionBuilder.java | 2 +- .../service/proxy/api7/DescriptionBuilder.java | 2 +- .../luckperms/sponge/service/CompatibilityUtil.java | 2 +- .../luckperms/sponge/service/model/LPSubject.java | 2 +- .../sponge/service/model/LPSubjectData.java | 2 +- .../lucko/luckperms/sponge/SpongeSenderFactory.java | 2 +- .../sponge/calculator/DefaultsProcessor.java | 2 +- .../sponge/calculator/SpongeWildcardProcessor.java | 2 +- .../luckperms/sponge/commands/PermissionSet.java | 2 +- .../sponge/commands/SpongeCommandUtils.java | 2 +- .../sponge/model/manager/SpongeGroupManager.java | 2 +- .../sponge/model/manager/SpongeUserManager.java | 2 +- .../service/model/calculated/CalculatedSubject.java | 2 +- .../model/calculated/CalculatedSubjectData.java | 2 +- .../model/calculated/MonitoredSubjectData.java | 2 +- .../permissionholder/PermissionHolderSubject.java | 2 +- .../PermissionHolderSubjectData.java | 2 +- .../service/model/persisted/PersistedCollection.java | 2 +- .../luckperms/velocity/VelocitySenderFactory.java | 2 +- .../listeners/MonitoringPermissionCheckListener.java | 2 +- .../velocity/service/CompatibilityUtil.java | 2 +- 92 files changed, 108 insertions(+), 105 deletions(-) rename api/src/main/java/net/luckperms/api/event/{ => type}/Cancellable.java (87%) rename api/src/main/java/net/luckperms/api/event/{ => type}/Sourced.java (91%) rename api/src/main/java/net/luckperms/api/event/{ => util}/Param.java (94%) rename api/src/main/java/net/luckperms/api/{node => util}/Tristate.java (96%) 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 6da5a09fe..7d156aa60 100644 --- a/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java +++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java @@ -25,7 +25,7 @@ package net.luckperms.api.cacheddata; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; 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 006e65314..463326e6f 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.extension; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 f116e5c6b..7cb693049 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 @@ -27,7 +27,7 @@ package net.luckperms.api.event.group; import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 173709392..feb360167 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.group; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.model.group.Group; 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 4a3bbadd7..47f261f1a 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 @@ -27,7 +27,7 @@ package net.luckperms.api.event.group; import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 54b253a89..b331725e7 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.group; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.event.cause.DeletionCause; import net.luckperms.api.node.Node; 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 e3fa9101a..b4c0f0454 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.group; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 67e48b8b8..620cf5f9b 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 @@ -26,9 +26,9 @@ package net.luckperms.api.event.log; import net.luckperms.api.actionlog.Action; -import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 f0fa4c7e1..7ac9b410a 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 @@ -26,9 +26,9 @@ package net.luckperms.api.event.log; import net.luckperms.api.actionlog.Action; -import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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/LogNotifyEvent.java b/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java index cf336a8a0..ae932309f 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 @@ -26,9 +26,9 @@ package net.luckperms.api.event.log; import net.luckperms.api.actionlog.Action; -import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 301c6739c..89e99c086 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 @@ -26,9 +26,9 @@ package net.luckperms.api.event.log; import net.luckperms.api.actionlog.Action; -import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 49a079782..5cc4bc6d2 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 @@ -27,7 +27,7 @@ package net.luckperms.api.event.log; import net.luckperms.api.actionlog.Action; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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/node/NodeAddEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java index f046904ad..0afb3dd73 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 @@ -25,7 +25,7 @@ package net.luckperms.api.event.node; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.node.Node; import org.checkerframework.checker.nullness.qual.NonNull; 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 3fe298880..aee6cc097 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.node; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.model.PermissionHolder; import net.luckperms.api.model.data.DataType; import net.luckperms.api.model.group.Group; 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 abec8817b..846d7e32c 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 @@ -25,7 +25,7 @@ package net.luckperms.api.event.node; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.node.Node; import org.checkerframework.checker.nullness.qual.NonNull; 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 c22d18f06..9ccd42e23 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.player; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.model.PlayerSaveResult; import net.luckperms.api.model.user.UserManager; 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 4470504fc..ea37aacdd 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.player; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.model.user.User; import net.luckperms.api.util.Result; 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 242ced99b..e90cc1d00 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 @@ -25,9 +25,9 @@ package net.luckperms.api.event.sync; -import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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/sync/PreSyncEvent.java b/api/src/main/java/net/luckperms/api/event/sync/PreSyncEvent.java index fa258bccc..9e6f5ad28 100644 --- a/api/src/main/java/net/luckperms/api/event/sync/PreSyncEvent.java +++ b/api/src/main/java/net/luckperms/api/event/sync/PreSyncEvent.java @@ -25,7 +25,7 @@ package net.luckperms.api.event.sync; -import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.LuckPermsEvent; /** 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 ad6d8ed7e..766b361b1 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.track; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.track.Track; 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 21f7f1e67..4c5372391 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.track; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import net.luckperms.api.event.cause.DeletionCause; import org.checkerframework.checker.nullness.qual.NonNull; 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 6d84a3a96..318a7d201 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.track; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 29ac01207..3657e9779 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 @@ -25,7 +25,7 @@ package net.luckperms.api.event.track.mutate; -import net.luckperms.api.event.Param; +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 cc9abfd02..8eae42901 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.track.mutate; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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/TrackRemoveGroupEvent.java b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java index 7d10c7ed6..6d985a2dc 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 @@ -25,7 +25,7 @@ package net.luckperms.api.event.track.mutate; -import net.luckperms.api.event.Param; +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/Cancellable.java b/api/src/main/java/net/luckperms/api/event/type/Cancellable.java similarity index 87% rename from api/src/main/java/net/luckperms/api/event/Cancellable.java rename to api/src/main/java/net/luckperms/api/event/type/Cancellable.java index 217016380..009620bef 100644 --- a/api/src/main/java/net/luckperms/api/event/Cancellable.java +++ b/api/src/main/java/net/luckperms/api/event/type/Cancellable.java @@ -1,5 +1,5 @@ /* - * This file is part of LuckPerms, licensed under the MIT License. + * This file is part of luckperms, licensed under the MIT License. * * Copyright (c) lucko (Luck) * Copyright (c) contributors @@ -23,7 +23,9 @@ * SOFTWARE. */ -package net.luckperms.api.event; +package net.luckperms.api.event.type; + +import net.luckperms.api.event.util.Param; import org.checkerframework.checker.nullness.qual.NonNull; @@ -40,7 +42,7 @@ public interface Cancellable { * @return the cancellation */ @Param(-1) - @NonNull AtomicBoolean getCancellationState(); + @NonNull AtomicBoolean cancellationState(); /** * Returns true if the event is currently cancelled. @@ -48,7 +50,7 @@ public interface Cancellable { * @return if the event is cancelled */ default boolean isCancelled() { - return getCancellationState().get(); + return cancellationState().get(); } /** @@ -67,7 +69,7 @@ public interface Cancellable { * @return the previous state */ default boolean setCancelled(boolean cancelled) { - return getCancellationState().getAndSet(cancelled); + return cancellationState().getAndSet(cancelled); } } diff --git a/api/src/main/java/net/luckperms/api/event/Sourced.java b/api/src/main/java/net/luckperms/api/event/type/Sourced.java similarity index 91% rename from api/src/main/java/net/luckperms/api/event/Sourced.java rename to api/src/main/java/net/luckperms/api/event/type/Sourced.java index 9b833562b..889963d71 100644 --- a/api/src/main/java/net/luckperms/api/event/Sourced.java +++ b/api/src/main/java/net/luckperms/api/event/type/Sourced.java @@ -1,5 +1,5 @@ /* - * This file is part of LuckPerms, licensed under the MIT License. + * This file is part of luckperms, licensed under the MIT License. * * Copyright (c) lucko (Luck) * Copyright (c) contributors @@ -23,8 +23,9 @@ * SOFTWARE. */ -package net.luckperms.api.event; +package net.luckperms.api.event.type; +import net.luckperms.api.event.util.Param; import net.luckperms.api.event.source.Source; 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 49658123a..9aa312aff 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 @@ -27,7 +27,7 @@ package net.luckperms.api.event.user; import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 3e6875487..e9f0b59a7 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 @@ -27,7 +27,7 @@ package net.luckperms.api.event.user; import net.luckperms.api.cacheddata.CachedDataManager; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 86bb3f0a4..c1157e233 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.user; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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/UserLoadEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java index b764addfc..45418b269 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 @@ -26,7 +26,7 @@ package net.luckperms.api.event.user; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +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 be4a8cb16..8531aafe0 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 @@ -26,8 +26,8 @@ package net.luckperms.api.event.user.track; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; -import net.luckperms.api.event.Sourced; +import net.luckperms.api.event.util.Param; +import net.luckperms.api.event.type.Sourced; import net.luckperms.api.model.user.User; import net.luckperms.api.track.Track; diff --git a/api/src/main/java/net/luckperms/api/event/Param.java b/api/src/main/java/net/luckperms/api/event/util/Param.java similarity index 94% rename from api/src/main/java/net/luckperms/api/event/Param.java rename to api/src/main/java/net/luckperms/api/event/util/Param.java index cb2bb7645..e988fe730 100644 --- a/api/src/main/java/net/luckperms/api/event/Param.java +++ b/api/src/main/java/net/luckperms/api/event/util/Param.java @@ -1,5 +1,5 @@ /* - * This file is part of LuckPerms, licensed under the MIT License. + * This file is part of luckperms, licensed under the MIT License. * * Copyright (c) lucko (Luck) * Copyright (c) contributors @@ -23,7 +23,7 @@ * SOFTWARE. */ -package net.luckperms.api.event; +package net.luckperms.api.event.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; 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 e771c5d7b..ef95d778a 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 @@ -34,7 +34,7 @@ import net.luckperms.api.model.user.User; import net.luckperms.api.model.user.UserManager; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/api/src/main/java/net/luckperms/api/node/Tristate.java b/api/src/main/java/net/luckperms/api/util/Tristate.java similarity index 96% rename from api/src/main/java/net/luckperms/api/node/Tristate.java rename to api/src/main/java/net/luckperms/api/util/Tristate.java index 670c8da5a..319140fc9 100644 --- a/api/src/main/java/net/luckperms/api/node/Tristate.java +++ b/api/src/main/java/net/luckperms/api/util/Tristate.java @@ -1,5 +1,5 @@ /* - * This file is part of LuckPerms, licensed under the MIT License. + * This file is part of luckperms, licensed under the MIT License. * * Copyright (c) lucko (Luck) * Copyright (c) contributors @@ -23,7 +23,7 @@ * SOFTWARE. */ -package net.luckperms.api.node; +package net.luckperms.api.util; import org.checkerframework.checker.nullness.qual.NonNull; 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 b1b57ec95..9eab052db 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; import net.kyori.text.adapter.bukkit.TextAdapter; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; 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 095456158..5e9e9b2f9 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 @@ -30,7 +30,7 @@ import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcesso import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Collections; import java.util.Map; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java index 8e9a7e0be..64c6a0860 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java @@ -29,7 +29,7 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.bukkit.permissions.Permission; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java index acc0ed180..bba67b0f1 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java @@ -36,7 +36,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissibleBase; 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 da10bde9a..018260390 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,7 +31,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import org.bukkit.permissions.PermissibleBase; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java index 86a42721e..ca3dd7d9f 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LPDefaultsMap.java @@ -34,7 +34,7 @@ import com.google.common.collect.Maps; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.cache.Cache; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.bukkit.permissions.Permission; import org.bukkit.plugin.PluginManager; 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 ea8d70c6b..e48d35e48 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 @@ -49,7 +49,7 @@ import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.model.data.DataType; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.util.Result; 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 25ad54c2e..384d7697c 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; import net.kyori.text.adapter.bungeecord.TextAdapter; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java b/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java index 6b66bab51..e04b54330 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/event/TristateCheckEvent.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.bungee.event; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java b/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java index 479fa8302..a81130224 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 @@ -31,7 +31,7 @@ import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PermissionCheckEvent; 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 52999f616..f22f3d047 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 @@ -36,7 +36,7 @@ import net.luckperms.api.model.data.NodeMap; import net.luckperms.api.model.data.TemporaryNodeMergeStrategy; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; 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 223ea7fb8..c846ff4cc 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 @@ -32,7 +32,7 @@ import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import net.luckperms.api.cacheddata.CachedPermissionData; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; 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 70888c95f..2b0e0e9e4 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 @@ -34,7 +34,7 @@ import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java index 78f2046e5..22900f1ae 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java @@ -27,7 +27,7 @@ package me.lucko.luckperms.common.calculator.processor; import me.lucko.luckperms.common.calculator.result.TristateResult; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; public class MapProcessor extends AbstractPermissionProcessor implements PermissionProcessor { private static final TristateResult.Factory RESULT_FACTORY = new TristateResult.Factory(MapProcessor.class); 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 dda7cd8ed..ae844f57c 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 @@ -31,7 +31,7 @@ import com.google.common.collect.Maps; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.node.types.RegexPermission; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Collections; import java.util.List; 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 ba124b71a..710a3b521 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 @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableMap; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.node.AbstractNode; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Collections; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/result/TristateResult.java b/common/src/main/java/me/lucko/luckperms/common/calculator/result/TristateResult.java index e86fd0536..931b801a7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/result/TristateResult.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/result/TristateResult.java @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.calculator.result; import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; /** * Represents the result of a {@link PermissionCalculator} lookup. 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 91964d1d3..e8e77ab59 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 @@ -41,7 +41,7 @@ import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import java.util.function.BiFunction; diff --git a/common/src/main/java/me/lucko/luckperms/common/command/utils/MessageUtils.java b/common/src/main/java/me/lucko/luckperms/common/command/utils/MessageUtils.java index 8153239c0..cd9ce0588 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/utils/MessageUtils.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/utils/MessageUtils.java @@ -31,7 +31,7 @@ import me.lucko.luckperms.common.locale.message.Message; import net.luckperms.api.context.Context; import net.luckperms.api.context.ContextSet; import net.luckperms.api.node.Node; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Collection; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheck.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheck.java index 42b838a37..90f75b455 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 @@ -46,7 +46,7 @@ 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.NodeEqualityPredicate; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java index abbf3e383..e803f1ae2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java @@ -44,7 +44,7 @@ import me.lucko.luckperms.common.util.Predicates; import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.node.Node; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata; import net.luckperms.api.query.QueryOptions; diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java index ad78434f9..1d4814091 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java @@ -42,7 +42,7 @@ import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.List; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java b/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java index d6f7e87f5..854ee084d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java @@ -44,7 +44,7 @@ import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.sender.Sender; import net.luckperms.api.actionlog.Action; -import net.luckperms.api.event.Cancellable; +import net.luckperms.api.event.type.Cancellable; import net.luckperms.api.event.LuckPermsEvent; 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/event/gen/GeneratedEventSpec.java b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java index cedf16fc8..ba2c50911 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.util.PrivateMethodHandles; import net.luckperms.api.LuckPerms; import net.luckperms.api.event.LuckPermsEvent; -import net.luckperms.api.event.Param; +import net.luckperms.api.event.util.Param; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; 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 c08561638..98e14e14f 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 @@ -44,7 +44,7 @@ import net.luckperms.api.model.data.TemporaryNodeMergeStrategy; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeEqualityPredicate; import net.luckperms.api.node.NodeType; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; 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 c2e6bd3b7..32d880d3a 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 @@ -31,7 +31,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.lang.ref.WeakReference; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java b/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java index 6842c3199..3f8a75d6b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java +++ b/common/src/main/java/me/lucko/luckperms/common/sender/DummySender.java @@ -29,7 +29,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; -import net.luckperms.api.node.Tristate; +import 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 b016e05ff..82304ad8e 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 @@ -33,7 +33,7 @@ import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.ImmutableContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Set; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/sender/SenderFactory.java b/common/src/main/java/me/lucko/luckperms/common/sender/SenderFactory.java index 6fea70c1a..e2e05bbb1 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 @@ -28,7 +28,7 @@ package me.lucko.luckperms.common.sender; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import net.kyori.text.Component; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Objects; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java index d2bed6afc..2f81129a1 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 @@ -45,7 +45,7 @@ import me.lucko.luckperms.common.web.BytebinClient; import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryMode; import java.io.ByteArrayOutputStream; 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 d555af16d..0970f0202 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitSenderFactory.java @@ -31,7 +31,7 @@ import me.lucko.luckperms.common.sender.SenderFactory; import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import cn.nukkit.Player; import cn.nukkit.command.CommandSender; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/ChildProcessor.java index 52bab1c9f..2747645d6 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 @@ -30,7 +30,7 @@ import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.nukkit.LPNukkitPlugin; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Collections; import java.util.Map; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java index 77017b606..e3fcc0734 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/calculator/DefaultsProcessor.java @@ -30,7 +30,7 @@ import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.inject.PermissionDefault; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; /** * Permission Processor for Nukkits "default" permission system. diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java index 1995acc26..258d5ddf0 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java @@ -37,7 +37,7 @@ import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.calculator.DefaultsProcessor; import me.lucko.luckperms.nukkit.inject.PermissionDefault; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; 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 bdc876309..b78dde39a 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 @@ -31,7 +31,7 @@ import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.nukkit.inject.dummy.DummyPermissibleBase; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import cn.nukkit.permission.PermissibleBase; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java index eee5b0836..9d3139662 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LPDefaultsMap.java @@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableMap; import me.lucko.luckperms.common.cache.Cache; import me.lucko.luckperms.nukkit.LPNukkitPlugin; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java index b433b4ef6..f1c4c8bf3 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/DescriptionBuilder.java @@ -32,7 +32,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.ProxiedServiceObject; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java index 05ecf90d7..40b50a730 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/DescriptionBuilder.java @@ -32,7 +32,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.ProxiedServiceObject; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; 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 f4de0fd4e..beb76ecfc 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 @@ -34,7 +34,7 @@ import me.lucko.luckperms.sponge.service.context.DelegatingImmutableContextSet; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.spongepowered.api.service.context.Context; 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 b8574dbb5..eaca6c2f6 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 @@ -28,7 +28,7 @@ package me.lucko.luckperms.sponge.service.model; import com.google.common.collect.ImmutableList; import net.luckperms.api.context.ImmutableContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import org.spongepowered.api.command.CommandSource; 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 6eee4b9e1..35014f268 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 @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableMap; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.model.data.DataType; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.spongepowered.api.service.permission.SubjectData; 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 a9ebe56f5..dda9a3e02 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java @@ -32,7 +32,7 @@ import me.lucko.luckperms.sponge.service.CompatibilityUtil; import net.kyori.text.Component; import net.kyori.text.adapter.spongeapi.TextAdapter; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.entity.living.player.Player; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java index e9746a911..1ad9c26c0 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/DefaultsProcessor.java @@ -30,7 +30,7 @@ import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; public abstract class DefaultsProcessor implements PermissionProcessor { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java index 0087d3f9d..c31fb3297 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculator/SpongeWildcardProcessor.java @@ -30,7 +30,7 @@ import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.node.AbstractNode; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; public class SpongeWildcardProcessor extends AbstractPermissionProcessor implements PermissionProcessor { private static final TristateResult.Factory RESULT_FACTORY = new TristateResult.Factory(SpongeWildcardProcessor.class); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java index 63150eb47..cd5d10bd0 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 @@ -39,7 +39,7 @@ import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.sponge.service.model.LPSubjectData; import net.luckperms.api.context.ImmutableContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.List; 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 2d13fbbf2..467f80f97 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 @@ -31,7 +31,7 @@ import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import net.luckperms.api.context.ContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.List; import java.util.Map; 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 65f2577c7..93456a9cf 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 @@ -49,7 +49,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.node.HeldNode; -import net.luckperms.api.node.Tristate; +import 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 59d4acffd..1d15d1de2 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 @@ -49,7 +49,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.node.HeldNode; -import net.luckperms.api.node.Tristate; +import 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/model/calculated/CalculatedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java index 22405a8c9..4dbb796c9 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 @@ -37,7 +37,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import net.luckperms.api.context.ImmutableContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import java.util.HashMap; 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 01056f0dc..4eadedb4d 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 @@ -38,7 +38,7 @@ 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.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import org.spongepowered.api.service.permission.SubjectData; 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 c6175461f..408c5da58 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 @@ -31,7 +31,7 @@ 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.Tristate; +import net.luckperms.api.util.Tristate; import java.util.concurrent.CompletableFuture; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java index 5b477a194..674331c2e 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 @@ -46,7 +46,7 @@ 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.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import org.spongepowered.api.service.permission.PermissionService; 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 35a6d3911..1b4598015 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 @@ -49,7 +49,7 @@ import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.ChatMetaType; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeType; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.node.types.MetaNode; import net.luckperms.api.node.types.PrefixNode; 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 ac6c83244..8ad86b3eb 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 @@ -41,7 +41,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; import net.luckperms.api.context.ImmutableContextSet; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import org.spongepowered.api.service.permission.SubjectCollection; 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 f303f2bf6..53741b885 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocitySenderFactory.java @@ -35,7 +35,7 @@ import me.lucko.luckperms.common.util.TextUtils; import me.lucko.luckperms.velocity.service.CompatibilityUtil; import net.kyori.text.Component; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.UUID; 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 4548f47a2..25c9e410b 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 @@ -38,7 +38,7 @@ import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.velocity.LPVelocityPlugin; import me.lucko.luckperms.velocity.service.CompatibilityUtil; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import net.luckperms.api.query.QueryOptions; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java b/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java index eff5f5170..cabbb689f 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/service/CompatibilityUtil.java @@ -25,7 +25,7 @@ package me.lucko.luckperms.velocity.service; -import net.luckperms.api.node.Tristate; +import net.luckperms.api.util.Tristate; import java.util.Objects;