diff --git a/api/build.gradle b/api/build.gradle
index 1aa56c3a0..9deff0b41 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'java-library'
+
 group = 'net.luckperms'
 project.version = '5.5'
 
@@ -12,8 +14,8 @@ jar {
 }
 
 dependencies {
-    compileOnly 'org.checkerframework:checker-qual:3.49.3'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    api 'org.jspecify:jspecify:1.0.0'
+    compileOnlyApi 'org.jetbrains:annotations:26.1.0'
 }
 
 // Only used occasionally for deployment - not needed for normal builds.
@@ -27,7 +29,7 @@ if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePass
         options.encoding = 'UTF-8'
         options.charSet = 'UTF-8'
         options.links(
-                'https://checkerframework.org/api/',
+                'https://jspecify.dev/docs/api/',
                 'https://javadoc.io/static/org.jetbrains/annotations/26.0.2/'
         )
         options.addStringOption('Xdoclint:none', '-quiet')
diff --git a/api/src/main/java/net/luckperms/api/LuckPerms.java b/api/src/main/java/net/luckperms/api/LuckPerms.java
index 6c851c45c..f0fe5bc13 100644
--- a/api/src/main/java/net/luckperms/api/LuckPerms.java
+++ b/api/src/main/java/net/luckperms/api/LuckPerms.java
@@ -48,7 +48,6 @@ import net.luckperms.api.platform.PluginMetadata;
 import net.luckperms.api.query.QueryOptionsRegistry;
 import net.luckperms.api.track.Track;
 import net.luckperms.api.track.TrackManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.Internal;
 
 import java.util.Optional;
