A few more small API changes

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;
 

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;

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;

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;
 

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;

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;
 

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;

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;
 

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;
 

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;

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;
 

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;
 

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;

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;

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;

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;
 

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;
 

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;
 

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;
 
 /**

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;
 

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;

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;

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;
 

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;

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;
 

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) <luck@lucko.me>
  *  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);
     }
 
 }

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) <luck@lucko.me>
  *  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;

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;

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;

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;
 

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;

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.util.Param;
-import net.luckperms.api.event.Sourced;
+import net.luckperms.api.event.type.Sourced;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.track.Track;
 

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) <luck@lucko.me>
  *  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;

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;
 

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) <luck@lucko.me>
  *  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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;
 

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);

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;

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;

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.

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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.

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;
 

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;

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;
 

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;

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;

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;
 

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;

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;
 

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;

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 {

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);

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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;
 

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;
 

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;

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;