@@ -84,7 +83,7 @@ public interface LuckPerms {
      *
      * @return the server name
      */
-    @NonNull String getServerName();
+    String getServerName();
 
     /**
      * Gets the {@link UserManager}, responsible for managing
@@ -95,7 +94,7 @@ public interface LuckPerms {
      *
      * @return the user manager
      */
-    @NonNull UserManager getUserManager();
+    UserManager getUserManager();
 
     /**
      * Gets the {@link GroupManager}, responsible for managing
@@ -106,7 +105,7 @@ public interface LuckPerms {
      *
      * @return the group manager
      */
-    @NonNull GroupManager getGroupManager();
+    GroupManager getGroupManager();
 
     /**
      * Gets the {@link TrackManager}, responsible for managing
@@ -117,7 +116,7 @@ public interface LuckPerms {
      *
      * @return the track manager
      */
-    @NonNull TrackManager getTrackManager();
+    TrackManager getTrackManager();
 
     /**
      * Gets the {@link PlayerAdapter} instance, a utility class for adapting platform Player
@@ -144,7 +143,7 @@ public interface LuckPerms {
      * @throws IllegalArgumentException if the player class is not correct
      * @since 5.1
      */
-    <T> @NonNull PlayerAdapter<T> getPlayerAdapter(@NonNull Class<T> playerClass);
+    <T> PlayerAdapter<T> getPlayerAdapter(Class<T> playerClass);
 
     /**
      * Gets the {@link Platform}, which represents the server platform the
@@ -152,7 +151,7 @@ public interface LuckPerms {
      *
      * @return the platform
      */
-    @NonNull Platform getPlatform();
+    Platform getPlatform();
 
     /**
      * Gets the {@link PluginMetadata}, responsible for providing metadata about
@@ -160,7 +159,7 @@ public interface LuckPerms {
      *
      * @return the plugin metadata
      */
-    @NonNull PluginMetadata getPluginMetadata();
+    PluginMetadata getPluginMetadata();
 
     /**
      * Gets the {@link EventBus}, used for subscribing to internal LuckPerms
@@ -168,7 +167,7 @@ public interface LuckPerms {
      *
      * @return the event bus
      */
-    @NonNull EventBus getEventBus();
+    EventBus getEventBus();
 
     /**
      * Gets the {@link MessagingService}, used to dispatch updates throughout a
@@ -179,7 +178,7 @@ public interface LuckPerms {
      *
      * @return the messaging service instance, if present.
      */
-    @NonNull Optional<MessagingService> getMessagingService();
+    Optional<MessagingService> getMessagingService();
 
     /**
      * Gets the {@link ActionLogger}, responsible for saving and broadcasting
@@ -187,7 +186,7 @@ public interface LuckPerms {
      *
      * @return the action logger
      */
-    @NonNull ActionLogger getActionLogger();
+    ActionLogger getActionLogger();
 
     /**
      * Gets the {@link ContextManager}, responsible for managing
@@ -195,7 +194,7 @@ public interface LuckPerms {
      *
      * @return the context manager
      */
-    @NonNull ContextManager getContextManager();
+    ContextManager getContextManager();
 
     /**
      * Gets the {@link MetaStackFactory}.
@@ -206,7 +205,7 @@ public interface LuckPerms {
      *
      * @return the meta stack factory
      */
-    @NonNull MetaStackFactory getMetaStackFactory();
+    MetaStackFactory getMetaStackFactory();
 
     /**
      * Schedules the execution of an update task, and returns an encapsulation
@@ -219,7 +218,7 @@ public interface LuckPerms {
      *
      * @return a future
      */
-    @NonNull CompletableFuture<Void> runUpdateTask();
+    CompletableFuture<Void> runUpdateTask();
 
     /**
      * Executes a health check.
@@ -230,7 +229,7 @@ public interface LuckPerms {
      * @return the health status
      * @since 5.5
      */
-    @NonNull Health runHealthCheck();
+    Health runHealthCheck();
 
     /**
      * Registers a {@link MessengerProvider} for use by the platform.
@@ -240,7 +239,7 @@ public interface LuckPerms {
      *
      * @param messengerProvider the messenger provider.
      */
-    void registerMessengerProvider(@NonNull MessengerProvider messengerProvider);
+    void registerMessengerProvider(MessengerProvider messengerProvider);
 
     /**
      * Gets the {@link NodeBuilderRegistry}.
@@ -248,7 +247,7 @@ public interface LuckPerms {
      * @return the node builder registry
      */
     @Internal
-    @NonNull NodeBuilderRegistry getNodeBuilderRegistry();
+    NodeBuilderRegistry getNodeBuilderRegistry();
 
     /**
      * Gets the {@link QueryOptionsRegistry}.
@@ -257,7 +256,7 @@ public interface LuckPerms {
      * @since 5.1
      */
     @Internal
-    @NonNull QueryOptionsRegistry getQueryOptionsRegistry();
+    QueryOptionsRegistry getQueryOptionsRegistry();
 
     /**
      * Gets the {@link NodeMatcherFactory}.
@@ -266,7 +265,7 @@ public interface LuckPerms {
      * @since 5.1
      */
     @Internal
-    @NonNull NodeMatcherFactory getNodeMatcherFactory();
+    NodeMatcherFactory getNodeMatcherFactory();
 
     /**
      * Gets the {@link ActionFilterFactory}.
@@ -275,7 +274,6 @@ public interface LuckPerms {
      * @since 5.5
      */
     @Internal
-    @NonNull
     ActionFilterFactory getActionFilterFactory();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/LuckPermsProvider.java b/api/src/main/java/net/luckperms/api/LuckPermsProvider.java
index 4f36c2d28..0c80b0fd4 100644
--- a/api/src/main/java/net/luckperms/api/LuckPermsProvider.java
+++ b/api/src/main/java/net/luckperms/api/LuckPermsProvider.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import static org.jetbrains.annotations.ApiStatus.Internal;
 
@@ -47,7 +46,7 @@ public final class LuckPermsProvider {
      * @return an instance of the LuckPerms API
      * @throws IllegalStateException if the API is not loaded yet
      */
-    public static @NonNull LuckPerms get() {
+    public static LuckPerms get() {
         LuckPerms instance = LuckPermsProvider.instance;
         if (instance == null) {
             throw new NotLoadedException();
diff --git a/api/src/main/java/net/luckperms/api/actionlog/Action.java b/api/src/main/java/net/luckperms/api/actionlog/Action.java
index 53260674c..f775f69fa 100644
--- a/api/src/main/java/net/luckperms/api/actionlog/Action.java
+++ b/api/src/main/java/net/luckperms/api/actionlog/Action.java
@@ -26,9 +26,8 @@
 package net.luckperms.api.actionlog;
 
 import net.luckperms.api.LuckPermsProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Instant;
 import java.util.Optional;
@@ -47,7 +46,7 @@ public interface Action extends Comparable<Action> {
      *
      * @return a new builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getActionLogger().actionBuilder();
     }
 
@@ -56,21 +55,21 @@ public interface Action extends Comparable<Action> {
      *
      * @return the timestamp
      */
-    @NonNull Instant getTimestamp();
+    Instant getTimestamp();
 
     /**
      * Gets the source of the action.
      *
      * @return the source
      */
-    @NonNull Source getSource();
+    Source getSource();
 
     /**
      * Gets the target of the action.
      *
      * @return the target
      */
-    @NonNull Target getTarget();
+    Target getTarget();
 
     /**
      * Returns a string describing the action which took place.
@@ -80,7 +79,7 @@ public interface Action extends Comparable<Action> {
      *
      * @return the action
      */
-    @NonNull String getDescription();
+    String getDescription();
 
     /**
      * Represents the source of an action.
@@ -93,14 +92,14 @@ public interface Action extends Comparable<Action> {
          *
          * @return the source unique id
          */
-        @NonNull UUID getUniqueId();
+        UUID getUniqueId();
 
         /**
          * Gets the source name.
          *
          * @return the source name
          */
-        @NonNull String getName();
+        String getName();
 
     }
 
@@ -115,21 +114,21 @@ public interface Action extends Comparable<Action> {
          *
          * @return the target unique id
          */
-        @NonNull Optional<UUID> getUniqueId();
+        Optional<UUID> getUniqueId();
 
         /**
          * Gets the target name.
          *
          * @return the target name
          */
-        @NonNull String getName();
+        String getName();
 
         /**
          * Gets the target type.
          *
          * @return the target type
          */
-        @NonNull Type getType();
+        Type getType();
 
         /**
          * Represents the type of {@link Target}.
@@ -151,7 +150,7 @@ public interface Action extends Comparable<Action> {
          * @return the builder
          * @see Action#getTimestamp()
          */
-        @NonNull Builder timestamp(@NonNull Instant timestamp);
+        Builder timestamp(Instant timestamp);
 
         /**
          * Sets the actor of the entry.
@@ -159,7 +158,7 @@ public interface Action extends Comparable<Action> {
          * @param actor the actor
          * @return the builder
          */
-        @NonNull Builder source(@NonNull UUID actor);
+        Builder source(UUID actor);
 
         /**
          * Sets the actor name of the entry.
@@ -167,7 +166,7 @@ public interface Action extends Comparable<Action> {
          * @param actorName the actor name
          * @return the builder
          */
-        @NonNull Builder sourceName(@NonNull String actorName);
+        Builder sourceName(String actorName);
 
         /**
          * Sets the type of the entry.
@@ -175,7 +174,7 @@ public interface Action extends Comparable<Action> {
          * @param type the type
          * @return the builder
          */
-        @NonNull Builder targetType(Target.@NonNull Type type);
+        Builder targetType(Target.Type type);
 
         /**
          * Sets the acted object for the entry.
@@ -183,7 +182,7 @@ public interface Action extends Comparable<Action> {
          * @param acted the acted object
          * @return the builder
          */
-        @NonNull Builder target(@Nullable UUID acted);
+        Builder target(@Nullable UUID acted);
 
         /**
          * Sets the acted name for the entry.
@@ -191,7 +190,7 @@ public interface Action extends Comparable<Action> {
          * @param actedName the acted name
          * @return the builder
          */
-        @NonNull Builder targetName(@NonNull String actedName);
+        Builder targetName(String actedName);
 
         /**
          * Sets the action of the entry.
@@ -199,14 +198,14 @@ public interface Action extends Comparable<Action> {
          * @param action the action
          * @return the builder
          */
-        @NonNull Builder description(@NonNull String action);
+        Builder description(String action);
 
         /**
          * Creates a {@link Action} instance from the builder.
          *
          * @return a new log entry instance
          */
-        @NonNull Action build();
+        Action build();
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/actionlog/ActionLog.java b/api/src/main/java/net/luckperms/api/actionlog/ActionLog.java
index 131ab3a5c..d96c259d1 100644
--- a/api/src/main/java/net/luckperms/api/actionlog/ActionLog.java
+++ b/api/src/main/java/net/luckperms/api/actionlog/ActionLog.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.actionlog;
 
 import net.luckperms.api.actionlog.filter.ActionFilter;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.SortedSet;
@@ -53,7 +52,7 @@ public interface ActionLog {
      *
      * @return the content
      */
-    @NonNull @Unmodifiable SortedSet<Action> getContent();
+    @Unmodifiable SortedSet<Action> getContent();
 
     /**
      * Gets the entries in the log performed by the given actor.
@@ -61,7 +60,7 @@ public interface ActionLog {
      * @param actor the uuid of the actor to filter by
      * @return the content for the given actor
      */
-    @NonNull @Unmodifiable SortedSet<Action> getContent(@NonNull UUID actor);
+    @Unmodifiable SortedSet<Action> getContent(UUID actor);
 
     /**
      * Gets the log content for a given user
@@ -69,7 +68,7 @@ public interface ActionLog {
      * @param uniqueId the uuid to filter by
      * @return all content in this log where the user = uuid
      */
-    @NonNull @Unmodifiable SortedSet<Action> getUserHistory(@NonNull UUID uniqueId);
+    @Unmodifiable SortedSet<Action> getUserHistory(UUID uniqueId);
 
     /**
      * Gets the log content for a given group
@@ -77,7 +76,7 @@ public interface ActionLog {
      * @param name the name to filter by
      * @return all content in this log where the group = name
      */
-    @NonNull @Unmodifiable SortedSet<Action> getGroupHistory(@NonNull String name);
+    @Unmodifiable SortedSet<Action> getGroupHistory(String name);
 
     /**
      * Gets the log content for a given track
@@ -85,6 +84,6 @@ public interface ActionLog {
      * @param name the name to filter by
      * @return all content in this log where the track = name
      */
-    @NonNull @Unmodifiable SortedSet<Action> getTrackHistory(@NonNull String name);
+    @Unmodifiable SortedSet<Action> getTrackHistory(String name);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java b/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java
index 8b8eb6dca..e87b87392 100644
--- a/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java
+++ b/api/src/main/java/net/luckperms/api/actionlog/ActionLogger.java
@@ -27,7 +27,6 @@ package net.luckperms.api.actionlog;
 
 import net.luckperms.api.actionlog.filter.ActionFilter;
 import net.luckperms.api.util.Page;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -42,7 +41,7 @@ public interface ActionLogger {
      *
      * @return a new builder
      */
-    Action.@NonNull Builder actionBuilder();
+    Action.Builder actionBuilder();
 
     /**
      * Gets a {@link ActionLog} instance from the plugin storage.
@@ -52,7 +51,7 @@ public interface ActionLogger {
      * are more efficient (they don't load the full action log into memory) and allow for pagination.
      */
     @Deprecated
-    @NonNull CompletableFuture<ActionLog> getLog();
+    CompletableFuture<ActionLog> getLog();
 
     /**
      * Gets all actions from the action log matching the given {@code filter}.
@@ -66,7 +65,7 @@ public interface ActionLogger {
      * @return the actions
      * @since 5.5
      */
-    @NonNull CompletableFuture<List<Action>> queryActions(@NonNull ActionFilter filter);
+    CompletableFuture<List<Action>> queryActions(ActionFilter filter);
 
     /**
      * Gets a page of actions from the action log matching the given {@code filter}.
@@ -79,7 +78,7 @@ public interface ActionLogger {
      * @return the page of actions
      * @since 5.5
      */
-    @NonNull CompletableFuture<Page<Action>> queryActions(@NonNull ActionFilter filter, int pageSize, int pageNumber);
+    CompletableFuture<Page<Action>> queryActions(ActionFilter filter, int pageSize, int pageNumber);
 
     /**
      * Submits a logged action to LuckPerms.
@@ -98,7 +97,7 @@ public interface ActionLogger {
      * @param entry the entry to submit
      * @return a future which will complete when the action is submitted
      */
-    @NonNull CompletableFuture<Void> submit(@NonNull Action entry);
+    CompletableFuture<Void> submit(Action entry);
 
     /**
      * Submits a logged action to LuckPerms and persists it in the storage backend.
@@ -108,7 +107,7 @@ public interface ActionLogger {
      * @param entry the entry to submit
      * @return a future which will complete when the action is submitted
      */
-    @NonNull CompletableFuture<Void> submitToStorage(@NonNull Action entry);
+    CompletableFuture<Void> submitToStorage(Action entry);
 
     /**
      * Submits a logged action to LuckPerms and broadcasts it to administrators.
@@ -121,6 +120,6 @@ public interface ActionLogger {
      * @param entry the entry to submit
      * @return a future which will complete when the action is broadcasted
      */
-    @NonNull CompletableFuture<Void> broadcastAction(@NonNull Action entry);
+    CompletableFuture<Void> broadcastAction(Action entry);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/actionlog/filter/package-info.java b/api/src/main/java/net/luckperms/api/actionlog/filter/package-info.java
index 2eebf3be8..e1366b703 100644
--- a/api/src/main/java/net/luckperms/api/actionlog/filter/package-info.java
+++ b/api/src/main/java/net/luckperms/api/actionlog/filter/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.actionlog.Action} filters.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.actionlog.filter;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/actionlog/package-info.java b/api/src/main/java/net/luckperms/api/actionlog/package-info.java
index 97b4ad2e8..a67ce8a29 100644
--- a/api/src/main/java/net/luckperms/api/actionlog/package-info.java
+++ b/api/src/main/java/net/luckperms/api/actionlog/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.actionlog.ActionLog} related functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.actionlog;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java
index e2e1eec77..e0f1e09ce 100644
--- a/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java
+++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedData.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.cacheddata;
 
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Holds cached lookup data for a given set of query options.
@@ -42,6 +41,6 @@ public interface CachedData {
      *
      * @return the query options this container is caching
      */
-    @NonNull QueryOptions getQueryOptions();
+    QueryOptions getQueryOptions();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java
index 91682fd42..e66626718 100644
--- a/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java
+++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedDataManager.java
@@ -30,7 +30,6 @@ import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -48,14 +47,14 @@ public interface CachedDataManager {
      *
      * @return the permission data manager
      */
-    @NonNull Container<CachedPermissionData> permissionData();
+    Container<CachedPermissionData> permissionData();
 
     /**
      * Gets the manager for {@link CachedMetaData}.
      *
      * @return the meta data manager
      */
-    @NonNull Container<CachedMetaData> metaData();
+    Container<CachedMetaData> metaData();
 
     /**
      * Gets PermissionData from the cache, using the given query options.
@@ -63,7 +62,7 @@ public interface CachedDataManager {
      * @param queryOptions the query options
      * @return a permission data instance
      */
-    @NonNull CachedPermissionData getPermissionData(@NonNull QueryOptions queryOptions);
+    CachedPermissionData getPermissionData(QueryOptions queryOptions);
 
     /**
      * Gets MetaData from the cache, using the given query options.
@@ -71,7 +70,7 @@ public interface CachedDataManager {
      * @param queryOptions the query options
      * @return a meta data instance
      */
-    @NonNull CachedMetaData getMetaData(@NonNull QueryOptions queryOptions);
+    CachedMetaData getMetaData(QueryOptions queryOptions);
 
     /**
      * Gets PermissionData from the cache, using the most appropriate query options
@@ -88,7 +87,7 @@ public interface CachedDataManager {
      * @return a permission data instance
      * @since 5.1
      */
-    @NonNull CachedPermissionData getPermissionData();
+    CachedPermissionData getPermissionData();
 
     /**
      * Gets MetaData from the cache, using the most appropriate query options
@@ -106,7 +105,7 @@ public interface CachedDataManager {
      * @since 5.1
      * @see PermissionHolder#getQueryOptions()
      */
-    @NonNull CachedMetaData getMetaData();
+    CachedMetaData getMetaData();
 
     /**
      * Invalidates all cached {@link CachedPermissionData} and {@link CachedMetaData}
@@ -136,7 +135,7 @@ public interface CachedDataManager {
          * @return a data instance
          * @throws NullPointerException if contexts is null
          */
-        @NonNull T get(@NonNull QueryOptions queryOptions);
+        T get(QueryOptions queryOptions);
 
         /**
          * Calculates {@link T data}, bypassing the cache.
@@ -153,7 +152,7 @@ public interface CachedDataManager {
          * @return a data instance
          * @throws NullPointerException if contexts is null
          */
-        @NonNull T calculate(@NonNull QueryOptions queryOptions);
+        T calculate(QueryOptions queryOptions);
 
         /**
          * (Re)calculates data for a given context.
@@ -171,7 +170,7 @@ public interface CachedDataManager {
          * @param queryOptions the query options
          * @throws NullPointerException if contexts is null
          */
-        void recalculate(@NonNull QueryOptions queryOptions);
+        void recalculate(QueryOptions queryOptions);
 
         /**
          * (Re)loads permission data for a given context.
@@ -197,7 +196,7 @@ public interface CachedDataManager {
          * @return a future
          * @throws NullPointerException if contexts is null
          */
-        @NonNull CompletableFuture<? extends T> reload(@NonNull QueryOptions queryOptions);
+        CompletableFuture<? extends T> reload(QueryOptions queryOptions);
 
         /**
          * Recalculates data for all known contexts.
@@ -229,14 +228,14 @@ public interface CachedDataManager {
          *
          * @return a future
          */
-        @NonNull CompletableFuture<Void> reload();
+        CompletableFuture<Void> reload();
 
         /**
          * Invalidates any cached data instances mapped to the given context.
          *
          * @param queryOptions the queryOptions to invalidate for
          */
-        void invalidate(@NonNull QueryOptions queryOptions);
+        void invalidate(QueryOptions queryOptions);
 
         /**
          * Invalidates all cached data instances.
diff --git a/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java b/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java
index 7e3d28850..3a5d5a2db 100644
--- a/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java
+++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedMetaData.java
@@ -30,9 +30,8 @@ import net.luckperms.api.node.types.MetaNode;
 import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -63,7 +62,7 @@ public interface CachedMetaData extends CachedData {
      * @return a result containing the value
      * @since 5.4
      */
-    @NonNull Result<String, MetaNode> queryMetaValue(@NonNull String key);
+    Result<String, MetaNode> queryMetaValue(String key);
 
     /**
      * Gets a value for the given meta key.
@@ -73,7 +72,7 @@ public interface CachedMetaData extends CachedData {
      * @param key the key
      * @return the value
      */
-    default @Nullable String getMetaValue(@NonNull String key) {
+    default @Nullable String getMetaValue(String key) {
         return queryMetaValue(key).result();
     }
 
@@ -97,7 +96,7 @@ public interface CachedMetaData extends CachedData {
      * @return the meta value
      * @since 5.3
      */
-    default <T> @NonNull Optional<T> getMetaValue(@NonNull String key, @NonNull Function<String, ? extends T> valueTransformer) {
+    default <T> Optional<T> getMetaValue(String key, Function<String, ? extends T> valueTransformer) {
         return Optional.ofNullable(getMetaValue(key)).map(value -> {
             try {
                 return valueTransformer.apply(value);
@@ -123,7 +122,7 @@ public interface CachedMetaData extends CachedData {
      * @return a result containing the prefix
      * @since 5.4
      */
-    @NonNull Result<String, PrefixNode> queryPrefix();
+    Result<String, PrefixNode> queryPrefix();
 
     /**
      * Gets the prefix.
@@ -158,7 +157,7 @@ public interface CachedMetaData extends CachedData {
      * @return a result containing the suffix
      * @since 5.4
      */
-    @NonNull Result<String, SuffixNode> querySuffix();
+    Result<String, SuffixNode> querySuffix();
 
     /**
      * Gets the suffix.
@@ -187,7 +186,7 @@ public interface CachedMetaData extends CachedData {
      * @return a result containing the weight
      * @since 5.5
      */
-    @NonNull Result<Integer, WeightNode> queryWeight();
+    Result<Integer, WeightNode> queryWeight();
 
     /**
      * Gets the weight.
@@ -208,7 +207,7 @@ public interface CachedMetaData extends CachedData {
      *
      * @return a map of meta
      */
-    @NonNull @Unmodifiable Map<String, List<String>> getMeta();
+    @Unmodifiable Map<String, List<String>> getMeta();
 
     /**
      * Gets a sorted map of all accumulated {@link PrefixNode prefixes}.
@@ -217,7 +216,7 @@ public interface CachedMetaData extends CachedData {
      *
      * @return a sorted map of prefixes
      */
-    @NonNull @Unmodifiable SortedMap<Integer, String> getPrefixes();
+    @Unmodifiable SortedMap<Integer, String> getPrefixes();
 
     /**
      * Gets a sorted map of all accumulated {@link SuffixNode suffixes}.
@@ -226,7 +225,7 @@ public interface CachedMetaData extends CachedData {
      *
      * @return a sorted map of suffixes
      */
-    @NonNull @Unmodifiable SortedMap<Integer, String> getSuffixes();
+    @Unmodifiable SortedMap<Integer, String> getSuffixes();
 
     /**
      * Gets the name of the holders primary group.
@@ -243,13 +242,13 @@ public interface CachedMetaData extends CachedData {
      *
      * @return the definition used for the prefix stack
      */
-    @NonNull MetaStackDefinition getPrefixStackDefinition();
+    MetaStackDefinition getPrefixStackDefinition();
 
     /**
      * Gets the definition used for the suffix stack.
      *
      * @return the definition used for the suffix stack
      */
-    @NonNull MetaStackDefinition getSuffixStackDefinition();
+    MetaStackDefinition getSuffixStackDefinition();
 
 }
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 0f5205540..96bc0d07b 100644
--- a/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java
+++ b/api/src/main/java/net/luckperms/api/cacheddata/CachedPermissionData.java
@@ -27,7 +27,6 @@ package net.luckperms.api.cacheddata;
 
 import net.luckperms.api.node.Node;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Map;
@@ -52,7 +51,7 @@ public interface CachedPermissionData extends CachedData {
      * @throws NullPointerException if permission is null
      * @since 5.4
      */
-    @NonNull Result<Tristate, Node> queryPermission(@NonNull String permission);
+    Result<Tristate, Node> queryPermission(String permission);
 
     /**
      * Performs a permission check for the given {@code permission} node.
@@ -64,7 +63,7 @@ public interface CachedPermissionData extends CachedData {
      * @return a tristate result
      * @throws NullPointerException if permission is null
      */
-    default @NonNull Tristate checkPermission(@NonNull String permission) {
+    default Tristate checkPermission(String permission) {
         return queryPermission(permission).result();
     }
 
@@ -80,6 +79,6 @@ public interface CachedPermissionData extends CachedData {
      *
      * @return an immutable set of permissions
      */
-    @NonNull @Unmodifiable Map<String, Boolean> getPermissionMap();
+    @Unmodifiable Map<String, Boolean> getPermissionMap();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/cacheddata/Result.java b/api/src/main/java/net/luckperms/api/cacheddata/Result.java
index 729c6d788..e059adb92 100644
--- a/api/src/main/java/net/luckperms/api/cacheddata/Result.java
+++ b/api/src/main/java/net/luckperms/api/cacheddata/Result.java
@@ -26,7 +26,7 @@
 package net.luckperms.api.cacheddata;
 
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents the result of a cached data lookup.
diff --git a/api/src/main/java/net/luckperms/api/cacheddata/package-info.java b/api/src/main/java/net/luckperms/api/cacheddata/package-info.java
index ec5b4bb8c..5181858e9 100644
--- a/api/src/main/java/net/luckperms/api/cacheddata/package-info.java
+++ b/api/src/main/java/net/luckperms/api/cacheddata/package-info.java
@@ -27,4 +27,5 @@
  * Caches permission checks and meta lookups for {@link net.luckperms.api.model.user.User}s and
  * {@link net.luckperms.api.model.group.Group}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.cacheddata;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/context/Context.java b/api/src/main/java/net/luckperms/api/context/Context.java
index af398a1b3..479455546 100644
--- a/api/src/main/java/net/luckperms/api/context/Context.java
+++ b/api/src/main/java/net/luckperms/api/context/Context.java
@@ -25,8 +25,7 @@
 
 package net.luckperms.api.context;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents an individual context pair.
@@ -89,13 +88,13 @@ public interface Context {
      *
      * @return the key
      */
-    @NonNull String getKey();
+    String getKey();
 
     /**
      * Gets the context value
      *
      * @return the value
      */
-    @NonNull String getValue();
+    String getValue();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/context/ContextCalculator.java b/api/src/main/java/net/luckperms/api/context/ContextCalculator.java
index e3bc37731..c389d8966 100644
--- a/api/src/main/java/net/luckperms/api/context/ContextCalculator.java
+++ b/api/src/main/java/net/luckperms/api/context/ContextCalculator.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.context;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Objects;
 import java.util.function.Function;
@@ -70,7 +69,7 @@ public interface ContextCalculator<T> {
      * @param <T> the contextual type
      * @return the resultant calculator
      */
-    static <T> @NonNull ContextCalculator<T> forSingleContext(@NonNull String key, @NonNull Function<T, String> valueFunction) {
+    static <T> ContextCalculator<T> forSingleContext(String key, Function<T, String> valueFunction) {
         Objects.requireNonNull(key, "key");
         Objects.requireNonNull(valueFunction, "valueFunction");
         return (target, consumer) -> {
@@ -92,7 +91,7 @@ public interface ContextCalculator<T> {
      * @param target the target contextual subject for this operation
      * @param consumer the {@link ContextConsumer} to submit contexts to
      */
-    void calculate(@NonNull T target, @NonNull ContextConsumer consumer);
+    void calculate(T target, ContextConsumer consumer);
 
     /**
      * Gets a {@link ContextSet}, containing some/all of the contexts this
@@ -103,7 +102,7 @@ public interface ContextCalculator<T> {
      *
      * @return a set of potential contexts
      */
-    default @NonNull ContextSet estimatePotentialContexts() {
+    default ContextSet estimatePotentialContexts() {
         return ImmutableContextSet.empty();
     }
 
diff --git a/api/src/main/java/net/luckperms/api/context/ContextConsumer.java b/api/src/main/java/net/luckperms/api/context/ContextConsumer.java
index e3f58a0cb..4261538ae 100644
--- a/api/src/main/java/net/luckperms/api/context/ContextConsumer.java
+++ b/api/src/main/java/net/luckperms/api/context/ContextConsumer.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.context;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Functional interface that accepts context key value pairs.
@@ -39,14 +38,14 @@ public interface ContextConsumer {
      * @param key the key
      * @param value the value
      */
-    void accept(@NonNull String key, @NonNull String value);
+    void accept(String key, String value);
 
     /**
      * Accepts a context pair.
      *
      * @param context the context
      */
-    default void accept(@NonNull Context context) {
+    default void accept(Context context) {
         accept(context.getKey(), context.getValue());
     }
 
@@ -55,7 +54,7 @@ public interface ContextConsumer {
      *
      * @param contextSet the context set
      */
-    default void accept(@NonNull ContextSet contextSet) {
+    default void accept(ContextSet contextSet) {
         for (Context entry : contextSet) {
             accept(entry);
         }
diff --git a/api/src/main/java/net/luckperms/api/context/ContextManager.java b/api/src/main/java/net/luckperms/api/context/ContextManager.java
index 7719caeb1..0f665f26e 100644
--- a/api/src/main/java/net/luckperms/api/context/ContextManager.java
+++ b/api/src/main/java/net/luckperms/api/context/ContextManager.java
@@ -28,7 +28,6 @@ package net.luckperms.api.context;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.query.QueryMode;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.Internal;
 
 import java.util.Optional;
@@ -61,7 +60,7 @@ public interface ContextManager {
      * @param subject the subject
      * @return the applicable context for the subject
      */
-    @NonNull ImmutableContextSet getContext(@NonNull Object subject);
+    ImmutableContextSet getContext(Object subject);
 
     /**
      * Queries the ContextManager for current context values for the given User.
@@ -76,7 +75,7 @@ public interface ContextManager {
      * @param user the user
      * @return the applicable context for the subject
      */
-    @NonNull Optional<ImmutableContextSet> getContext(@NonNull User user);
+    Optional<ImmutableContextSet> getContext(User user);
 
     /**
      * Gets the contexts from the static calculators in this manager.
@@ -86,7 +85,7 @@ public interface ContextManager {
      *
      * @return the current active static contexts
      */
-    @NonNull ImmutableContextSet getStaticContext();
+    ImmutableContextSet getStaticContext();
 
     /**
      * Creates a new {@link QueryOptions.Builder}.
@@ -94,7 +93,7 @@ public interface ContextManager {
      * @param mode the mode
      * @return a new query options builder
      */
-    QueryOptions.@NonNull Builder queryOptionsBuilder(@NonNull QueryMode mode);
+    QueryOptions.Builder queryOptionsBuilder(QueryMode mode);
 
     /**
      * Obtains current {@link QueryOptions} for the subject.
@@ -102,7 +101,7 @@ public interface ContextManager {
      * @param subject the subject
      * @return the query options for the subject
      */
-    @NonNull QueryOptions getQueryOptions(@NonNull Object subject);
+    QueryOptions getQueryOptions(Object subject);
 
     /**
      * Obtains current {@link QueryOptions} for the given User.
@@ -116,28 +115,28 @@ public interface ContextManager {
      * @param user the user
      * @return the query options for the subject
      */
-    @NonNull Optional<QueryOptions> getQueryOptions(@NonNull User user);
+    Optional<QueryOptions> getQueryOptions(User user);
 
     /**
      * Gets the static query options, using the registered static context calculators.
      *
      * @return the current static query options
      */
-    @NonNull QueryOptions getStaticQueryOptions();
+    QueryOptions getStaticQueryOptions();
 
     /**
      * Registers a context calculator with the manager.
      *
      * @param calculator the calculator
      */
-    void registerCalculator(@NonNull ContextCalculator<?> calculator);
+    void registerCalculator(ContextCalculator<?> calculator);
 
     /**
      * Unregisters a context calculator with the manager.
      *
      * @param calculator the calculator
      */
-    void unregisterCalculator(@NonNull ContextCalculator<?> calculator);
+    void unregisterCalculator(ContextCalculator<?> calculator);
 
     /**
      * Signal to the {@link ContextManager} that a {@code subject}s
@@ -149,7 +148,7 @@ public interface ContextManager {
      * @param subject the subject
      * @since 5.2
      */
-    void signalContextUpdate(@NonNull Object subject);
+    void signalContextUpdate(Object subject);
 
     /**
      * Gets the {@link ContextSetFactory}, responsible for creating
@@ -158,7 +157,7 @@ public interface ContextManager {
      * @return the context set factory
      */
     @Internal
-    @NonNull ContextSetFactory getContextSetFactory();
+    ContextSetFactory getContextSetFactory();
 
     /**
      * Invalidates the lookup cache for a given subject
@@ -167,7 +166,7 @@ public interface ContextManager {
      * @deprecated Use {@link #signalContextUpdate(Object)} instead
      */
     @Deprecated
-    default void invalidateCache(@NonNull Object subject) {
+    default void invalidateCache(Object subject) {
         signalContextUpdate(subject);
     }
 
diff --git a/api/src/main/java/net/luckperms/api/context/ContextSet.java b/api/src/main/java/net/luckperms/api/context/ContextSet.java
index bb4e0d157..d744a80ee 100644
--- a/api/src/main/java/net/luckperms/api/context/ContextSet.java
+++ b/api/src/main/java/net/luckperms/api/context/ContextSet.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.context;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Iterator;
@@ -91,7 +90,7 @@ public interface ContextSet extends Iterable<Context> {
      *
      * @return an immutable representation of this set
      */
-    @NonNull ImmutableContextSet immutableCopy();
+    ImmutableContextSet immutableCopy();
 
     /**
      * Creates a mutable copy of this {@link ContextSet}.
@@ -101,7 +100,7 @@ public interface ContextSet extends Iterable<Context> {
      *
      * @return a mutable ContextSet
      */
-    @NonNull MutableContextSet mutableCopy();
+    MutableContextSet mutableCopy();
 
     /**
      * Returns a {@link Set} of {@link Context}s representing the current
@@ -112,7 +111,7 @@ public interface ContextSet extends Iterable<Context> {
      *
      * @return an immutable set
      */
-    @NonNull @Unmodifiable Set<Context> toSet();
+    @Unmodifiable Set<Context> toSet();
 
     /**
      * Returns a {@link Map} representing the current state of this
@@ -123,7 +122,7 @@ public interface ContextSet extends Iterable<Context> {
      *
      * @return a map
      */
-    @NonNull @Unmodifiable Map<String, Set<String>> toMap();
+    @Unmodifiable Map<String, Set<String>> toMap();
 
     /**
      * Returns a {@link Map} <b>loosely</b> representing the current state of
@@ -139,7 +138,7 @@ public interface ContextSet extends Iterable<Context> {
      * @deprecated Deprecated because the returned map may not contain all data in the ContextSet
      */
     @Deprecated
-    @NonNull @Unmodifiable Map<String, String> toFlattenedMap();
+    @Unmodifiable Map<String, String> toFlattenedMap();
 
     /**
      * Returns an {@link Iterator} over each of the context pairs in this set.
@@ -152,7 +151,7 @@ public interface ContextSet extends Iterable<Context> {
      * @return an iterator
      */
     @Override
-    @NonNull @Unmodifiable Iterator<Context> iterator();
+    @Unmodifiable Iterator<Context> iterator();
 
     /**
      * Returns if the {@link ContextSet} contains at least one value for the
@@ -162,7 +161,7 @@ public interface ContextSet extends Iterable<Context> {
      * @return true if the set contains a value for the key
      * @throws NullPointerException if the key is null
      */
-    boolean containsKey(@NonNull String key);
+    boolean containsKey(String key);
 
     /**
      * Returns a {@link Set} of the values mapped to the given key.
@@ -174,7 +173,7 @@ public interface ContextSet extends Iterable<Context> {
      * @return a set of values
      * @throws NullPointerException if the key is null
      */
-    @NonNull @Unmodifiable Set<String> getValues(@NonNull String key);
+    @Unmodifiable Set<String> getValues(String key);
 
     /**
      * Returns any value from this {@link ContextSet} matching the key, if present.
@@ -185,7 +184,7 @@ public interface ContextSet extends Iterable<Context> {
      * @param key the key to find values for
      * @return an optional containing any match
      */
-    default @NonNull Optional<String> getAnyValue(@NonNull String key) {
+    default Optional<String> getAnyValue(String key) {
         return getValues(key).stream().findAny();
     }
 
@@ -197,7 +196,7 @@ public interface ContextSet extends Iterable<Context> {
      * @return true if the set contains the context pair
      * @throws NullPointerException if the key or value is null
      */
-    boolean contains(@NonNull String key, @NonNull String value);
+    boolean contains(String key, String value);
 
     /**
      * Returns if the {@link ContextSet} contains a given context pairing.
@@ -206,7 +205,7 @@ public interface ContextSet extends Iterable<Context> {
      * @return true if the set contains the context pair
      * @throws NullPointerException if the key or value is null
      */
-    default boolean contains(@NonNull Context entry) {
+    default boolean contains(Context entry) {
         Objects.requireNonNull(entry, "entry");
         return contains(entry.getKey(), entry.getValue());
     }
@@ -219,7 +218,7 @@ public interface ContextSet extends Iterable<Context> {
      * @return true if the set contains any of the pairs
      * @since 5.2
      */
-    default boolean containsAny(@NonNull String key, @NonNull Iterable<String> values) {
+    default boolean containsAny(String key, Iterable<String> values) {
         Objects.requireNonNull(key, "key");
         Objects.requireNonNull(values, "values");
 
@@ -239,7 +238,7 @@ public interface ContextSet extends Iterable<Context> {
      * @param other the other set
      * @return true if this context set is satisfied by the other
      */
-    default boolean isSatisfiedBy(@NonNull ContextSet other) {
+    default boolean isSatisfiedBy(ContextSet other) {
         return isSatisfiedBy(other, ContextSatisfyMode.AT_LEAST_ONE_VALUE_PER_KEY);
     }
 
@@ -252,7 +251,7 @@ public interface ContextSet extends Iterable<Context> {
      * @return true if this context set is satisfied by the other
      * @since 5.2
      */
-    boolean isSatisfiedBy(@NonNull ContextSet other, @NonNull ContextSatisfyMode mode);
+    boolean isSatisfiedBy(ContextSet other, ContextSatisfyMode mode);
 
     /**
      * Returns if the {@link ContextSet} is empty.
diff --git a/api/src/main/java/net/luckperms/api/context/ContextSetFactory.java b/api/src/main/java/net/luckperms/api/context/ContextSetFactory.java
index 5463dfdc9..79f2b980f 100644
--- a/api/src/main/java/net/luckperms/api/context/ContextSetFactory.java
+++ b/api/src/main/java/net/luckperms/api/context/ContextSetFactory.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.context;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.Internal;
 
 /**
@@ -43,7 +42,7 @@ public interface ContextSetFactory {
      * @return a immutable context set builder
      * @see ImmutableContextSet#builder()
      */
-    ImmutableContextSet.@NonNull Builder immutableBuilder();
+    ImmutableContextSet.Builder immutableBuilder();
 
     /**
      * Prefer using {@link ImmutableContextSet#of(String, String)}.
@@ -53,7 +52,7 @@ public interface ContextSetFactory {
      * @return an immutable context set
      * @see ImmutableContextSet#of(String, String)
      */
-    @NonNull ImmutableContextSet immutableOf(@NonNull String key, @NonNull String value);
+    ImmutableContextSet immutableOf(String key, String value);
 
     /**
      * Prefer using {@link ImmutableContextSet#empty()}.
@@ -61,7 +60,7 @@ public interface ContextSetFactory {
      * @return an empty immutable context set
      * @see ImmutableContextSet#empty()
      */
-    @NonNull ImmutableContextSet immutableEmpty();
+    ImmutableContextSet immutableEmpty();
 
     /**
      * Prefer using {@link MutableContextSet#create()}.
@@ -69,6 +68,6 @@ public interface ContextSetFactory {
      * @return a new mutable context set
      * @see MutableContextSet#create()
      */
-    @NonNull MutableContextSet mutable();
+    MutableContextSet mutable();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java b/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java
index ae2fb0230..8d8ee8724 100644
--- a/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java
+++ b/api/src/main/java/net/luckperms/api/context/ImmutableContextSet.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.context;
 
 import net.luckperms.api.LuckPermsProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Objects;
 
@@ -40,7 +39,7 @@ public interface ImmutableContextSet extends ContextSet {
      *
      * @return a new ImmutableContextSet builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getContextManager().getContextSetFactory().immutableBuilder();
     }
 
@@ -49,7 +48,7 @@ public interface ImmutableContextSet extends ContextSet {
      *
      * @return an empty ImmutableContextSet
      */
-    static @NonNull ImmutableContextSet empty() {
+    static ImmutableContextSet empty() {
         return LuckPermsProvider.get().getContextManager().getContextSetFactory().immutableEmpty();
     }
 
@@ -61,7 +60,7 @@ public interface ImmutableContextSet extends ContextSet {
      * @return a new ImmutableContextSet containing one context pair
      * @throws NullPointerException if key or value is null
      */
-    static @NonNull ImmutableContextSet of(@NonNull String key, @NonNull String value) {
+    static ImmutableContextSet of(String key, String value) {
         return LuckPermsProvider.get().getContextManager().getContextSetFactory().immutableOf(key, value);
     }
 
@@ -70,7 +69,7 @@ public interface ImmutableContextSet extends ContextSet {
      */
     @Override
     @Deprecated
-    @NonNull ImmutableContextSet immutableCopy();
+    ImmutableContextSet immutableCopy();
 
     /**
      * A builder for {@link ImmutableContextSet}.
@@ -86,7 +85,7 @@ public interface ImmutableContextSet extends ContextSet {
          * @throws NullPointerException if the key or value is null
          * @see MutableContextSet#add(String, String)
          */
-        @NonNull Builder add(@NonNull String key, @NonNull String value);
+        Builder add(String key, String value);
 
         /**
          * Adds a context to the set.
@@ -96,7 +95,7 @@ public interface ImmutableContextSet extends ContextSet {
          * @throws NullPointerException if the entry is null
          * @see MutableContextSet#add(Context)
          */
-        default @NonNull Builder add(@NonNull Context entry) {
+        default Builder add(Context entry) {
             Objects.requireNonNull(entry, "entry");
             add(entry.getKey(), entry.getValue());
             return this;
@@ -110,7 +109,7 @@ public interface ImmutableContextSet extends ContextSet {
          * @throws NullPointerException if iterable is null
          * @see MutableContextSet#addAll(Iterable)
          */
-        default @NonNull Builder addAll(@NonNull Iterable<Context> iterable) {
+        default Builder addAll(Iterable<Context> iterable) {
             for (Context e : Objects.requireNonNull(iterable, "iterable")) {
                 add(e);
             }
@@ -125,7 +124,7 @@ public interface ImmutableContextSet extends ContextSet {
          * @throws NullPointerException if the contextSet is null
          * @see MutableContextSet#addAll(ContextSet)
          */
-        @NonNull Builder addAll(@NonNull ContextSet contextSet);
+        Builder addAll(ContextSet contextSet);
 
         /**
          * Creates a {@link ImmutableContextSet} from the values previously
@@ -133,6 +132,6 @@ public interface ImmutableContextSet extends ContextSet {
          *
          * @return an {@link ImmutableContextSet} from the builder
          */
-        @NonNull ImmutableContextSet build();
+        ImmutableContextSet build();
     }
 }
diff --git a/api/src/main/java/net/luckperms/api/context/MutableContextSet.java b/api/src/main/java/net/luckperms/api/context/MutableContextSet.java
index cdee00145..cde0d6f7c 100644
--- a/api/src/main/java/net/luckperms/api/context/MutableContextSet.java
+++ b/api/src/main/java/net/luckperms/api/context/MutableContextSet.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.context;
 
 import net.luckperms.api.LuckPermsProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Objects;
 
@@ -40,7 +39,7 @@ public interface MutableContextSet extends ContextSet {
      *
      * @return a new MutableContextSet
      */
-    static @NonNull MutableContextSet create() {
+    static MutableContextSet create() {
         return LuckPermsProvider.get().getContextManager().getContextSetFactory().mutable();
     }
 
@@ -52,7 +51,7 @@ public interface MutableContextSet extends ContextSet {
      * @return a new MutableContextSet containing one context pair
      * @throws NullPointerException if key or value is null
      */
-    static @NonNull MutableContextSet of(@NonNull String key, @NonNull String value) {
+    static MutableContextSet of(String key, String value) {
         Objects.requireNonNull(key, "key");
         Objects.requireNonNull(value, "value");
         MutableContextSet set = create();
@@ -67,7 +66,7 @@ public interface MutableContextSet extends ContextSet {
      * @param value the value to add
      * @throws NullPointerException if the key or value is null
      */
-    void add(@NonNull String key, @NonNull String value);
+    void add(String key, String value);
 
     /**
      * Adds a context to this set.
@@ -75,7 +74,7 @@ public interface MutableContextSet extends ContextSet {
      * @param entry the entry to add
      * @throws NullPointerException if the entry is null
      */
-    default void add(@NonNull Context entry) {
+    default void add(Context entry) {
         Objects.requireNonNull(entry, "entry");
         add(entry.getKey(), entry.getValue());
     }
@@ -86,7 +85,7 @@ public interface MutableContextSet extends ContextSet {
      * @param iterable an iterable of key value context pairs
      * @throws NullPointerException if iterable is null
      */
-    default void addAll(@NonNull Iterable<Context> iterable) {
+    default void addAll(Iterable<Context> iterable) {
         for (Context e : Objects.requireNonNull(iterable, "iterable")) {
             add(e);
         }
@@ -98,7 +97,7 @@ public interface MutableContextSet extends ContextSet {
      * @param contextSet the set to add from
      * @throws NullPointerException if the contextSet is null
      */
-    void addAll(@NonNull ContextSet contextSet);
+    void addAll(ContextSet contextSet);
 
     /**
      * Removes a context from this set.
@@ -107,7 +106,7 @@ public interface MutableContextSet extends ContextSet {
      * @param value the value to remove
      * @throws NullPointerException if the key or value is null
      */
-    void remove(@NonNull String key, @NonNull String value);
+    void remove(String key, String value);
 
     /**
      * Removes all contexts from this set with the given key.
@@ -115,7 +114,7 @@ public interface MutableContextSet extends ContextSet {
      * @param key the key to remove
      * @throws NullPointerException if the key is null
      */
-    void removeAll(@NonNull String key);
+    void removeAll(String key);
 
     /**
      * Removes all contexts from the set.
diff --git a/api/src/main/java/net/luckperms/api/context/StaticContextCalculator.java b/api/src/main/java/net/luckperms/api/context/StaticContextCalculator.java
index 9550f12b0..9b3be9eec 100644
--- a/api/src/main/java/net/luckperms/api/context/StaticContextCalculator.java
+++ b/api/src/main/java/net/luckperms/api/context/StaticContextCalculator.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.context;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Objects;
 import java.util.function.Supplier;
@@ -66,10 +65,10 @@ public interface StaticContextCalculator extends ContextCalculator<Object> {
      *
      * @param consumer the {@link ContextConsumer} to submit contexts to
      */
-    void calculate(@NonNull ContextConsumer consumer);
+    void calculate(ContextConsumer consumer);
 
     @Override
-    default void calculate(@NonNull Object target, @NonNull ContextConsumer consumer) {
+    default void calculate(Object target, ContextConsumer consumer) {
         calculate(consumer);
     }
 }
diff --git a/api/src/main/java/net/luckperms/api/context/package-info.java b/api/src/main/java/net/luckperms/api/context/package-info.java
index 554258d8e..1241ed460 100644
--- a/api/src/main/java/net/luckperms/api/context/package-info.java
+++ b/api/src/main/java/net/luckperms/api/context/package-info.java
@@ -27,4 +27,5 @@
  * Context functionality, including {@link net.luckperms.api.context.ContextSet}s and
  * {@link net.luckperms.api.context.ContextCalculator}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.context;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/EventBus.java b/api/src/main/java/net/luckperms/api/event/EventBus.java
index 15f827a32..9efe545ed 100644
--- a/api/src/main/java/net/luckperms/api/event/EventBus.java
+++ b/api/src/main/java/net/luckperms/api/event/EventBus.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.event;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Set;
@@ -50,7 +49,7 @@ public interface EventBus {
      * @param <T>        the event class
      * @return an event handler instance representing this subscription
      */
-    <T extends LuckPermsEvent> @NonNull EventSubscription<T> subscribe(@NonNull Class<T> eventClass, @NonNull Consumer<? super T> handler);
+    <T extends LuckPermsEvent> EventSubscription<T> subscribe(Class<T> eventClass, Consumer<? super T> handler);
 
     /**
      * Registers a new subscription to the given event.
@@ -70,7 +69,7 @@ public interface EventBus {
      * @param handler    the event handler
      * @return an event handler instance representing this subscription
      */
-    <T extends LuckPermsEvent> @NonNull EventSubscription<T> subscribe(Object plugin, @NonNull Class<T> eventClass, @NonNull Consumer<? super T> handler);
+    <T extends LuckPermsEvent> EventSubscription<T> subscribe(Object plugin, Class<T> eventClass, Consumer<? super T> handler);
 
     /**
      * Gets a set of all registered handlers for a given event.
@@ -79,6 +78,6 @@ public interface EventBus {
      * @param <T>        the event class
      * @return an immutable set of event handlers
      */
-    <T extends LuckPermsEvent> @NonNull @Unmodifiable Set<EventSubscription<T>> getSubscriptions(@NonNull Class<T> eventClass);
+    <T extends LuckPermsEvent> @Unmodifiable Set<EventSubscription<T>> getSubscriptions(Class<T> eventClass);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/EventSubscription.java b/api/src/main/java/net/luckperms/api/event/EventSubscription.java
index ffae8abf7..93efceae4 100644
--- a/api/src/main/java/net/luckperms/api/event/EventSubscription.java
+++ b/api/src/main/java/net/luckperms/api/event/EventSubscription.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.event;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.function.Consumer;
 
@@ -41,7 +40,7 @@ public interface EventSubscription<T extends LuckPermsEvent> extends AutoCloseab
      *
      * @return the event class
      */
-    @NonNull Class<T> getEventClass();
+    Class<T> getEventClass();
 
     /**
      * Returns true if this handler is active
@@ -61,5 +60,5 @@ public interface EventSubscription<T extends LuckPermsEvent> extends AutoCloseab
      *
      * @return the event consumer
      */
-    @NonNull Consumer<? super T> getHandler();
+    Consumer<? super T> getHandler();
 }
diff --git a/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java b/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java
index a3f2cd497..51071c366 100644
--- a/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/LuckPermsEvent.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.event;
 
 import net.luckperms.api.LuckPerms;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A superinterface for all LuckPerms events.
@@ -38,13 +37,13 @@ public interface LuckPermsEvent {
      *
      * @return the api instance
      */
-    @NonNull LuckPerms getLuckPerms();
+    LuckPerms getLuckPerms();
 
     /**
      * Gets the type of the event.
      *
      * @return the type of the event
      */
-    @NonNull Class<? extends LuckPermsEvent> getEventType();
+    Class<? extends LuckPermsEvent> getEventType();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/cause/package-info.java b/api/src/main/java/net/luckperms/api/event/cause/package-info.java
index 45e289314..fac878fff 100644
--- a/api/src/main/java/net/luckperms/api/event/cause/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/cause/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Event causes.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.cause;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java b/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java
index aeac27492..edb93dce9 100644
--- a/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/context/ContextUpdateEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.context;
 import net.luckperms.api.context.ContextManager;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Optional;
 
@@ -58,7 +57,7 @@ public interface ContextUpdateEvent extends LuckPermsEvent {
      * @return the subject
      */
     @Param(0)
-    @NonNull Object getSubject();
+    Object getSubject();
 
     /**
      * Gets the subject whose contexts were updated, casted to a given type.
@@ -67,7 +66,7 @@ public interface ContextUpdateEvent extends LuckPermsEvent {
      * @param <T> the subject type
      * @return the casted subject
      */
-    default <T> @NonNull Optional<T> getSubject(@NonNull Class<T> subjectClass) {
+    default <T> Optional<T> getSubject(Class<T> subjectClass) {
         Object subject = getSubject();
         return subjectClass.isInstance(subject) ? Optional.of(subjectClass.cast(subject)) : Optional.empty();
     }
diff --git a/api/src/main/java/net/luckperms/api/event/context/package-info.java b/api/src/main/java/net/luckperms/api/event/context/package-info.java
index b7507c2ac..a125569f4 100644
--- a/api/src/main/java/net/luckperms/api/event/context/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/context/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to {@link net.luckperms.api.context.Context}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.context;
\ No newline at end of file
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 0097fb1a4..4b2a94c37 100644
--- a/api/src/main/java/net/luckperms/api/event/extension/ExtensionLoadEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/extension/ExtensionLoadEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.extension;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.extension.Extension;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when an {@link Extension} is loaded.
@@ -41,6 +40,6 @@ public interface ExtensionLoadEvent extends LuckPermsEvent {
      * @return the extension
      */
     @Param(0)
-    @NonNull Extension getExtension();
+    Extension getExtension();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/extension/package-info.java b/api/src/main/java/net/luckperms/api/event/extension/package-info.java
index eb3c3669f..f0a9f689c 100644
--- a/api/src/main/java/net/luckperms/api/event/extension/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/extension/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to {@link net.luckperms.api.extension.Extension}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.extension;
\ No newline at end of file
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 b2ead950a..f84ba93b2 100644
--- a/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/group/GroupCacheLoadEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.group.Group;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a groups {@link CachedDataManager} is loaded.
@@ -42,7 +41,7 @@ public interface GroupCacheLoadEvent extends LuckPermsEvent {
      * @return the group
      */
     @Param(0)
-    @NonNull Group getGroup();
+    Group getGroup();
 
     /**
      * Gets the data that was loaded
@@ -50,6 +49,6 @@ public interface GroupCacheLoadEvent extends LuckPermsEvent {
      * @return the loaded data
      */
     @Param(1)
-    @NonNull CachedDataManager getLoadedData();
+    CachedDataManager getLoadedData();
 
 }
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 3f1fad1ab..aaab2e756 100644
--- a/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/group/GroupCreateEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.cause.CreationCause;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.group.Group;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a group is created
@@ -42,7 +41,7 @@ public interface GroupCreateEvent extends LuckPermsEvent {
      * @return the new group
      */
     @Param(0)
-    @NonNull Group getGroup();
+    Group getGroup();
 
     /**
      * Gets the cause of the creation
@@ -50,6 +49,6 @@ public interface GroupCreateEvent extends LuckPermsEvent {
      * @return the cause of the creation
      */
     @Param(1)
-    @NonNull CreationCause getCause();
+    CreationCause getCause();
 
 }
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 182581adc..c5402041b 100644
--- a/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/group/GroupDataRecalculateEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.group.Group;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a groups cached data is refreshed
@@ -42,7 +41,7 @@ public interface GroupDataRecalculateEvent extends LuckPermsEvent {
      * @return the group
      */
     @Param(0)
-    @NonNull Group getGroup();
+    Group getGroup();
 
     /**
      * Gets the data that was recalculated
@@ -50,6 +49,6 @@ public interface GroupDataRecalculateEvent extends LuckPermsEvent {
      * @return the data
      */
     @Param(1)
-    @NonNull CachedDataManager getData();
+    CachedDataManager getData();
 
 }
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 4511ca7df..93ba174cd 100644
--- a/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/group/GroupDeleteEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.cause.DeletionCause;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Set;
 
@@ -44,7 +43,7 @@ public interface GroupDeleteEvent extends LuckPermsEvent {
      * @return the name of the deleted group
      */
     @Param(0)
-    @NonNull String getGroupName();
+    String getGroupName();
 
     /**
      * Gets an immutable copy of the groups existing data
@@ -52,7 +51,7 @@ public interface GroupDeleteEvent extends LuckPermsEvent {
      * @return a copy of the groups existing data
      */
     @Param(1)
-    @NonNull Set<Node> getExistingData();
+    Set<Node> getExistingData();
 
     /**
      * Gets the cause of the deletion
@@ -60,6 +59,6 @@ public interface GroupDeleteEvent extends LuckPermsEvent {
      * @return the cause of the deletion
      */
     @Param(2)
-    @NonNull DeletionCause getCause();
+    DeletionCause getCause();
 
 }
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 b8c2de247..ba9e51450 100644
--- a/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/group/GroupLoadEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.group;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.group.Group;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a group is loaded into memory from the storage.
@@ -43,6 +42,6 @@ public interface GroupLoadEvent extends LuckPermsEvent {
      * @return the group that was loaded
      */
     @Param(0)
-    @NonNull Group getGroup();
+    Group getGroup();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/group/package-info.java b/api/src/main/java/net/luckperms/api/event/group/package-info.java
index 2ce5ddfc7..6646b4d71 100644
--- a/api/src/main/java/net/luckperms/api/event/group/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/group/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to {@link net.luckperms.api.model.group.Group}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.group;
\ No newline at end of file
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 b97c33075..719cdafe1 100644
--- a/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/log/LogBroadcastEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.Cancellable;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a log entry is about to be sent to notifiable players on the platform
@@ -42,7 +41,7 @@ public interface LogBroadcastEvent extends LuckPermsEvent, Cancellable {
      * @return the log entry to be broadcasted
      */
     @Param(0)
-    @NonNull Action getEntry();
+    Action getEntry();
 
     /**
      * Gets where the log entry originated from.
@@ -50,7 +49,7 @@ public interface LogBroadcastEvent extends LuckPermsEvent, Cancellable {
      * @return the origin of the log
      */
     @Param(1)
-    @NonNull Origin getOrigin();
+    Origin getOrigin();
 
     /**
      * Represents where a log entry is from
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 6f2d90a23..0be838a28 100644
--- a/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/log/LogNetworkPublishEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.Cancellable;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
 
@@ -44,7 +43,7 @@ public interface LogNetworkPublishEvent extends LuckPermsEvent, Cancellable {
      * @return the id of the log entry being published
      */
     @Param(0)
-    @NonNull UUID getLogId();
+    UUID getLogId();
 
     /**
      * Gets the log entry to be published
@@ -52,6 +51,6 @@ public interface LogNetworkPublishEvent extends LuckPermsEvent, Cancellable {
      * @return the log entry to be published
      */
     @Param(1)
-    @NonNull Action getEntry();
+    Action getEntry();
 
 }
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 c51549348..9d526d0af 100644
--- a/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/log/LogNotifyEvent.java
@@ -30,7 +30,6 @@ import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.Cancellable;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.platform.PlatformEntity;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a log entry is about to be sent to specific notifiable object on
@@ -48,7 +47,7 @@ public interface LogNotifyEvent extends LuckPermsEvent, Cancellable {
      * @return the log entry to be sent
      */
     @Param(0)
-    @NonNull Action getEntry();
+    Action getEntry();
 
     /**
      * Gets where the log entry originated from.
@@ -56,7 +55,7 @@ public interface LogNotifyEvent extends LuckPermsEvent, Cancellable {
      * @return the origin of the log
      */
     @Param(1)
-    @NonNull Origin getOrigin();
+    Origin getOrigin();
 
     /**
      * Gets the object to be notified.
@@ -64,7 +63,7 @@ public interface LogNotifyEvent extends LuckPermsEvent, Cancellable {
      * @return the object to notify
      */
     @Param(2)
-    @NonNull PlatformEntity getNotifiable();
+    PlatformEntity getNotifiable();
 
     /**
      * Represents where a log entry is from
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 060cd1aef..7495aaf17 100644
--- a/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/log/LogPublishEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.Cancellable;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a log is about to be published to the storage file/table
@@ -42,6 +41,6 @@ public interface LogPublishEvent extends LuckPermsEvent, Cancellable {
      * @return the log entry to be published
      */
     @Param(0)
-    @NonNull Action getEntry();
+    Action getEntry();
 
 }
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 96ac1d9ea..9e45004b3 100644
--- a/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/log/LogReceiveEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.log;
 import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
 
@@ -47,7 +46,7 @@ public interface LogReceiveEvent extends LuckPermsEvent {
      * @return the id of the log entry being received
      */
     @Param(0)
-    @NonNull UUID getLogId();
+    UUID getLogId();
 
     /**
      * Gets the log entry being received
@@ -55,6 +54,6 @@ public interface LogReceiveEvent extends LuckPermsEvent {
      * @return the log entry being received
      */
     @Param(1)
-    @NonNull Action getEntry();
+    Action getEntry();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/log/package-info.java b/api/src/main/java/net/luckperms/api/event/log/package-info.java
index a0bfba683..9ad0a5ceb 100644
--- a/api/src/main/java/net/luckperms/api/event/log/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/log/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to the {@link net.luckperms.api.actionlog.ActionLog}.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.log;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/messaging/CustomMessageReceiveEvent.java b/api/src/main/java/net/luckperms/api/event/messaging/CustomMessageReceiveEvent.java
index 2e43b5dea..8d0ef8b06 100644
--- a/api/src/main/java/net/luckperms/api/event/messaging/CustomMessageReceiveEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/messaging/CustomMessageReceiveEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.messaging;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.messaging.MessagingService;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a custom payload message is received via the {@link MessagingService}.
@@ -46,7 +45,7 @@ public interface CustomMessageReceiveEvent extends LuckPermsEvent {
      * @return the channel id
      */
     @Param(0)
-    @NonNull String getChannelId();
+    String getChannelId();
 
     /**
      * Gets the custom payload that was sent.
@@ -54,6 +53,6 @@ public interface CustomMessageReceiveEvent extends LuckPermsEvent {
      * @return the custom payload
      */
     @Param(1)
-    @NonNull String getPayload();
+    String getPayload();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/messaging/package-info.java b/api/src/main/java/net/luckperms/api/event/messaging/package-info.java
index ed66949e5..f8164ea5c 100644
--- a/api/src/main/java/net/luckperms/api/event/messaging/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/messaging/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to the {@link net.luckperms.api.messaging.MessagingService}.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.messaging;
\ No newline at end of file
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 c86985c15..87b34c577 100644
--- a/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/node/NodeAddEvent.java
@@ -27,7 +27,6 @@ package net.luckperms.api.event.node;
 
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Collections;
@@ -45,10 +44,10 @@ public interface NodeAddEvent extends NodeMutateEvent {
      * @return the node that was added
      */
     @Param(3)
-    @NonNull Node getNode();
+    Node getNode();
 
     @Override
-    default @NonNull @Unmodifiable Set<Node> getDataBefore() {
+    default @Unmodifiable Set<Node> getDataBefore() {
         // Get data after, then reverse the action
         Set<Node> nodes = new HashSet<>(this.getDataAfter());
         nodes.remove(this.getNode());
diff --git a/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java b/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java
index 1bb8e62ce..73c46b21c 100644
--- a/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/node/NodeClearEvent.java
@@ -27,7 +27,6 @@ package net.luckperms.api.event.node;
 
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Collections;
@@ -46,10 +45,10 @@ public interface NodeClearEvent extends NodeMutateEvent {
      * @since 5.3
      */
     @Param(3)
-    @NonNull @Unmodifiable Set<Node> getNodes();
+    @Unmodifiable Set<Node> getNodes();
 
     @Override
-    default @NonNull @Unmodifiable Set<Node> getDataBefore() {
+    default @Unmodifiable Set<Node> getDataBefore() {
         // Get data after, then reverse the action
         Set<Node> nodes = new HashSet<>(this.getDataAfter());
         nodes.addAll(this.getNodes());
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 f65575695..328d12c2e 100644
--- a/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/node/NodeMutateEvent.java
@@ -32,7 +32,6 @@ import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Set;
@@ -48,7 +47,7 @@ public interface NodeMutateEvent extends LuckPermsEvent {
      * @return the event target
      */
     @Param(0)
-    @NonNull PermissionHolder getTarget();
+    PermissionHolder getTarget();
 
     /**
      * Gets the data type that was mutated.
@@ -56,14 +55,14 @@ public interface NodeMutateEvent extends LuckPermsEvent {
      * @return the data type
      */
     @Param(1)
-    @NonNull DataType getDataType();
+    DataType getDataType();
 
     /**
      * Gets an immutable copy of the holders data before the change
      *
      * @return the data before the change
      */
-    @NonNull @Unmodifiable Set<Node> getDataBefore();
+    @Unmodifiable Set<Node> getDataBefore();
 
     /**
      * Gets an immutable copy of the holders data after the change
@@ -71,7 +70,7 @@ public interface NodeMutateEvent extends LuckPermsEvent {
      * @return the data after the change
      */
     @Param(2)
-    @NonNull @Unmodifiable Set<Node> getDataAfter();
+    @Unmodifiable Set<Node> getDataAfter();
 
     /**
      * Gets whether the target of this event is a {@link User}
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 fc29ff894..ce9575c78 100644
--- a/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/node/NodeRemoveEvent.java
@@ -27,7 +27,6 @@ package net.luckperms.api.event.node;
 
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Collections;
@@ -45,10 +44,10 @@ public interface NodeRemoveEvent extends NodeMutateEvent {
      * @return the node that was removed
      */
     @Param(3)
-    @NonNull Node getNode();
+    Node getNode();
 
     @Override
-    default @NonNull @Unmodifiable Set<Node> getDataBefore() {
+    default @Unmodifiable Set<Node> getDataBefore() {
         // Get data after, then reverse the action
         Set<Node> nodes = new HashSet<>(this.getDataAfter());
         nodes.add(this.getNode());
diff --git a/api/src/main/java/net/luckperms/api/event/node/package-info.java b/api/src/main/java/net/luckperms/api/event/node/package-info.java
index cf33da929..29c36543e 100644
--- a/api/src/main/java/net/luckperms/api/event/node/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/node/package-info.java
@@ -27,4 +27,5 @@
  * Events relating to changes to a {@link net.luckperms.api.model.user.User} or
  * {@link net.luckperms.api.model.group.Group}s {@link net.luckperms.api.model.data.NodeMap}.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.node;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/package-info.java b/api/src/main/java/net/luckperms/api/event/package-info.java
index 26343feea..ee9b67576 100644
--- a/api/src/main/java/net/luckperms/api/event/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Main events package.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event;
\ No newline at end of file
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 dd147f340..fd5a2fef9 100644
--- a/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/player/PlayerDataSaveEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.model.user.UserManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
 
@@ -46,7 +45,7 @@ public interface PlayerDataSaveEvent extends LuckPermsEvent {
      * @return the uuid
      */
     @Param(0)
-    @NonNull UUID getUniqueId();
+    UUID getUniqueId();
 
     /**
      * Gets the username that was saved.
@@ -54,7 +53,7 @@ public interface PlayerDataSaveEvent extends LuckPermsEvent {
      * @return the username
      */
     @Param(1)
-    @NonNull String getUsername();
+    String getUsername();
 
     /**
      * Gets the result of the operation.
@@ -62,6 +61,6 @@ public interface PlayerDataSaveEvent extends LuckPermsEvent {
      * @return the result
      */
     @Param(2)
-    @NonNull PlayerSaveResult getResult();
+    PlayerSaveResult getResult();
 
 }
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 334f63007..c57ff5751 100644
--- a/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/player/PlayerLoginProcessEvent.java
@@ -29,8 +29,7 @@ import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.util.Result;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
@@ -58,7 +57,7 @@ public interface PlayerLoginProcessEvent extends LuckPermsEvent, Result {
      * @return the uuid of the connection which was processed
      */
     @Param(0)
-    @NonNull UUID getUniqueId();
+    UUID getUniqueId();
 
     /**
      * Gets the username of the connection which was processed
@@ -66,7 +65,7 @@ public interface PlayerLoginProcessEvent extends LuckPermsEvent, Result {
      * @return the username of the connection which was processed
      */
     @Param(1)
-    @NonNull String getUsername();
+    String getUsername();
 
     /**
      * Gets if the login was processed successfully.
diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java
index ac1ca8510..cee366add 100644
--- a/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdDetermineTypeEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.player.lookup;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.ResultEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Objects;
 import java.util.UUID;
@@ -77,14 +76,14 @@ public interface UniqueIdDetermineTypeEvent extends LuckPermsEvent, ResultEvent<
      * @return the unique id
      */
     @Param(0)
-    @NonNull UUID getUniqueId();
+    UUID getUniqueId();
 
     /**
      * Gets the current result unique id type.
      *
      * @return the type
      */
-    default @NonNull String getType() {
+    default String getType() {
         return result().get();
     }
 
@@ -93,7 +92,7 @@ public interface UniqueIdDetermineTypeEvent extends LuckPermsEvent, ResultEvent<
      *
      * @param type the type
      */
-    default void setType(@NonNull String type) {
+    default void setType(String type) {
         Objects.requireNonNull(type, "type");
         result().set(type);
     }
diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java
index d6d9d151e..34a5faf81 100644
--- a/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UniqueIdLookupEvent.java
@@ -28,8 +28,7 @@ package net.luckperms.api.event.player.lookup;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.ResultEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
@@ -46,7 +45,7 @@ public interface UniqueIdLookupEvent extends LuckPermsEvent, ResultEvent<UUID> {
      * @return the username
      */
     @Param(0)
-    @NonNull String getUsername();
+    String getUsername();
 
     /**
      * Sets the result unique id.
diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java
index 54eb0f625..5e8352df9 100644
--- a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameLookupEvent.java
@@ -28,8 +28,7 @@ package net.luckperms.api.event.player.lookup;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.ResultEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
@@ -46,7 +45,7 @@ public interface UsernameLookupEvent extends LuckPermsEvent, ResultEvent<String>
      * @return the unique id
      */
     @Param(0)
-    @NonNull UUID getUniqueId();
+    UUID getUniqueId();
 
     /**
      * Sets the result username.
diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java
index a96f16875..39a28329f 100644
--- a/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/player/lookup/UsernameValidityCheckEvent.java
@@ -27,7 +27,6 @@ package net.luckperms.api.event.player.lookup;
 
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -44,7 +43,7 @@ public interface UsernameValidityCheckEvent extends LuckPermsEvent {
      * @return the username
      */
     @Param(0)
-    @NonNull String getUsername();
+    String getUsername();
 
     /**
      * Gets the current validity state for the username.
@@ -52,7 +51,7 @@ public interface UsernameValidityCheckEvent extends LuckPermsEvent {
      * @return the validity state
      */
     @Param(1)
-    @NonNull AtomicBoolean validityState();
+    AtomicBoolean validityState();
 
     /**
      * Gets if the username is currently considered to be valid.
diff --git a/api/src/main/java/net/luckperms/api/event/player/lookup/package-info.java b/api/src/main/java/net/luckperms/api/event/player/lookup/package-info.java
index 5fac0193a..e8f329c53 100644
--- a/api/src/main/java/net/luckperms/api/event/player/lookup/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/player/lookup/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to a player {@link java.util.UUID unique id} or username lookup.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.player.lookup;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/player/package-info.java b/api/src/main/java/net/luckperms/api/event/player/package-info.java
index dc109694b..44542eea5 100644
--- a/api/src/main/java/net/luckperms/api/event/player/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/player/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to a player.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.player;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/source/EntitySource.java b/api/src/main/java/net/luckperms/api/event/source/EntitySource.java
index 4225ad611..7660c8c1d 100644
--- a/api/src/main/java/net/luckperms/api/event/source/EntitySource.java
+++ b/api/src/main/java/net/luckperms/api/event/source/EntitySource.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.event.source;
 
 import net.luckperms.api.platform.PlatformEntity;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents an {@link PlatformEntity} which was the {@link Source} of something.
@@ -38,6 +37,6 @@ public interface EntitySource extends Source {
      *
      * @return the entity
      */
-    @NonNull PlatformEntity getEntity();
+    PlatformEntity getEntity();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/source/Source.java b/api/src/main/java/net/luckperms/api/event/source/Source.java
index 9426e870c..8a47e7956 100644
--- a/api/src/main/java/net/luckperms/api/event/source/Source.java
+++ b/api/src/main/java/net/luckperms/api/event/source/Source.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.event.source;
 
 import net.luckperms.api.platform.PlatformEntity;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents the source of an event.
@@ -40,7 +39,7 @@ public interface Source {
      *
      * @return the type
      */
-    @NonNull Type getType();
+    Type getType();
 
     /**
      * Represents a type of source
diff --git a/api/src/main/java/net/luckperms/api/event/source/package-info.java b/api/src/main/java/net/luckperms/api/event/source/package-info.java
index f068f09af..8d5c649fb 100644
--- a/api/src/main/java/net/luckperms/api/event/source/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/source/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Event sources.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.source;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/sync/PostNetworkSyncEvent.java b/api/src/main/java/net/luckperms/api/event/sync/PostNetworkSyncEvent.java
index c156eb0ce..f533ae8a7 100644
--- a/api/src/main/java/net/luckperms/api/event/sync/PostNetworkSyncEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/sync/PostNetworkSyncEvent.java
@@ -27,8 +27,7 @@ package net.luckperms.api.event.sync;
 
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
@@ -47,7 +46,7 @@ public interface PostNetworkSyncEvent extends LuckPermsEvent {
      * @return the id of the sync request
      */
     @Param(0)
-    @NonNull UUID getSyncId();
+    UUID getSyncId();
 
     /**
      * Gets the sync type.
@@ -55,7 +54,7 @@ public interface PostNetworkSyncEvent extends LuckPermsEvent {
      * @return the sync type
      */
     @Param(1)
-    @NonNull SyncType getType();
+    SyncType getType();
 
     /**
      * Gets if a sync occurred.
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 013d47f39..93baeb147 100644
--- a/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/sync/PreNetworkSyncEvent.java
@@ -28,8 +28,7 @@ package net.luckperms.api.event.sync;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.Cancellable;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
@@ -47,7 +46,7 @@ public interface PreNetworkSyncEvent extends LuckPermsEvent, Cancellable {
      * @return the id of the sync request
      */
     @Param(0)
-    @NonNull UUID getSyncId();
+    UUID getSyncId();
 
     /**
      * Gets the sync type.
@@ -56,7 +55,7 @@ public interface PreNetworkSyncEvent extends LuckPermsEvent, Cancellable {
      * @since 5.5
      */
     @Param(1)
-    @NonNull SyncType getType();
+    SyncType getType();
 
     /**
      * Gets the unique id of the specific user that will be synced, if applicable.
diff --git a/api/src/main/java/net/luckperms/api/event/sync/package-info.java b/api/src/main/java/net/luckperms/api/event/sync/package-info.java
index fe476a89b..7d17a8087 100644
--- a/api/src/main/java/net/luckperms/api/event/sync/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/sync/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to {@link net.luckperms.api.LuckPerms#runUpdateTask() sync/update task}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.sync;
\ No newline at end of file
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 3075e56f7..cca8870c8 100644
--- a/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/track/TrackCreateEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.cause.CreationCause;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.track.Track;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a track is created
@@ -42,7 +41,7 @@ public interface TrackCreateEvent extends LuckPermsEvent {
      * @return the new track
      */
     @Param(0)
-    @NonNull Track getTrack();
+    Track getTrack();
 
     /**
      * Gets the cause of the creation
@@ -50,6 +49,6 @@ public interface TrackCreateEvent extends LuckPermsEvent {
      * @return the cause of the creation
      */
     @Param(1)
-    @NonNull CreationCause getCause();
+    CreationCause getCause();
 
 }
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 24c6ee0f7..82fedfa76 100644
--- a/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/track/TrackDeleteEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.track;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.cause.DeletionCause;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.List;
 
@@ -43,7 +42,7 @@ public interface TrackDeleteEvent extends LuckPermsEvent {
      * @return the name of the deleted track
      */
     @Param(0)
-    @NonNull String getTrackName();
+    String getTrackName();
 
     /**
      * Gets an immutable copy of the tracks existing data
@@ -51,7 +50,7 @@ public interface TrackDeleteEvent extends LuckPermsEvent {
      * @return a copy of the tracks existing data
      */
     @Param(1)
-    @NonNull List<String> getExistingData();
+    List<String> getExistingData();
 
     /**
      * Gets the cause of the deletion
@@ -59,6 +58,6 @@ public interface TrackDeleteEvent extends LuckPermsEvent {
      * @return the cause of the deletion
      */
     @Param(2)
-    @NonNull DeletionCause getCause();
+    DeletionCause getCause();
 
 }
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 78d42e273..6b55e17a8 100644
--- a/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/track/TrackLoadEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.track;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.track.Track;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a track is loaded into memory from the storage.
@@ -43,6 +42,6 @@ public interface TrackLoadEvent extends LuckPermsEvent {
      * @return the track that was loaded
      */
     @Param(0)
-    @NonNull Track getTrack();
+    Track getTrack();
 
 }
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 14306b4ad..394bcd646 100644
--- a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackAddGroupEvent.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.event.track.mutate;
 
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a group is added to a track
@@ -39,6 +38,6 @@ public interface TrackAddGroupEvent extends TrackMutateEvent {
      * @return the group that was added
      */
     @Param(3)
-    @NonNull String getGroup();
+    String getGroup();
 
 }
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 276778707..670e936ba 100644
--- a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackMutateEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.track.mutate;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.track.Track;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.List;
@@ -44,7 +43,7 @@ public interface TrackMutateEvent extends LuckPermsEvent {
      * @return the track that was mutated
      */
     @Param(0)
-    @NonNull Track getTrack();
+    Track getTrack();
 
     /**
      * Gets an immutable copy of the tracks data before the change
@@ -52,7 +51,7 @@ public interface TrackMutateEvent extends LuckPermsEvent {
      * @return the data before the change
      */
     @Param(1)
-    @NonNull @Unmodifiable List<String> getStateBefore();
+    @Unmodifiable List<String> getStateBefore();
 
     /**
      * Gets an immutable copy of the tracks data after the change
@@ -60,6 +59,6 @@ public interface TrackMutateEvent extends LuckPermsEvent {
      * @return the data after the change
      */
     @Param(2)
-    @NonNull @Unmodifiable List<String> getStateAfter();
+    @Unmodifiable List<String> getStateAfter();
 
 }
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 edf93e99f..0fd75ab30 100644
--- a/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.event.track.mutate;
 
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a group is removed from a track
@@ -39,6 +38,6 @@ public interface TrackRemoveGroupEvent extends TrackMutateEvent {
      * @return the group that was removed
      */
     @Param(3)
-    @NonNull String getGroup();
+    String getGroup();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/track/mutate/package-info.java b/api/src/main/java/net/luckperms/api/event/track/mutate/package-info.java
index 1b79849d9..5eff3a3ce 100644
--- a/api/src/main/java/net/luckperms/api/event/track/mutate/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/track/mutate/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to changes to a {@link net.luckperms.api.track.Track}s contents.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.track.mutate;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/track/package-info.java b/api/src/main/java/net/luckperms/api/event/track/package-info.java
index f495fccf6..3ff53fae0 100644
--- a/api/src/main/java/net/luckperms/api/event/track/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/track/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to {@link net.luckperms.api.track.Track}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.track;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/type/Cancellable.java b/api/src/main/java/net/luckperms/api/event/type/Cancellable.java
index 4091406d0..742624e99 100644
--- a/api/src/main/java/net/luckperms/api/event/type/Cancellable.java
+++ b/api/src/main/java/net/luckperms/api/event/type/Cancellable.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.event.type;
 
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -41,7 +40,7 @@ public interface Cancellable {
      * @return the cancellation
      */
     @Param(-1)
-    @NonNull AtomicBoolean cancellationState();
+    AtomicBoolean cancellationState();
 
     /**
      * Returns true if the event is currently cancelled.
diff --git a/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java b/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java
index 5f2a951ff..856559fc6 100644
--- a/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/type/ResultEvent.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.event.type;
 
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -44,7 +43,7 @@ public interface ResultEvent<T> {
      * @return the result
      */
     @Param(-1)
-    @NonNull AtomicReference<T> result();
+    AtomicReference<T> result();
 
     /**
      * Gets if a result has been set for the event.
diff --git a/api/src/main/java/net/luckperms/api/event/type/Sourced.java b/api/src/main/java/net/luckperms/api/event/type/Sourced.java
index 407d56d1a..613bc2a8e 100644
--- a/api/src/main/java/net/luckperms/api/event/type/Sourced.java
+++ b/api/src/main/java/net/luckperms/api/event/type/Sourced.java
@@ -27,7 +27,6 @@ package net.luckperms.api.event.type;
 
 import net.luckperms.api.event.source.Source;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents an event with a {@link Source}.
@@ -42,6 +41,6 @@ public interface Sourced {
      *
      * @return the source
      */
-    @NonNull @Param(-1) Source getSource();
+    @Param(-1) Source getSource();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/type/package-info.java b/api/src/main/java/net/luckperms/api/event/type/package-info.java
index 58b69eed0..d3334bde2 100644
--- a/api/src/main/java/net/luckperms/api/event/type/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/type/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Event abstract types.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.type;
\ No newline at end of file
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 363df3629..0ab6609c4 100644
--- a/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/UserCacheLoadEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.user.User;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a users {@link CachedDataManager} is loaded.
@@ -42,7 +41,7 @@ public interface UserCacheLoadEvent extends LuckPermsEvent {
      * @return the user
      */
     @Param(0)
-    @NonNull User getUser();
+    User getUser();
 
     /**
      * Gets the data that was loaded
@@ -50,6 +49,6 @@ public interface UserCacheLoadEvent extends LuckPermsEvent {
      * @return the loaded data
      */
     @Param(1)
-    @NonNull CachedDataManager getLoadedData();
+    CachedDataManager getLoadedData();
 
 }
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 fbbc72b24..5c2a4d880 100644
--- a/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/UserDataRecalculateEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.cacheddata.CachedDataManager;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.user.User;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a users cached data is refreshed
@@ -42,7 +41,7 @@ public interface UserDataRecalculateEvent extends LuckPermsEvent {
      * @return the user
      */
     @Param(0)
-    @NonNull User getUser();
+    User getUser();
 
     /**
      * Gets the data that was recalculated
@@ -50,6 +49,6 @@ public interface UserDataRecalculateEvent extends LuckPermsEvent {
      * @return the data
      */
     @Param(1)
-    @NonNull CachedDataManager getData();
+    CachedDataManager getData();
 
 }
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 7f656ed1c..71e95116f 100644
--- a/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/UserFirstLoginEvent.java
@@ -27,7 +27,6 @@ package net.luckperms.api.event.user;
 
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
 
@@ -50,7 +49,7 @@ public interface UserFirstLoginEvent extends LuckPermsEvent {
      * @return the uuid of the user
      */
     @Param(0)
-    @NonNull UUID getUniqueId();
+    UUID getUniqueId();
 
     /**
      * Gets the username of the user
@@ -58,6 +57,6 @@ public interface UserFirstLoginEvent extends LuckPermsEvent {
      * @return the username of the user
      */
     @Param(1)
-    @NonNull String getUsername();
+    String getUsername();
 
 }
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 8b36fdce7..12d89c3ea 100644
--- a/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/UserLoadEvent.java
@@ -28,7 +28,6 @@ package net.luckperms.api.event.user;
 import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.user.User;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a user is loaded into memory from the storage.
@@ -41,6 +40,6 @@ public interface UserLoadEvent extends LuckPermsEvent {
      * @return the user that was loaded
      */
     @Param(0)
-    @NonNull User getUser();
+    User getUser();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java b/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java
index a97c9ec63..e1028f028 100644
--- a/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/UserUnloadEvent.java
@@ -29,7 +29,6 @@ import net.luckperms.api.event.LuckPermsEvent;
 import net.luckperms.api.event.type.Cancellable;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.user.User;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a user is about to be unloaded from memory.
@@ -44,6 +43,6 @@ public interface UserUnloadEvent extends LuckPermsEvent, Cancellable {
      * @return the user that is being unloaded
      */
     @Param(0)
-    @NonNull User getUser();
+    User getUser();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/user/package-info.java b/api/src/main/java/net/luckperms/api/event/user/package-info.java
index 9394ecab2..0ac967901 100644
--- a/api/src/main/java/net/luckperms/api/event/user/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/user/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Events relating to {@link net.luckperms.api.model.user.User}s.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.user;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/user/track/UserDemoteEvent.java b/api/src/main/java/net/luckperms/api/event/user/track/UserDemoteEvent.java
index 31ab30343..736a79c25 100644
--- a/api/src/main/java/net/luckperms/api/event/user/track/UserDemoteEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/track/UserDemoteEvent.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.event.user.track;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a user is demoted down a track.
@@ -35,7 +34,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface UserDemoteEvent extends UserTrackEvent {
 
     @Override
-    default @NonNull TrackAction getAction() {
+    default TrackAction getAction() {
         return TrackAction.DEMOTION;
     }
 }
diff --git a/api/src/main/java/net/luckperms/api/event/user/track/UserPromoteEvent.java b/api/src/main/java/net/luckperms/api/event/user/track/UserPromoteEvent.java
index 07b5abd7f..600285617 100644
--- a/api/src/main/java/net/luckperms/api/event/user/track/UserPromoteEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/track/UserPromoteEvent.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.event.user.track;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Called when a user is promoted up a track.
@@ -35,7 +34,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface UserPromoteEvent extends UserTrackEvent {
 
     @Override
-    default @NonNull TrackAction getAction() {
+    default TrackAction getAction() {
         return TrackAction.PROMOTION;
     }
 }
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 cdec0416b..085cd3b78 100644
--- a/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java
+++ b/api/src/main/java/net/luckperms/api/event/user/track/UserTrackEvent.java
@@ -30,7 +30,6 @@ import net.luckperms.api.event.type.Sourced;
 import net.luckperms.api.event.util.Param;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.track.Track;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Optional;
 
@@ -45,7 +44,7 @@ public interface UserTrackEvent extends LuckPermsEvent, Sourced {
      * @return the track involved in the event
      */
     @Param(0)
-    @NonNull Track getTrack();
+    Track getTrack();
 
     /**
      * Gets the user who was promoted or demoted
@@ -53,14 +52,14 @@ public interface UserTrackEvent extends LuckPermsEvent, Sourced {
      * @return the user involved in the event
      */
     @Param(1)
-    @NonNull User getUser();
+    User getUser();
 
     /**
      * Gets the action performed
      *
      * @return the action performed
      */
-    @NonNull TrackAction getAction();
+    TrackAction getAction();
 
     /**
      * Gets the group the user was promoted/demoted from.
@@ -70,7 +69,7 @@ public interface UserTrackEvent extends LuckPermsEvent, Sourced {
      * @return the group the user was promoted/demoted from
      */
     @Param(2)
-    @NonNull Optional<String> getGroupFrom();
+    Optional<String> getGroupFrom();
 
     /**
      * Gets the group the user was promoted/demoted to
@@ -78,6 +77,6 @@ public interface UserTrackEvent extends LuckPermsEvent, Sourced {
      * @return the group the user was promoted/demoted to
      */
     @Param(3)
-    @NonNull Optional<String> getGroupTo();
+    Optional<String> getGroupTo();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/event/user/track/package-info.java b/api/src/main/java/net/luckperms/api/event/user/track/package-info.java
index e810487f1..6de272d36 100644
--- a/api/src/main/java/net/luckperms/api/event/user/track/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/user/track/package-info.java
@@ -27,4 +27,5 @@
  * Events relating to a {@link net.luckperms.api.model.user.User}s movement on a
  * {@link net.luckperms.api.track.Track}.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.user.track;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/event/util/package-info.java b/api/src/main/java/net/luckperms/api/event/util/package-info.java
index 5bcdcc0ad..34ad57052 100644
--- a/api/src/main/java/net/luckperms/api/event/util/package-info.java
+++ b/api/src/main/java/net/luckperms/api/event/util/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Event utilities.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.event.util;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/extension/ExtensionManager.java b/api/src/main/java/net/luckperms/api/extension/ExtensionManager.java
index d097665ac..16e32d85f 100644
--- a/api/src/main/java/net/luckperms/api/extension/ExtensionManager.java
+++ b/api/src/main/java/net/luckperms/api/extension/ExtensionManager.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.extension;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.io.IOException;
@@ -51,13 +50,13 @@ public interface ExtensionManager {
      * @return the extension
      * @throws IOException if the extension could not be loaded
      */
-    @NonNull Extension loadExtension(Path path) throws IOException;
+    Extension loadExtension(Path path) throws IOException;
 
     /**
      * Gets a collection of all loaded extensions.
      *
      * @return the loaded extensions
      */
-    @NonNull @Unmodifiable Collection<Extension> getLoadedExtensions();
+    @Unmodifiable Collection<Extension> getLoadedExtensions();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/extension/package-info.java b/api/src/main/java/net/luckperms/api/extension/package-info.java
index 3989a9bab..e3dd2bc1a 100644
--- a/api/src/main/java/net/luckperms/api/extension/package-info.java
+++ b/api/src/main/java/net/luckperms/api/extension/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.extension.Extension}s functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.extension;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/messaging/MessagingService.java b/api/src/main/java/net/luckperms/api/messaging/MessagingService.java
index a1fa20d55..58e7ccf3d 100644
--- a/api/src/main/java/net/luckperms/api/messaging/MessagingService.java
+++ b/api/src/main/java/net/luckperms/api/messaging/MessagingService.java
@@ -28,7 +28,6 @@ package net.luckperms.api.messaging;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.event.messaging.CustomMessageReceiveEvent;
 import net.luckperms.api.model.user.User;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A means to send messages to other servers using the platforms networking
@@ -40,7 +39,7 @@ public interface MessagingService {
      *
      * @return the name of this messaging service
      */
-    @NonNull String getName();
+    String getName();
 
     /**
      * Uses the messaging service to inform other servers about a general
@@ -70,7 +69,7 @@ public interface MessagingService {
      *
      * @param user the user to push the update for
      */
-    void pushUserUpdate(@NonNull User user);
+    void pushUserUpdate(User user);
 
     /**
      * Uses the messaging service to send a message with a custom payload.
@@ -110,6 +109,6 @@ public interface MessagingService {
      * @param payload the message payload
      * @since 5.5
      */
-    void sendCustomMessage(@NonNull String channelId, @NonNull String payload);
+    void sendCustomMessage(String channelId, String payload);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messaging/package-info.java b/api/src/main/java/net/luckperms/api/messaging/package-info.java
index 3f60d9add..43e97ae27 100644
--- a/api/src/main/java/net/luckperms/api/messaging/package-info.java
+++ b/api/src/main/java/net/luckperms/api/messaging/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.messaging.MessagingService} functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.messaging;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java b/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java
index 69d59594c..9911fe552 100644
--- a/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java
+++ b/api/src/main/java/net/luckperms/api/messenger/IncomingMessageConsumer.java
@@ -27,7 +27,6 @@ package net.luckperms.api.messenger;
 
 import net.luckperms.api.messenger.message.Message;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 
 /**
@@ -51,7 +50,7 @@ public interface IncomingMessageConsumer {
      * @param message the message
      * @return true if the message was accepted by the plugin
      */
-    boolean consumeIncomingMessage(@NonNull Message message);
+    boolean consumeIncomingMessage(Message message);
 
     /**
      * Consumes a message in an encoded string format.
@@ -72,6 +71,6 @@ public interface IncomingMessageConsumer {
      * @param encodedString the encoded string
      * @return true if the message was accepted by the plugin
      */
-    boolean consumeIncomingMessageAsString(@NonNull String encodedString);
+    boolean consumeIncomingMessageAsString(String encodedString);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messenger/Messenger.java b/api/src/main/java/net/luckperms/api/messenger/Messenger.java
index 0ffade886..04d8d4a2f 100644
--- a/api/src/main/java/net/luckperms/api/messenger/Messenger.java
+++ b/api/src/main/java/net/luckperms/api/messenger/Messenger.java
@@ -27,7 +27,6 @@ package net.luckperms.api.messenger;
 
 import net.luckperms.api.messenger.message.Message;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.OverrideOnly;
 
 /**
@@ -51,7 +50,7 @@ public interface Messenger extends AutoCloseable {
      *
      * @param outgoingMessage the outgoing message
      */
-    void sendOutgoingMessage(@NonNull OutgoingMessage outgoingMessage);
+    void sendOutgoingMessage(OutgoingMessage outgoingMessage);
 
     /**
      * Performs the necessary action to gracefully shutdown the messenger.
diff --git a/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java b/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java
index 31d12ec9a..73d66c852 100644
--- a/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java
+++ b/api/src/main/java/net/luckperms/api/messenger/MessengerProvider.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.messenger;
 
 import net.luckperms.api.LuckPerms;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.OverrideOnly;
 
 /**
@@ -45,7 +44,7 @@ public interface MessengerProvider {
      *
      * @return the provider name
      */
-    @NonNull String getName();
+    String getName();
 
     /**
      * Creates and returns a new {@link Messenger} instance, which passes
@@ -58,6 +57,6 @@ public interface MessengerProvider {
      *                                incoming messages to
      * @return a new messenger agent instance
      */
-    @NonNull Messenger obtain(@NonNull IncomingMessageConsumer incomingMessageConsumer);
+    Messenger obtain(IncomingMessageConsumer incomingMessageConsumer);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messenger/message/Message.java b/api/src/main/java/net/luckperms/api/messenger/message/Message.java
index bde57a056..57300c7b9 100644
--- a/api/src/main/java/net/luckperms/api/messenger/message/Message.java
+++ b/api/src/main/java/net/luckperms/api/messenger/message/Message.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.messenger.message;
 
 import net.luckperms.api.messenger.Messenger;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 
 import java.util.UUID;
@@ -45,6 +44,6 @@ public interface Message {
      *
      * @return the id of the message
      */
-    @NonNull UUID getId();
+    UUID getId();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java
index 9bf39ef8d..c48fe4b0f 100644
--- a/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java
+++ b/api/src/main/java/net/luckperms/api/messenger/message/OutgoingMessage.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.messenger.message;
 
 import net.luckperms.api.messenger.IncomingMessageConsumer;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents an outgoing {@link Message}.
@@ -53,6 +52,6 @@ public interface OutgoingMessage extends Message {
      *
      * @return an encoded string form of the message
      */
-    @NonNull String asEncodedString();
+    String asEncodedString();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messenger/message/package-info.java b/api/src/main/java/net/luckperms/api/messenger/message/package-info.java
index 2f98a26bc..f6f6dc2d0 100644
--- a/api/src/main/java/net/luckperms/api/messenger/message/package-info.java
+++ b/api/src/main/java/net/luckperms/api/messenger/message/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.messenger.Messenger} message abstract types.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.messenger.message;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java
index 55c093e6d..a9483b572 100644
--- a/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java
+++ b/api/src/main/java/net/luckperms/api/messenger/message/type/ActionLogMessage.java
@@ -27,7 +27,6 @@ package net.luckperms.api.messenger.message.type;
 
 import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.messenger.message.Message;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents an "action log" message.
@@ -41,6 +40,6 @@ public interface ActionLogMessage extends Message {
      *
      * @return the action
      */
-    @NonNull Action getAction();
+    Action getAction();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messenger/message/type/CustomMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/CustomMessage.java
index 7fb820ebe..18ec1afb9 100644
--- a/api/src/main/java/net/luckperms/api/messenger/message/type/CustomMessage.java
+++ b/api/src/main/java/net/luckperms/api/messenger/message/type/CustomMessage.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.messenger.message.type;
 
 import net.luckperms.api.messenger.message.Message;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents a "custom payload" message.
@@ -44,13 +43,13 @@ public interface CustomMessage extends Message {
      *
      * @return the namespace
      */
-    @NonNull String getChannelId();
+    String getChannelId();
 
     /**
      * Gets the payload.
      *
      * @return the payload
      */
-    @NonNull String getPayload();
+    String getPayload();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java b/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java
index 88f8c642c..708751db8 100644
--- a/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java
+++ b/api/src/main/java/net/luckperms/api/messenger/message/type/UserUpdateMessage.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.messenger.message.type;
 
 import net.luckperms.api.messenger.message.Message;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
 
@@ -42,6 +41,6 @@ public interface UserUpdateMessage extends Message {
      *
      * @return the user
      */
-    @NonNull UUID getUserUniqueId();
+    UUID getUserUniqueId();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/messenger/message/type/package-info.java b/api/src/main/java/net/luckperms/api/messenger/message/type/package-info.java
index 23a43c4e7..4708a71f1 100644
--- a/api/src/main/java/net/luckperms/api/messenger/message/type/package-info.java
+++ b/api/src/main/java/net/luckperms/api/messenger/message/type/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.messenger.Messenger} message actual types.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.messenger.message.type;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/messenger/package-info.java b/api/src/main/java/net/luckperms/api/messenger/package-info.java
index 1a881ea91..5fa54be3b 100644
--- a/api/src/main/java/net/luckperms/api/messenger/package-info.java
+++ b/api/src/main/java/net/luckperms/api/messenger/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.messenger.Messenger} provider API.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.messenger;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/metastacking/DuplicateRemovalFunction.java b/api/src/main/java/net/luckperms/api/metastacking/DuplicateRemovalFunction.java
index d2ae6a4b9..d1e0acf53 100644
--- a/api/src/main/java/net/luckperms/api/metastacking/DuplicateRemovalFunction.java
+++ b/api/src/main/java/net/luckperms/api/metastacking/DuplicateRemovalFunction.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.metastacking;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.HashSet;
 import java.util.List;
@@ -46,14 +45,14 @@ public interface DuplicateRemovalFunction {
      * @param list the entries
      * @param <T> the type of entries
      */
-    <T> void processDuplicates(@NonNull List<T> list);
+    <T> void processDuplicates(List<T> list);
 
     /**
      * A {@link DuplicateRemovalFunction} that does not remove duplicates.
      */
     DuplicateRemovalFunction RETAIN_ALL = new DuplicateRemovalFunction() {
         @Override
-        public <T> void processDuplicates(@NonNull List<T> list) {
+        public <T> void processDuplicates(List<T> list) {
 
         }
 
@@ -69,7 +68,7 @@ public interface DuplicateRemovalFunction {
     DuplicateRemovalFunction FIRST_ONLY = new DuplicateRemovalFunction() {
         @SuppressWarnings("Java8CollectionRemoveIf")
         @Override
-        public <T> void processDuplicates(@NonNull List<T> list) {
+        public <T> void processDuplicates(List<T> list) {
             Set<T> seen = new HashSet<>(list.size());
             for (ListIterator<T> it = list.listIterator(); it.hasNext(); ) {
                 T next = it.next();
@@ -90,7 +89,7 @@ public interface DuplicateRemovalFunction {
      */
     DuplicateRemovalFunction LAST_ONLY = new DuplicateRemovalFunction() {
         @Override
-        public <T> void processDuplicates(@NonNull List<T> list) {
+        public <T> void processDuplicates(List<T> list) {
             Set<T> seen = new HashSet<>(list.size());
             for (ListIterator<T> it = list.listIterator(list.size()); it.hasPrevious(); ) {
                 T next = it.previous();
diff --git a/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java
index 0b91379c6..8e1af9946 100644
--- a/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java
+++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackDefinition.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.metastacking;
 
 import net.luckperms.api.query.OptionKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.List;
@@ -57,7 +56,7 @@ public interface MetaStackDefinition {
      *
      * @return the elements in this stack
      */
-    @NonNull @Unmodifiable List<MetaStackElement> getElements();
+    @Unmodifiable List<MetaStackElement> getElements();
 
     /**
      * Gets the duplicate removal function, applied to the entries before
@@ -65,27 +64,27 @@ public interface MetaStackDefinition {
      *
      * @return the duplicate removal function
      */
-    @NonNull DuplicateRemovalFunction getDuplicateRemovalFunction();
+    DuplicateRemovalFunction getDuplicateRemovalFunction();
 
     /**
      * Gets the spacer string added before any stack elements
      *
      * @return the start spacer
      */
-    @NonNull String getStartSpacer();
+    String getStartSpacer();
 
     /**
      * Gets the spacer added between stack elements
      *
      * @return the middle spacer
      */
-    @NonNull String getMiddleSpacer();
+    String getMiddleSpacer();
 
     /**
      * Gets the spacer added after any stack elements
      *
      * @return the end spacer
      */
-    @NonNull String getEndSpacer();
+    String getEndSpacer();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java
index bb5c0248a..466ef38b6 100644
--- a/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java
+++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackElement.java
@@ -27,8 +27,7 @@ package net.luckperms.api.metastacking;
 
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.types.ChatMetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents an element within a {@link MetaStackDefinition}.
@@ -45,6 +44,6 @@ public interface MetaStackElement {
      * @param current the current value being used. If this returns true, the current value will be replaced by this entry
      * @return true if the node should be accumulated into this element, replacing the current value
      */
-    boolean shouldAccumulate(@NonNull ChatMetaType type, @NonNull ChatMetaNode<?, ?> node, @Nullable ChatMetaNode<?, ?> current);
+    boolean shouldAccumulate(ChatMetaType type, ChatMetaNode<?, ?> node, @Nullable ChatMetaNode<?, ?> current);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/metastacking/MetaStackFactory.java b/api/src/main/java/net/luckperms/api/metastacking/MetaStackFactory.java
index 88ecd40ff..70e65baf0 100644
--- a/api/src/main/java/net/luckperms/api/metastacking/MetaStackFactory.java
+++ b/api/src/main/java/net/luckperms/api/metastacking/MetaStackFactory.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.metastacking;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.List;
@@ -42,7 +41,7 @@ public interface MetaStackFactory {
      * @param definition the definition
      * @return the parsed element, if present
      */
-    @NonNull Optional<MetaStackElement> fromString(@NonNull String definition);
+    Optional<MetaStackElement> fromString(String definition);
 
     /**
      * Parses a list of {@link MetaStackElement}s from string, using the pre-defined elements in the plugin.
@@ -52,7 +51,7 @@ public interface MetaStackFactory {
      * @param definitions the definition strings
      * @return a list of parsed elements
      */
-    @NonNull @Unmodifiable List<MetaStackElement> fromStrings(@NonNull List<String> definitions);
+    @Unmodifiable List<MetaStackElement> fromStrings(List<String> definitions);
 
     /**
      * Creates a new {@link MetaStackDefinition} with the given properties.
@@ -64,7 +63,7 @@ public interface MetaStackFactory {
      * @param endSpacer                the spacer to be included at the end of the stacks output
      * @return the new stack definition instance
      */
-    @NonNull MetaStackDefinition createDefinition(@NonNull List<MetaStackElement> elements, @NonNull DuplicateRemovalFunction duplicateRemovalFunction, @NonNull String startSpacer, @NonNull String middleSpacer, @NonNull String endSpacer);
+    MetaStackDefinition createDefinition(List<MetaStackElement> elements, DuplicateRemovalFunction duplicateRemovalFunction, String startSpacer, String middleSpacer, String endSpacer);
 
 
 }
diff --git a/api/src/main/java/net/luckperms/api/metastacking/package-info.java b/api/src/main/java/net/luckperms/api/metastacking/package-info.java
index ae6db7c89..372d6f695 100644
--- a/api/src/main/java/net/luckperms/api/metastacking/package-info.java
+++ b/api/src/main/java/net/luckperms/api/metastacking/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.metastacking.MetaStackDefinition Meta stacking} functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.metastacking;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/model/PermissionHolder.java b/api/src/main/java/net/luckperms/api/model/PermissionHolder.java
index 831d1b6ca..936c9f68b 100644
--- a/api/src/main/java/net/luckperms/api/model/PermissionHolder.java
+++ b/api/src/main/java/net/luckperms/api/model/PermissionHolder.java
@@ -35,7 +35,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.query.Flag;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.ArrayList;
@@ -81,14 +80,14 @@ public interface PermissionHolder {
          *
          * @return the identifier for this object. Either a uuid string or name.
          */
-        @NonNull String getName();
+        String getName();
 
         /**
          * Gets the type of the {@link PermissionHolder}.
          *
          * @return the type
          */
-        @NonNull String getType();
+        String getType();
     }
 
     /**
@@ -96,7 +95,7 @@ public interface PermissionHolder {
      *
      * @return the identifier
      */
-    @NonNull Identifier getIdentifier();
+    Identifier getIdentifier();
 
     /**
      * Gets a friendly name for this holder, to be displayed in command output, etc.
@@ -112,7 +111,7 @@ public interface PermissionHolder {
      *
      * @return a friendly identifier for this holder
      */
-    @NonNull String getFriendlyName();
+    String getFriendlyName();
 
     /**
      * Gets the most appropriate query options available at the time for the
@@ -130,14 +129,14 @@ public interface PermissionHolder {
      * @return query options
      * @since 5.1
      */
-    @NonNull QueryOptions getQueryOptions();
+    QueryOptions getQueryOptions();
 
     /**
      * Gets the holders {@link CachedDataManager} cache.
      *
      * @return the holders cached data.
      */
-    @NonNull CachedDataManager getCachedData();
+    CachedDataManager getCachedData();
 
     /**
      * Gets the {@link NodeMap} of a particular type.
@@ -145,14 +144,14 @@ public interface PermissionHolder {
      * @param dataType the data type
      * @return the data
      */
-    @NonNull NodeMap getData(@NonNull DataType dataType);
+    NodeMap getData(DataType dataType);
 
     /**
      * Gets the holders {@link DataType#NORMAL} data.
      *
      * @return the normal data
      */
-    @NonNull NodeMap data();
+    NodeMap data();
 
     /**
      * Gets the holders {@link DataType#TRANSIENT} data.
@@ -170,7 +169,7 @@ public interface PermissionHolder {
      *
      * @return the transient data
      */
-    @NonNull NodeMap transientData();
+    NodeMap transientData();
 
     /**
      * Gets a flattened view of the holders own {@link Node}s.
@@ -186,7 +185,7 @@ public interface PermissionHolder {
      *
      * @return a collection of the holders own nodes.
      */
-    default @NonNull @Unmodifiable Collection<Node> getNodes() {
+    default @Unmodifiable Collection<Node> getNodes() {
         /* This default method is overridden in the implementation, and is just here
            to demonstrate what this method does in the API sources. */
         List<Node> nodes = new ArrayList<>();
@@ -204,7 +203,7 @@ public interface PermissionHolder {
      * @see #getNodes()
      * @since 5.1
      */
-    default <T extends Node> @NonNull @Unmodifiable Collection<T> getNodes(@NonNull NodeType<T> type) {
+    default <T extends Node> @Unmodifiable Collection<T> getNodes(NodeType<T> type) {
         /* This default method is overridden in the implementation, and is just here
            to demonstrate what this method does in the API sources. */
         return getNodes().stream()
@@ -223,7 +222,7 @@ public interface PermissionHolder {
      *
      * @return a sorted set of the holders own distinct nodes
      */
-    @NonNull @Unmodifiable SortedSet<Node> getDistinctNodes();
+    @Unmodifiable SortedSet<Node> getDistinctNodes();
 
     /**
      * Gets a resolved view of the holders own and inherited {@link Node}s.
@@ -240,7 +239,7 @@ public interface PermissionHolder {
      * @param queryOptions the query options
      * @return a list of the holders inherited nodes
      */
-    @NonNull @Unmodifiable Collection<Node> resolveInheritedNodes(@NonNull QueryOptions queryOptions);
+    @Unmodifiable Collection<Node> resolveInheritedNodes(QueryOptions queryOptions);
 
     /**
      * Gets a resolved view of the holders own and inherited {@link Node}s of a given {@code type}.
@@ -252,7 +251,7 @@ public interface PermissionHolder {
      * @see #resolveInheritedNodes(QueryOptions)
      * @since 5.1
      */
-    default <T extends Node> @NonNull @Unmodifiable Collection<T> resolveInheritedNodes(@NonNull NodeType<T> type, @NonNull QueryOptions queryOptions) {
+    default <T extends Node> @Unmodifiable Collection<T> resolveInheritedNodes(NodeType<T> type, QueryOptions queryOptions) {
         /* This default method is overridden in the implementation, and is just here
            to demonstrate what this method does in the API sources. */
         return resolveInheritedNodes(queryOptions).stream()
@@ -275,7 +274,7 @@ public interface PermissionHolder {
      * @param queryOptions the query options
      * @return a sorted set of the holders distinct inherited nodes
      */
-    @NonNull @Unmodifiable SortedSet<Node> resolveDistinctInheritedNodes(@NonNull QueryOptions queryOptions);
+    @Unmodifiable SortedSet<Node> resolveDistinctInheritedNodes(QueryOptions queryOptions);
 
     /**
      * Gets a collection of the {@link Group}s this holder inherits nodes from.
@@ -296,7 +295,7 @@ public interface PermissionHolder {
      * @return a collection of the groups the holder inherits from
      * @since 5.1
      */
-    @NonNull @Unmodifiable Collection<Group> getInheritedGroups(@NonNull QueryOptions queryOptions);
+    @Unmodifiable Collection<Group> getInheritedGroups(QueryOptions queryOptions);
 
     /**
      * Removes any temporary permissions that have expired.
diff --git a/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java b/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java
index fd7d875ce..c44644cdc 100644
--- a/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java
+++ b/api/src/main/java/net/luckperms/api/model/PlayerSaveResult.java
@@ -26,9 +26,8 @@
 package net.luckperms.api.model;
 
 import net.luckperms.api.model.user.UserManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.Set;
@@ -47,7 +46,7 @@ public interface PlayerSaveResult {
      *
      * @return the status
      */
-    @NonNull @Unmodifiable Set<Outcome> getOutcomes();
+    @Unmodifiable Set<Outcome> getOutcomes();
 
     /**
      * Gets if the result includes a certain outcome.
@@ -55,7 +54,7 @@ public interface PlayerSaveResult {
      * @param outcome the outcome to check for
      * @return if the result includes the outcome
      */
-    default boolean includes(@NonNull Outcome outcome) {
+    default boolean includes(Outcome outcome) {
         Objects.requireNonNull(outcome, "outcome");
         return getOutcomes().contains(outcome);
     }
diff --git a/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java b/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java
index 39bddd54d..42fb81b71 100644
--- a/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java
+++ b/api/src/main/java/net/luckperms/api/model/data/DataMutateResult.java
@@ -29,7 +29,6 @@ import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.track.Track;
 import net.luckperms.api.util.Result;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents the result of a data mutation call on a LuckPerms object.
@@ -79,7 +78,7 @@ public enum DataMutateResult implements Result {
          *
          * @return the result
          */
-        @NonNull DataMutateResult getResult();
+        DataMutateResult getResult();
 
         /**
          * Gets the node that resulted from any {@link TemporaryNodeMergeStrategy}
@@ -90,7 +89,7 @@ public enum DataMutateResult implements Result {
          *
          * @return the resultant node
          */
-        @NonNull Node getMergedNode();
+        Node getMergedNode();
 
     }
 }
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 a52498b72..5dcdb49b9 100644
--- a/api/src/main/java/net/luckperms/api/model/data/NodeMap.java
+++ b/api/src/main/java/net/luckperms/api/model/data/NodeMap.java
@@ -35,7 +35,6 @@ import net.luckperms.api.model.user.UserManager;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeEqualityPredicate;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Collection;
@@ -65,7 +64,7 @@ public interface NodeMap {
      *
      * @return a map of nodes
      */
-    @NonNull @Unmodifiable Map<ImmutableContextSet, Collection<Node>> toMap();
+    @Unmodifiable Map<ImmutableContextSet, Collection<Node>> toMap();
 
     /**
      * Gets a flattened view of {@link Node}s contained within this instance.
@@ -75,7 +74,7 @@ public interface NodeMap {
      *
      * @return a flattened collection of nodes
      */
-    @NonNull @Unmodifiable Collection<Node> toCollection();
+    @Unmodifiable Collection<Node> toCollection();
 
     /**
      * Gets if this instance contains a given {@link Node}.
@@ -89,7 +88,7 @@ public interface NodeMap {
      * @return a Tristate relating to the assigned state of the node
      * @throws NullPointerException if the node is null
      */
-    @NonNull Tristate contains(@NonNull Node node, @NonNull NodeEqualityPredicate equalityPredicate);
+    Tristate contains(Node node, NodeEqualityPredicate equalityPredicate);
 
     /**
      * Adds a node.
@@ -97,7 +96,7 @@ public interface NodeMap {
      * @param node the node to be add
      * @return the result of the operation
      */
-    @NonNull DataMutateResult add(@NonNull Node node);
+    DataMutateResult add(Node node);
 
     /**
      * Adds a node.
@@ -106,7 +105,7 @@ public interface NodeMap {
      * @param temporaryNodeMergeStrategy the strategy used to merge temporary permission entries
      * @return the result of the operation
      */
-    DataMutateResult.@NonNull WithMergedNode add(@NonNull Node node, @NonNull TemporaryNodeMergeStrategy temporaryNodeMergeStrategy);
+    DataMutateResult.WithMergedNode add(Node node, TemporaryNodeMergeStrategy temporaryNodeMergeStrategy);
 
     /**
      * Removes a node.
@@ -114,7 +113,7 @@ public interface NodeMap {
      * @param node the node to remove
      * @return the result of the operation
      */
-    @NonNull DataMutateResult remove(@NonNull Node node);
+    DataMutateResult remove(Node node);
 
     /**
      * Clears all nodes.
@@ -126,14 +125,14 @@ public interface NodeMap {
      *
      * @param test the predicate to test for nodes which should be removed
      */
-    void clear(@NonNull Predicate<? super Node> test);
+    void clear(Predicate<? super Node> test);
 
     /**
      * Clears all nodes in a specific context.
      *
      * @param contextSet the contexts to filter by
      */
-    void clear(@NonNull ContextSet contextSet);
+    void clear(ContextSet contextSet);
 
     /**
      * Clears all nodes in a specific context which pass the predicate.
@@ -141,6 +140,6 @@ public interface NodeMap {
      * @param contextSet the contexts to filter by
      * @param test the predicate to test for nodes which should be removed
      */
-    void clear(@NonNull ContextSet contextSet, @NonNull Predicate<? super Node> test);
+    void clear(ContextSet contextSet, Predicate<? super Node> test);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/model/data/package-info.java b/api/src/main/java/net/luckperms/api/model/data/package-info.java
index 6a693e1d3..550341623 100644
--- a/api/src/main/java/net/luckperms/api/model/data/package-info.java
+++ b/api/src/main/java/net/luckperms/api/model/data/package-info.java
@@ -27,4 +27,5 @@
  * {@link net.luckperms.api.model.PermissionHolder}
  * ({@link net.luckperms.api.model.user.User}/{@link net.luckperms.api.model.group.Group}) data.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.model.data;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/model/group/Group.java b/api/src/main/java/net/luckperms/api/model/group/Group.java
index 17c4e7056..2b6f85bd6 100644
--- a/api/src/main/java/net/luckperms/api/model/group/Group.java
+++ b/api/src/main/java/net/luckperms/api/model/group/Group.java
@@ -27,8 +27,7 @@ package net.luckperms.api.model.group;
 
 import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.OptionalInt;
 
@@ -42,7 +41,7 @@ public interface Group extends PermissionHolder {
      *
      * @return the name of the group
      */
-    @NonNull String getName();
+    String getName();
 
     /**
      * Gets the groups "display name", if it has one that differs from it's actual name.
@@ -65,13 +64,13 @@ public interface Group extends PermissionHolder {
      * @param queryOptions the query options to lookup in
      * @return the display name
      */
-    @Nullable String getDisplayName(@NonNull QueryOptions queryOptions);
+    @Nullable String getDisplayName(QueryOptions queryOptions);
 
     /**
      * Gets the weight of this group, if present.
      *
      * @return the group weight
      */
-    @NonNull OptionalInt getWeight();
+    OptionalInt getWeight();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/model/group/GroupManager.java b/api/src/main/java/net/luckperms/api/model/group/GroupManager.java
index b7a37dbcf..5ff63dbcc 100644
--- a/api/src/main/java/net/luckperms/api/model/group/GroupManager.java
+++ b/api/src/main/java/net/luckperms/api/model/group/GroupManager.java
@@ -28,9 +28,8 @@ package net.luckperms.api.model.group;
 import net.luckperms.api.node.HeldNode;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.matcher.NodeMatcher;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.List;
@@ -66,7 +65,7 @@ public interface GroupManager {
      * @return the resultant group
      * @throws NullPointerException if the name is null
      */
-    @NonNull CompletableFuture<Group> createAndLoadGroup(@NonNull String name);
+    CompletableFuture<Group> createAndLoadGroup(String name);
 
     /**
      * Loads a group from the plugin's storage provider into memory.
@@ -78,7 +77,7 @@ public interface GroupManager {
      * @return the resultant group
      * @throws NullPointerException if the name is null
      */
-    @NonNull CompletableFuture<Optional<Group>> loadGroup(@NonNull String name);
+    CompletableFuture<Optional<Group>> loadGroup(String name);
 
     /**
      * Saves a group's data back to the plugin's storage provider.
@@ -90,7 +89,7 @@ public interface GroupManager {
      * @throws NullPointerException  if group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    @NonNull CompletableFuture<Void> saveGroup(@NonNull Group group);
+    CompletableFuture<Void> saveGroup(Group group);
 
     /**
      * Permanently deletes a group from the plugin's storage provider.
@@ -100,7 +99,7 @@ public interface GroupManager {
      * @throws NullPointerException  if group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    @NonNull CompletableFuture<Void> deleteGroup(@NonNull Group group);
+    CompletableFuture<Void> deleteGroup(Group group);
 
     /**
      * Loads (or creates) a group from the plugin's storage provider, applies the given
@@ -115,7 +114,7 @@ public interface GroupManager {
      * @return a future to encapsulate the operation
      * @since 5.1
      */
-    default @NonNull CompletableFuture<Void> modifyGroup(@NonNull String name, @NonNull Consumer<? super Group> action) {
+    default CompletableFuture<Void> modifyGroup(String name, Consumer<? super Group> action) {
         /* This default method is overridden in the implementation, and is just here
            to demonstrate what this method does in the API sources. */
         return createAndLoadGroup(name)
@@ -128,7 +127,7 @@ public interface GroupManager {
      *
      * @return a future to encapsulate the operation.
      */
-    @NonNull CompletableFuture<Void> loadAllGroups();
+    CompletableFuture<Void> loadAllGroups();
 
     /**
      * Searches the {@link Group#data() normal node maps} of all known {@link Group}s for {@link Node}
@@ -138,7 +137,7 @@ public interface GroupManager {
      * @return the entries which matched
      * @since 5.1
      */
-    <T extends Node> @NonNull CompletableFuture<@Unmodifiable Map<String, Collection<T>>> searchAll(@NonNull NodeMatcher<? extends T> matcher);
+    <T extends Node> CompletableFuture<@Unmodifiable Map<String, Collection<T>>> searchAll(NodeMatcher<? extends T> matcher);
 
     /**
      * Searches for a list of groups with a given permission.
@@ -149,7 +148,7 @@ public interface GroupManager {
      * @deprecated Use {@link #searchAll(NodeMatcher)} instead
      */
     @Deprecated
-    @NonNull CompletableFuture<@Unmodifiable List<HeldNode<String>>> getWithPermission(@NonNull String permission);
+    CompletableFuture<@Unmodifiable List<HeldNode<String>>> getWithPermission(String permission);
 
     /**
      * Gets a loaded group.
@@ -158,14 +157,14 @@ public interface GroupManager {
      * @return a {@link Group} object, if one matching the name exists, or null if not
      * @throws NullPointerException if the name is null
      */
-    @Nullable Group getGroup(@NonNull String name);
+    @Nullable Group getGroup(String name);
 
     /**
      * Gets a set of all loaded groups.
      *
      * @return a {@link Set} of {@link Group} objects
      */
-    @NonNull @Unmodifiable Set<Group> getLoadedGroups();
+    @Unmodifiable Set<Group> getLoadedGroups();
 
     /**
      * Check if a group is loaded in memory
@@ -174,6 +173,6 @@ public interface GroupManager {
      * @return true if the group is loaded
      * @throws NullPointerException if the name is null
      */
-    boolean isLoaded(@NonNull String name);
+    boolean isLoaded(String name);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/model/group/package-info.java b/api/src/main/java/net/luckperms/api/model/group/package-info.java
index 82995673f..501a4bfb7 100644
--- a/api/src/main/java/net/luckperms/api/model/group/package-info.java
+++ b/api/src/main/java/net/luckperms/api/model/group/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.model.group.Group} data model and functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.model.group;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/model/package-info.java b/api/src/main/java/net/luckperms/api/model/package-info.java
index 0d2879fff..3714c9124 100644
--- a/api/src/main/java/net/luckperms/api/model/package-info.java
+++ b/api/src/main/java/net/luckperms/api/model/package-info.java
@@ -28,4 +28,5 @@
  * ({@link net.luckperms.api.model.user.User}s and {@link net.luckperms.api.model.group.Group}s) and
  * their corresponding {@link net.luckperms.api.model.data.NodeMap data}.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.model;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/model/user/User.java b/api/src/main/java/net/luckperms/api/model/user/User.java
index 94b746b10..d22bbee81 100644
--- a/api/src/main/java/net/luckperms/api/model/user/User.java
+++ b/api/src/main/java/net/luckperms/api/model/user/User.java
@@ -27,8 +27,7 @@ package net.luckperms.api.model.user;
 
 import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.model.data.DataMutateResult;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
@@ -42,7 +41,7 @@ public interface User extends PermissionHolder {
      *
      * @return the users Mojang assigned unique id
      */
-    @NonNull UUID getUniqueId();
+    UUID getUniqueId();
 
     /**
      * Gets the users username
@@ -62,7 +61,7 @@ public interface User extends PermissionHolder {
      *
      * @return the users primary group
      */
-    @NonNull String getPrimaryGroup();
+    String getPrimaryGroup();
 
     /**
      * Sets a users primary group.
@@ -75,6 +74,6 @@ public interface User extends PermissionHolder {
      * @throws IllegalStateException if the user is not a member of that group
      * @throws NullPointerException  if the group is null
      */
-    @NonNull DataMutateResult setPrimaryGroup(@NonNull String group);
+    DataMutateResult setPrimaryGroup(String group);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/model/user/UserManager.java b/api/src/main/java/net/luckperms/api/model/user/UserManager.java
index f2978fb15..e192d9696 100644
--- a/api/src/main/java/net/luckperms/api/model/user/UserManager.java
+++ b/api/src/main/java/net/luckperms/api/model/user/UserManager.java
@@ -29,9 +29,8 @@ import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.node.HeldNode;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.matcher.NodeMatcher;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.List;
@@ -68,7 +67,7 @@ public interface UserManager {
      * @return the resultant user
      * @throws NullPointerException if the uuid is null
      */
-    @NonNull CompletableFuture<User> loadUser(@NonNull UUID uniqueId, @Nullable String username);
+    CompletableFuture<User> loadUser(UUID uniqueId, @Nullable String username);
 
     /**
      * Loads a user from the plugin's storage provider into memory.
@@ -77,7 +76,7 @@ public interface UserManager {
      * @return the resultant user
      * @throws NullPointerException if the uuid is null
      */
-    default @NonNull CompletableFuture<User> loadUser(@NonNull UUID uniqueId) {
+    default CompletableFuture<User> loadUser(UUID uniqueId) {
         return loadUser(uniqueId, null);
     }
 
@@ -89,7 +88,7 @@ public interface UserManager {
      * @throws NullPointerException if the uuid set is null
      * @since 5.6
      */
-    @NonNull CompletableFuture<@Unmodifiable Map<UUID, User>> loadUsers(@NonNull Set<@NonNull UUID> uniqueIds);
+    CompletableFuture<@Unmodifiable Map<UUID, User>> loadUsers(Set<UUID> uniqueIds);
 
     /**
      * Uses the LuckPerms cache to find a uuid for the given username.
@@ -101,7 +100,7 @@ public interface UserManager {
      * @throws NullPointerException     if either parameters are null
      * @throws IllegalArgumentException if the username is invalid
      */
-    @NonNull CompletableFuture<UUID> lookupUniqueId(@NonNull String username);
+    CompletableFuture<UUID> lookupUniqueId(String username);
 
     /**
      * Uses the LuckPerms cache to find a username for the given uuid.
@@ -111,7 +110,7 @@ public interface UserManager {
      * @throws NullPointerException     if either parameters are null
      * @throws IllegalArgumentException if the username is invalid
      */
-    @NonNull CompletableFuture<String> lookupUsername(@NonNull UUID uniqueId);
+    CompletableFuture<String> lookupUsername(UUID uniqueId);
 
     /**
      * Saves a user's data back to the plugin's storage provider.
@@ -123,7 +122,7 @@ public interface UserManager {
      * @throws NullPointerException  if user is null
      * @throws IllegalStateException if the user instance was not obtained from LuckPerms.
      */
-    @NonNull CompletableFuture<Void> saveUser(@NonNull User user);
+    CompletableFuture<Void> saveUser(User user);
 
     /**
      * Loads a user from the plugin's storage provider, applies the given {@code action},
@@ -138,7 +137,7 @@ public interface UserManager {
      * @return a future to encapsulate the operation
      * @since 5.1
      */
-    default @NonNull CompletableFuture<Void> modifyUser(@NonNull UUID uniqueId, @NonNull Consumer<? super User> action) {
+    default CompletableFuture<Void> modifyUser(UUID uniqueId, Consumer<? super User> action) {
         /* This default method is overridden in the implementation, and is just here
            to demonstrate what this method does in the API sources. */
         return loadUser(uniqueId)
@@ -155,7 +154,7 @@ public interface UserManager {
      * @throws NullPointerException     if either parameters are null
      * @throws IllegalArgumentException if the username is invalid
      */
-    @NonNull CompletableFuture<PlayerSaveResult> savePlayerData(@NonNull UUID uniqueId, @NonNull String username);
+    CompletableFuture<PlayerSaveResult> savePlayerData(UUID uniqueId, String username);
 
     /**
      * Deletes any data about a given player from the uuid caching system.
@@ -166,7 +165,7 @@ public interface UserManager {
      * @return a future encapsulating the result of the operation
      * @since 5.2
      */
-    @NonNull CompletableFuture<Void> deletePlayerData(@NonNull UUID uniqueId);
+    CompletableFuture<Void> deletePlayerData(UUID uniqueId);
 
     /**
      * Gets a set all "unique" user UUIDs.
@@ -175,7 +174,7 @@ public interface UserManager {
      *
      * @return a set of uuids
      */
-    @NonNull CompletableFuture<@Unmodifiable Set<UUID>> getUniqueUsers();
+    CompletableFuture<@Unmodifiable Set<UUID>> getUniqueUsers();
 
     /**
      * Searches the {@link User#data() normal node maps} of all known {@link User}s for {@link Node}
@@ -185,7 +184,7 @@ public interface UserManager {
      * @return the entries which matched
      * @since 5.1
      */
-    <T extends Node> @NonNull CompletableFuture<@Unmodifiable Map<UUID, Collection<T>>> searchAll(@NonNull NodeMatcher<? extends T> matcher);
+    <T extends Node> CompletableFuture<@Unmodifiable Map<UUID, Collection<T>>> searchAll(NodeMatcher<? extends T> matcher);
 
     /**
      * Searches for a list of users with a given permission.
@@ -196,7 +195,7 @@ public interface UserManager {
      * @deprecated Use {@link #searchAll(NodeMatcher)} instead
      */
     @Deprecated
-    @NonNull CompletableFuture<@Unmodifiable List<HeldNode<UUID>>> getWithPermission(@NonNull String permission);
+    CompletableFuture<@Unmodifiable List<HeldNode<UUID>>> getWithPermission(String permission);
 
     /**
      * Gets a loaded user.
@@ -205,7 +204,7 @@ public interface UserManager {
      * @return a {@link User} object, if one matching the uuid is loaded, or null if not
      * @throws NullPointerException if the uuid is null
      */
-    @Nullable User getUser(@NonNull UUID uniqueId);
+    @Nullable User getUser(UUID uniqueId);
 
     /**
      * Gets a loaded user.
@@ -214,14 +213,14 @@ public interface UserManager {
      * @return a {@link User} object, if one matching the uuid is loaded, or null if not
      * @throws NullPointerException if the name is null
      */
-    @Nullable User getUser(@NonNull String username);
+    @Nullable User getUser(String username);
 
     /**
      * Gets a set of all loaded users.
      *
      * @return a {@link Set} of {@link User} objects
      */
-    @NonNull @Unmodifiable Set<User> getLoadedUsers();
+    @Unmodifiable Set<User> getLoadedUsers();
 
     /**
      * Check if a user is loaded in memory
@@ -230,7 +229,7 @@ public interface UserManager {
      * @return true if the user is loaded
      * @throws NullPointerException if the uuid is null
      */
-    boolean isLoaded(@NonNull UUID uniqueId);
+    boolean isLoaded(UUID uniqueId);
 
     /**
      * Unload a user from the internal storage, if they're not currently online.
@@ -238,6 +237,6 @@ public interface UserManager {
      * @param user the user to unload
      * @throws NullPointerException if the user is null
      */
-    void cleanupUser(@NonNull User user);
+    void cleanupUser(User user);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/model/user/package-info.java b/api/src/main/java/net/luckperms/api/model/user/package-info.java
index ba45feeaa..dac1670ab 100644
--- a/api/src/main/java/net/luckperms/api/model/user/package-info.java
+++ b/api/src/main/java/net/luckperms/api/model/user/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.model.user.User} data model and functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.model.user;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/node/ChatMetaType.java b/api/src/main/java/net/luckperms/api/node/ChatMetaType.java
index d0033a919..cec54ee6a 100644
--- a/api/src/main/java/net/luckperms/api/node/ChatMetaType.java
+++ b/api/src/main/java/net/luckperms/api/node/ChatMetaType.java
@@ -28,7 +28,6 @@ package net.luckperms.api.node;
 import net.luckperms.api.node.types.ChatMetaNode;
 import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.SuffixNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Locale;
 
@@ -42,12 +41,12 @@ public enum ChatMetaType {
      */
     PREFIX(NodeType.PREFIX) {
         @Override
-        public ChatMetaNode.@NonNull Builder<?, ?> builder() {
+        public ChatMetaNode.Builder<?, ?> builder() {
             return PrefixNode.builder();
         }
 
         @Override
-        public ChatMetaNode.@NonNull Builder<?, ?> builder(@NonNull String prefix, int priority) {
+        public ChatMetaNode.Builder<?, ?> builder(String prefix, int priority) {
             return PrefixNode.builder(prefix, priority);
         }
     },
@@ -57,12 +56,12 @@ public enum ChatMetaType {
      */
     SUFFIX(NodeType.SUFFIX) {
         @Override
-        public ChatMetaNode.@NonNull Builder<?, ?> builder() {
+        public ChatMetaNode.Builder<?, ?> builder() {
             return SuffixNode.builder();
         }
 
         @Override
-        public ChatMetaNode.@NonNull Builder<?, ?> builder(@NonNull String suffix, int priority) {
+        public ChatMetaNode.Builder<?, ?> builder(String suffix, int priority) {
             return SuffixNode.builder(suffix, priority);
         }
     };
@@ -80,7 +79,7 @@ public enum ChatMetaType {
      *
      * @return the node type
      */
-    public @NonNull NodeType<? extends ChatMetaNode<?, ?>> nodeType() {
+    public NodeType<? extends ChatMetaNode<?, ?>> nodeType() {
         return this.nodeType;
     }
 
@@ -89,7 +88,7 @@ public enum ChatMetaType {
      *
      * @return a builder
      */
-    public abstract ChatMetaNode.@NonNull Builder<?, ?> builder();
+    public abstract ChatMetaNode.Builder<?, ?> builder();
 
     /**
      * Creates a {@link ChatMetaNode.Builder} for the {@link ChatMetaType}.
@@ -98,7 +97,7 @@ public enum ChatMetaType {
      * @param priority the priority to set
      * @return a builder
      */
-    public abstract ChatMetaNode.@NonNull Builder<?, ?> builder(@NonNull String value, int priority);
+    public abstract ChatMetaNode.Builder<?, ?> builder(String value, int priority);
 
     @Override
     public String toString() {
diff --git a/api/src/main/java/net/luckperms/api/node/DummyNodeEqualityPredicate.java b/api/src/main/java/net/luckperms/api/node/DummyNodeEqualityPredicate.java
index 80c76cc78..2837b465d 100644
--- a/api/src/main/java/net/luckperms/api/node/DummyNodeEqualityPredicate.java
+++ b/api/src/main/java/net/luckperms/api/node/DummyNodeEqualityPredicate.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.node;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Dummy implementation of {@link NodeEqualityPredicate}, used for the given constant
@@ -43,7 +42,7 @@ final class DummyNodeEqualityPredicate implements NodeEqualityPredicate {
     }
 
     @Override
-    public boolean areEqual(@NonNull Node o1, @NonNull Node o2) {
+    public boolean areEqual(Node o1, Node o2) {
         return o1.equals(o2, this);
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/HeldNode.java b/api/src/main/java/net/luckperms/api/node/HeldNode.java
index ed966dba2..3e83c661b 100644
--- a/api/src/main/java/net/luckperms/api/node/HeldNode.java
+++ b/api/src/main/java/net/luckperms/api/node/HeldNode.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.node;
 
 import net.luckperms.api.model.PermissionHolder;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A relationship between a {@link PermissionHolder} and a {@link Node}.
@@ -42,13 +41,13 @@ public interface HeldNode<T> {
      *
      * @return the holder
      */
-    @NonNull T getHolder();
+    T getHolder();
 
     /**
      * Gets the node
      *
      * @return the node
      */
-    @NonNull Node getNode();
+    Node getNode();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/node/Node.java b/api/src/main/java/net/luckperms/api/node/Node.java
index 881ac9750..31315c86f 100644
--- a/api/src/main/java/net/luckperms/api/node/Node.java
+++ b/api/src/main/java/net/luckperms/api/node/Node.java
@@ -36,10 +36,9 @@ import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.RegexPermissionNode;
 import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -107,7 +106,7 @@ public interface Node {
      * @param key the key
      * @return the node builder
      */
-    static @NonNull NodeBuilder<?, ?> builder(@NonNull String key) {
+    static NodeBuilder<?, ?> builder(String key) {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forKey(key);
     }
 
@@ -116,14 +115,14 @@ public interface Node {
      *
      * @return the node type
      */
-    @NonNull NodeType<?> getType();
+    NodeType<?> getType();
 
     /**
      * Gets the key ({@link String}) of the node.
      *
      * @return the key
      */
-    @NonNull String getKey();
+    String getKey();
 
     /**
      * Gets the value of the node.
@@ -153,7 +152,7 @@ public interface Node {
      *
      * @return a list of full nodes
      */
-    @NonNull @Unmodifiable Collection<String> resolveShorthand();
+    @Unmodifiable Collection<String> resolveShorthand();
 
     /**
      * Gets if this node is assigned temporarily.
@@ -195,7 +194,7 @@ public interface Node {
      *
      * @return the contexts required for this node to apply
      */
-    @NonNull ImmutableContextSet getContexts();
+    ImmutableContextSet getContexts();
 
     /**
      * Gets the metadata corresponding to the given <code>key</code>, if present.
@@ -204,7 +203,7 @@ public interface Node {
      * @param key the key
      * @return the data, if present
      */
-    <T> Optional<T> getMetadata(@NonNull NodeMetadataKey<T> key);
+    <T> Optional<T> getMetadata(NodeMetadataKey<T> key);
 
     /**
      * Gets the metadata corresponding to the given <code>key</code>, throwing an exception
@@ -215,7 +214,7 @@ public interface Node {
      * @return the data
      * @throws IllegalStateException if data isn't present
      */
-    default <T> T metadata(@NonNull NodeMetadataKey<T> key) throws IllegalStateException {
+    default <T> T metadata(NodeMetadataKey<T> key) throws IllegalStateException {
         return getMetadata(key).orElseThrow(() -> new IllegalStateException("Node '" + getKey() + "' does not have '" + key.name() + "' attached."));
     }
 
@@ -237,7 +236,7 @@ public interface Node {
      * @param equalityPredicate the predicate
      * @return true if this node is considered equal
      */
-    boolean equals(@NonNull Node other, @NonNull NodeEqualityPredicate equalityPredicate);
+    boolean equals(Node other, NodeEqualityPredicate equalityPredicate);
 
     /**
      * Gets a {@link NodeBuilder}, with the attributes of this node already
@@ -245,6 +244,6 @@ public interface Node {
      *
      * @return an editable, builder form of this node
      */
-    @NonNull NodeBuilder<?, ?> toBuilder();
+    NodeBuilder<?, ?> toBuilder();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/node/NodeBuilder.java b/api/src/main/java/net/luckperms/api/node/NodeBuilder.java
index 9e4c9cdd7..150c70278 100644
--- a/api/src/main/java/net/luckperms/api/node/NodeBuilder.java
+++ b/api/src/main/java/net/luckperms/api/node/NodeBuilder.java
@@ -27,9 +27,8 @@ package net.luckperms.api.node;
 
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.time.temporal.TemporalAccessor;
@@ -53,7 +52,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @return the builder
      * @see Node#getValue()
      */
-    @NonNull B value(boolean value);
+    B value(boolean value);
 
     /**
      * Sets the value of negated for the node.
@@ -62,7 +61,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @return the builder
      * @see Node#isNegated()
      */
-    @NonNull B negated(boolean negated);
+    B negated(boolean negated);
 
     /**
      * Sets the time when the node should expire.
@@ -74,7 +73,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @return the builder
      * @see Node#getExpiry()
      */
-    @NonNull B expiry(long expiryEpochSeconds);
+    B expiry(long expiryEpochSeconds);
 
     /**
      * Sets the time when the node should expire.
@@ -83,7 +82,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @return the builder
      * @see Node#getExpiry()
      */
-    @NonNull B expiry(@Nullable TemporalAccessor expiry);
+    B expiry(@Nullable TemporalAccessor expiry);
 
     /**
      * Sets the time when the node should expire.
@@ -96,7 +95,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @see Node#getExpiry()
      * @since 5.1
      */
-    @NonNull B expiry(@Nullable TemporalAmount duration);
+    B expiry(@Nullable TemporalAmount duration);
 
     /**
      * Sets the time when the node should expire.
@@ -108,7 +107,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @param unit     the unit <code>duration</code> is measured in
      * @return the builder
      */
-    default @NonNull B expiry(long duration, @NonNull TimeUnit unit) {
+    default B expiry(long duration, TimeUnit unit) {
         if (duration <= 0) {
             throw new IllegalArgumentException("duration must be positive");
         }
@@ -121,7 +120,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      *
      * @return the builder
      */
-    @NonNull B clearExpiry();
+    B clearExpiry();
 
     /**
      * Sets the extra contexts for the node.
@@ -131,7 +130,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @see ContextSet
      * @see Node#getContexts()
      */
-    @NonNull B context(@NonNull ContextSet contextSet);
+    B context(ContextSet contextSet);
 
     /**
      * Appends an extra context onto the node.
@@ -142,7 +141,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @see ContextSet
      * @see Node#getContexts()
      */
-    @NonNull B withContext(@NonNull String key, @NonNull String value);
+    B withContext(String key, String value);
 
     /**
      * Appends extra contexts onto the node.
@@ -152,7 +151,7 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @see ContextSet
      * @see Node#getContexts()
      */
-    @NonNull B withContext(@NonNull ContextSet contextSet);
+    B withContext(ContextSet contextSet);
 
     /**
      * Sets the given metadata for the node.
@@ -162,12 +161,12 @@ public interface NodeBuilder<N extends ScopedNode<N, B>, B extends NodeBuilder<N
      * @param <T> the metadata type
      * @return the builder
      */
-    <T> @NonNull B withMetadata(@NonNull NodeMetadataKey<T> key, @Nullable T metadata);
+    <T> B withMetadata(NodeMetadataKey<T> key, @Nullable T metadata);
 
     /**
      * Creates a {@link Node} instance from the builder.
      *
      * @return a new node instance
      */
-    @NonNull N build();
+    N build();
 }
diff --git a/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java b/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java
index 5f2dea12b..26fa80386 100644
--- a/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java
+++ b/api/src/main/java/net/luckperms/api/node/NodeBuilderRegistry.java
@@ -33,7 +33,6 @@ import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.RegexPermissionNode;
 import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.Internal;
 
 /**
@@ -52,7 +51,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see Node#builder(String)
      */
-    @NonNull NodeBuilder<?, ?> forKey(String key);
+    NodeBuilder<?, ?> forKey(String key);
 
     /**
      * Gets a {@link NodeBuilder} for {@link PermissionNode}s.
@@ -62,7 +61,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see PermissionNode#builder()
      */
-    PermissionNode.@NonNull Builder forPermission();
+    PermissionNode.Builder forPermission();
 
     /**
      * Gets a {@link NodeBuilder} for {@link RegexPermissionNode}s.
@@ -72,7 +71,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see RegexPermissionNode#builder()
      */
-    RegexPermissionNode.@NonNull Builder forRegexPermission();
+    RegexPermissionNode.Builder forRegexPermission();
 
     /**
      * Gets a {@link NodeBuilder} for {@link InheritanceNode}s.
@@ -82,7 +81,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see InheritanceNode#builder()
      */
-    InheritanceNode.@NonNull Builder forInheritance();
+    InheritanceNode.Builder forInheritance();
 
     /**
      * Gets a {@link NodeBuilder} for {@link PrefixNode}s.
@@ -92,7 +91,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see PrefixNode#builder()
      */
-    PrefixNode.@NonNull Builder forPrefix();
+    PrefixNode.Builder forPrefix();
 
     /**
      * Gets a {@link NodeBuilder} for {@link SuffixNode}s.
@@ -102,7 +101,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see SuffixNode#builder()
      */
-    SuffixNode.@NonNull Builder forSuffix();
+    SuffixNode.Builder forSuffix();
 
     /**
      * Gets a {@link NodeBuilder} for {@link MetaNode}s.
@@ -112,7 +111,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see MetaNode#builder()
      */
-    MetaNode.@NonNull Builder forMeta();
+    MetaNode.Builder forMeta();
 
     /**
      * Gets a {@link NodeBuilder} for {@link WeightNode}s.
@@ -122,7 +121,7 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see WeightNode#builder()
      */
-    WeightNode.@NonNull Builder forWeight();
+    WeightNode.Builder forWeight();
 
     /**
      * Gets a {@link NodeBuilder} for {@link DisplayNameNode}s.
@@ -132,6 +131,6 @@ public interface NodeBuilderRegistry {
      * @return the node builder
      * @see DisplayNameNode#builder()
      */
-    DisplayNameNode.@NonNull Builder forDisplayName();
+    DisplayNameNode.Builder forDisplayName();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/node/NodeEqualityPredicate.java b/api/src/main/java/net/luckperms/api/node/NodeEqualityPredicate.java
index f0579d7f2..69704d913 100644
--- a/api/src/main/java/net/luckperms/api/node/NodeEqualityPredicate.java
+++ b/api/src/main/java/net/luckperms/api/node/NodeEqualityPredicate.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.node;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.function.Predicate;
 
@@ -59,7 +58,7 @@ public interface NodeEqualityPredicate {
      * @param o2 the second node
      * @return true if equal
      */
-    boolean areEqual(@NonNull Node o1, @NonNull Node o2);
+    boolean areEqual(Node o1, Node o2);
 
     /**
      * Returns a {@link Predicate}, returning true if the tested node is equal
diff --git a/api/src/main/java/net/luckperms/api/node/NodeType.java b/api/src/main/java/net/luckperms/api/node/NodeType.java
index e1c7b8143..a007c5294 100644
--- a/api/src/main/java/net/luckperms/api/node/NodeType.java
+++ b/api/src/main/java/net/luckperms/api/node/NodeType.java
@@ -34,7 +34,6 @@ import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.RegexPermissionNode;
 import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -157,7 +156,7 @@ public interface NodeType<T extends Node> {
      *
      * @return a name
      */
-    @NonNull String name();
+    String name();
 
     /**
      * Returns if the passed node matches the type
@@ -165,7 +164,7 @@ public interface NodeType<T extends Node> {
      * @param node the node to test
      * @return true if the node has the same type
      */
-    boolean matches(@NonNull Node node);
+    boolean matches(Node node);
 
     /**
      * Casts the given {@link Node} to the type defined by the {@link NodeType}.
@@ -177,7 +176,7 @@ public interface NodeType<T extends Node> {
      * @return the casted node
      * @throws IllegalArgumentException if the node to cast does not match the type
      */
-    @NonNull T cast(@NonNull Node node);
+    T cast(Node node);
 
     /**
      * Attempts to cast the given {@link Node} to the type defined by the
@@ -189,7 +188,7 @@ public interface NodeType<T extends Node> {
      * @param node the node to cast
      * @return an optional, possibly containing a casted node
      */
-    default @NonNull Optional<T> tryCast(@NonNull Node node) {
+    default Optional<T> tryCast(Node node) {
         Objects.requireNonNull(node, "node");
         if (!matches(node)) {
             return Optional.empty();
@@ -204,7 +203,7 @@ public interface NodeType<T extends Node> {
      *
      * @return a predicate for the {@link #matches(Node)} method.
      */
-    default @NonNull Predicate<Node> predicate() {
+    default Predicate<Node> predicate() {
         return this::matches;
     }
 
@@ -216,7 +215,7 @@ public interface NodeType<T extends Node> {
      * @param and a predicate to AND with the result of the type match check
      * @return a matching predicate, ANDed with the given predicate parameter
      */
-    default @NonNull Predicate<Node> predicate(@NonNull Predicate<? super T> and) {
+    default Predicate<Node> predicate(Predicate<? super T> and) {
         return node -> matches(node) && and.test(cast(node));
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/ScopedNode.java b/api/src/main/java/net/luckperms/api/node/ScopedNode.java
index 9ce55a013..c80398d2c 100644
--- a/api/src/main/java/net/luckperms/api/node/ScopedNode.java
+++ b/api/src/main/java/net/luckperms/api/node/ScopedNode.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.node;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A {@link Node}, with its own type and the type of its associated builder
@@ -37,9 +36,9 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface ScopedNode<N extends ScopedNode<N, B>, B extends NodeBuilder<N, B>> extends Node {
 
     @Override
-    @NonNull NodeType<N> getType();
+    NodeType<N> getType();
 
     @Override
-    @NonNull B toBuilder();
+    B toBuilder();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/node/SimpleNodeType.java b/api/src/main/java/net/luckperms/api/node/SimpleNodeType.java
index 1e0adbb63..f84246f21 100644
--- a/api/src/main/java/net/luckperms/api/node/SimpleNodeType.java
+++ b/api/src/main/java/net/luckperms/api/node/SimpleNodeType.java
@@ -25,8 +25,6 @@
 
 package net.luckperms.api.node;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
 import java.util.function.Function;
@@ -46,18 +44,18 @@ final class SimpleNodeType<T extends Node> implements NodeType<T>, Comparable<Si
     }
 
     @Override
-    public @NotNull String name() {
+    public String name() {
         return this.name;
     }
 
     @Override
-    public boolean matches(@NonNull Node node) {
+    public boolean matches(Node node) {
         Objects.requireNonNull(node, "node");
         return this.matches.test(node);
     }
 
     @Override
-    public @NotNull T cast(@NonNull Node node) {
+    public T cast(Node node) {
         if (!matches(node)) {
             throw new IllegalArgumentException("Node " + node.getClass() + " does not match " + this.name);
         }
@@ -70,7 +68,7 @@ final class SimpleNodeType<T extends Node> implements NodeType<T>, Comparable<Si
     }
 
     @Override
-    public int compareTo(@NotNull SimpleNodeType<?> o) {
+    public int compareTo(SimpleNodeType<?> o) {
         return Integer.compare(this.sortOrder, o.sortOrder);
     }
 }
diff --git a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java
index d08b550c9..71263e790 100644
--- a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java
+++ b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcher.java
@@ -30,7 +30,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeEqualityPredicate;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.types.MetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 
 import java.util.function.Predicate;
@@ -54,7 +53,7 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @param key the key
      * @return the matcher
      */
-    static @NonNull NodeMatcher<Node> key(@NonNull String key) {
+    static NodeMatcher<Node> key(String key) {
         return LuckPermsProvider.get().getNodeMatcherFactory().key(key);
     }
 
@@ -67,7 +66,7 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @param <T> the node type
      * @return the matcher
      */
-    static <T extends Node> @NonNull NodeMatcher<T> key(@NonNull T node) {
+    static <T extends Node> NodeMatcher<T> key(T node) {
         return LuckPermsProvider.get().getNodeMatcherFactory().key(node);
     }
 
@@ -78,7 +77,7 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @param startingWith the string to match
      * @return the matcher
      */
-    static @NonNull NodeMatcher<Node> keyStartsWith(@NonNull String startingWith) {
+    static NodeMatcher<Node> keyStartsWith(String startingWith) {
         return LuckPermsProvider.get().getNodeMatcherFactory().keyStartsWith(startingWith);
     }
 
@@ -92,7 +91,7 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @param <T> the node type
      * @return the matcher
      */
-    static <T extends Node> @NonNull NodeMatcher<T> equals(@NonNull T other, @NonNull NodeEqualityPredicate equalityPredicate) {
+    static <T extends Node> NodeMatcher<T> equals(T other, NodeEqualityPredicate equalityPredicate) {
         return LuckPermsProvider.get().getNodeMatcherFactory().equals(other, equalityPredicate);
     }
 
@@ -105,7 +104,7 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @param metaKey the meta key
      * @return the matcher
      */
-    static @NonNull NodeMatcher<MetaNode> metaKey(@NonNull String metaKey) {
+    static NodeMatcher<MetaNode> metaKey(String metaKey) {
         return LuckPermsProvider.get().getNodeMatcherFactory().metaKey(metaKey);
     }
 
@@ -118,7 +117,7 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @param metaNode the meta node to use for the meta key
      * @return the matcher
      */
-    static @NonNull NodeMatcher<MetaNode> metaKey(@NonNull MetaNode metaNode) {
+    static NodeMatcher<MetaNode> metaKey(MetaNode metaNode) {
         return metaKey(metaNode.getMetaKey());
     }
 
@@ -133,7 +132,7 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @param <T> the node type
      * @return the matcher
      */
-    static <T extends Node> @NonNull NodeMatcher<T> type(@NonNull NodeType<? extends T> type) {
+    static <T extends Node> NodeMatcher<T> type(NodeType<? extends T> type) {
         return LuckPermsProvider.get().getNodeMatcherFactory().type(type);
     }
 
@@ -144,5 +143,5 @@ public interface NodeMatcher<T extends Node> extends Predicate<Node> {
      * @return true if the node matched
      */
     @Override
-    boolean test(@NonNull Node node);
+    boolean test(Node node);
 }
diff --git a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java
index 3fd53b570..c3c6f124e 100644
--- a/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java
+++ b/api/src/main/java/net/luckperms/api/node/matcher/NodeMatcherFactory.java
@@ -29,7 +29,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeEqualityPredicate;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.types.MetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.Internal;
 
 /**
@@ -50,7 +49,7 @@ public interface NodeMatcherFactory {
      * @param key the key
      * @return the matcher
      */
-    @NonNull NodeMatcher<Node> key(@NonNull String key);
+    NodeMatcher<Node> key(String key);
 
     /**
      * Gets a {@link NodeMatcher} which matches nodes with the same {@link Node#getKey() key}.
@@ -63,7 +62,7 @@ public interface NodeMatcherFactory {
      * @param <T> the node type
      * @return the matcher
      */
-    <T extends Node> @NonNull NodeMatcher<T> key(@NonNull T node);
+    <T extends Node> NodeMatcher<T> key(T node);
 
     /**
      * Gets a {@link NodeMatcher} which matches nodes with a {@link Node#getKey() key} starting
@@ -74,7 +73,7 @@ public interface NodeMatcherFactory {
      * @param startingWith the string to match
      * @return the matcher
      */
-    @NonNull NodeMatcher<Node> keyStartsWith(@NonNull String startingWith);
+    NodeMatcher<Node> keyStartsWith(String startingWith);
 
     /**
      * Gets a {@link NodeMatcher} which matches nodes which are
@@ -88,7 +87,7 @@ public interface NodeMatcherFactory {
      * @param <T> the node type
      * @return the matcher
      */
-    <T extends Node> @NonNull NodeMatcher<T> equals(@NonNull T other, @NonNull NodeEqualityPredicate equalityPredicate);
+    <T extends Node> NodeMatcher<T> equals(T other, NodeEqualityPredicate equalityPredicate);
 
     /**
      * Gets a {@link NodeMatcher} which matches {@link MetaNode}s with the same
@@ -101,7 +100,7 @@ public interface NodeMatcherFactory {
      * @param metaKey the meta key
      * @return the matcher
      */
-    @NonNull NodeMatcher<MetaNode> metaKey(@NonNull String metaKey);
+    NodeMatcher<MetaNode> metaKey(String metaKey);
 
     /**
      * Gets a {@link NodeMatcher} which matches {@link Node}s with the same
@@ -116,6 +115,6 @@ public interface NodeMatcherFactory {
      * @param <T> the node type
      * @return the matcher
      */
-    <T extends Node> @NonNull NodeMatcher<T> type(@NonNull NodeType<? extends T> type);
+    <T extends Node> NodeMatcher<T> type(NodeType<? extends T> type);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/node/matcher/package-info.java b/api/src/main/java/net/luckperms/api/node/matcher/package-info.java
index e79eb520b..d0aad6c8d 100644
--- a/api/src/main/java/net/luckperms/api/node/matcher/package-info.java
+++ b/api/src/main/java/net/luckperms/api/node/matcher/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.node.Node} matchers.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.node.matcher;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/node/metadata/NodeMetadataKey.java b/api/src/main/java/net/luckperms/api/node/metadata/NodeMetadataKey.java
index 0717979ba..b15a8a50a 100644
--- a/api/src/main/java/net/luckperms/api/node/metadata/NodeMetadataKey.java
+++ b/api/src/main/java/net/luckperms/api/node/metadata/NodeMetadataKey.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.node.metadata;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 
 import java.util.Objects;
@@ -54,7 +53,7 @@ public interface NodeMetadataKey<T> {
      * @param <T> the type parameter
      * @return the key
      */
-    static <T> @NonNull NodeMetadataKey<T> of(@NonNull String name, @NonNull Class<T> type) {
+    static <T> NodeMetadataKey<T> of(String name, Class<T> type) {
         Objects.requireNonNull(name, "name");
         Objects.requireNonNull(type, "type");
         return new SimpleNodeMetadataKey<>(name, type);
@@ -65,13 +64,13 @@ public interface NodeMetadataKey<T> {
      *
      * @return the key name
      */
-    @NonNull String name();
+    String name();
 
     /**
      * Gets the type of the key
      *
      * @return the type
      */
-    @NonNull Class<T> type();
+    Class<T> type();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/node/metadata/SimpleNodeMetadataKey.java b/api/src/main/java/net/luckperms/api/node/metadata/SimpleNodeMetadataKey.java
index 6350538ae..4a904c434 100644
--- a/api/src/main/java/net/luckperms/api/node/metadata/SimpleNodeMetadataKey.java
+++ b/api/src/main/java/net/luckperms/api/node/metadata/SimpleNodeMetadataKey.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.node.metadata;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Locale;
 import java.util.Objects;
@@ -40,12 +39,12 @@ final class SimpleNodeMetadataKey<T> implements NodeMetadataKey<T> {
     }
 
     @Override
-    public @NonNull String name() {
+    public String name() {
         return this.name;
     }
 
     @Override
-    public @NonNull Class<T> type() {
+    public Class<T> type() {
         return this.type;
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/metadata/package-info.java b/api/src/main/java/net/luckperms/api/node/metadata/package-info.java
index a36d2031b..c1ce025ed 100644
--- a/api/src/main/java/net/luckperms/api/node/metadata/package-info.java
+++ b/api/src/main/java/net/luckperms/api/node/metadata/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.node.Node} metadata.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.node.metadata;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java b/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java
index 6abe244f9..0662b70f0 100644
--- a/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java
+++ b/api/src/main/java/net/luckperms/api/node/metadata/types/InheritanceOriginMetadata.java
@@ -29,7 +29,6 @@ import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 
 /**
@@ -54,7 +53,7 @@ public interface InheritanceOriginMetadata {
      *
      * @return where the node was inherited from.
      */
-    PermissionHolder.@NonNull Identifier getOrigin();
+    PermissionHolder.Identifier getOrigin();
 
     /**
      * Gets the {@link DataType type} of the {@link net.luckperms.api.model.data.NodeMap}
@@ -63,7 +62,7 @@ public interface InheritanceOriginMetadata {
      * @return the type of the NodeMap the node was inherited from.
      * @since 5.4
      */
-    @NonNull DataType getDataType();
+    DataType getDataType();
 
     /**
      * Gets whether the associated node was inherited from another holder.
@@ -74,7 +73,7 @@ public interface InheritanceOriginMetadata {
      * @return if true the node was inherited, false if it was defined by the same holder
      * @since 5.3
      */
-    default boolean wasInherited(PermissionHolder.@NonNull Identifier holder) {
+    default boolean wasInherited(PermissionHolder.Identifier holder) {
         return !holder.equals(getOrigin());
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/metadata/types/package-info.java b/api/src/main/java/net/luckperms/api/node/metadata/types/package-info.java
index e385ad9f3..914ca2d22 100644
--- a/api/src/main/java/net/luckperms/api/node/metadata/types/package-info.java
+++ b/api/src/main/java/net/luckperms/api/node/metadata/types/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.node.Node} metadata types.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.node.metadata.types;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/node/package-info.java b/api/src/main/java/net/luckperms/api/node/package-info.java
index 9f4224e44..42560a6cb 100644
--- a/api/src/main/java/net/luckperms/api/node/package-info.java
+++ b/api/src/main/java/net/luckperms/api/node/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.node.Node} functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.node;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java b/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java
index f7056ff64..c47d918b0 100644
--- a/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/ChatMetaNode.java
@@ -28,7 +28,6 @@ package net.luckperms.api.node.types;
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.ScopedNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents a chat meta node. (a {@link PrefixNode} or {@link SuffixNode})
@@ -57,7 +56,7 @@ public interface ChatMetaNode<N extends ChatMetaNode<N, B>, B extends ChatMetaNo
      *
      * @return the type
      */
-    @NonNull ChatMetaType getMetaType();
+    ChatMetaType getMetaType();
 
     /**
      * A {@link ChatMetaNode} builder.
@@ -73,7 +72,7 @@ public interface ChatMetaNode<N extends ChatMetaNode<N, B>, B extends ChatMetaNo
          * @param priority the priority
          * @return the builder
          */
-        @NonNull B priority(int priority);
+        B priority(int priority);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java b/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java
index 3db052fad..8d865a8a7 100644
--- a/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/DisplayNameNode.java
@@ -30,7 +30,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.ScopedNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A sub-type of {@link Node} used to mark the display name of the node's holder.
@@ -38,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface DisplayNameNode extends ScopedNode<DisplayNameNode, DisplayNameNode.Builder> {
 
     @Override
-    default @NonNull NodeType<DisplayNameNode> getType() {
+    default NodeType<DisplayNameNode> getType() {
         return NodeType.DISPLAY_NAME;
     }
 
@@ -47,14 +46,14 @@ public interface DisplayNameNode extends ScopedNode<DisplayNameNode, DisplayName
      *
      * @return the display name
      */
-    @NonNull String getDisplayName();
+    String getDisplayName();
 
     /**
      * Creates a {@link DisplayNameNode} builder.
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forDisplayName();
     }
 
@@ -65,7 +64,7 @@ public interface DisplayNameNode extends ScopedNode<DisplayNameNode, DisplayName
      * @return the builder
      * @throws IllegalArgumentException if {@code displayName} is empty
      */
-    static @NonNull Builder builder(@NonNull String displayName) {
+    static Builder builder(String displayName) {
         return builder().displayName(displayName);
     }
 
@@ -81,7 +80,7 @@ public interface DisplayNameNode extends ScopedNode<DisplayNameNode, DisplayName
          * @return the builder
          * @throws IllegalArgumentException if {@code displayName} is empty
          */
-        @NonNull Builder displayName(@NonNull String displayName);
+        Builder displayName(String displayName);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java b/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java
index e1c060ee2..856590620 100644
--- a/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/InheritanceNode.java
@@ -31,7 +31,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.ScopedNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A sub-type of {@link Node} used to mark that the holder of the node should inherit
@@ -40,7 +39,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface InheritanceNode extends ScopedNode<InheritanceNode, InheritanceNode.Builder> {
 
     @Override
-    default @NonNull NodeType<InheritanceNode> getType() {
+    default NodeType<InheritanceNode> getType() {
         return NodeType.INHERITANCE;
     }
 
@@ -51,14 +50,14 @@ public interface InheritanceNode extends ScopedNode<InheritanceNode, Inheritance
      *
      * @return the name of the group
      */
-    @NonNull String getGroupName();
+    String getGroupName();
 
     /**
      * Creates a {@link InheritanceNode} builder.
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forInheritance();
     }
 
@@ -69,7 +68,7 @@ public interface InheritanceNode extends ScopedNode<InheritanceNode, Inheritance
      * @return the builder
      * @throws IllegalArgumentException if {@code group} is not a valid group name
      */
-    static @NonNull Builder builder(@NonNull String group) {
+    static Builder builder(String group) {
         return builder().group(group);
     }
 
@@ -79,7 +78,7 @@ public interface InheritanceNode extends ScopedNode<InheritanceNode, Inheritance
      * @param group the group name
      * @return the builder
      */
-    static @NonNull Builder builder(@NonNull Group group) {
+    static Builder builder(Group group) {
         return builder().group(group);
     }
 
@@ -98,7 +97,7 @@ public interface InheritanceNode extends ScopedNode<InheritanceNode, Inheritance
          * @return the builder
          * @throws IllegalArgumentException if {@code group} is not a valid group name
          */
-        @NonNull Builder group(@NonNull String group);
+        Builder group(String group);
 
         /**
          * Sets the group to inherit.
@@ -109,7 +108,7 @@ public interface InheritanceNode extends ScopedNode<InheritanceNode, Inheritance
          * @param group the group
          * @return the builder
          */
-        @NonNull Builder group(@NonNull Group group);
+        Builder group(Group group);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/MetaNode.java b/api/src/main/java/net/luckperms/api/node/types/MetaNode.java
index da8f2b29b..a2e974ada 100644
--- a/api/src/main/java/net/luckperms/api/node/types/MetaNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/MetaNode.java
@@ -30,7 +30,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.ScopedNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A sub-type of {@link Node} used to store meta assignments.
@@ -38,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface MetaNode extends ScopedNode<MetaNode, MetaNode.Builder> {
 
     @Override
-    default @NonNull NodeType<MetaNode> getType() {
+    default NodeType<MetaNode> getType() {
         return NodeType.META;
     }
 
@@ -47,21 +46,21 @@ public interface MetaNode extends ScopedNode<MetaNode, MetaNode.Builder> {
      *
      * @return the meta key
      */
-    @NonNull String getMetaKey();
+    String getMetaKey();
 
     /**
      * Gets the meta value.
      *
      * @return the meta value
      */
-    @NonNull String getMetaValue();
+    String getMetaValue();
 
     /**
      * Creates a {@link MetaNode} builder.
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forMeta();
     }
 
@@ -73,7 +72,7 @@ public interface MetaNode extends ScopedNode<MetaNode, MetaNode.Builder> {
      * @return the builder
      * @throws IllegalArgumentException if {@code key} is empty
      */
-    static @NonNull Builder builder(@NonNull String key, @NonNull String value) {
+    static Builder builder(String key, String value) {
         return builder().key(key).value(value);
     }
 
@@ -89,7 +88,7 @@ public interface MetaNode extends ScopedNode<MetaNode, MetaNode.Builder> {
          * @return the builder
          * @throws IllegalArgumentException if {@code key} is empty
          */
-        @NonNull Builder key(@NonNull String key);
+        Builder key(String key);
 
         /**
          * Sets the meta value.
@@ -97,7 +96,7 @@ public interface MetaNode extends ScopedNode<MetaNode, MetaNode.Builder> {
          * @param value the meta value
          * @return the builder
          */
-        @NonNull Builder value(@NonNull String value);
+        Builder value(String value);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java b/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java
index f992c10ef..9acbd1f55 100644
--- a/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/PermissionNode.java
@@ -30,7 +30,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.ScopedNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.OptionalInt;
 
@@ -40,7 +39,7 @@ import java.util.OptionalInt;
 public interface PermissionNode extends ScopedNode<PermissionNode, PermissionNode.Builder> {
 
     @Override
-    default @NonNull NodeType<PermissionNode> getType() {
+    default NodeType<PermissionNode> getType() {
         return NodeType.PERMISSION;
     }
 
@@ -52,7 +51,7 @@ public interface PermissionNode extends ScopedNode<PermissionNode, PermissionNod
      *
      * @return the actual permission node
      */
-    @NonNull String getPermission();
+    String getPermission();
 
     /**
      * Gets if this node is a wildcard permission.
@@ -72,14 +71,14 @@ public interface PermissionNode extends ScopedNode<PermissionNode, PermissionNod
      *
      * @return the wildcard level
      */
-    @NonNull OptionalInt getWildcardLevel();
+    OptionalInt getWildcardLevel();
 
     /**
      * Creates a {@link PermissionNode} builder.
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forPermission();
     }
 
@@ -90,7 +89,7 @@ public interface PermissionNode extends ScopedNode<PermissionNode, PermissionNod
      * @return the builder
      * @throws IllegalArgumentException if {@code permission} is empty
      */
-    static @NonNull Builder builder(@NonNull String permission) {
+    static Builder builder(String permission) {
         return builder().permission(permission);
     }
 
@@ -106,7 +105,7 @@ public interface PermissionNode extends ScopedNode<PermissionNode, PermissionNod
          * @return the builder
          * @throws IllegalArgumentException if {@code permission} is empty
          */
-        @NonNull Builder permission(@NonNull String permission);
+        Builder permission(String permission);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java b/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java
index cd74241aa..eb8f41b73 100644
--- a/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/PrefixNode.java
@@ -28,7 +28,6 @@ package net.luckperms.api.node.types;
 import net.luckperms.api.LuckPermsProvider;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeType;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A sub-type of {@link Node} used to store prefix assignments.
@@ -36,7 +35,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface PrefixNode extends ChatMetaNode<PrefixNode, PrefixNode.Builder> {
 
     @Override
-    default @NonNull NodeType<PrefixNode> getType() {
+    default NodeType<PrefixNode> getType() {
         return NodeType.PREFIX;
     }
 
@@ -45,7 +44,7 @@ public interface PrefixNode extends ChatMetaNode<PrefixNode, PrefixNode.Builder>
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forPrefix();
     }
 
@@ -56,7 +55,7 @@ public interface PrefixNode extends ChatMetaNode<PrefixNode, PrefixNode.Builder>
      * @param priority the priority to set
      * @return the builder
      */
-    static @NonNull Builder builder(@NonNull String prefix, int priority) {
+    static Builder builder(String prefix, int priority) {
         return builder().prefix(prefix).priority(priority);
     }
 
@@ -71,7 +70,7 @@ public interface PrefixNode extends ChatMetaNode<PrefixNode, PrefixNode.Builder>
          * @param prefix the prefix
          * @return the builder
          */
-        @NonNull Builder prefix(@NonNull String prefix);
+        Builder prefix(String prefix);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java b/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java
index 9e7f364ff..b6cfe0405 100644
--- a/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/RegexPermissionNode.java
@@ -30,7 +30,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.ScopedNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Optional;
 import java.util.regex.Pattern;
@@ -41,7 +40,7 @@ import java.util.regex.Pattern;
 public interface RegexPermissionNode extends ScopedNode<RegexPermissionNode, RegexPermissionNode.Builder> {
 
     @Override
-    default @NonNull NodeType<RegexPermissionNode> getType() {
+    default NodeType<RegexPermissionNode> getType() {
         return NodeType.REGEX_PERMISSION;
     }
 
@@ -50,7 +49,7 @@ public interface RegexPermissionNode extends ScopedNode<RegexPermissionNode, Reg
      *
      * @return the pattern string
      */
-    @NonNull String getPatternString();
+    String getPatternString();
 
     /**
      * Gets the pattern for the regex node.
@@ -59,14 +58,14 @@ public interface RegexPermissionNode extends ScopedNode<RegexPermissionNode, Reg
      *
      * @return the pattern
      */
-    @NonNull Optional<Pattern> getPattern();
+    Optional<Pattern> getPattern();
 
     /**
      * Creates a {@link RegexPermissionNode} builder.
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forRegexPermission();
     }
 
@@ -77,7 +76,7 @@ public interface RegexPermissionNode extends ScopedNode<RegexPermissionNode, Reg
      * @return the builder
      * @throws IllegalArgumentException if {@code pattern} is empty
      */
-    static @NonNull Builder builder(@NonNull String pattern) {
+    static Builder builder(String pattern) {
         return builder().pattern(pattern);
     }
 
@@ -87,7 +86,7 @@ public interface RegexPermissionNode extends ScopedNode<RegexPermissionNode, Reg
      * @param pattern the pattern to set
      * @return the builder
      */
-    static @NonNull Builder builder(@NonNull Pattern pattern) {
+    static Builder builder(Pattern pattern) {
         return builder().pattern(pattern);
     }
 
@@ -103,7 +102,7 @@ public interface RegexPermissionNode extends ScopedNode<RegexPermissionNode, Reg
          * @return the builder
          * @throws IllegalArgumentException if {@code pattern} is empty
          */
-        @NonNull Builder pattern(@NonNull String pattern);
+        Builder pattern(String pattern);
 
         /**
          * Sets the pattern.
@@ -111,7 +110,7 @@ public interface RegexPermissionNode extends ScopedNode<RegexPermissionNode, Reg
          * @param pattern the pattern
          * @return the builder
          */
-        @NonNull Builder pattern(@NonNull Pattern pattern);
+        Builder pattern(Pattern pattern);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java b/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java
index 3c80e83ca..edbf092e0 100644
--- a/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/SuffixNode.java
@@ -28,7 +28,6 @@ package net.luckperms.api.node.types;
 import net.luckperms.api.LuckPermsProvider;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeType;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A sub-type of {@link Node} used to store suffix assignments.
@@ -36,7 +35,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface SuffixNode extends ChatMetaNode<SuffixNode, SuffixNode.Builder> {
 
     @Override
-    default @NonNull NodeType<SuffixNode> getType() {
+    default NodeType<SuffixNode> getType() {
         return NodeType.SUFFIX;
     }
 
@@ -45,7 +44,7 @@ public interface SuffixNode extends ChatMetaNode<SuffixNode, SuffixNode.Builder>
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forSuffix();
     }
 
@@ -56,7 +55,7 @@ public interface SuffixNode extends ChatMetaNode<SuffixNode, SuffixNode.Builder>
      * @param priority the priority to set
      * @return the builder
      */
-    static @NonNull Builder builder(@NonNull String suffix, int priority) {
+    static Builder builder(String suffix, int priority) {
         return builder().suffix(suffix).priority(priority);
     }
 
@@ -71,7 +70,7 @@ public interface SuffixNode extends ChatMetaNode<SuffixNode, SuffixNode.Builder>
          * @param suffix the suffix
          * @return the builder
          */
-        @NonNull Builder suffix(@NonNull String suffix);
+        Builder suffix(String suffix);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/WeightNode.java b/api/src/main/java/net/luckperms/api/node/types/WeightNode.java
index f01d1aa9f..a40110fe0 100644
--- a/api/src/main/java/net/luckperms/api/node/types/WeightNode.java
+++ b/api/src/main/java/net/luckperms/api/node/types/WeightNode.java
@@ -30,7 +30,6 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.ScopedNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A sub-type of {@link Node} used to mark the weight of the node's holder.
@@ -38,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public interface WeightNode extends ScopedNode<WeightNode, WeightNode.Builder> {
 
     @Override
-    default @NonNull NodeType<WeightNode> getType() {
+    default NodeType<WeightNode> getType() {
         return NodeType.WEIGHT;
     }
 
@@ -54,7 +53,7 @@ public interface WeightNode extends ScopedNode<WeightNode, WeightNode.Builder> {
      *
      * @return the builder
      */
-    static @NonNull Builder builder() {
+    static Builder builder() {
         return LuckPermsProvider.get().getNodeBuilderRegistry().forWeight();
     }
 
@@ -64,7 +63,7 @@ public interface WeightNode extends ScopedNode<WeightNode, WeightNode.Builder> {
      * @param weight the weight to set
      * @return the builder
      */
-    static @NonNull Builder builder(int weight) {
+    static Builder builder(int weight) {
         return builder().weight(weight);
     }
 
@@ -79,7 +78,7 @@ public interface WeightNode extends ScopedNode<WeightNode, WeightNode.Builder> {
          * @param weight the weight
          * @return the builder
          */
-        @NonNull Builder weight(int weight);
+        Builder weight(int weight);
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/node/types/package-info.java b/api/src/main/java/net/luckperms/api/node/types/package-info.java
index a2f8ba7ac..9e5209319 100644
--- a/api/src/main/java/net/luckperms/api/node/types/package-info.java
+++ b/api/src/main/java/net/luckperms/api/node/types/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.node.Node} types.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.node.types;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/package-info.java b/api/src/main/java/net/luckperms/api/package-info.java
index b62326c15..73fc40f37 100644
--- a/api/src/main/java/net/luckperms/api/package-info.java
+++ b/api/src/main/java/net/luckperms/api/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Main package for the {@link net.luckperms.api.LuckPerms} API interface.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/platform/Platform.java b/api/src/main/java/net/luckperms/api/platform/Platform.java
index 9bc2d8c32..fe0e4fbf7 100644
--- a/api/src/main/java/net/luckperms/api/platform/Platform.java
+++ b/api/src/main/java/net/luckperms/api/platform/Platform.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.platform;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.time.Instant;
@@ -43,28 +42,28 @@ public interface Platform {
      *
      * @return the type of platform LuckPerms is running on
      */
-    Platform.@NonNull Type getType();
+    Platform.Type getType();
 
     /**
      * Gets the unique players which have connected to the server since it started.
      *
      * @return the unique connections
      */
-    @NonNull @Unmodifiable Set<UUID> getUniqueConnections();
+    @Unmodifiable Set<UUID> getUniqueConnections();
 
     /**
      * Gets a {@link Collection} of all known permission strings.
      *
      * @return a collection of the known permissions
      */
-    @NonNull @Unmodifiable Collection<String> getKnownPermissions();
+    @Unmodifiable Collection<String> getKnownPermissions();
 
     /**
      * Gets the time when the plugin first started.
      *
      * @return the enable time
      */
-    @NonNull Instant getStartTime();
+    Instant getStartTime();
 
     /**
      * Represents a type of platform which LuckPerms can run on.
@@ -92,7 +91,7 @@ public interface Platform {
          *
          * @return a readable name
          */
-        public @NonNull String getFriendlyName() {
+        public String getFriendlyName() {
             return this.friendlyName;
         }
     }
diff --git a/api/src/main/java/net/luckperms/api/platform/PlatformEntity.java b/api/src/main/java/net/luckperms/api/platform/PlatformEntity.java
index 5f3ca264a..eb7891956 100644
--- a/api/src/main/java/net/luckperms/api/platform/PlatformEntity.java
+++ b/api/src/main/java/net/luckperms/api/platform/PlatformEntity.java
@@ -25,8 +25,7 @@
 
 package net.luckperms.api.platform;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
@@ -54,14 +53,14 @@ public interface PlatformEntity {
      *
      * @return the object name
      */
-    @NonNull String getName();
+    String getName();
 
     /**
      * Gets the entities type.
      *
      * @return the type
      */
-    @NonNull Type getType();
+    Type getType();
 
     /**
      * The different types of {@link PlatformEntity}
diff --git a/api/src/main/java/net/luckperms/api/platform/PlayerAdapter.java b/api/src/main/java/net/luckperms/api/platform/PlayerAdapter.java
index 1f60dc7d1..5d837b77c 100644
--- a/api/src/main/java/net/luckperms/api/platform/PlayerAdapter.java
+++ b/api/src/main/java/net/luckperms/api/platform/PlayerAdapter.java
@@ -33,7 +33,6 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.model.user.UserManager;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
 
@@ -68,7 +67,7 @@ public interface PlayerAdapter<T> {
      * @return the user
      * @see UserManager#getUser(UUID)
      */
-    @NonNull User getUser(@NonNull T player);
+    User getUser(T player);
 
     /**
      * Gets current {@link ImmutableContextSet active context} for the {@code player}.
@@ -77,7 +76,7 @@ public interface PlayerAdapter<T> {
      * @return the active context for the player
      * @see ContextManager#getContext(Object)
      */
-    @NonNull ImmutableContextSet getContext(@NonNull T player);
+    ImmutableContextSet getContext(T player);
 
     /**
      * Gets current {@link QueryOptions active query options} for the {@code player}.
@@ -86,7 +85,7 @@ public interface PlayerAdapter<T> {
      * @return the active query options for the player
      * @see ContextManager#getQueryOptions(Object)
      */
-    @NonNull QueryOptions getQueryOptions(@NonNull T player);
+    QueryOptions getQueryOptions(T player);
 
     /**
      * Gets the current {@link CachedPermissionData} for the {@code player},
@@ -96,7 +95,7 @@ public interface PlayerAdapter<T> {
      * @return the cached permission data for the player
      * @see CachedDataManager#getPermissionData()
      */
-    default @NonNull CachedPermissionData getPermissionData(@NonNull T player) {
+    default CachedPermissionData getPermissionData(T player) {
         return getUser(player).getCachedData().getPermissionData(getQueryOptions(player));
     }
 
@@ -108,7 +107,7 @@ public interface PlayerAdapter<T> {
      * @return the cached meta data for the player
      * @see CachedDataManager#getMetaData()
      */
-    default @NonNull CachedMetaData getMetaData(@NonNull T player) {
+    default CachedMetaData getMetaData(T player) {
         return getUser(player).getCachedData().getMetaData(getQueryOptions(player));
     }
 
diff --git a/api/src/main/java/net/luckperms/api/platform/PluginMetadata.java b/api/src/main/java/net/luckperms/api/platform/PluginMetadata.java
index ffd43117f..dd67b1ff3 100644
--- a/api/src/main/java/net/luckperms/api/platform/PluginMetadata.java
+++ b/api/src/main/java/net/luckperms/api/platform/PluginMetadata.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.platform;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Provides information about the LuckPerms plugin.
@@ -37,13 +36,13 @@ public interface PluginMetadata {
      *
      * @return the version of the plugin running on the platform
      */
-    @NonNull String getVersion();
+    String getVersion();
 
     /**
      * Gets the API version
      *
      * @return the version of the API running on the platform
      */
-    @NonNull String getApiVersion();
+    String getApiVersion();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/platform/package-info.java b/api/src/main/java/net/luckperms/api/platform/package-info.java
index 63ec9e649..58eb0f6fb 100644
--- a/api/src/main/java/net/luckperms/api/platform/package-info.java
+++ b/api/src/main/java/net/luckperms/api/platform/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.platform.Platform} specific information and utilities.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.platform;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/query/OptionKey.java b/api/src/main/java/net/luckperms/api/query/OptionKey.java
index 16f9b8baf..e4ef9f3bb 100644
--- a/api/src/main/java/net/luckperms/api/query/OptionKey.java
+++ b/api/src/main/java/net/luckperms/api/query/OptionKey.java
@@ -26,7 +26,6 @@
 package net.luckperms.api.query;
 
 import net.luckperms.api.node.metadata.NodeMetadataKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 
 import java.util.Objects;
@@ -54,7 +53,7 @@ public interface OptionKey<T> {
      * @param <T> the type parameter
      * @return the key
      */
-    static <T> @NonNull OptionKey<T> of(@NonNull String name, @NonNull Class<T> type) {
+    static <T> OptionKey<T> of(String name, Class<T> type) {
         Objects.requireNonNull(name, "name");
         Objects.requireNonNull(type, "type");
         return new SimpleOptionKey<>(name, type);
@@ -65,13 +64,13 @@ public interface OptionKey<T> {
      *
      * @return the key name
      */
-    @NonNull String name();
+    String name();
 
     /**
      * Gets the type of the key
      *
      * @return the type
      */
-    @NonNull Class<T> type();
+    Class<T> type();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/query/QueryOptions.java b/api/src/main/java/net/luckperms/api/query/QueryOptions.java
index 0ff603e79..f5708c62e 100644
--- a/api/src/main/java/net/luckperms/api/query/QueryOptions.java
+++ b/api/src/main/java/net/luckperms/api/query/QueryOptions.java
@@ -29,9 +29,8 @@ import net.luckperms.api.LuckPermsProvider;
 import net.luckperms.api.context.ContextSatisfyMode;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.ImmutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Optional;
@@ -49,7 +48,7 @@ public interface QueryOptions {
      * @param mode the query mode
      * @return a new builder
      */
-    static @NonNull Builder builder(@NonNull QueryMode mode) {
+    static Builder builder(QueryMode mode) {
         return LuckPermsProvider.get().getContextManager().queryOptionsBuilder(mode);
     }
 
@@ -61,7 +60,7 @@ public interface QueryOptions {
      * @param flags the query flags
      * @return the query options
      */
-    static @NonNull QueryOptions contextual(@NonNull ContextSet context, @NonNull Set<Flag> flags) {
+    static QueryOptions contextual(ContextSet context, Set<Flag> flags) {
         return builder(QueryMode.CONTEXTUAL).context(context).flags(flags).build();
     }
 
@@ -72,7 +71,7 @@ public interface QueryOptions {
      * @param context the contexts to query in
      * @return the query options
      */
-    static @NonNull QueryOptions contextual(@NonNull ContextSet context) {
+    static QueryOptions contextual(ContextSet context) {
         return builder(QueryMode.CONTEXTUAL).context(context).build();
     }
 
@@ -83,7 +82,7 @@ public interface QueryOptions {
      * @param flags the query flags
      * @return the query options
      */
-    static @NonNull QueryOptions nonContextual(@NonNull Set<Flag> flags) {
+    static QueryOptions nonContextual(Set<Flag> flags) {
         return builder(QueryMode.NON_CONTEXTUAL).flags(flags).build();
     }
 
@@ -95,7 +94,7 @@ public interface QueryOptions {
      *
      * @return the default non contextual query options
      */
-    static @NonNull QueryOptions nonContextual() {
+    static QueryOptions nonContextual() {
         return LuckPermsProvider.get().getQueryOptionsRegistry().defaultNonContextualOptions();
     }
 
@@ -108,7 +107,7 @@ public interface QueryOptions {
      *
      * @return the default contextual query options
      */
-    static @NonNull QueryOptions defaultContextualOptions() {
+    static QueryOptions defaultContextualOptions() {
         return LuckPermsProvider.get().getQueryOptionsRegistry().defaultContextualOptions();
     }
 
@@ -117,7 +116,7 @@ public interface QueryOptions {
      *
      * @return the query mode
      */
-    @NonNull QueryMode mode();
+    QueryMode mode();
 
     /**
      * Gets the {@link ContextSet context}, if the options are
@@ -128,7 +127,7 @@ public interface QueryOptions {
      *
      * @return the context
      */
-    @NonNull ImmutableContextSet context();
+    ImmutableContextSet context();
 
     /**
      * Gets if the given {@link Flag} is set.
@@ -136,14 +135,14 @@ public interface QueryOptions {
      * @param flag the flag
      * @return if the flag is set
      */
-    boolean flag(@NonNull Flag flag);
+    boolean flag(Flag flag);
 
     /**
      * Gets the {@link Flag}s which are set.
      *
      * @return the flags
      */
-    @NonNull Set<Flag> flags();
+    Set<Flag> flags();
 
     /**
      * Gets the value assigned to the given {@link OptionKey}.
@@ -155,14 +154,14 @@ public interface QueryOptions {
      * @param <O> the option type
      * @return the value assigned to the key
      */
-    <O> @NonNull Optional<O> option(@NonNull OptionKey<O> key);
+    <O> Optional<O> option(OptionKey<O> key);
 
     /**
      * Gets the options which are set.
      *
      * @return the options
      */
-    @NonNull Map<OptionKey<?>, Object> options();
+    Map<OptionKey<?>, Object> options();
 
     /**
      * Gets whether this {@link QueryOptions} satisfies the given required
@@ -174,7 +173,7 @@ public interface QueryOptions {
      * @param contextSet the contexts
      * @return the result
      */
-    default boolean satisfies(@NonNull ContextSet contextSet) {
+    default boolean satisfies(ContextSet contextSet) {
         return satisfies(contextSet, ContextSatisfyMode.AT_LEAST_ONE_VALUE_PER_KEY);
     }
 
@@ -190,14 +189,14 @@ public interface QueryOptions {
      * @return the result
      * @since 5.2
      */
-    boolean satisfies(@NonNull ContextSet contextSet, @NonNull ContextSatisfyMode defaultContextSatisfyMode);
+    boolean satisfies(ContextSet contextSet, ContextSatisfyMode defaultContextSatisfyMode);
 
     /**
      * Converts this {@link QueryOptions} to a mutable builder.
      *
      * @return a builder, with the same properties already set
      */
-    @NonNull Builder toBuilder();
+    Builder toBuilder();
 
     /**
      * Builder for {@link QueryOptions}.
@@ -211,7 +210,7 @@ public interface QueryOptions {
          * @param mode the mode to set
          * @return this builder
          */
-        @NonNull Builder mode(@NonNull QueryMode mode);
+        Builder mode(QueryMode mode);
 
         /**
          * Sets the context.
@@ -225,7 +224,7 @@ public interface QueryOptions {
          * @param context the context to set
          * @return this builder
          */
-        @NonNull Builder context(@NonNull ContextSet context);
+        Builder context(ContextSet context);
 
         /**
          * Sets the value of the given flag.
@@ -236,7 +235,7 @@ public interface QueryOptions {
          * @param value the value to set
          * @return this builder
          */
-        @NonNull Builder flag(@NonNull Flag flag, boolean value);
+        Builder flag(Flag flag, boolean value);
 
         /**
          * Sets the flags.
@@ -249,7 +248,7 @@ public interface QueryOptions {
          * @param flags the flags
          * @return this builder
          */
-        @NonNull Builder flags(@NonNull Set<Flag> flags);
+        Builder flags(Set<Flag> flags);
 
         /**
          * Sets the value of the given option.
@@ -262,7 +261,7 @@ public interface QueryOptions {
          * @param <O> the option type
          * @return this builder
          */
-        <O> @NonNull Builder option(@NonNull OptionKey<O> key, @Nullable O value);
+        <O> Builder option(OptionKey<O> key, @Nullable O value);
 
         /**
          * Builds a {@link QueryOptions} instance from the properties defined to
@@ -270,7 +269,7 @@ public interface QueryOptions {
          *
          * @return a {@link QueryOptions} instance.
          */
-        @NonNull QueryOptions build();
+        QueryOptions build();
 
     }
 
diff --git a/api/src/main/java/net/luckperms/api/query/QueryOptionsRegistry.java b/api/src/main/java/net/luckperms/api/query/QueryOptionsRegistry.java
index 260700922..c2380058c 100644
--- a/api/src/main/java/net/luckperms/api/query/QueryOptionsRegistry.java
+++ b/api/src/main/java/net/luckperms/api/query/QueryOptionsRegistry.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.query;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.ApiStatus.Internal;
 
 /**
@@ -45,7 +44,7 @@ public interface QueryOptionsRegistry {
      * @return the default contextual query options
      * @see QueryOptions#defaultContextualOptions()
      */
-    @NonNull QueryOptions defaultContextualOptions();
+    QueryOptions defaultContextualOptions();
 
     /**
      * Gets the default {@link QueryMode#NON_CONTEXTUAL non contextual}
@@ -56,6 +55,6 @@ public interface QueryOptionsRegistry {
      * @return the default non contextual query options
      * @see QueryOptions#nonContextual()
      */
-    @NonNull QueryOptions defaultNonContextualOptions();
+    QueryOptions defaultNonContextualOptions();
 
 }
diff --git a/api/src/main/java/net/luckperms/api/query/SimpleOptionKey.java b/api/src/main/java/net/luckperms/api/query/SimpleOptionKey.java
index 6efc5e2ba..47eba588f 100644
--- a/api/src/main/java/net/luckperms/api/query/SimpleOptionKey.java
+++ b/api/src/main/java/net/luckperms/api/query/SimpleOptionKey.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.query;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Locale;
 import java.util.Objects;
@@ -42,12 +41,12 @@ final class SimpleOptionKey<T> implements OptionKey<T> {
     }
 
     @Override
-    public @NonNull String name() {
+    public String name() {
         return this.name;
     }
 
     @Override
-    public @NonNull Class<T> type() {
+    public Class<T> type() {
         return this.type;
     }
 
diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java
index c78af6d7d..94c87da51 100644
--- a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java
+++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrder.java
@@ -27,7 +27,6 @@ package net.luckperms.api.query.dataorder;
 
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -92,7 +91,7 @@ public enum DataQueryOrder implements Comparator<DataType> {
      * @param comparator the comparator
      * @return the ordered data types
      */
-    public static @NonNull List<DataType> order(@NonNull Comparator<? super DataType> comparator) {
+    public static List<DataType> order(Comparator<? super DataType> comparator) {
         int compare = comparator.compare(DataType.TRANSIENT, DataType.NORMAL);
         if (compare > 0) {
             // transient first
@@ -113,7 +112,7 @@ public enum DataQueryOrder implements Comparator<DataType> {
      * @param comparator the comparator
      * @param action the action
      */
-    public static void queryInOrder(@NonNull Comparator<? super DataType> comparator, @NonNull Consumer<? super DataType> action) {
+    public static void queryInOrder(Comparator<? super DataType> comparator, Consumer<? super DataType> action) {
         order(comparator).forEach(action);
     }
 
diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java
index d7e081821..5dd2ef2d7 100644
--- a/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java
+++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataQueryOrderFunction.java
@@ -28,7 +28,6 @@ package net.luckperms.api.query.dataorder;
 import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.query.OptionKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Comparator;
 import java.util.Objects;
@@ -52,7 +51,7 @@ public interface DataQueryOrderFunction {
      * @return the data query order function
      * @since 5.2
      */
-    static @NonNull DataQueryOrderFunction always(@NonNull Comparator<DataType> comparator) {
+    static DataQueryOrderFunction always(Comparator<DataType> comparator) {
         Objects.requireNonNull(comparator, "comparator");
         return id -> comparator;
     }
@@ -64,6 +63,6 @@ public interface DataQueryOrderFunction {
      * @param holderIdentifier the holder identifier
      * @return the comparator to use
      */
-    @NonNull Comparator<DataType> getOrderComparator(PermissionHolder.@NonNull Identifier holderIdentifier);
+    Comparator<DataType> getOrderComparator(PermissionHolder.Identifier holderIdentifier);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java
index f027212da..1edce9c17 100644
--- a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java
+++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilter.java
@@ -27,7 +27,6 @@ package net.luckperms.api.query.dataorder;
 
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -101,7 +100,7 @@ public enum DataTypeFilter implements Predicate<DataType> {
      * @param predicate the predicate to filter with
      * @return the list of data types
      */
-    public static @NonNull List<DataType> values(@NonNull Predicate<? super DataType> predicate) {
+    public static List<DataType> values(Predicate<? super DataType> predicate) {
         boolean normal = predicate.test(DataType.NORMAL);
         boolean trans = predicate.test(DataType.TRANSIENT);
 
diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java
index 0ad457547..39feffc6c 100644
--- a/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java
+++ b/api/src/main/java/net/luckperms/api/query/dataorder/DataTypeFilterFunction.java
@@ -28,7 +28,6 @@ package net.luckperms.api.query.dataorder;
 import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.query.OptionKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Objects;
 import java.util.function.Predicate;
@@ -53,7 +52,7 @@ public interface DataTypeFilterFunction {
      * @param predicate the predicate
      * @return the data type filter function
      */
-    static @NonNull DataTypeFilterFunction always(@NonNull Predicate<DataType> predicate) {
+    static DataTypeFilterFunction always(Predicate<DataType> predicate) {
         Objects.requireNonNull(predicate, "predicate");
         return id -> predicate;
     }
@@ -65,6 +64,6 @@ public interface DataTypeFilterFunction {
      * @param holderIdentifier the holder identifier
      * @return the predicate to use
      */
-    @NonNull Predicate<DataType> getTypeFilter(PermissionHolder.@NonNull Identifier holderIdentifier);
+    Predicate<DataType> getTypeFilter(PermissionHolder.Identifier holderIdentifier);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/query/dataorder/package-info.java b/api/src/main/java/net/luckperms/api/query/dataorder/package-info.java
index 7f28f3de8..cd8fc70d3 100644
--- a/api/src/main/java/net/luckperms/api/query/dataorder/package-info.java
+++ b/api/src/main/java/net/luckperms/api/query/dataorder/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.query.QueryOptions} data order and filter customization.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.query.dataorder;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java b/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java
index 424126387..79e575c0b 100644
--- a/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java
+++ b/api/src/main/java/net/luckperms/api/query/meta/MetaValueSelector.java
@@ -28,7 +28,6 @@ package net.luckperms.api.query.meta;
 import net.luckperms.api.cacheddata.Result;
 import net.luckperms.api.node.types.MetaNode;
 import net.luckperms.api.query.OptionKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.List;
 
@@ -54,6 +53,6 @@ public interface MetaValueSelector {
      * @param values the values, in the order in which they were accumulated.
      * @return the selected value
      */
-    @NonNull Result<String, MetaNode> selectValue(@NonNull String key, @NonNull List<? extends Result<String, MetaNode>> values);
+    Result<String, MetaNode> selectValue(String key, List<? extends Result<String, MetaNode>> values);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/query/meta/package-info.java b/api/src/main/java/net/luckperms/api/query/meta/package-info.java
index e76dfd45a..8b866cdc7 100644
--- a/api/src/main/java/net/luckperms/api/query/meta/package-info.java
+++ b/api/src/main/java/net/luckperms/api/query/meta/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.query.QueryOptions} meta customization.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.query.meta;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/query/package-info.java b/api/src/main/java/net/luckperms/api/query/package-info.java
index 309720e82..92c55748d 100644
--- a/api/src/main/java/net/luckperms/api/query/package-info.java
+++ b/api/src/main/java/net/luckperms/api/query/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.query.QueryOptions} functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.query;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/track/DemotionResult.java b/api/src/main/java/net/luckperms/api/track/DemotionResult.java
index 214f51c64..e38a41a8f 100644
--- a/api/src/main/java/net/luckperms/api/track/DemotionResult.java
+++ b/api/src/main/java/net/luckperms/api/track/DemotionResult.java
@@ -27,7 +27,6 @@ package net.luckperms.api.track;
 
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.util.Result;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Optional;
 
@@ -41,7 +40,7 @@ public interface DemotionResult extends Result {
      *
      * @return the status
      */
-    @NonNull Status getStatus();
+    Status getStatus();
 
     @Override
     default boolean wasSuccessful() {
@@ -59,7 +58,7 @@ public interface DemotionResult extends Result {
      *
      * @return the group the user was demoted from.
      */
-    @NonNull Optional<String> getGroupFrom();
+    Optional<String> getGroupFrom();
 
     /**
      * Gets the name of the group the user was demoted from, if applicable.
@@ -69,7 +68,7 @@ public interface DemotionResult extends Result {
      *
      * @return the group the user was demoted to.
      */
-    @NonNull Optional<String> getGroupTo();
+    Optional<String> getGroupTo();
 
     /**
      * The result status
diff --git a/api/src/main/java/net/luckperms/api/track/PromotionResult.java b/api/src/main/java/net/luckperms/api/track/PromotionResult.java
index 41ae090d5..0c65b3acb 100644
--- a/api/src/main/java/net/luckperms/api/track/PromotionResult.java
+++ b/api/src/main/java/net/luckperms/api/track/PromotionResult.java
@@ -27,7 +27,6 @@ package net.luckperms.api.track;
 
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.util.Result;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Optional;
 
@@ -41,7 +40,7 @@ public interface PromotionResult extends Result {
      *
      * @return the status
      */
-    @NonNull Status getStatus();
+    Status getStatus();
 
     @Override
     default boolean wasSuccessful() {
@@ -56,7 +55,7 @@ public interface PromotionResult extends Result {
      *
      * @return the group the user was promoted from.
      */
-    @NonNull Optional<String> getGroupFrom();
+    Optional<String> getGroupFrom();
 
     /**
      * Gets the name of the group the user was promoted from, if applicable.
@@ -69,7 +68,7 @@ public interface PromotionResult extends Result {
      *
      * @return the group the user was promoted to.
      */
-    @NonNull Optional<String> getGroupTo();
+    Optional<String> getGroupTo();
 
     /**
      * The result status
diff --git a/api/src/main/java/net/luckperms/api/track/Track.java b/api/src/main/java/net/luckperms/api/track/Track.java
index 83538c502..18a75e370 100644
--- a/api/src/main/java/net/luckperms/api/track/Track.java
+++ b/api/src/main/java/net/luckperms/api/track/Track.java
@@ -29,9 +29,8 @@ import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.model.data.DataMutateResult;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -45,7 +44,7 @@ public interface Track {
      *
      * @return the name of this track
      */
-    @NonNull String getName();
+    String getName();
 
     /**
      * Gets a list of the groups on this track
@@ -56,7 +55,7 @@ public interface Track {
      *
      * @return an ordered {@link List} of the groups on this track
      */
-    @NonNull @Unmodifiable List<String> getGroups();
+    @Unmodifiable List<String> getGroups();
 
     /**
      * Gets the next group on the track, after the one provided
@@ -68,7 +67,7 @@ public interface Track {
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    @Nullable String getNext(@NonNull Group current);
+    @Nullable String getNext(Group current);
 
     /**
      * Gets the previous group on the track, before the one provided
@@ -80,7 +79,7 @@ public interface Track {
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    @Nullable String getPrevious(@NonNull Group current);
+    @Nullable String getPrevious(Group current);
 
     /**
      * Promotes the given user along this track.
@@ -89,7 +88,7 @@ public interface Track {
      * @param contextSet the contexts to promote the user in
      * @return the result of the action
      */
-    @NonNull PromotionResult promote(@NonNull User user, @NonNull ContextSet contextSet);
+    PromotionResult promote(User user, ContextSet contextSet);
 
     /**
      * Demotes the given user along this track.
@@ -98,7 +97,7 @@ public interface Track {
      * @param contextSet the contexts to demote the user in
      * @return the result of the action
      */
-    @NonNull DemotionResult demote(@NonNull User user, @NonNull ContextSet contextSet);
+    DemotionResult demote(User user, ContextSet contextSet);
 
     /**
      * Appends a group to the end of this track
@@ -108,7 +107,7 @@ public interface Track {
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    @NonNull DataMutateResult appendGroup(@NonNull Group group);
+    DataMutateResult appendGroup(Group group);
 
     /**
      * Inserts a group at a certain position on this track
@@ -120,7 +119,7 @@ public interface Track {
      * @throws NullPointerException      if the group is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      */
-    @NonNull DataMutateResult insertGroup(@NonNull Group group, int position) throws IndexOutOfBoundsException;
+    DataMutateResult insertGroup(Group group, int position) throws IndexOutOfBoundsException;
 
     /**
      * Removes a group from this track
@@ -130,7 +129,7 @@ public interface Track {
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    @NonNull DataMutateResult removeGroup(@NonNull Group group);
+    DataMutateResult removeGroup(Group group);
 
     /**
      * Removes a group from this track
@@ -139,7 +138,7 @@ public interface Track {
      * @return the result of the operation
      * @throws NullPointerException if the group is null
      */
-    @NonNull DataMutateResult removeGroup(@NonNull String group);
+    DataMutateResult removeGroup(String group);
 
     /**
      * Checks if a group features on this track
@@ -149,7 +148,7 @@ public interface Track {
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    boolean containsGroup(@NonNull Group group);
+    boolean containsGroup(Group group);
 
     /**
      * Checks if a group features on this track
@@ -158,7 +157,7 @@ public interface Track {
      * @return true if the group is on this track
      * @throws NullPointerException if the group is null
      */
-    boolean containsGroup(@NonNull String group);
+    boolean containsGroup(String group);
 
     /**
      * Clear all of the groups from this track
diff --git a/api/src/main/java/net/luckperms/api/track/TrackManager.java b/api/src/main/java/net/luckperms/api/track/TrackManager.java
index c5c22ae4e..851575d5c 100644
--- a/api/src/main/java/net/luckperms/api/track/TrackManager.java
+++ b/api/src/main/java/net/luckperms/api/track/TrackManager.java
@@ -25,9 +25,8 @@
 
 package net.luckperms.api.track;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Optional;
 import java.util.Set;
@@ -60,7 +59,7 @@ public interface TrackManager {
      * @return the resultant track
      * @throws NullPointerException if the name is null
      */
-    @NonNull CompletableFuture<Track> createAndLoadTrack(@NonNull String name);
+    CompletableFuture<Track> createAndLoadTrack(String name);
 
     /**
      * Loads a track from the plugin's storage provider into memory.
@@ -72,7 +71,7 @@ public interface TrackManager {
      * @return the resultant track
      * @throws NullPointerException if the name is null
      */
-    @NonNull CompletableFuture<Optional<Track>> loadTrack(@NonNull String name);
+    CompletableFuture<Optional<Track>> loadTrack(String name);
 
     /**
      * Saves a track's data back to the plugin's storage provider.
@@ -84,7 +83,7 @@ public interface TrackManager {
      * @throws NullPointerException  if track is null
      * @throws IllegalStateException if the track instance was not obtained from LuckPerms.
      */
-    @NonNull CompletableFuture<Void> saveTrack(@NonNull Track track);
+    CompletableFuture<Void> saveTrack(Track track);
 
     /**
      * Permanently deletes a track from the plugin's storage provider.
@@ -94,7 +93,7 @@ public interface TrackManager {
      * @throws NullPointerException  if track is null
      * @throws IllegalStateException if the track instance was not obtained from LuckPerms.
      */
-    @NonNull CompletableFuture<Void> deleteTrack(@NonNull Track track);
+    CompletableFuture<Void> deleteTrack(Track track);
 
     /**
      * Loads (or creates) a track from the plugin's storage provider, applies the given {@code action},
@@ -109,7 +108,7 @@ public interface TrackManager {
      * @return a future to encapsulate the operation
      * @since 5.5
      */
-    default @NonNull CompletableFuture<Void> modifyTrack(@NonNull String name, @NonNull Consumer<? super Track> action) {
+    default CompletableFuture<Void> modifyTrack(String name, Consumer<? super Track> action) {
         /* This default method is overridden in the implementation, and is just here
            to demonstrate what this method does in the API sources. */
         return createAndLoadTrack(name)
@@ -122,7 +121,7 @@ public interface TrackManager {
      *
      * @return a future to encapsulate the operation.
      */
-    @NonNull CompletableFuture<Void> loadAllTracks();
+    CompletableFuture<Void> loadAllTracks();
 
     /**
      * Gets a loaded track.
@@ -131,14 +130,14 @@ public interface TrackManager {
      * @return a {@link Track} object, if one matching the name exists, or null if not
      * @throws NullPointerException if the name is null
      */
-    @Nullable Track getTrack(@NonNull String name);
+    @Nullable Track getTrack(String name);
 
     /**
      * Gets a set of all loaded tracks.
      *
      * @return a {@link Set} of {@link Track} objects
      */
-    @NonNull @Unmodifiable Set<Track> getLoadedTracks();
+    @Unmodifiable Set<Track> getLoadedTracks();
 
     /**
      * Check if a track is loaded in memory
@@ -147,6 +146,6 @@ public interface TrackManager {
      * @return true if the track is loaded
      * @throws NullPointerException if the name is null
      */
-    boolean isLoaded(@NonNull String name);
+    boolean isLoaded(String name);
 
 }
diff --git a/api/src/main/java/net/luckperms/api/track/package-info.java b/api/src/main/java/net/luckperms/api/track/package-info.java
index 4058e326c..85aabf9f1 100644
--- a/api/src/main/java/net/luckperms/api/track/package-info.java
+++ b/api/src/main/java/net/luckperms/api/track/package-info.java
@@ -26,4 +26,5 @@
 /**
  * {@link net.luckperms.api.track.Track} data model and functionality.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.track;
\ No newline at end of file
diff --git a/api/src/main/java/net/luckperms/api/util/Page.java b/api/src/main/java/net/luckperms/api/util/Page.java
index 3ecf589c4..626f84746 100644
--- a/api/src/main/java/net/luckperms/api/util/Page.java
+++ b/api/src/main/java/net/luckperms/api/util/Page.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.util;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.List;
 
@@ -41,7 +40,7 @@ public interface Page<T> {
      *
      * @return the entries
      */
-    @NonNull List<T> entries();
+    List<T> entries();
 
     /**
      * Gets the total/overall number of entries (not just the number of entries on this page).
diff --git a/api/src/main/java/net/luckperms/api/util/Tristate.java b/api/src/main/java/net/luckperms/api/util/Tristate.java
index 6e24177f1..363bfec46 100644
--- a/api/src/main/java/net/luckperms/api/util/Tristate.java
+++ b/api/src/main/java/net/luckperms/api/util/Tristate.java
@@ -25,7 +25,6 @@
 
 package net.luckperms.api.util;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents three different states of a setting.
@@ -61,7 +60,7 @@ public enum Tristate {
      * @param val the boolean value
      * @return {@link #TRUE} or {@link #FALSE}, if the value is <code>true</code> or <code>false</code>, respectively.
      */
-    public static @NonNull Tristate of(boolean val) {
+    public static Tristate of(boolean val) {
         return val ? TRUE : FALSE;
     }
 
@@ -75,7 +74,7 @@ public enum Tristate {
      * @return {@link #UNDEFINED}, {@link #TRUE} or {@link #FALSE}, if the value
      *         is <code>null</code>, <code>true</code> or <code>false</code>, respectively.
      */
-    public static @NonNull Tristate of(Boolean val) {
+    public static Tristate of(Boolean val) {
         return val == null ? UNDEFINED : val ? TRUE : FALSE;
     }
 
diff --git a/api/src/main/java/net/luckperms/api/util/package-info.java b/api/src/main/java/net/luckperms/api/util/package-info.java
index bdfb11d98..972842214 100644
--- a/api/src/main/java/net/luckperms/api/util/package-info.java
+++ b/api/src/main/java/net/luckperms/api/util/package-info.java
@@ -26,4 +26,5 @@
 /**
  * Miscellaneous utilities and classes that don't fit into any package.
  */
+@org.jspecify.annotations.NullMarked
 package net.luckperms.api.util;
\ No newline at end of file
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java
index 24fd39ab2..8f4f96fcc 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java
@@ -40,7 +40,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.ServerCommandEvent;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java
index c57427cc2..db2f662c5 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java
@@ -39,7 +39,7 @@ import org.bukkit.Server;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Method;
 import java.nio.file.Path;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java
index f9735bfa8..0449ebb8f 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitContextManager.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.context.manager.QueryOptionsSupplier;
 import net.luckperms.api.query.OptionKey;
 import net.luckperms.api.query.QueryOptions;
 import org.bukkit.entity.Player;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.UUID;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java
index 2b14c490d..6f355b4db 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java
@@ -46,7 +46,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Set;
 
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java
index 657a25740..5d1692d19 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/DummyPermissibleBase.java
@@ -31,7 +31,7 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.lang.reflect.Field;
 import java.util.Collections;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissible.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissible.java
index a8f5848cb..cadd69a6f 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissible.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissible.java
@@ -43,7 +43,7 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.lang.reflect.Field;
 import java.util.Collection;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissionAttachment.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissionAttachment.java
index 4afd48c9a..160f9f076 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissionAttachment.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LuckPermsPermissionAttachment.java
@@ -37,7 +37,7 @@ import net.luckperms.api.query.QueryOptions;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionRemovedExecutor;
 import org.bukkit.plugin.Plugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.lang.reflect.Field;
 import java.util.Collection;
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 3f37b5386..d5c985014 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
@@ -37,7 +37,7 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Set;
 
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java
index 0cdab7d1b..f52116fa6 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/PermissibleInjector.java
@@ -30,7 +30,7 @@ import me.lucko.luckperms.common.plugin.logging.PluginLogger;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissibleBase;
 import org.bukkit.permissions.PermissionAttachment;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Field;
 import java.util.List;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java
index 91b5f9a0d..f2a5ce414 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsDefaultsMap.java
@@ -35,7 +35,7 @@ import me.lucko.luckperms.common.cache.Cache;
 import net.luckperms.api.util.Tristate;
 import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.PluginManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java
index 01579398d..8eb194313 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java
@@ -32,8 +32,8 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.treeview.PermissionRegistry;
 import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.PluginManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Field;
 import java.util.Collections;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java
index 9c9075c21..290ba8ba6 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java
@@ -29,7 +29,7 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.PluginManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java
index fc01ccdf2..6a8681a38 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.messaging.MessagingFactory;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class BukkitMessagingFactory extends MessagingFactory<LPBukkitPlugin> {
     public BukkitMessagingFactory(LPBukkitPlugin plugin) {
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java
index 57d476ee1..029d2ff2b 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessenger.java
@@ -34,7 +34,7 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java
index c119ab8c0..0a4f46196 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/PluginMessageMessenger.java
@@ -33,7 +33,7 @@ import net.luckperms.api.messenger.Messenger;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collection;
 
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/util/NullSafeConsoleCommandSender.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/util/NullSafeConsoleCommandSender.java
index 49726c7c9..6cb849e01 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/util/NullSafeConsoleCommandSender.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/util/NullSafeConsoleCommandSender.java
@@ -35,9 +35,9 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Optional;
 import java.util.Set;
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 d5e8860b5..097c0605f 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
@@ -55,7 +55,7 @@ import net.luckperms.api.query.Flag;
 import net.luckperms.api.query.QueryOptions;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.entity.Player;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Locale;
 import java.util.Objects;
diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java
index 4a932bb19..7e260af2f 100644
--- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java
+++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeeBootstrap.java
@@ -39,7 +39,7 @@ import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginDescription;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Field;
 import java.nio.file.Path;
diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java
index bfb8a7009..e0445dabe 100644
--- a/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java
+++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/BungeePlayerCalculator.java
@@ -40,7 +40,7 @@ import net.md_5.bungee.api.event.ServerSwitchEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class BungeePlayerCalculator implements ContextCalculator<ProxiedPlayer>, Listener {
     private final LPBungeePlugin plugin;
diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java
index c26fa4a60..e63487e0c 100644
--- a/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java
+++ b/bungee/src/main/java/me/lucko/luckperms/bungee/context/RedisBungeeCalculator.java
@@ -32,7 +32,7 @@ import net.luckperms.api.context.ContextConsumer;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.context.StaticContextCalculator;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class RedisBungeeCalculator implements StaticContextCalculator {
     private static final String PROXY_KEY = "proxy";
diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java
index cd7aa2efe..5904768f4 100644
--- a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java
+++ b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/BungeeMessagingFactory.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.messaging.MessagingFactory;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class BungeeMessagingFactory extends MessagingFactory<LPBungeePlugin> {
     public BungeeMessagingFactory(LPBungeePlugin plugin) {
diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java
index 409296648..aab2821e4 100644
--- a/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java
+++ b/bungee/src/main/java/me/lucko/luckperms/bungee/messaging/RedisBungeeMessenger.java
@@ -34,7 +34,7 @@ import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * An implementation of {@link Messenger} using Redis, via RedisBungee's API.
diff --git a/common/build.gradle b/common/build.gradle
index ab2cc373f..edf2d3164 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -44,7 +44,6 @@ dependencies {
     testImplementation 'net.luckperms:rest-api-java-client:0.1'
 
     api project(':api')
-    api 'org.checkerframework:checker-qual:3.12.0'
 
     compileOnly project(':common:loader-utils')
 
diff --git a/common/minecraft/src/main/java/me/lucko/luckperms/common/minecraft/context/MinecraftPlayerCalculator.java b/common/minecraft/src/main/java/me/lucko/luckperms/common/minecraft/context/MinecraftPlayerCalculator.java
index 6a0ad1718..dc1b62913 100644
--- a/common/minecraft/src/main/java/me/lucko/luckperms/common/minecraft/context/MinecraftPlayerCalculator.java
+++ b/common/minecraft/src/main/java/me/lucko/luckperms/common/minecraft/context/MinecraftPlayerCalculator.java
@@ -41,7 +41,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Set;
 
diff --git a/common/placeholders/build.gradle b/common/placeholders/build.gradle
index 155198238..580a74424 100644
--- a/common/placeholders/build.gradle
+++ b/common/placeholders/build.gradle
@@ -14,9 +14,6 @@ jacocoTestReport {
 dependencies {
     api project(':api')
 
-    compileOnly 'org.checkerframework:checker-qual:3.49.3'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
-
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
diff --git a/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/Placeholder.java b/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/Placeholder.java
index dbb7e6faf..84fe20935 100644
--- a/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/Placeholder.java
+++ b/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/Placeholder.java
@@ -25,8 +25,8 @@
 
 package me.lucko.luckperms.common.placeholders;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * A placeholder definition.
diff --git a/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderContext.java b/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderContext.java
index d1b2bd75d..768c1d817 100644
--- a/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderContext.java
+++ b/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderContext.java
@@ -31,7 +31,7 @@ import net.luckperms.api.cacheddata.CachedMetaData;
 import net.luckperms.api.cacheddata.CachedPermissionData;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * The context passed to a {@link Placeholder} resolve request.
diff --git a/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderRegistry.java b/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderRegistry.java
index bde519859..281a7ff5a 100644
--- a/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderRegistry.java
+++ b/common/placeholders/src/main/java/me/lucko/luckperms/common/placeholders/PlaceholderRegistry.java
@@ -25,8 +25,8 @@
 
 package me.lucko.luckperms.common.placeholders;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/LogPage.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/LogPage.java
index b9ea7c008..ae39df180 100644
--- a/common/src/main/java/me/lucko/luckperms/common/actionlog/LogPage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/LogPage.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.actionlog;
 
 import com.google.common.collect.ImmutableList;
 import me.lucko.luckperms.common.filter.PageParameters;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java
index 00ce2c64d..6de4e0b05 100644
--- a/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java
+++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java
@@ -39,7 +39,7 @@ import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.context.Context;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.DefaultContextKeys;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java b/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java
index a68ef671a..64680ab57 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java
@@ -63,7 +63,7 @@ import net.luckperms.api.platform.PlayerAdapter;
 import net.luckperms.api.platform.PluginMetadata;
 import net.luckperms.api.query.QueryOptionsRegistry;
 import net.luckperms.api.track.TrackManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java
index ef8e7df79..83813b1dd 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLog.java
@@ -30,7 +30,7 @@ import me.lucko.luckperms.common.actionlog.LoggedAction;
 import me.lucko.luckperms.common.util.ImmutableCollectors;
 import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.actionlog.ActionLog;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java
index c571d5e04..e795067d2 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java
@@ -37,7 +37,7 @@ import net.luckperms.api.actionlog.ActionLog;
 import net.luckperms.api.actionlog.ActionLogger;
 import net.luckperms.api.actionlog.filter.ActionFilter;
 import net.luckperms.api.util.Page;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java
index 227427b88..4ee2e964a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java
@@ -34,7 +34,7 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.query.QueryMode;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java
index e7ec45ad7..f9d649388 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextSetFactory.java
@@ -30,7 +30,7 @@ import me.lucko.luckperms.common.context.MutableContextSetImpl;
 import net.luckperms.api.context.ContextSetFactory;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.context.MutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class ApiContextSetFactory implements ContextSetFactory {
     public static final ApiContextSetFactory INSTANCE = new ApiContextSetFactory();
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java
index 6748455b7..1c83e5382 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java
@@ -29,8 +29,8 @@ import com.google.common.base.Preconditions;
 import me.lucko.luckperms.common.cacheddata.GroupCachedDataManager;
 import me.lucko.luckperms.common.model.Group;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.OptionalInt;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java
index a118fd248..40b638a2c 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java
@@ -39,7 +39,7 @@ import net.luckperms.api.event.cause.DeletionCause;
 import net.luckperms.api.node.HeldNode;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.matcher.NodeMatcher;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java
index b86624872..75c1941f8 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.api.implementation;
 import me.lucko.luckperms.common.messaging.InternalMessagingService;
 import net.luckperms.api.messaging.MessagingService;
 import net.luckperms.api.model.user.User;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java
index 8abcf2bec..38dddf039 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java
@@ -33,7 +33,7 @@ import net.luckperms.api.metastacking.DuplicateRemovalFunction;
 import net.luckperms.api.metastacking.MetaStackDefinition;
 import net.luckperms.api.metastacking.MetaStackElement;
 import net.luckperms.api.metastacking.MetaStackFactory;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java
index b11be199f..130d86aad 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeBuilderRegistry.java
@@ -44,7 +44,7 @@ import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.RegexPermissionNode;
 import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public final class ApiNodeBuilderRegistry implements NodeBuilderRegistry {
     public static final ApiNodeBuilderRegistry INSTANCE = new ApiNodeBuilderRegistry();
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeMatcherFactory.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeMatcherFactory.java
index 66fa6dcaf..46ab5a16d 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeMatcherFactory.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeMatcherFactory.java
@@ -32,7 +32,7 @@ import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.matcher.NodeMatcher;
 import net.luckperms.api.node.matcher.NodeMatcherFactory;
 import net.luckperms.api.node.types.MetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java
index 693a2f6aa..a795589cc 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
@@ -41,7 +41,7 @@ import net.luckperms.api.node.NodeEqualityPredicate;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.query.QueryOptions;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java
index 3dcfcfe1e..f5cdcd3b6 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatform.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.api.implementation;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import net.luckperms.api.platform.Platform;
 import net.luckperms.api.platform.PluginMetadata;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.time.Instant;
 import java.util.Collection;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlayerAdapter.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlayerAdapter.java
index d093fd9a2..f1f3d748e 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlayerAdapter.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlayerAdapter.java
@@ -31,7 +31,7 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.platform.PlayerAdapter;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiQueryOptionsRegistry.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiQueryOptionsRegistry.java
index e415eaf20..00af4bca2 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiQueryOptionsRegistry.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiQueryOptionsRegistry.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.api.implementation;
 import me.lucko.luckperms.common.query.QueryOptionsImpl;
 import net.luckperms.api.query.QueryOptions;
 import net.luckperms.api.query.QueryOptionsRegistry;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public final class ApiQueryOptionsRegistry implements QueryOptionsRegistry {
     public static final ApiQueryOptionsRegistry INSTANCE = new ApiQueryOptionsRegistry();
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java
index d7836b363..da5d7b5ee 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java
@@ -34,7 +34,7 @@ import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.track.DemotionResult;
 import net.luckperms.api.track.PromotionResult;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java
index 1d2ce0df7..671cbf8aa 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.util.ImmutableCollectors;
 import net.luckperms.api.event.cause.CreationCause;
 import net.luckperms.api.event.cause.DeletionCause;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java
index 21d62c5dc..00e420224 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.verbose.event.CheckOrigin;
 import net.luckperms.api.model.data.DataMutateResult;
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.node.NodeEqualityPredicate;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Locale;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
index a68813b70..a79c407aa 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
@@ -38,8 +38,8 @@ import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.node.HeldNode;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.matcher.NodeMatcher;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java
index 5740ccde1..83cfb3e1e 100644
--- a/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java
+++ b/common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java
@@ -29,7 +29,7 @@ import me.lucko.luckperms.common.bulkupdate.action.BulkUpdateAction;
 import me.lucko.luckperms.common.filter.FilterList;
 import me.lucko.luckperms.common.model.HolderType;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cache/Cache.java b/common/src/main/java/me/lucko/luckperms/common/cache/Cache.java
index 2438dd2b7..68a95b46a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cache/Cache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cache/Cache.java
@@ -25,7 +25,7 @@
 
 package me.lucko.luckperms.common.cache;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Optional;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/cache/ExpiringCache.java b/common/src/main/java/me/lucko/luckperms/common/cache/ExpiringCache.java
index fb807f810..c84962262 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cache/ExpiringCache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cache/ExpiringCache.java
@@ -25,7 +25,7 @@
 
 package me.lucko.luckperms.common.cache;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cache/PatternCache.java b/common/src/main/java/me/lucko/luckperms/common/cache/PatternCache.java
index 72198b588..9ea12ebe3 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cache/PatternCache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cache/PatternCache.java
@@ -25,7 +25,7 @@
 
 package me.lucko.luckperms.common.cache;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java
index 66e54f300..039ead0af 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedDataManager.java
@@ -42,7 +42,7 @@ import net.luckperms.api.metastacking.MetaStackDefinition;
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/FluentMetaStackElement.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/FluentMetaStackElement.java
index c7d5ce48c..101be99e5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/FluentMetaStackElement.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/FluentMetaStackElement.java
@@ -30,8 +30,8 @@ import com.google.common.collect.ImmutableMap;
 import net.luckperms.api.metastacking.MetaStackElement;
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.types.ChatMetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/SimpleMetaStackDefinition.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/SimpleMetaStackDefinition.java
index bda2e9265..1642f29c9 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/SimpleMetaStackDefinition.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/SimpleMetaStackDefinition.java
@@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList;
 import net.luckperms.api.metastacking.DuplicateRemovalFunction;
 import net.luckperms.api.metastacking.MetaStackDefinition;
 import net.luckperms.api.metastacking.MetaStackElement;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/StandardStackElements.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/StandardStackElements.java
index a67ee0c87..9653d3a81 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/StandardStackElements.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/metastack/StandardStackElements.java
@@ -33,8 +33,8 @@ import net.luckperms.api.model.PermissionHolder;
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata;
 import net.luckperms.api.node.types.ChatMetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/AbstractResult.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/AbstractResult.java
index 5d5199de2..6266114a1 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/AbstractResult.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/AbstractResult.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.cacheddata.result;
 
 import net.luckperms.api.cacheddata.Result;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class AbstractResult<T, N extends Node, S extends AbstractResult<T, N, S>> implements Result<T, N> {
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java
index e7230b331..15da40684 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/IntegerResult.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.cacheddata.result;
 
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Represents the result of an integer meta lookup
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/StringResult.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/StringResult.java
index 204117608..bca06e1b6 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/StringResult.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/StringResult.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.cacheddata.result;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.types.ChatMetaNode;
 import net.luckperms.api.node.types.MetaNode;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents the result of a meta lookup
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java
index 1b0dcc019..617729484 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/result/TristateResult.java
@@ -29,8 +29,8 @@ import me.lucko.luckperms.common.calculator.PermissionCalculator;
 import me.lucko.luckperms.common.calculator.processor.PermissionProcessor;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents the result of a {@link PermissionCalculator} lookup.
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java
index 46670715f..4729f8606 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java
@@ -49,8 +49,8 @@ import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
 import net.luckperms.api.query.QueryOptions;
 import net.luckperms.api.query.meta.MetaValueSelector;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaStackAccumulator.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaStackAccumulator.java
index 031ad7c34..e2f68438d 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaStackAccumulator.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaStackAccumulator.java
@@ -30,7 +30,7 @@ import net.luckperms.api.metastacking.MetaStackDefinition;
 import net.luckperms.api.metastacking.MetaStackElement;
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.types.ChatMetaNode;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java
index 0b4498233..388546839 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MonitoredMetaCache.java
@@ -39,8 +39,8 @@ import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Iterator;
 import java.util.List;
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 ac0a0fdf3..52f78e4f1 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
@@ -37,7 +37,7 @@ import net.luckperms.api.cacheddata.Result;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.query.QueryOptions;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java
index 26004cdc9..9027c895f 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaValueSelector.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.cacheddata.type;
 import net.luckperms.api.cacheddata.Result;
 import net.luckperms.api.node.types.MetaNode;
 import net.luckperms.api.query.meta.MetaValueSelector;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculatorBase.java b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculatorBase.java
index 6abad7bc4..a4325e5cd 100644
--- a/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculatorBase.java
+++ b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculatorBase.java
@@ -29,7 +29,7 @@ import me.lucko.luckperms.common.cache.LoadingMap;
 import me.lucko.luckperms.common.cacheddata.result.TristateResult;
 import me.lucko.luckperms.common.calculator.processor.PermissionProcessor;
 import me.lucko.luckperms.common.verbose.event.CheckOrigin;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collection;
 import java.util.Locale;
diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java
index 46561bb0a..5aca0a21a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java
+++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/Command.java
@@ -32,8 +32,8 @@ import me.lucko.luckperms.common.command.utils.ArgumentList;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.sender.Sender;
 import net.kyori.adventure.text.Component;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java
index 99d8b494f..f7c69a905 100644
--- a/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java
+++ b/common/src/main/java/me/lucko/luckperms/common/command/abstraction/ParentCommand.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.locale.Message;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.sender.Sender;
 import me.lucko.luckperms.common.util.Predicates;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java b/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java
index 2c199a725..a15edb0e4 100644
--- a/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java
+++ b/common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentList.java
@@ -38,7 +38,7 @@ import net.luckperms.api.context.DefaultContextKeys;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.context.MutableContextSet;
 import net.luckperms.api.model.data.TemporaryNodeMergeStrategy;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java
index d9f7445c0..76311aa20 100644
--- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java
+++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/EnvironmentVariableConfigAdapter.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.config.generic.adapter;
 
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Locale;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/FileSecretConfigAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/FileSecretConfigAdapter.java
index b73fde0b9..5d470c670 100644
--- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/FileSecretConfigAdapter.java
+++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/FileSecretConfigAdapter.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.config.generic.adapter;
 
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java
index a1b81daa9..da5c4b5b3 100644
--- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java
+++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/StringBasedConfigurationAdapter.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.config.generic.adapter;
 
 import com.google.common.base.Splitter;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java
index dfe369c0f..0ced30b1d 100644
--- a/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java
+++ b/common/src/main/java/me/lucko/luckperms/common/config/generic/adapter/SystemPropertyConfigAdapter.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.config.generic.adapter;
 
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class SystemPropertyConfigAdapter extends StringBasedConfigurationAdapter {
     private static final String PREFIX = "luckperms.";
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java b/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java
index bd8346c98..3c6dc8ea2 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/AbstractContextSet.java
@@ -29,7 +29,7 @@ import net.luckperms.api.context.Context;
 import net.luckperms.api.context.ContextSatisfyMode;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.DefaultContextKeys;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Locale;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java
index 23c238331..f86ab1a4c 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.context;
 
 import me.lucko.luckperms.common.context.comparator.ContextComparator;
 import net.luckperms.api.context.Context;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public final class ContextImpl implements Context, Comparable<Context> {
     private final String key;
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java
index 4f9153aff..0cf4b0533 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/ImmutableContextSetImpl.java
@@ -36,7 +36,7 @@ import net.luckperms.api.context.ContextSatisfyMode;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.context.MutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java b/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java
index 667fd53e6..c98aaf47a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/MutableContextSetImpl.java
@@ -36,7 +36,7 @@ import net.luckperms.api.context.ContextSatisfyMode;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.context.MutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java b/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java
index 9665a7ee9..8a7757492 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/calculator/ConfigurationContextCalculator.java
@@ -33,7 +33,7 @@ import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.DefaultContextKeys;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.context.StaticContextCalculator;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class ConfigurationContextCalculator implements StaticContextCalculator {
     private final LuckPermsConfiguration config;
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManagerBase.java b/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManagerBase.java
index 7125cfd2d..782dc9a05 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManagerBase.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/manager/ContextManagerBase.java
@@ -36,7 +36,7 @@ import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.context.StaticContextCalculator;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/manager/DetachedContextManager.java b/common/src/main/java/me/lucko/luckperms/common/context/manager/DetachedContextManager.java
index cf0e904b3..8236e4b97 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/manager/DetachedContextManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/manager/DetachedContextManager.java
@@ -29,7 +29,7 @@ import com.github.benmanes.caffeine.cache.LoadingCache;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.util.CaffeineFactory;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java b/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java
index ee92a11e8..8e9019d98 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/manager/QueryOptionsCache.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.context.manager;
 import me.lucko.luckperms.common.cache.ExpiringCache;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java
index f5b150f3a..891991b50 100644
--- a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyManagerImpl.java
@@ -34,7 +34,6 @@ import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender;
 import me.lucko.luckperms.common.storage.StorageType;
 import me.lucko.luckperms.common.util.MoreFiles;
 import net.luckperms.api.platform.Platform;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -73,7 +72,7 @@ public class DependencyManagerImpl implements DependencyManager {
     /** A map of isolated classloaders which have been created. */
     private final Map<ImmutableSet<Dependency>, IsolatedClassLoader> loaders = new HashMap<>();
     /** Cached relocation handler instance. */
-    private @MonotonicNonNull RelocationHandler relocationHandler = null;
+    private RelocationHandler relocationHandler = null;
 
     public DependencyManagerImpl(LuckPermsPlugin plugin, Collection<DependencyRepository> repositories) {
         this.registry = new DependencyRegistry(plugin.getBootstrap().getType());
diff --git a/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java b/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java
index ff11bcd96..4894e037e 100644
--- a/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java
+++ b/common/src/main/java/me/lucko/luckperms/common/event/AbstractEventBus.java
@@ -32,7 +32,7 @@ import net.kyori.event.SimpleEventBus;
 import net.luckperms.api.event.EventBus;
 import net.luckperms.api.event.EventSubscription;
 import net.luckperms.api.event.LuckPermsEvent;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 import java.util.Set;
diff --git a/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java b/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java
index 4a7b9387c..7eeb565ae 100644
--- a/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java
+++ b/common/src/main/java/me/lucko/luckperms/common/event/EventDispatcher.java
@@ -96,7 +96,7 @@ import net.luckperms.api.extension.Extension;
 import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java b/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java
index bc0c06665..bc97de6a5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java
+++ b/common/src/main/java/me/lucko/luckperms/common/event/LuckPermsEventSubscription.java
@@ -28,8 +28,8 @@ package me.lucko.luckperms.common.event;
 import net.kyori.event.EventSubscriber;
 import net.luckperms.api.event.EventSubscription;
 import net.luckperms.api.event.LuckPermsEvent;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
diff --git a/common/src/main/java/me/lucko/luckperms/common/event/gen/AbstractEvent.java b/common/src/main/java/me/lucko/luckperms/common/event/gen/AbstractEvent.java
index 5dd3b120e..2fdc2f272 100644
--- a/common/src/main/java/me/lucko/luckperms/common/event/gen/AbstractEvent.java
+++ b/common/src/main/java/me/lucko/luckperms/common/event/gen/AbstractEvent.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.event.gen;
 
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.event.LuckPermsEvent;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.lang.invoke.MethodHandles;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java b/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java
index 3919cd827..d2d093c1f 100644
--- a/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/event/model/EntitySourceImpl.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.event.model;
 
 import net.luckperms.api.event.source.EntitySource;
 import net.luckperms.api.platform.PlatformEntity;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class EntitySourceImpl implements EntitySource {
     private final PlatformEntity entity;
diff --git a/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java b/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java
index aac1b5261..1d4325544 100644
--- a/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java
+++ b/common/src/main/java/me/lucko/luckperms/common/event/model/SenderPlatformEntity.java
@@ -27,8 +27,8 @@ package me.lucko.luckperms.common.event.model;
 
 import me.lucko.luckperms.common.sender.Sender;
 import net.luckperms.api.platform.PlatformEntity;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/event/model/UnknownSource.java b/common/src/main/java/me/lucko/luckperms/common/event/model/UnknownSource.java
index 571367c8b..9760d9dde 100644
--- a/common/src/main/java/me/lucko/luckperms/common/event/model/UnknownSource.java
+++ b/common/src/main/java/me/lucko/luckperms/common/event/model/UnknownSource.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.event.model;
 
 import net.luckperms.api.event.source.Source;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public final class UnknownSource implements Source {
     public static final Source INSTANCE = new UnknownSource();
diff --git a/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java b/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java
index bf2e0a1cd..4f358f198 100644
--- a/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/extension/SimpleExtensionManager.java
@@ -31,7 +31,7 @@ import me.lucko.luckperms.common.util.gson.GsonProvider;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.extension.Extension;
 import net.luckperms.api.extension.ExtensionManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/common/src/main/java/me/lucko/luckperms/common/filter/mongo/ConstraintMongoBuilder.java b/common/src/main/java/me/lucko/luckperms/common/filter/mongo/ConstraintMongoBuilder.java
index 5d37061bd..85ac29c76 100644
--- a/common/src/main/java/me/lucko/luckperms/common/filter/mongo/ConstraintMongoBuilder.java
+++ b/common/src/main/java/me/lucko/luckperms/common/filter/mongo/ConstraintMongoBuilder.java
@@ -31,7 +31,7 @@ import me.lucko.luckperms.common.filter.Comparison;
 import me.lucko.luckperms.common.filter.Constraint;
 import me.lucko.luckperms.common.filter.PageParameters;
 import org.bson.conversions.Bson;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.regex.Pattern;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/filter/sql/ConstraintSqlBuilder.java b/common/src/main/java/me/lucko/luckperms/common/filter/sql/ConstraintSqlBuilder.java
index 04e5d7fc5..b40873816 100644
--- a/common/src/main/java/me/lucko/luckperms/common/filter/sql/ConstraintSqlBuilder.java
+++ b/common/src/main/java/me/lucko/luckperms/common/filter/sql/ConstraintSqlBuilder.java
@@ -29,7 +29,7 @@ import me.lucko.luckperms.common.filter.Comparison;
 import me.lucko.luckperms.common.filter.Constraint;
 import me.lucko.luckperms.common.filter.PageParameters;
 import me.lucko.luckperms.common.storage.implementation.sql.builder.AbstractSqlBuilder;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ConstraintSqlBuilder extends AbstractSqlBuilder {
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java
index 2ceb2ba66..bdea6bb73 100644
--- a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java
@@ -34,7 +34,7 @@ import net.kyori.adventure.translation.GlobalTranslator;
 import net.kyori.adventure.translation.TranslationRegistry;
 import net.kyori.adventure.translation.Translator;
 import net.kyori.adventure.util.UTF8ResourceBundleControl;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java
index c350e7a9f..6285c83bd 100644
--- a/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java
+++ b/common/src/main/java/me/lucko/luckperms/common/locale/TranslationRepository.java
@@ -36,7 +36,7 @@ import me.lucko.luckperms.common.util.gson.GsonProvider;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java
index 4322c3204..c3ed3671b 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java
@@ -50,8 +50,8 @@ import net.luckperms.api.messenger.message.type.ActionLogMessage;
 import net.luckperms.api.messenger.message.type.CustomMessage;
 import net.luckperms.api.messenger.message.type.UpdateMessage;
 import net.luckperms.api.messenger.message.type.UserUpdateMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.Set;
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java b/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java
index e9ec391a2..3b772f5a3 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.storage.implementation.sql.connection.hikari.Po
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java
index c37f8711f..dfac57bf1 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/AbstractMessage.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.messaging.message;
 
 import net.luckperms.api.messenger.message.Message;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.UUID;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java
index db24d1122..fe9fd0420 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/ActionLogMessageImpl.java
@@ -30,8 +30,8 @@ import me.lucko.luckperms.common.actionlog.ActionJsonSerializer;
 import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
 import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.messenger.message.type.ActionLogMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/CustomMessageImpl.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/CustomMessageImpl.java
index 0265eb35a..3533044cd 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/CustomMessageImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/CustomMessageImpl.java
@@ -30,8 +30,8 @@ import com.google.gson.JsonObject;
 import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
 import me.lucko.luckperms.common.util.gson.JObject;
 import net.luckperms.api.messenger.message.type.CustomMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/UpdateMessageImpl.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UpdateMessageImpl.java
index 95a0e34c4..4b999ba97 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/UpdateMessageImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UpdateMessageImpl.java
@@ -28,8 +28,8 @@ package me.lucko.luckperms.common.messaging.message;
 import com.google.gson.JsonElement;
 import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
 import net.luckperms.api.messenger.message.type.UpdateMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java
index 96d66c4d7..c5275e1e0 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/message/UserUpdateMessageImpl.java
@@ -29,8 +29,8 @@ import com.google.gson.JsonElement;
 import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
 import me.lucko.luckperms.common.util.gson.JObject;
 import net.luckperms.api.messenger.message.type.UserUpdateMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java
index 9a9e7c690..6108cd186 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.util.Throwing;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.time.Duration;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java
index 4cbf43850..4ff306954 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/pluginmsg/AbstractPluginMessageMessenger.java
@@ -31,7 +31,7 @@ import com.google.common.io.ByteStreams;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Abstract implementation of {@link Messenger} using Minecraft's
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/postgres/PostgresMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/postgres/PostgresMessenger.java
index a79a9b63f..2a4d18e88 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/postgres/PostgresMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/postgres/PostgresMessenger.java
@@ -31,7 +31,7 @@ import me.lucko.luckperms.common.storage.implementation.sql.SqlStorage;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.postgresql.PGConnection;
 import org.postgresql.PGNotification;
 import org.postgresql.util.PSQLException;
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/rabbitmq/RabbitMQMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/rabbitmq/RabbitMQMessenger.java
index 22b62f805..9359e95db 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/rabbitmq/RabbitMQMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/rabbitmq/RabbitMQMessenger.java
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.util.HostAndPort;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java
index e10d705c2..20e1bb552 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java
@@ -29,7 +29,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import redis.clients.jedis.DefaultJedisClientConfig;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.JedisClientConfig;
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java
index 0f1bd6ef1..ebb8e3060 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.messaging.sql;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.message.OutgoingMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java b/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java
index 993edbd65..8d77ed539 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/DemotionResults.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.model;
 
 import net.luckperms.api.track.DemotionResult;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/Group.java b/common/src/main/java/me/lucko/luckperms/common/model/Group.java
index c3db40f64..6e1f865dc 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/Group.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/Group.java
@@ -38,7 +38,7 @@ import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.types.DisplayNameNode;
 import net.luckperms.api.node.types.WeightNode;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Locale;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java b/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java
index 3c368afe6..99b3fa317 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/InheritanceOrigin.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.model;
 
 import net.luckperms.api.model.data.DataType;
 import net.luckperms.api.node.metadata.types.InheritanceOriginMetadata;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java
index ca7b8b774..a435691a3 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
@@ -52,8 +52,8 @@ import net.luckperms.api.node.types.WeightNode;
 import net.luckperms.api.query.Flag;
 import net.luckperms.api.query.QueryOptions;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolderIdentifier.java b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolderIdentifier.java
index 8faf2eded..cd637b789 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolderIdentifier.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolderIdentifier.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.model;
 
 import net.luckperms.api.model.PermissionHolder.Identifier;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java b/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java
index 213e49d37..06bae620e 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/PromotionResults.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.model;
 
 import net.luckperms.api.track.PromotionResult;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/Track.java b/common/src/main/java/me/lucko/luckperms/common/model/Track.java
index 0eff019b7..0489841af 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/Track.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/Track.java
@@ -38,7 +38,7 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.types.InheritanceNode;
 import net.luckperms.api.track.DemotionResult;
 import net.luckperms.api.track.PromotionResult;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/User.java b/common/src/main/java/me/lucko/luckperms/common/model/User.java
index 35a2bd440..549445712 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/User.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/User.java
@@ -31,7 +31,7 @@ import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import net.kyori.adventure.text.Component;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Optional;
 import java.util.UUID;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/UserIdentifier.java b/common/src/main/java/me/lucko/luckperms/common/model/UserIdentifier.java
index 988a8026f..50aa5fe5b 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/UserIdentifier.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/UserIdentifier.java
@@ -25,8 +25,8 @@
 
 package me.lucko.luckperms.common.model;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java b/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java
index 6b947ed7d..4acfd42c6 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/WeightCache.java
@@ -31,7 +31,7 @@ import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.query.QueryOptionsImpl;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Locale;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java
index 2c9c96b2e..95954be1c 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNode.java
@@ -35,8 +35,8 @@ import net.luckperms.api.node.NodeEqualityPredicate;
 import net.luckperms.api.node.ScopedNode;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.PermissionNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/AbstractNodeBuilder.java b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNodeBuilder.java
index ca2a97b79..bf82cfb96 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/AbstractNodeBuilder.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/AbstractNodeBuilder.java
@@ -31,8 +31,8 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.ScopedNode;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Instant;
 import java.time.temporal.ChronoField;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java
index 00fad6501..3cdb569e6 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/factory/NodeBuilders.java
@@ -41,8 +41,8 @@ import net.luckperms.api.node.types.PrefixNode;
 import net.luckperms.api.node.types.RegexPermissionNode;
 import net.luckperms.api.node.types.SuffixNode;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java b/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java
index d07f780e6..5bdba1b53 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/matcher/ConstraintNodeMatcher.java
@@ -30,8 +30,8 @@ import me.lucko.luckperms.common.filter.Constraint;
 import me.lucko.luckperms.common.filter.ConstraintFactory;
 import net.luckperms.api.node.Node;
 import net.luckperms.api.node.matcher.NodeMatcher;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Abstract implementation of {@link NodeMatcher} backed by a {@link Constraint}.
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/matcher/StandardNodeMatchers.java b/common/src/main/java/me/lucko/luckperms/common/node/matcher/StandardNodeMatchers.java
index c1b12785e..1b2232b13 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/matcher/StandardNodeMatchers.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/matcher/StandardNodeMatchers.java
@@ -38,8 +38,8 @@ import net.luckperms.api.node.Node;
 import net.luckperms.api.node.NodeEqualityPredicate;
 import net.luckperms.api.node.NodeType;
 import net.luckperms.api.node.types.MetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 public final class StandardNodeMatchers {
     private StandardNodeMatchers() {}
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java b/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java
index fe87b1a9d..d61212a61 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/DisplayName.java
@@ -30,8 +30,8 @@ import me.lucko.luckperms.common.node.AbstractNodeBuilder;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.DisplayNameNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Locale;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java
index d19128022..a65a67126 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java
@@ -32,8 +32,8 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.InheritanceNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Locale;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java
index f5477088e..e6be2e4dc 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java
@@ -31,8 +31,8 @@ import me.lucko.luckperms.common.node.factory.Delimiters;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.MetaNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Iterator;
 import java.util.Locale;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java
index 31357b33b..b2293b564 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Permission.java
@@ -33,7 +33,7 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.NodeBuilder;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.PermissionNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java
index 3902afae2..01fadc9b0 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Prefix.java
@@ -32,8 +32,8 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.PrefixNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Iterator;
 import java.util.Locale;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java b/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java
index c04c943a6..6f52c60b8 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/RegexPermission.java
@@ -32,8 +32,8 @@ import me.lucko.luckperms.common.node.AbstractNodeBuilder;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.RegexPermissionNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java
index 4821c0513..e6ccfd01d 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Suffix.java
@@ -32,8 +32,8 @@ import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.ChatMetaType;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.SuffixNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Iterator;
 import java.util.Locale;
diff --git a/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java b/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java
index 4e6c02085..550886ad3 100644
--- a/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java
+++ b/common/src/main/java/me/lucko/luckperms/common/node/types/Weight.java
@@ -30,8 +30,8 @@ import me.lucko.luckperms.common.node.AbstractNodeBuilder;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.node.metadata.NodeMetadataKey;
 import net.luckperms.api.node.types.WeightNode;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Locale;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java b/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java
index def95b260..372cb0db5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java
+++ b/common/src/main/java/me/lucko/luckperms/common/plugin/bootstrap/LuckPermsBootstrap.java
@@ -29,7 +29,7 @@ import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender;
 import me.lucko.luckperms.common.plugin.logging.PluginLogger;
 import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter;
 import net.luckperms.api.platform.Platform;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.InputStream;
 import java.nio.file.Path;
diff --git a/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java
index 3ff75aa63..64cb3e1bb 100644
--- a/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java
@@ -32,8 +32,8 @@ import net.luckperms.api.query.Flag;
 import net.luckperms.api.query.OptionKey;
 import net.luckperms.api.query.QueryMode;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.EnumSet;
 import java.util.HashMap;
diff --git a/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java
index 0fe3d6d7e..cb30d7575 100644
--- a/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java
@@ -35,8 +35,8 @@ import net.luckperms.api.query.Flag;
 import net.luckperms.api.query.OptionKey;
 import net.luckperms.api.query.QueryMode;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Objects;
@@ -69,7 +69,7 @@ public class QueryOptionsImpl implements QueryOptions {
     }
 
     @Override
-    public @NonNull QueryMode mode() {
+    public QueryMode mode() {
         return this.mode;
     }
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
index 0f89eecb7..72c28d5da 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
@@ -44,7 +44,7 @@ import net.luckperms.api.event.cause.CreationCause;
 import net.luckperms.api.event.cause.DeletionCause;
 import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java
index 7e9f1e315..8198c41e6 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/StorageImplementation.java
@@ -39,7 +39,7 @@ import me.lucko.luckperms.common.storage.misc.NodeEntry;
 import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java
index 2ab38b26f..326eeefb8 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java
@@ -61,7 +61,7 @@ import net.luckperms.api.node.types.InheritanceNode;
 import net.luckperms.api.node.types.MetaNode;
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.Types;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Path;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java
index 35ac6c5f3..1ddcdb904 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileActionLogger.java
@@ -37,7 +37,7 @@ import me.lucko.luckperms.common.filter.PageParameters;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.util.gson.GsonProvider;
 import net.luckperms.api.actionlog.Action;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java
index 346a3cbb4..e9c70a0c5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/FileUuidCache.java
@@ -32,8 +32,8 @@ import com.google.common.collect.SetMultimap;
 import me.lucko.luckperms.common.storage.misc.PlayerSaveResultImpl;
 import me.lucko.luckperms.common.util.Uuids;
 import net.luckperms.api.model.PlayerSaveResult;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
index 3c2016e45..fbba02503 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
@@ -77,7 +77,7 @@ import net.luckperms.api.node.NodeBuilder;
 import org.bson.Document;
 import org.bson.UuidRepresentation;
 import org.bson.conversions.Bson;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Instant;
 import java.util.ArrayList;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/rest/RestStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/rest/RestStorage.java
index a94c3e1b9..8337744c1 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/rest/RestStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/rest/RestStorage.java
@@ -68,7 +68,7 @@ import net.luckperms.rest.model.UpdateTrackRequest;
 import net.luckperms.rest.model.UpdateUserRequest;
 import net.luckperms.rest.model.UserLookupResult;
 import net.luckperms.rest.model.UserSearchResult;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 import retrofit2.Response;
 
 import java.io.IOException;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java
index e0a1c8397..0be941c81 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/split/SplitStorage.java
@@ -42,7 +42,7 @@ import me.lucko.luckperms.common.storage.misc.NodeEntry;
 import net.luckperms.api.actionlog.Action;
 import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java
index 17a9bfe37..1d8efc304 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java
@@ -58,7 +58,7 @@ import net.luckperms.api.context.DefaultContextKeys;
 import net.luckperms.api.context.MutableContextSet;
 import net.luckperms.api.model.PlayerSaveResult;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java b/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java
index 6b8ad0b4e..c00a4aece 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/misc/NodeEntry.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.common.storage.misc;
 
 import net.luckperms.api.node.HeldNode;
 import net.luckperms.api.node.Node;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 @SuppressWarnings("deprecation")
 public final class NodeEntry<H extends Comparable<H>, N extends Node> implements HeldNode<H> {
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java b/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java
index b61f5239c..ab40df5eb 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/misc/PlayerSaveResultImpl.java
@@ -27,8 +27,8 @@ package me.lucko.luckperms.common.storage.misc;
 
 import com.google.common.collect.ImmutableSet;
 import net.luckperms.api.model.PlayerSaveResult;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.EnumSet;
 import java.util.Objects;
diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java b/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java
index 725f77c6d..14bd55599 100644
--- a/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java
+++ b/common/src/main/java/me/lucko/luckperms/common/treeview/ImmutableTreeNode.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.treeview;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.gson.JsonObject;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java
index 6893d18bd..813840b0e 100644
--- a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java
+++ b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeNode.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.treeview;
 
 import com.google.common.collect.Maps;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java b/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java
index 9f49b7201..7079f05f4 100644
--- a/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java
+++ b/common/src/main/java/me/lucko/luckperms/common/util/Predicates.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.util;
 
 import com.google.common.collect.Range;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Locale;
 import java.util.function.Predicate;
diff --git a/common/src/main/java/me/lucko/luckperms/common/util/Uuids.java b/common/src/main/java/me/lucko/luckperms/common/util/Uuids.java
index 9f398a83f..5ecfb664c 100644
--- a/common/src/main/java/me/lucko/luckperms/common/util/Uuids.java
+++ b/common/src/main/java/me/lucko/luckperms/common/util/Uuids.java
@@ -25,7 +25,7 @@
 
 package me.lucko.luckperms.common.util;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 import java.util.function.Predicate;
diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java
index c249c8b3b..548df3d4a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java
+++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseCheckTarget.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.verbose;
 import me.lucko.luckperms.common.model.Group;
 import me.lucko.luckperms.common.model.User;
 import net.luckperms.api.model.PermissionHolder;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.UUID;
diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java
index 0e7bb1010..5b31dd429 100644
--- a/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java
+++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/socket/listener/WebEditorSocketListener.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.webeditor.socket.WebEditorSocket;
 import okhttp3.Response;
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.io.EOFException;
 import java.security.PublicKey;
diff --git a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java
index 7033a6b07..e39e3575d 100644
--- a/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java
+++ b/common/src/main/java/me/lucko/luckperms/common/webeditor/store/WebEditorSessionMap.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.webeditor.store;
 
 import me.lucko.luckperms.common.webeditor.WebEditorRequest;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java
index 9b2c527de..875d2fc57 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/context/FabricContextManager.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.fabric.model.MixinUser;
 import net.luckperms.api.query.QueryOptions;
 import net.minecraft.server.level.ServerPlayer;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.UUID;
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiV0Listener.java b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiV0Listener.java
index a76f48186..70a4a3746 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiV0Listener.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricPermissionsApiV0Listener.java
@@ -45,7 +45,7 @@ import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Optional;
 import java.util.UUID;
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java
index f86ac11a4..ae4735967 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/FabricMessagingFactory.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.fabric.LPFabricPlugin;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class FabricMessagingFactory extends MessagingFactory<LPFabricPlugin> {
     public FabricMessagingFactory(LPFabricPlugin plugin) {
diff --git a/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java b/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java
index 26852ba64..bc9a3b8ae 100644
--- a/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java
+++ b/forge/src/main/java/me/lucko/luckperms/forge/messaging/ForgeMessagingFactory.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.forge.LPForgePlugin;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class ForgeMessagingFactory extends MessagingFactory<LPForgePlugin> {
     public ForgeMessagingFactory(LPForgePlugin plugin) {
diff --git a/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java b/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java
index 4883579af..bea2bba01 100644
--- a/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java
+++ b/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java
@@ -29,7 +29,6 @@ import com.hypixel.hytale.server.core.plugin.JavaPlugin;
 import com.hypixel.hytale.server.core.plugin.JavaPluginInit;
 import me.lucko.luckperms.common.loader.JarInJarClassLoader;
 import me.lucko.luckperms.common.loader.LoaderBootstrap;
-import org.checkerframework.checker.nullness.compatqual.NonNullDecl;
 
 import java.util.List;
 
@@ -43,7 +42,7 @@ public class HytaleLoaderPlugin extends JavaPlugin {
 
     private final LoaderBootstrap plugin;
 
-    public HytaleLoaderPlugin(@NonNullDecl JavaPluginInit init) {
+    public HytaleLoaderPlugin(JavaPluginInit init) {
         super(init);
         JarInJarClassLoader loader = new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME);
         loader.setPriorityPackagePrefixes(List.of("org.slf4j"));
diff --git a/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java b/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java
index af7d7fa99..5210d0ac8 100644
--- a/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java
+++ b/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java
@@ -29,7 +29,6 @@ import com.hypixel.hytale.server.core.plugin.JavaPlugin;
 import com.hypixel.hytale.server.core.plugin.JavaPluginInit;
 import me.lucko.luckperms.common.loader.JarInJarClassLoader;
 import me.lucko.luckperms.common.loader.LoaderBootstrap;
-import org.checkerframework.checker.nullness.compatqual.NonNullDecl;
 
 import java.util.List;
 
@@ -39,7 +38,7 @@ public class HytaleLoaderPlugin extends JavaPlugin {
 
     private final LoaderBootstrap plugin;
 
-    public HytaleLoaderPlugin(@NonNullDecl JavaPluginInit init) {
+    public HytaleLoaderPlugin(JavaPluginInit init) {
         super(init);
         JarInJarClassLoader loader = new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME);
         loader.setPriorityPackagePrefixes(List.of("org.slf4j"));
diff --git a/hytale/src/main/java/me/lucko/luckperms/hytale/LPHytaleBootstrap.java b/hytale/src/main/java/me/lucko/luckperms/hytale/LPHytaleBootstrap.java
index 714c85dd9..7cd6f6c4f 100644
--- a/hytale/src/main/java/me/lucko/luckperms/hytale/LPHytaleBootstrap.java
+++ b/hytale/src/main/java/me/lucko/luckperms/hytale/LPHytaleBootstrap.java
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.plugin.classpath.ClassPathAppender;
 import me.lucko.luckperms.common.plugin.classpath.JarInJarClassPathAppender;
 import me.lucko.luckperms.common.plugin.logging.PluginLogger;
 import net.luckperms.api.platform.Platform;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hytale/src/main/java/me/lucko/luckperms/hytale/context/HytalePlayerCalculator.java b/hytale/src/main/java/me/lucko/luckperms/hytale/context/HytalePlayerCalculator.java
index f78dba899..d9e2cf207 100644
--- a/hytale/src/main/java/me/lucko/luckperms/hytale/context/HytalePlayerCalculator.java
+++ b/hytale/src/main/java/me/lucko/luckperms/hytale/context/HytalePlayerCalculator.java
@@ -53,7 +53,7 @@ import net.luckperms.api.context.ContextConsumer;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.DefaultContextKeys;
 import net.luckperms.api.context.ImmutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/neoforge/src/main/java/me/lucko/luckperms/neoforge/messaging/NeoForgeMessagingFactory.java b/neoforge/src/main/java/me/lucko/luckperms/neoforge/messaging/NeoForgeMessagingFactory.java
index 26f35e71d..a474050ff 100644
--- a/neoforge/src/main/java/me/lucko/luckperms/neoforge/messaging/NeoForgeMessagingFactory.java
+++ b/neoforge/src/main/java/me/lucko/luckperms/neoforge/messaging/NeoForgeMessagingFactory.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.neoforge.LPNeoForgePlugin;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class NeoForgeMessagingFactory extends MessagingFactory<LPNeoForgePlugin> {
     public NeoForgeMessagingFactory(LPNeoForgePlugin plugin) {
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java
index 0ff92d4b5..f3ab1704b 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitContextManager.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.nukkit.inject.permissible.LuckPermsPermissible;
 import me.lucko.luckperms.nukkit.inject.permissible.PermissibleInjector;
 import net.luckperms.api.query.OptionKey;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.UUID;
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java
index b54c562a4..7d63ee3f1 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/context/NukkitPlayerCalculator.java
@@ -42,7 +42,7 @@ import net.luckperms.api.context.ContextConsumer;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.DefaultContextKeys;
 import net.luckperms.api.context.ImmutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Locale;
 import java.util.Set;
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java
index a3f184fcf..2b92b0133 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/PermissionDefault.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.nukkit.inject;
 
 import cn.nukkit.permission.Permission;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java
index f6d8f4455..93c0d00d5 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java
@@ -44,8 +44,8 @@ import me.lucko.luckperms.nukkit.calculator.PermissionMapProcessor;
 import me.lucko.luckperms.nukkit.inject.PermissionDefault;
 import net.luckperms.api.query.QueryOptions;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Field;
 import java.util.Collection;
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleInjector.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleInjector.java
index ca1c3f392..3a966a762 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleInjector.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/PermissibleInjector.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.nukkit.inject.permissible;
 import cn.nukkit.Player;
 import cn.nukkit.permission.PermissibleBase;
 import cn.nukkit.permission.PermissionAttachment;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Field;
 import java.util.Set;
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java
index ff2ce74ea..d422fd59c 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsDefaultsMap.java
@@ -32,7 +32,7 @@ import com.google.common.collect.ImmutableMap;
 import me.lucko.luckperms.common.cache.Cache;
 import me.lucko.luckperms.nukkit.LPNukkitPlugin;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java
index a276b48c8..6dc5dea93 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java
@@ -32,8 +32,8 @@ import com.google.common.collect.ImmutableMap;
 import me.lucko.luckperms.common.cache.LoadingMap;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.treeview.PermissionRegistry;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Field;
 import java.util.Collections;
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java
index 1c3846b74..49a0dc7f8 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsSubscriptionMap.java
@@ -31,7 +31,7 @@ import cn.nukkit.plugin.PluginManager;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import me.lucko.luckperms.nukkit.LPNukkitPlugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/DescriptionBuilder.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/DescriptionBuilder.java
index ce4b06c28..7ee15cbfe 100644
--- a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/DescriptionBuilder.java
+++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/DescriptionBuilder.java
@@ -33,8 +33,8 @@ import me.lucko.luckperms.sponge.service.model.LPSubject;
 import me.lucko.luckperms.sponge.service.model.LPSubjectCollection;
 import net.kyori.adventure.text.Component;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.api.service.permission.PermissionDescription;
 import org.spongepowered.api.service.permission.PermissionService;
 import org.spongepowered.plugin.PluginContainer;
diff --git a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionDescriptionProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionDescriptionProxy.java
index f44f12f21..71eafc698 100644
--- a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionDescriptionProxy.java
+++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionDescriptionProxy.java
@@ -30,7 +30,7 @@ import me.lucko.luckperms.sponge.service.model.LPPermissionDescription;
 import me.lucko.luckperms.sponge.service.model.LPPermissionService;
 import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject;
 import net.kyori.adventure.text.Component;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.service.permission.PermissionDescription;
 import org.spongepowered.api.service.permission.Subject;
diff --git a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionServiceProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionServiceProxy.java
index 681bd8a98..8832644ff 100644
--- a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionServiceProxy.java
+++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionServiceProxy.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.sponge.service.model.LPPermissionDescription;
 import me.lucko.luckperms.sponge.service.model.LPPermissionService;
 import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject;
 import me.lucko.luckperms.sponge.service.model.LPSubjectCollection;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.service.context.Context;
 import org.spongepowered.api.service.context.ContextCalculator;
diff --git a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectCollectionProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectCollectionProxy.java
index 50fde0636..f21bf868a 100644
--- a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectCollectionProxy.java
+++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectCollectionProxy.java
@@ -29,7 +29,7 @@ import me.lucko.luckperms.common.util.ImmutableCollectors;
 import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject;
 import me.lucko.luckperms.sponge.service.model.LPSubject;
 import me.lucko.luckperms.sponge.service.model.LPSubjectCollection;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.service.permission.Subject;
 import org.spongepowered.api.service.permission.SubjectCollection;
diff --git a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectDataProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectDataProxy.java
index e55381b35..0e273283e 100644
--- a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectDataProxy.java
+++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectDataProxy.java
@@ -34,8 +34,8 @@ import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject;
 import me.lucko.luckperms.sponge.service.model.LPSubject;
 import me.lucko.luckperms.sponge.service.model.LPSubjectData;
 import me.lucko.luckperms.sponge.service.model.LPSubjectReference;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.api.service.context.Context;
 import org.spongepowered.api.service.permission.Subject;
 import org.spongepowered.api.service.permission.SubjectData;
diff --git a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectProxy.java
index c0497dabe..11d5d9d21 100644
--- a/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectProxy.java
+++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectProxy.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubject;
 import me.lucko.luckperms.sponge.service.model.LPSubjectReference;
 import me.lucko.luckperms.sponge.service.model.LPSubjectUser;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.service.context.Context;
diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java
index fa2eb332e..7d9d108b1 100644
--- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java
+++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/ForwardingImmutableContextSet.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.sponge.service.context;
 
 import net.luckperms.api.context.ImmutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.service.context.Context;
 
 import java.util.Iterator;
diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java
index d5f0664fc..b10f64537 100644
--- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java
+++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPProxiedSubject.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.sponge.service.model;
 
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.service.permission.Subject;
 
 /**
diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectReference.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectReference.java
index 0383c5ec4..387b3001a 100644
--- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectReference.java
+++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectReference.java
@@ -25,7 +25,7 @@
 
 package me.lucko.luckperms.sponge.service.model;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.service.permission.SubjectReference;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java
index e00202db4..ba9792bf8 100644
--- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java
+++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/reference/CachedSubjectReference.java
@@ -28,7 +28,7 @@ package me.lucko.luckperms.sponge.service.reference;
 import me.lucko.luckperms.sponge.service.model.LPPermissionService;
 import me.lucko.luckperms.sponge.service.model.LPSubject;
 import me.lucko.luckperms.sponge.service.model.LPSubjectReference;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.service.permission.Subject;
 
 import java.lang.ref.WeakReference;
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java
index 3d4ea5654..4a40170e1 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java
@@ -30,7 +30,7 @@ import me.lucko.luckperms.common.command.utils.ArgumentTokenizer;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.sender.Sender;
 import net.kyori.adventure.text.Component;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.command.Command;
 import org.spongepowered.api.command.CommandCause;
 import org.spongepowered.api.command.CommandCompletion;
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java
index ede7aef76..c0af239aa 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/context/SpongePlayerCalculator.java
@@ -34,7 +34,7 @@ import net.luckperms.api.context.ContextConsumer;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.DefaultContextKeys;
 import net.luckperms.api.context.ImmutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.Game;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Server;
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java
index 186936a2d..1b3bfc8c0 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.sponge.LPSpongePlugin;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class SpongeMessagingFactory extends MessagingFactory<LPSpongePlugin> {
     public SpongeMessagingFactory(LPSpongePlugin plugin) {
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/ContextCalculatorProxy.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/ContextCalculatorProxy.java
index 1c5b74bfa..3c1be85de 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/ContextCalculatorProxy.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/ContextCalculatorProxy.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.sponge.service.model;
 
 import me.lucko.luckperms.common.context.calculator.ForwardingContextCalculator;
 import net.luckperms.api.context.ContextConsumer;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.EventContext;
 import org.spongepowered.api.event.EventContextKeys;
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java
index eef979ee6..10aed7998 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SimplePermissionDescription.java
@@ -27,7 +27,7 @@ package me.lucko.luckperms.sponge.service.model;
 
 import me.lucko.luckperms.sponge.service.ProxyFactory;
 import net.kyori.adventure.text.Component;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.api.service.permission.PermissionDescription;
 import org.spongepowered.plugin.PluginContainer;
 
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java
index 9dd44a10a..ff16e05c1 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/SubjectDataUpdateEventImpl.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.sponge.service.model;
 
 import me.lucko.luckperms.sponge.LPSpongePlugin;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.EventContext;
 import org.spongepowered.api.event.EventContextKeys;
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/TemporaryCauseHolderSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/TemporaryCauseHolderSubject.java
index a84c5f91f..9749ec74c 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/TemporaryCauseHolderSubject.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/TemporaryCauseHolderSubject.java
@@ -25,8 +25,8 @@
 
 package me.lucko.luckperms.sponge.service.model;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.EventContextKeys;
 import org.spongepowered.api.service.context.Context;
diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java
index 55b1f4297..8b74a72e7 100644
--- a/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java
+++ b/velocity/src/main/java/me/lucko/luckperms/velocity/context/VelocityPlayerCalculator.java
@@ -39,8 +39,8 @@ import net.luckperms.api.context.ContextConsumer;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.DefaultContextKeys;
 import net.luckperms.api.context.ImmutableContextSet;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 
 public class VelocityPlayerCalculator implements ContextCalculator<Player> {
     private final LPVelocityPlugin plugin;
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 a559cadfb..67af64166 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
@@ -39,7 +39,7 @@ import me.lucko.luckperms.common.verbose.event.CheckOrigin;
 import me.lucko.luckperms.velocity.LPVelocityPlugin;
 import me.lucko.luckperms.velocity.service.CompatibilityUtil;
 import net.luckperms.api.util.Tristate;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class MonitoringPermissionCheckListener {
     private final LPVelocityPlugin plugin;
diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java b/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java
index bdd700047..6f1095a9a 100644
--- a/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java
+++ b/velocity/src/main/java/me/lucko/luckperms/velocity/messaging/VelocityMessagingFactory.java
@@ -32,7 +32,7 @@ import me.lucko.luckperms.velocity.LPVelocityPlugin;
 import net.luckperms.api.messenger.IncomingMessageConsumer;
 import net.luckperms.api.messenger.Messenger;
 import net.luckperms.api.messenger.MessengerProvider;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class VelocityMessagingFactory extends MessagingFactory<LPVelocityPlugin> {
     public VelocityMessagingFactory(LPVelocityPlugin plugin) {
diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java
index 3e967d3d2..2ffb9a5b7 100644
--- a/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java
+++ b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java
@@ -35,7 +35,7 @@ import com.velocitypowered.api.proxy.Player;
 import me.lucko.luckperms.common.model.User;
 import me.lucko.luckperms.common.verbose.event.CheckOrigin;
 import net.luckperms.api.query.QueryOptions;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public class PlayerPermissionProvider implements PermissionProvider, PermissionFunction {
     private final Player player;